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/aclocal.m4 | |
| 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/aclocal.m4')
| -rw-r--r-- | gcc-4.9/libatomic/aclocal.m4 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc-4.9/libatomic/aclocal.m4 b/gcc-4.9/libatomic/aclocal.m4 index 48f5ef54f..aa82d0aa8 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]) |