diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2012-12-26 17:09:25 -0800 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-26 17:09:25 -0800 |
commit | bc28de194bad99abc45cb516ca3ad95c6e7ba192 (patch) | |
tree | 92f943aa40b8ead0c1ef0f0822270a1c1e129986 | |
parent | 001afd51a767aef75b27675b0fafe203bada4774 (diff) | |
parent | 92c478dba755a1a2f6f00ff390666acbffd41982 (diff) | |
download | toolchain_gcc-bc28de194bad99abc45cb516ca3ad95c6e7ba192.tar.gz toolchain_gcc-bc28de194bad99abc45cb516ca3ad95c6e7ba192.tar.bz2 toolchain_gcc-bc28de194bad99abc45cb516ca3ad95c6e7ba192.zip |
Merge "Support OpenMP for task parallelism on Android-ICS/GCC-4.6.3"
-rw-r--r-- | gcc-4.6/gcc/config/arm/linux-eabi.h | 2 | ||||
-rw-r--r-- | gcc-4.6/gcc/config/linux-android.h | 3 | ||||
-rwxr-xr-x | gcc-4.6/libgomp/configure | 52 | ||||
-rw-r--r-- | gcc-4.6/libgomp/configure.ac | 9 | ||||
-rw-r--r-- | gcc-4.6/libgomp/env.c | 1 |
5 files changed, 63 insertions, 4 deletions
diff --git a/gcc-4.6/gcc/config/arm/linux-eabi.h b/gcc-4.6/gcc/config/arm/linux-eabi.h index 72f9bdd5f..bb1a681cd 100644 --- a/gcc-4.6/gcc/config/arm/linux-eabi.h +++ b/gcc-4.6/gcc/config/arm/linux-eabi.h @@ -87,7 +87,7 @@ #undef LIB_SPEC #define LIB_SPEC \ LINUX_OR_ANDROID_LD (GNU_USER_TARGET_LIB_SPEC, \ - GNU_USER_TARGET_LIB_SPEC " " ANDROID_LIB_SPEC) + ANDROID_LIB_SPEC " " GNU_USER_TARGET_LIB_SPEC ) #undef STARTFILE_SPEC #define STARTFILE_SPEC \ diff --git a/gcc-4.6/gcc/config/linux-android.h b/gcc-4.6/gcc/config/linux-android.h index 033cfefd1..c6d9cddb9 100644 --- a/gcc-4.6/gcc/config/linux-android.h +++ b/gcc-4.6/gcc/config/linux-android.h @@ -53,7 +53,8 @@ "--noexecstack" #define ANDROID_LIB_SPEC \ - "%{!static: -ldl}" + "%{!static: -ldl}" \ + "%{pthread:-lc}" #define ANDROID_STARTFILE_SPEC \ "%{shared: crtbegin_so%O%s;:" \ diff --git a/gcc-4.6/libgomp/configure b/gcc-4.6/libgomp/configure index 4017aa906..623b1a9a5 100755 --- a/gcc-4.6/libgomp/configure +++ b/gcc-4.6/libgomp/configure @@ -15030,7 +15030,54 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : XPCFLAGS=" -Wc,-pthread" else - CFLAGS="$save_CFLAGS" LIBS="-lpthread $LIBS" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +CFLAGS="$save_CFLAGS" LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <pthread.h> + void *g(void *d) { return NULL; } +int +main () +{ +pthread_t t; pthread_create(&t,NULL,g,NULL); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +CFLAGS="$save_CFLAGS" LIBS="-lpthread $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> @@ -15053,6 +15100,9 @@ rm -f core conftest.err conftest.$ac_objext \ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext # Check for functions needed. for ac_func in getloadavg clock_gettime strtoull diff --git a/gcc-4.6/libgomp/configure.ac b/gcc-4.6/libgomp/configure.ac index c3dcc0cb5..6db8054a5 100644 --- a/gcc-4.6/libgomp/configure.ac +++ b/gcc-4.6/libgomp/configure.ac @@ -184,6 +184,13 @@ AC_LINK_IFELSE( void *g(void *d) { return NULL; }], [pthread_t t; pthread_create(&t,NULL,g,NULL);])], [XPCFLAGS=" -Wc,-pthread"], + [CFLAGS="$save_CFLAGS" LIBS="$LIBS" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [#include <pthread.h> + void *g(void *d) { return NULL; }], + [pthread_t t; pthread_create(&t,NULL,g,NULL);])], + [], [CFLAGS="$save_CFLAGS" LIBS="-lpthread $LIBS" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -191,7 +198,7 @@ AC_LINK_IFELSE( void *g(void *d) { return NULL; }], [pthread_t t; pthread_create(&t,NULL,g,NULL);])], [], - [AC_MSG_ERROR([Pthreads are required to build libgomp])])]) + [AC_MSG_ERROR([Pthreads are required to build libgomp])])])]) # Check for functions needed. AC_CHECK_FUNCS(getloadavg clock_gettime strtoull) diff --git a/gcc-4.6/libgomp/env.c b/gcc-4.6/libgomp/env.c index 92fa8c374..8b1e29e5f 100644 --- a/gcc-4.6/libgomp/env.c +++ b/gcc-4.6/libgomp/env.c @@ -44,6 +44,7 @@ #endif #include <limits.h> #include <errno.h> +#include <asm/page.h> #ifndef HAVE_STRTOULL # define strtoull(ptr, eptr, base) strtoul (ptr, eptr, base) |