Merge "Fix GCC 4.4.3/4.6/4.7 openmp support to use libgomp/config/linux"

4 files changed, 28 insertions, 3 deletions

diff --git a/gcc-4.7/libgomp/config/linux/futex.h b/gcc-4.7/libgomp/config/linux/futex.h
index d0136f50a..d2fedd5aa 100644
--- a/gcc-4.7/libgomp/config/linux/futex.h
+++ b/gcc-4.7/libgomp/config/linux/futex.h
@@ -38,6 +38,10 @@
 
 #pragma GCC visibility pop
 
+#if !defined(SYS_futex)
+#define SYS_futex __NR_futex
+#endif
+
 static inline void
 futex_wait (int *addr, int val)
 {
diff --git a/gcc-4.7/libgomp/config/linux/mips/futex.h b/gcc-4.7/libgomp/config/linux/mips/futex.h
index 93655d311..85a6008b8 100644
--- a/gcc-4.7/libgomp/config/linux/mips/futex.h
+++ b/gcc-4.7/libgomp/config/linux/mips/futex.h
@@ -25,6 +25,11 @@
 /* Provide target-specific access to the futex system call.  */
 
 #include <sys/syscall.h>
+
+#if !defined(SYS_futex)
+#define SYS_futex __NR_futex
+#endif
+
 #define FUTEX_WAIT 0
 #define FUTEX_WAKE 1
 
diff --git a/gcc-4.7/libgomp/config/linux/proc.c b/gcc-4.7/libgomp/config/linux/proc.c
index 5cc389db6..a65496347 100644
--- a/gcc-4.7/libgomp/config/linux/proc.c
+++ b/gcc-4.7/libgomp/config/linux/proc.c
@@ -235,7 +235,7 @@ sc_nprocessors_actu ()
 
     if (buffer_len < 0)  /* should not happen */ {
         fprintf(stderr,"Could not find %s: %s\n", file_name, strerror(errno));
-        return;
+        return 1;
     }
 
     /* Count the CPU cores, the value may be 0 for single-core CPUs */
@@ -265,8 +265,10 @@ gomp_init_num_threads (void)
       return;
     }
 #endif
-#ifdef _SC_NPROCESSORS_ONLN
+#if defined(__ANDROID__)
   gomp_global_icv.nthreads_var = sc_nprocessors_actu ();
+#elif defined(_SC_NPROCESSORS_ONLN)
+  gomp_global_icv.nthreads_var = sysconf (_SC_NPROCESSORS_ONLN);
 #endif
 }
 
@@ -297,8 +299,10 @@ get_num_procs (void)
       return gomp_available_cpus;
     }
 #endif
-#ifdef _SC_NPROCESSORS_ONLN
+#if defined(__ANDROID__)
   return sc_nprocessors_actu ();
+#elif defined(_SC_NPROCESSORS_ONLN)
+  return sysconf (_SC_NPROCESSORS_ONLN);
 #else
   return gomp_icv (false)->nthreads_var;
 #endif
diff --git a/gcc-4.7/libgomp/configure b/gcc-4.7/libgomp/configure
index 3c99b25a2..d51937cf3 100755
--- a/gcc-4.7/libgomp/configure
+++ b/gcc-4.7/libgomp/configure
@@ -15140,6 +15140,12 @@ case "$target" in
 /* end confdefs.h.  */
 #include <sys/syscall.h>
 	   int lk;
+#if !defined(SYS_gettid)
+#define SYS_gettid __NR_gettid
+#endif
+#if !defined(SYS_futex)
+#define SYS_futex __NR_futex
+#endif
 int
 main ()
 {
@@ -15192,6 +15198,12 @@ rm -f core conftest.err conftest.$ac_objext \
 /* end confdefs.h.  */
 #include <sys/syscall.h>
 	   int lk;
+#if !defined(SYS_gettid)
+#define SYS_gettid __NR_gettid
+#endif
+#if !defined(SYS_futex)
+#define SYS_futex __NR_futex
+#endif
 int
 main ()
 {