Fixes for building on kFreeBSD. Re #1105

This commit was SVN r15592.

opal/mca/memory/ptmalloc2/opal_ptmalloc2_munmap.c

@@ -26,7 +26,8 @@
 #elif defined(HAVE_SYSCALL)
 #include <syscall.h>
 #include <unistd.h>
-#elif defined(HAVE_DLSYM)
+#endif
+#if defined(HAVE_DLSYM)
 #ifndef __USE_GNU
 #define __USE_GNU
 #endif
@@ -60,7 +61,8 @@ munmap(void* addr, size_t len)
 int
 opal_mem_free_ptmalloc2_munmap(void *start, size_t length, int from_alloc)
 {
-#if !defined(HAVE___MUNMAP) && !defined(HAVE_SYSCALL) && defined(HAVE_DLSYM)
+#if !defined(HAVE___MUNMAP) && \
+    !(defined(HAVE_SYSCALL) && defined(__NR_munmap)) && defined(HAVE_DLSYM)
     static int (*realmunmap)(void*, size_t);
 #endif
 
@@ -70,7 +72,7 @@ opal_mem_free_ptmalloc2_munmap(void *start, size_t length, int from_alloc)
     return __munmap(start, length);
 #elif defined(HAVE_SYSCALL)
     return syscall(__NR_munmap, start, length);
-#elif defined(HAVE_DLSYM)
+#elif defined(HAVE_DLSYM) && defined(__NR_munmap)
     if (NULL == realmunmap) {
         union { 
             int (*munmap_fp)(void*, size_t);

opal/util/stacktrace.c

@@ -145,7 +145,9 @@ static void opal_show_stackframe (int signo, siginfo_t * info, void * p)
             case FPE_FLTDIV: si_code_str = "Floating point divide-by-zero"; break;
             case FPE_FLTOVF: si_code_str = "Floating point overflow"; break;
             case FPE_FLTUND: si_code_str = "Floating point underflow"; break;
+#ifdef FPE_FLTRES
             case FPE_FLTRES: si_code_str = "Floating point inexact result"; break;
+#endif
 #ifdef FBE_FLTINV
             case FPE_FLTINV: si_code_str = "Invalid floating point operation"; break;
 #endif