From: Ilya Enkovich <ilya.enkovich@intel.com>
Date: Thu, 12 Mar 2015 08:58:08 +0000 (+0000)
Subject: re PR other/65384 (Intel MPX does not support x32)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=90d33d8fc9acffe8c9a17674e93632c9b420a203;p=gcc.git

re PR other/65384 (Intel MPX does not support x32)

libmpx/

       PR other/65384
       * configure.ac: Fix x32 test.
       * configure: Regenerate.

From-SVN: r221378
---

diff --git a/libmpx/ChangeLog b/libmpx/ChangeLog
index ccd706b1548..35bdeab35ee 100644
--- a/libmpx/ChangeLog
+++ b/libmpx/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-12  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+	PR other/65384
+	* configure.ac: Fix x32 test.
+	* configure: Regenerate.
+
 2015-03-10  Ilya Enkovich  <ilya.enkovich@intel.com>
 
 	* Makefile.am (SUBDIRS): Add mpxwrap when used
diff --git a/libmpx/configure b/libmpx/configure
index f3bd67d0443..3bbb54c2987 100644
--- a/libmpx/configure
+++ b/libmpx/configure
@@ -2498,7 +2498,7 @@ esac
 unset LIBMPX_SUPPORTED
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for target support for Intel MPX runtime library" >&5
 $as_echo_n "checking for target support for Intel MPX runtime library... " >&6; }
-echo "int isizeof (void *) == 4 ? 1 : -1 = { __x86_64__ };" > conftest.c
+echo "int i[sizeof (void *) == 4 ? 1 : -1] = { __x86_64__ };" > conftest.c
 if { ac_try='${CC} ${CFLAGS} -c -o conftest.o conftest.c 1>&5'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
@@ -9438,7 +9438,7 @@ _LT_EOF
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
@@ -12349,8 +12349,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test "$with_gnu_ld" = yes; then
-        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
         hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
         export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
diff --git a/libmpx/configure.ac b/libmpx/configure.ac
index 4669525eabd..fe0d3f2266e 100644
--- a/libmpx/configure.ac
+++ b/libmpx/configure.ac
@@ -28,7 +28,7 @@ GCC_LIBSTDCXX_RAW_CXX_FLAGS
 # See if supported.
 unset LIBMPX_SUPPORTED
 AC_MSG_CHECKING([for target support for Intel MPX runtime library])
-echo "int i[sizeof (void *) == 4 ? 1 : -1] = { __x86_64__ };" > conftest.c
+echo "int i[[sizeof (void *) == 4 ? 1 : -1]] = { __x86_64__ };" > conftest.c
 if AC_TRY_COMMAND([${CC} ${CFLAGS} -c -o conftest.o conftest.c 1>&AS_MESSAGE_LOG_FD])
 then
     LIBMPX_SUPPORTED=no