diff options
author | Caroline Tice <cmtice@google.com> | 2016-03-31 23:14:47 -0700 |
---|---|---|
committer | Caroline Tice <cmtice@google.com> | 2016-03-31 23:14:47 -0700 |
commit | 0fe7d085a96f8ab6169d663b2f45bca2df9c54ca (patch) | |
tree | 6c59c3f34d55198a16f4583e128829cbd5e31fc8 /gcc-4.9/libatomic/configure | |
parent | aec28b44e467a139d5f5cefe038e3f4a30dfc478 (diff) | |
download | toolchain_gcc-0fe7d085a96f8ab6169d663b2f45bca2df9c54ca.tar.gz toolchain_gcc-0fe7d085a96f8ab6169d663b2f45bca2df9c54ca.tar.bz2 toolchain_gcc-0fe7d085a96f8ab6169d663b2f45bca2df9c54ca.zip |
[ndk gcc] Finish fixing the libatomic IFUNC problem.
The previous CL, with --enable-libatomic-ifuncs, was missing an
important piece. This fixes that problem.
(See https://buganizer.corp.google.com/issues/22699878)
Change-Id: I42f9529f5e40187843a9a55ae80874eb8fae2a22
Diffstat (limited to 'gcc-4.9/libatomic/configure')
-rwxr-xr-x | gcc-4.9/libatomic/configure | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gcc-4.9/libatomic/configure b/gcc-4.9/libatomic/configure index 5ca62abc2..bbcdd509e 100755 --- a/gcc-4.9/libatomic/configure +++ b/gcc-4.9/libatomic/configure @@ -4059,7 +4059,6 @@ else # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. - rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4194,7 +4193,6 @@ else # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. - rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -11125,7 +11123,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11109 "configure" +#line 11126 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11231,7 +11229,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11215 "configure" +#line 11232 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14695,6 +14693,11 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libat_cv_have_ifunc" >&5 $as_echo "$libat_cv_have_ifunc" >&6; } + if test $enable_libatomic_ifuncs = no; then + libat_cv_have_ifunc=no + fi + + yesno=`echo $libat_cv_have_ifunc | tr 'yesno' '1 0 '` cat >>confdefs.h <<_ACEOF @@ -14703,6 +14706,9 @@ _ACEOF + if test $enable_libatomic_ifuncs = no; then + libat_cv_have_ifunc=no + fi fi # Check linker support. |