diff options
| author | Rong Xu <xur@google.com> | 2014-07-21 16:47:22 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-07-29 15:31:03 -0700 |
| commit | 38a8aecfb882072900434499696b5c32a2274515 (patch) | |
| tree | 2aac97f0ae24b03cd98c1a06e989c031c173f889 /gcc-4.9/libssp | |
| parent | c231900e5dcc14d8296bd9f62b45997a49d4d5e7 (diff) | |
| download | toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.gz toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.bz2 toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.zip | |
[4.9] Switch gcc-4.9 to use google/gcc-4_9 branch.
This source drop uses svn version r212828 of google/gcc-4.9 branch.
We also cherry-picked r213062, r213063 and r213064 to fix windows
build issues.
All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9.
The following prior commits has not been merged to google branch yet.
(They are included in this commit).
e7af147f979e657fe2df00808e5b4319b0e088c6,
baf87df3cb2683649ba7e9872362a7e721117c23, and
c231900e5dcc14d8296bd9f62b45997a49d4d5e7.
Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b
Diffstat (limited to 'gcc-4.9/libssp')
| -rwxr-xr-x | gcc-4.9/libssp/configure | 24 | ||||
| -rw-r--r-- | gcc-4.9/libssp/configure.ac | 3 |
2 files changed, 22 insertions, 5 deletions
diff --git a/gcc-4.9/libssp/configure b/gcc-4.9/libssp/configure index b26c0b335..64532a4d5 100755 --- a/gcc-4.9/libssp/configure +++ b/gcc-4.9/libssp/configure @@ -4508,7 +4508,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf is usable" >&5 $as_echo_n "checking whether vsnprintf is usable... " >&6; } if test "$cross_compiling" = yes; then : - ssp_have_usable_vsnprintf=undef + # Google-local: Assume this always works if cross-compiling. +ssp_have_usable_vsnprintf=define else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7238,7 +7239,22 @@ fi # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; p=${PACKAGE-default} + case "$withval" in + yes|no) pic_mode="$withval" ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -10664,7 +10680,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10667 "configure" +#line 10683 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10770,7 +10786,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10773 "configure" +#line 10789 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc-4.9/libssp/configure.ac b/gcc-4.9/libssp/configure.ac index 93dfa8da4..6e2a46b07 100644 --- a/gcc-4.9/libssp/configure.ac +++ b/gcc-4.9/libssp/configure.ac @@ -145,7 +145,8 @@ int foo (char *buf, size_t n, const char *fmt, ...) return memcmp (buf, ".CD\0AAAA", sizeof (buf)) != 0;]), [ssp_have_usable_vsnprintf=define], [ssp_have_usable_vsnprintf=undef], -[ssp_have_usable_vsnprintf=undef]) +# Google-local: Assume this always works if cross-compiling. +[ssp_have_usable_vsnprintf=define]) if test "x$ssp_have_usable_vsnprintf" = xdefine; then AC_MSG_RESULT(yes) AC_DEFINE([HAVE_USABLE_VSNPRINTF],[1],[vsnprintf is present and works]) |