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

5 files changed, 108 insertions, 3 deletions

diff --git a/gcc-4.4.3/libgomp/config/linux/futex.h b/gcc-4.4.3/libgomp/config/linux/futex.h
new file mode 100644
index 000000000..3c8345086
--- /dev/null
+++ b/gcc-4.4.3/libgomp/config/linux/futex.h
@@ -0,0 +1,80 @@
+/* Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+   Contributed by ARM Ltd.
+
+   This file is part of the GNU OpenMP Library (libgomp).
+
+   Libgomp is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+   FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+   more details.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+/* Provide target-specific access to the futex system call.  */
+
+/* The include file hierachy above us (wait.h) has pushed visibility
+   hidden, this will be applied to prototypes with headers we include
+   with the effect that we cannot link against an external function
+   (syscall). The solution here is to push default visibility, include
+   our required headers then reinstante the original visibility.  */
+
+#pragma GCC visibility push(default)
+
+#undef _GNU_SOURCE  /* could be previously defined to 1 instead */
+#define _GNU_SOURCE 
+#include <unistd.h>
+#include <sys/syscall.h>
+
+#pragma GCC visibility pop
+
+#if !defined(SYS_futex)
+#define SYS_futex __NR_futex
+#endif
+
+static inline void
+futex_wait (int *addr, int val)
+{
+  long err = syscall (SYS_futex, addr, gomp_futex_wait, val, NULL);
+  if (__builtin_expect (err == -ENOSYS, 0))
+    {
+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
+      syscall (SYS_futex, addr, gomp_futex_wait, val, NULL);
+    }
+}
+
+static inline void
+futex_wake (int *addr, int count)
+{
+  long err = syscall (SYS_futex, addr, gomp_futex_wake, count);
+  if (__builtin_expect (err == -ENOSYS, 0))
+    {
+      gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG;
+      gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG;
+      syscall (SYS_futex, addr, gomp_futex_wake, count);
+    }
+}
+
+static inline void
+cpu_relax (void)
+{
+  __asm volatile ("" : : : "memory");
+}
+
+static inline void
+atomic_write_barrier (void)
+{
+  __sync_synchronize ();
+}
diff --git a/gcc-4.4.3/libgomp/config/linux/mips/futex.h b/gcc-4.4.3/libgomp/config/linux/mips/futex.h
index 576ada452..fcac71756 100644
--- a/gcc-4.4.3/libgomp/config/linux/mips/futex.h
+++ b/gcc-4.4.3/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.4.3/libgomp/config/linux/proc.c b/gcc-4.4.3/libgomp/config/linux/proc.c
index 2450d97c0..5cdb1864b 100644
--- a/gcc-4.4.3/libgomp/config/linux/proc.c
+++ b/gcc-4.4.3/libgomp/config/linux/proc.c
@@ -234,7 +234,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 */
@@ -264,8 +264,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
 }
 
@@ -309,8 +311,10 @@ get_num_procs (void)
       return affinity_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.4.3/libgomp/configure b/gcc-4.4.3/libgomp/configure
index b5cfeb9ef..29645d13a 100755
--- a/gcc-4.4.3/libgomp/configure
+++ b/gcc-4.4.3/libgomp/configure
@@ -17617,6 +17617,12 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* 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 ()
 {
@@ -17726,6 +17732,12 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* 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 ()
 {
diff --git a/gcc-4.4.3/libgomp/configure.tgt b/gcc-4.4.3/libgomp/configure.tgt
index d66899fbf..df73870c8 100644
--- a/gcc-4.4.3/libgomp/configure.tgt
+++ b/gcc-4.4.3/libgomp/configure.tgt
@@ -31,6 +31,10 @@ if test $enable_linux_futex = yes; then
 	config_path="linux/alpha linux posix"
 	;;
 
+    arm*-*-linux*)
+	config_path="linux posix"
+	;;
+
     ia64*-*-linux*)
 	config_path="linux/ia64 linux posix"
 	;;