Fix Solaris bootstrap with GNU ld/LTO
* configure.ac (ac_lto_plugin_ldflags): Set to -Wc,-static-libgcc for gcc. * configure: Regenerate. * Makefile.am (AM_LDFLAGS): New variable. (liblto_plugin_la_LDFLAGS): Add it. * Makefile.in: Regenerate. From-SVN: r208614
This commit is contained in:
parent
8692ae102d
commit
5523efdf24
@ -1,3 +1,12 @@
|
||||
2014-03-17 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
|
||||
|
||||
* configure.ac (ac_lto_plugin_ldflags): Set to -Wc,-static-libgcc
|
||||
for gcc.
|
||||
* configure: Regenerate.
|
||||
* Makefile.am (AM_LDFLAGS): New variable.
|
||||
(liblto_plugin_la_LDFLAGS): Add it.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2013-09-20 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* configure: Regenerate.
|
||||
|
@ -9,6 +9,7 @@ libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
|
||||
AM_CFLAGS = @ac_lto_plugin_warn_cflags@
|
||||
AM_LDFLAGS = @ac_lto_plugin_ldflags@
|
||||
AM_LIBTOOLFLAGS = --tag=disable-static
|
||||
|
||||
libexecsub_LTLIBRARIES = liblto_plugin.la
|
||||
@ -22,7 +23,8 @@ liblto_plugin_la_SOURCES = lto-plugin.c
|
||||
liblto_plugin_la_LIBADD = \
|
||||
$(if $(wildcard ../libiberty/pic/libiberty.a),$(Wc)../libiberty/pic/libiberty.a,)
|
||||
# Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
|
||||
liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -bindir $(libexecsubdir) \
|
||||
liblto_plugin_la_LDFLAGS = $(AM_LDFLAGS) \
|
||||
$(lt_host_flags) -module -bindir $(libexecsubdir) \
|
||||
$(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)
|
||||
liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
|
||||
../libiberty/pic/libiberty.a),../libiberty/pic/libiberty.a,)
|
||||
|
@ -168,6 +168,7 @@ abs_top_builddir = @abs_top_builddir@
|
||||
abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
ac_lto_plugin_ldflags = @ac_lto_plugin_ldflags@
|
||||
ac_lto_plugin_warn_cflags = @ac_lto_plugin_warn_cflags@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
@ -230,6 +231,7 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
|
||||
libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
|
||||
AM_CFLAGS = @ac_lto_plugin_warn_cflags@
|
||||
AM_LDFLAGS = @ac_lto_plugin_ldflags@
|
||||
AM_LIBTOOLFLAGS = --tag=disable-static
|
||||
libexecsub_LTLIBRARIES = liblto_plugin.la
|
||||
gcc_build_dir = ../$(host_subdir)/gcc
|
||||
@ -242,7 +244,8 @@ liblto_plugin_la_LIBADD = \
|
||||
$(if $(wildcard ../libiberty/pic/libiberty.a),$(Wc)../libiberty/pic/libiberty.a,)
|
||||
|
||||
# Note that we intentionally override the bindir supplied by ACX_LT_HOST_FLAGS
|
||||
liblto_plugin_la_LDFLAGS = $(lt_host_flags) -module -bindir $(libexecsubdir) \
|
||||
liblto_plugin_la_LDFLAGS = $(AM_LDFLAGS) \
|
||||
$(lt_host_flags) -module -bindir $(libexecsubdir) \
|
||||
$(if $(wildcard ../libiberty/pic/libiberty.a),,-Wc,../libiberty/libiberty.a)
|
||||
|
||||
liblto_plugin_la_DEPENDENCIES = $(if $(wildcard \
|
||||
|
8
lto-plugin/configure
vendored
8
lto-plugin/configure
vendored
@ -622,6 +622,7 @@ EGREP
|
||||
GREP
|
||||
SED
|
||||
LIBTOOL
|
||||
ac_lto_plugin_ldflags
|
||||
ac_lto_plugin_warn_cflags
|
||||
am__fastdepCC_FALSE
|
||||
am__fastdepCC_TRUE
|
||||
@ -4086,6 +4087,9 @@ fi
|
||||
done
|
||||
CFLAGS="$save_CFLAGS"
|
||||
|
||||
# Need -Wc to get it through libtool.
|
||||
if test "x$GCC" = xyes; then ac_lto_plugin_ldflags="-Wc,-static-libgcc"; fi
|
||||
|
||||
case `pwd` in
|
||||
*\ * | *\ *)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
|
||||
@ -10558,7 +10562,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 10561 "configure"
|
||||
#line 10565 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10664,7 +10668,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 10671 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -7,6 +7,9 @@ AM_MAINTAINER_MODE
|
||||
AC_PROG_CC
|
||||
AC_SYS_LARGEFILE
|
||||
ACX_PROG_CC_WARNING_OPTS([-Wall], [ac_lto_plugin_warn_cflags])
|
||||
# Need -Wc to get it through libtool.
|
||||
if test "x$GCC" = xyes; then ac_lto_plugin_ldflags="-Wc,-static-libgcc"; fi
|
||||
AC_SUBST(ac_lto_plugin_ldflags)
|
||||
AM_PROG_LIBTOOL
|
||||
ACX_LT_HOST_FLAGS
|
||||
AC_SUBST(target_noncanonical)
|
||||
|
Loading…
Reference in New Issue
Block a user