diff options
| author | ienkovich <ienkovich@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-07-16 08:36:02 +0000 |
|---|---|---|
| committer | ienkovich <ienkovich@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-07-16 08:36:02 +0000 |
| commit | 3a1e60cbe199154b2030ebd9cbdabd3726b2d785 (patch) | |
| tree | 7706ecb501d46fdbf8b14b786c1abd6648f91c52 /libmpx | |
| parent | 7725cd5b3f6b5d0e4ae83ce3a1988c9e2c3f7c31 (diff) | |
gcc/
* config/i386/linux-common.h (LINK_MPX): New.
(MPX_SPEC): Use LINK_MPX instead of %(link_mpx).
* configure.ac: Add HAVE_LD_BNDPLT_SUPPORT macro
indicating '-z bndplt' support by linker.
* configure: Regenerate.
* config.in: Regenerate.
libmpx/
* configure.ac: Remove link_mpx.
* libmpx.spec.in: Likewise.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225862 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libmpx')
| -rw-r--r-- | libmpx/ChangeLog | 6 | ||||
| -rw-r--r-- | libmpx/configure | 24 | ||||
| -rw-r--r-- | libmpx/configure.ac | 11 | ||||
| -rw-r--r-- | libmpx/libmpx.spec.in | 2 |
4 files changed, 8 insertions, 35 deletions
diff --git a/libmpx/ChangeLog b/libmpx/ChangeLog index b6d9f96fe5e3..450b7d36e8c0 100644 --- a/libmpx/ChangeLog +++ b/libmpx/ChangeLog @@ -1,3 +1,9 @@ +2015-07-16 Ilya Enkovich <enkovich.gnu@gmail.com> + + * configure.ac: Remove link_mpx. + * libmpx.spec.in: Likewise. + * configure: Regenerate. + 2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> * Makefile.in: Regenerated with automake-1.11.6. diff --git a/libmpx/configure b/libmpx/configure index 8e260ed46274..16d0dd85d3d7 100644 --- a/libmpx/configure +++ b/libmpx/configure @@ -666,7 +666,6 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -link_mpx link_libmpx LIBMPX_SUPPORTED_FALSE LIBMPX_SUPPORTED_TRUE @@ -2364,25 +2363,6 @@ fi link_libmpx="-lpthread" -link_mpx="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld accepts -z bndplt" >&5 -$as_echo_n "checking whether ld accepts -z bndplt... " >&6; } -echo "int main() {};" > conftest.c -if { ac_try='${CC} ${CFLAGS} -Wl,-z,bndplt -o conftest conftest.c 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } -then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - link_mpx="$link_mpx -z bndplt" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - am__api_version='1.11' @@ -11250,7 +11230,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11253 "configure" +#line 11233 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11356,7 +11336,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11359 "configure" +#line 11339 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libmpx/configure.ac b/libmpx/configure.ac index 463e85562bcb..18ba6872035b 100644 --- a/libmpx/configure.ac +++ b/libmpx/configure.ac @@ -39,18 +39,7 @@ AC_MSG_RESULT($LIBMPX_SUPPORTED) AM_CONDITIONAL(LIBMPX_SUPPORTED, [test "x$LIBMPX_SUPPORTED" = "xyes"]) link_libmpx="-lpthread" -link_mpx="" -AC_MSG_CHECKING([whether ld accepts -z bndplt]) -echo "int main() {};" > conftest.c -if AC_TRY_COMMAND([${CC} ${CFLAGS} -Wl,-z,bndplt -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD]) -then - AC_MSG_RESULT([yes]) - link_mpx="$link_mpx -z bndplt" -else - AC_MSG_RESULT([no]) -fi AC_SUBST(link_libmpx) -AC_SUBST(link_mpx) AM_INIT_AUTOMAKE(foreign no-dist no-dependencies) AM_ENABLE_MULTILIB(, ..) diff --git a/libmpx/libmpx.spec.in b/libmpx/libmpx.spec.in index 34d0bdf165a8..a80bba71123e 100644 --- a/libmpx/libmpx.spec.in +++ b/libmpx/libmpx.spec.in @@ -1,5 +1,3 @@ # This spec file is read by gcc when linking. It is used to specify the # standard libraries we need in order to link with libmpx. *link_libmpx: @link_libmpx@ - -*link_mpx: @link_mpx@ |