diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2013-04-02 19:58:37 +0800 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2013-04-02 20:36:53 +0800 |
commit | d88e126b2b303c95d94b939c21f8672637871dbd (patch) | |
tree | 479e144b4e27acbf128095b5207b32b78eee66b2 /gcc-4.8 | |
parent | b6c94ff8e836a01ad3598135d19c49c9eb01a173 (diff) | |
download | toolchain_gcc-d88e126b2b303c95d94b939c21f8672637871dbd.tar.gz toolchain_gcc-d88e126b2b303c95d94b939c21f8672637871dbd.tar.bz2 toolchain_gcc-d88e126b2b303c95d94b939c21f8672637871dbd.zip |
[4.8] Fix openmp support to use libgomp/config/linux
See a38e7b29885b25278b1d356b2efd21622376695d
Change-Id: I4e2671ea3aa8a67e9b5c6d5974b7486eb7ae54b7
Diffstat (limited to 'gcc-4.8')
-rw-r--r-- | gcc-4.8/libgomp/config/linux/futex.h | 4 | ||||
-rw-r--r-- | gcc-4.8/libgomp/config/linux/mips/futex.h | 5 | ||||
-rw-r--r-- | gcc-4.8/libgomp/config/linux/proc.c | 10 | ||||
-rwxr-xr-x | gcc-4.8/libgomp/configure | 12 |
4 files changed, 28 insertions, 3 deletions
diff --git a/gcc-4.8/libgomp/config/linux/futex.h b/gcc-4.8/libgomp/config/linux/futex.h index fecaa9f58..676b2dbb8 100644 --- a/gcc-4.8/libgomp/config/linux/futex.h +++ b/gcc-4.8/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.8/libgomp/config/linux/mips/futex.h b/gcc-4.8/libgomp/config/linux/mips/futex.h index fa5aa2660..314033620 100644 --- a/gcc-4.8/libgomp/config/linux/mips/futex.h +++ b/gcc-4.8/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.8/libgomp/config/linux/proc.c b/gcc-4.8/libgomp/config/linux/proc.c index d13b0813a..45723083d 100644 --- a/gcc-4.8/libgomp/config/linux/proc.c +++ b/gcc-4.8/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 } @@ -296,8 +298,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.8/libgomp/configure b/gcc-4.8/libgomp/configure index 27235f7a6..b48979b3b 100755 --- a/gcc-4.8/libgomp/configure +++ b/gcc-4.8/libgomp/configure @@ -15149,6 +15149,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 () { @@ -15201,6 +15207,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 () { |