aboutsummaryrefslogtreecommitdiff
path: root/gcc/configure
diff options
context:
space:
mode:
authorBasile Starynkevitch <basile@starynkevitch.net>2016-04-16 15:14:01 +0000
committerBasile Starynkevitch <basile@starynkevitch.net>2016-04-16 15:14:01 +0000
commitae4c8f1f9798171676983570c6aec124b0247ad4 (patch)
tree009b43e2a42820164aa4dc34cf57b12d25d56b3a /gcc/configure
parent0ecde1d1b509d6bd5688b5535d3f500058e20c4b (diff)
2016-04-16 Basile Starynkevitch <basile@starynkevitch.net>
{{merging with even more of GCC 6, using subversion 1.9 svn merge -r230196:230700 ^/trunk }} git-svn-id: https://gcc.gnu.org/svn/gcc/branches/melt-branch@235061 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/configure')
-rwxr-xr-xgcc/configure12
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/configure b/gcc/configure
index 4b4e72457a7..bb5e02bec50 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -7715,6 +7715,10 @@ if test x"$offload_targets" != x; then
$as_echo "#define ENABLE_OFFLOADING 1" >>confdefs.h
+else
+
+$as_echo "#define ENABLE_OFFLOADING 0" >>confdefs.h
+
fi
@@ -18402,7 +18406,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18405 "configure"
+#line 18409 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18508,7 +18512,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18511 "configure"
+#line 18515 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -22008,7 +22012,7 @@ fi
if test "${with_plugin_ld+set}" = set; then :
withval=$with_plugin_ld; if test x"$withval" != x; then
ORIGINAL_PLUGIN_LD_FOR_TARGET="$withval"
- PLUGIN_LD_SUFFIX=`echo $withval | sed -e "s,$target_alias-,,"`
+ PLUGIN_LD_SUFFIX="$withval"
fi
fi
@@ -28054,7 +28058,7 @@ _start:
x: .quad .TOC.
EOF
if $gcc_cv_as -a64 -o conftest.o conftest.s > /dev/null 2>&1 \
- && $gcc_cv_ld $emul_name -o conftest conftest.o > /dev/null 2>&1; then
+ && $gcc_cv_ld $emul_name -z norelro -o conftest conftest.o > /dev/null 2>&1; then
gcc_cv_ld_toc_align=`$gcc_cv_nm conftest | ${AWK} '/\.TOC\./ { match ($0, "0[[:xdigit:]]*", a); print strtonum ("0x" substr(a[0], length(a[0])-3)) }'`
fi
rm -f conftest conftest.o conftest.s