aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaroline Tice <cmtice@google.com>2016-04-01 06:14:47 (GMT)
committerCaroline Tice <cmtice@google.com>2016-04-01 06:14:47 (GMT)
commit0fe7d085a96f8ab6169d663b2f45bca2df9c54ca (patch)
tree6c59c3f34d55198a16f4583e128829cbd5e31fc8
parentaec28b44e467a139d5f5cefe038e3f4a30dfc478 (diff)
downloadtoolchain_gcc-0fe7d085a96f8ab6169d663b2f45bca2df9c54ca.zip
toolchain_gcc-0fe7d085a96f8ab6169d663b2f45bca2df9c54ca.tar.gz
toolchain_gcc-0fe7d085a96f8ab6169d663b2f45bca2df9c54ca.tar.bz2
[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
-rw-r--r--gcc-4.9/libatomic/aclocal.m412
-rwxr-xr-xgcc-4.9/libatomic/configure14
-rw-r--r--gcc-4.9/libatomic/configure.ac3
3 files changed, 21 insertions, 8 deletions
diff --git a/gcc-4.9/libatomic/aclocal.m4 b/gcc-4.9/libatomic/aclocal.m4
index 48f5ef5..aa82d0a 100644
--- a/gcc-4.9/libatomic/aclocal.m4
+++ b/gcc-4.9/libatomic/aclocal.m4
@@ -277,7 +277,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
- msvisualcpp | msvcmsys)
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -342,10 +342,13 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -918,10 +921,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/gcc-4.9/libatomic/configure b/gcc-4.9/libatomic/configure
index 5ca62ab..bbcdd50 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.
diff --git a/gcc-4.9/libatomic/configure.ac b/gcc-4.9/libatomic/configure.ac
index ff241c2..b8c02c3 100644
--- a/gcc-4.9/libatomic/configure.ac
+++ b/gcc-4.9/libatomic/configure.ac
@@ -218,6 +218,9 @@ LIBAT_CHECK_ATTRIBUTE_DLLEXPORT
LIBAT_CHECK_ATTRIBUTE_ALIAS
if test x$try_ifunc = xyes; then
LIBAT_CHECK_IFUNC
+ if test $enable_libatomic_ifuncs = no; then
+ libat_cv_have_ifunc=no
+ fi
fi
# Check linker support.