OSHMEM: compilation fix for pathscale 5.0 and pshmem API

fixed by Roman, reviewed by Igor/Mike

cmr=v1.8.2:reviewer=ompi-rm1.8

This commit was SVN r31450.

oshmem/shmem/c/shmem_barrier.c

@@ -24,6 +24,7 @@
 #if OSHMEM_PROFILING
 #include "oshmem/include/pshmem.h"
 #pragma weak shmem_barrier = pshmem_barrier
+#pragma weak shmem_barrier_all = pshmem_barrier_all
 #include "oshmem/shmem/c/profile/defines.h"
 #endif
 
@@ -74,10 +75,6 @@ void shmem_barrier(int PE_start, int logPE_stride, int PE_size, long *pSync)
     RUNTIME_CHECK_RC(rc);
 }
 
-#if OSHMEM_PROFILING
-#pragma weak shmem_barrier_all = pshmem_barrier_all
-#endif
-
 void shmem_barrier_all(void)
 {
     int rc = OSHMEM_SUCCESS;

oshmem/shmem/c/shmem_get.c

@@ -52,6 +52,10 @@
 #pragma weak shmem_float_get = pshmem_float_get
 #pragma weak shmem_double_get = pshmem_double_get
 #pragma weak shmem_longdouble_get = pshmem_longdouble_get
+#pragma weak shmem_getmem = pshmem_getmem
+#pragma weak shmem_get32 = pshmem_get32
+#pragma weak shmem_get64 = pshmem_get64
+#pragma weak shmem_get128 = pshmem_get128
 #include "oshmem/shmem/c/profile/defines.h"
 #endif
 
@@ -85,13 +89,6 @@ SHMEM_TYPE_GET(_longdouble, long double)
         return ;                                                    \
     }
 
-#if OSHMEM_PROFILING
-#pragma weak shmem_getmem = pshmem_getmem
-#pragma weak shmem_get32 = pshmem_get32
-#pragma weak shmem_get64 = pshmem_get64
-#pragma weak shmem_get128 = pshmem_get128
-#endif
-
 SHMEM_TYPE_GETMEM(_getmem, 1)
 SHMEM_TYPE_GETMEM(_get32, 4)
 SHMEM_TYPE_GETMEM(_get64, 8)

oshmem/shmem/c/shmem_iget.c

@@ -56,6 +56,9 @@
 #pragma weak shmem_float_iget = pshmem_float_iget
 #pragma weak shmem_double_iget = pshmem_double_iget
 #pragma weak shmem_longdouble_iget = pshmem_longdouble_iget
+#pragma weak shmem_iget32 = pshmem_iget32
+#pragma weak shmem_iget64 = pshmem_iget64
+#pragma weak shmem_iget128 = pshmem_iget128
 #include "oshmem/shmem/c/profile/defines.h"
 #endif
 
@@ -90,12 +93,6 @@ SHMEM_TYPE_IGET(_longdouble, long double)
         return ;                                                    \
     }
 
-#if OSHMEM_PROFILING
-#pragma weak shmem_iget32 = pshmem_iget32
-#pragma weak shmem_iget64 = pshmem_iget64
-#pragma weak shmem_iget128 = pshmem_iget128
-#endif
-
 SHMEM_TYPE_IGETMEM(_iget32, 4)
 SHMEM_TYPE_IGETMEM(_iget64, 8)
 SHMEM_TYPE_IGETMEM(_iget128, 16)

oshmem/shmem/c/shmem_iput.c

@@ -56,6 +56,9 @@
 #pragma weak shmem_float_iput = pshmem_float_iput
 #pragma weak shmem_double_iput = pshmem_double_iput
 #pragma weak shmem_longdouble_iput = pshmem_longdouble_iput
+#pragma weak shmem_iput32 = pshmem_iput32
+#pragma weak shmem_iput64 = pshmem_iput64
+#pragma weak shmem_iput128 = pshmem_iput128
 #include "oshmem/shmem/c/profile/defines.h"
 #endif
 
@@ -90,12 +93,6 @@ SHMEM_TYPE_IPUT(_longdouble, long double)
         return ;                                                    \
     }
 
-#if OSHMEM_PROFILING
-#pragma weak shmem_iput32 = pshmem_iput32
-#pragma weak shmem_iput64 = pshmem_iput64
-#pragma weak shmem_iput128 = pshmem_iput128
-#endif
-
 SHMEM_TYPE_IPUTMEM(_iput32, 4)
 SHMEM_TYPE_IPUTMEM(_iput64, 8)
 SHMEM_TYPE_IPUTMEM(_iput128, 16)

oshmem/shmem/c/shmem_put.c

@@ -55,6 +55,10 @@
 #pragma weak shmem_float_put = pshmem_float_put
 #pragma weak shmem_double_put = pshmem_double_put
 #pragma weak shmem_longdouble_put = pshmem_longdouble_put
+#pragma weak shmem_putmem = pshmem_putmem
+#pragma weak shmem_put32 = pshmem_put32
+#pragma weak shmem_put64 = pshmem_put64
+#pragma weak shmem_put128 = pshmem_put128
 #include "oshmem/shmem/c/profile/defines.h"
 #endif
 
@@ -88,13 +92,6 @@ SHMEM_TYPE_PUT(_longdouble, long double)
         return ;                                                    \
     }
 
-#if OSHMEM_PROFILING
-#pragma weak shmem_putmem = pshmem_putmem
-#pragma weak shmem_put32 = pshmem_put32
-#pragma weak shmem_put64 = pshmem_put64
-#pragma weak shmem_put128 = pshmem_put128
-#endif
-
 SHMEM_TYPE_PUTMEM(_putmem, 1)
 SHMEM_TYPE_PUTMEM(_put32, 4)
 SHMEM_TYPE_PUTMEM(_put64, 8)

oshmem/shmem/c/shmem_wait.c

@@ -44,6 +44,11 @@
 #pragma weak shmem_int_wait = pshmem_int_wait
 #pragma weak shmem_long_wait = pshmem_long_wait
 #pragma weak shmem_longlong_wait = pshmem_longlong_wait
+#pragma weak shmem_wait_until = pshmem_wait_until
+#pragma weak shmem_short_wait_until = pshmem_short_wait_until
+#pragma weak shmem_int_wait_until = pshmem_int_wait_until
+#pragma weak shmem_long_wait_until = pshmem_long_wait_until
+#pragma weak shmem_longlong_wait_until = pshmem_longlong_wait_until
 #include "oshmem/shmem/c/profile/defines.h"
 #endif
 
@@ -70,14 +75,6 @@ SHMEM_TYPE_WAIT(_longlong, long long, SHMEM_LLONG)
         return ;                                                    \
     }
 
-#if OSHMEM_PROFILING
-#pragma weak shmem_wait_until = pshmem_wait_until
-#pragma weak shmem_short_wait_until = pshmem_short_wait_until
-#pragma weak shmem_int_wait_until = pshmem_int_wait_until
-#pragma weak shmem_long_wait_until = pshmem_long_wait_until
-#pragma weak shmem_longlong_wait_until = pshmem_longlong_wait_until
-#endif
-
 SHMEM_TYPE_WAIT_UNTIL(, long, SHMEM_LONG)
 SHMEM_TYPE_WAIT_UNTIL(_short, short, SHMEM_SHORT)
 SHMEM_TYPE_WAIT_UNTIL(_int, int, SHMEM_INT)