diff options
author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2015-02-12 05:34:14 +0100 |
---|---|---|
committer | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2015-02-12 05:34:14 +0100 |
commit | 0fecabe062c3be8538f10c77110af444bc70d599 (patch) | |
tree | 0d341cfc628e93a2a5a92ab747b123faa7a1396e | |
parent | 58e061f04d53a02effa8681b0dd1a0b14f0817ce (diff) | |
download | gcc-patches-0fecabe062c3be8538f10c77110af444bc70d599.tar.gz |
Remove upstreamed bit
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r-- | 5.0/0008-Fix-OpenMP-support-on-Android.patch | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/5.0/0008-Fix-OpenMP-support-on-Android.patch b/5.0/0008-Fix-OpenMP-support-on-Android.patch index 1981e11..9c366d8 100644 --- a/5.0/0008-Fix-OpenMP-support-on-Android.patch +++ b/5.0/0008-Fix-OpenMP-support-on-Android.patch @@ -10,96 +10,3 @@ #define ANDROID_STARTFILE_SPEC \ "%{shared: crtbegin_so%O%s;:" \ ---- gcc-5.0/libgomp/configure.ac.omv~ 2015-01-03 12:40:54.506113200 +0100 -+++ gcc-5.0/libgomp/configure.ac 2015-01-03 12:43:03.946990041 +0100 -@@ -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])])])]) - - plugin_support=yes - AC_CHECK_LIB(dl, dlsym, , [plugin_support=no]) ---- gcc-5.0/libgomp/configure.omv~ 2015-01-03 12:36:49.937761295 +0100 -+++ gcc-5.0/libgomp/configure 2015-01-03 12:40:50.789421213 +0100 -@@ -15031,7 +15031,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> -@@ -15090,6 +15137,9 @@ rm -f core conftest.err conftest.$ac_obj - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5 - $as_echo "$ac_cv_lib_dl_dlsym" >&6; } - if test "x$ac_cv_lib_dl_dlsym" = x""yes; then : |