diff options
author | Caroline Tice <cmtice@google.com> | 2016-03-16 13:56:07 -0700 |
---|---|---|
committer | Caroline Tice <cmtice@google.com> | 2016-03-16 13:56:07 -0700 |
commit | ac16f08b86701ecf70e32f4ead8db63d92603808 (patch) | |
tree | 08f5e73c8a8f3c980468347bcc0c283bc1e6d3eb /gcc-4.9/config | |
parent | 3a800d7d75ceba88429096186a2150a2d938334a (diff) | |
download | toolchain_gcc-ac16f08b86701ecf70e32f4ead8db63d92603808.zip toolchain_gcc-ac16f08b86701ecf70e32f4ead8db63d92603808.tar.gz toolchain_gcc-ac16f08b86701ecf70e32f4ead8db63d92603808.tar.bz2 |
GCC unification, part 2. Fix various errors from previous unificaiton.
The previous version of the unified GCC compiler (Android & ChromeOS)
caused some ChromeOS tests to fail. It also caused an Android NDK
test case to fail. This CL fixes those problems. In particular it
does the following:
- Fix some file formatting errors from previous unification patch.
- Update ChangeLog files to reflect Android backport patches.
- Find and incorporate a few missing pieces from the following backports
backports from trunk r221007, r221675, r222011, r212011, r214942,
r214957, r215012, r215016, r218115, r218733, r218746, r220491. This
involved small changes in the following files:
gcc/cfghoks.c
gcc/cfgloop.c
gcc/cfgloop.h
gcc/except.c
gcc/loop-init.c
gcc/omp-low.c
- Fix minor Android test case regression introduced in the previous
unification patch.
Change-Id: I482e3a34e3ed97c7ba609fe2954b4781f02ec617
Diffstat (limited to 'gcc-4.9/config')
-rw-r--r-- | gcc-4.9/config/futex.m4 | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gcc-4.9/config/futex.m4 b/gcc-4.9/config/futex.m4 index e95144d..3356e14 100644 --- a/gcc-4.9/config/futex.m4 +++ b/gcc-4.9/config/futex.m4 @@ -22,7 +22,13 @@ case "$target" in AC_LINK_IFELSE( [AC_LANG_PROGRAM( [#include <sys/syscall.h> - int lk;], + int lk; +#if !defined(SYS_gettid) +#define SYS_gettid __NR_gettid +#endif +#if !defined(SYS_futex) +#define SYS_futex __NR_futex +#endif], [syscall (SYS_gettid); syscall (SYS_futex, &lk, 0, 0, 0);])], [save_LIBS="$LIBS" LIBS="-lpthread $LIBS" @@ -48,7 +54,13 @@ If so, please configure with --disable-linux-futex]) AC_LINK_IFELSE( [AC_LANG_PROGRAM( [#include <sys/syscall.h> - int lk;], + int lk; +#if !defined(SYS_gettid) +#define SYS_gettid __NR_gettid +#endif +#if !defined(SYS_futex) +#define SYS_futex __NR_futex +#endif], [syscall (SYS_gettid); syscall (SYS_futex, &lk, 0, 0, 0);])],[], [AC_MSG_ERROR([SYS_gettid and SYS_futex required for --enable-linux-futex])]) ;; |