From 26505cc0c4e4257c36df3e80507e531c8b1380e5 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 16 Oct 2013 00:29:48 +0000 Subject: [PATCH] merge from gcc --- libdecnumber/ChangeLog | 8 ++++++++ libdecnumber/Makefile.in | 3 ++- libdecnumber/configure | 13 +++++++++++++ libdecnumber/configure.ac | 7 +++++++ libiberty/ChangeLog | 10 ++++++++++ libiberty/configure | 6 ++++++ libiberty/configure.ac | 6 ++++++ libiberty/cp-demangle.c | 2 +- libiberty/testsuite/demangle-expected | 3 +++ 9 files changed, 56 insertions(+), 2 deletions(-) diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog index fb88bcc..52b5178 100644 --- a/libdecnumber/ChangeLog +++ b/libdecnumber/ChangeLog @@ -1,3 +1,11 @@ +2013-10-15 David Malcolm + + * Makefile.in (PICFLAG): New. + (ALL_CFLAGS): Add PICFLAG. + * configure.ac: Add --enable-host-shared, setting up new + PICFLAG variable. + * configure: Regenerate. + 2013-07-09 Simon Baldwin * configure.ac: Add AC_CONFIG_AUX_DIR. diff --git a/libdecnumber/Makefile.in b/libdecnumber/Makefile.in index e67ff27..b6f3842 100644 --- a/libdecnumber/Makefile.in +++ b/libdecnumber/Makefile.in @@ -40,6 +40,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ LDFLAGS = @LDFLAGS@ LIBICONV = @LIBICONV@ PACKAGE = @PACKAGE@ +PICFLAG = @PICFLAG@ RANLIB = @RANLIB@ SHELL = @SHELL@ objext = @OBJEXT@ @@ -57,7 +58,7 @@ enable_decimal_float= @enable_decimal_float@ INCLUDES = -I$(srcdir) -I. -ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) +ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(PICFLAG) bid_OBJS = bid2dpd_dpd2bid.$(objext) host-ieee32.$(objext) \ host-ieee64.$(objext) host-ieee128.$(objext) diff --git a/libdecnumber/configure b/libdecnumber/configure index 4a1896e..2720f46 100755 --- a/libdecnumber/configure +++ b/libdecnumber/configure @@ -593,6 +593,7 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +PICFLAG ADDITIONAL_OBJS enable_decimal_float target_os @@ -670,6 +671,7 @@ enable_option_checking enable_werror_always enable_maintainer_mode enable_decimal_float +enable_host_shared ' ac_precious_vars='build_alias host_alias @@ -1301,6 +1303,7 @@ Optional Features: enable decimal float extension to C. Selecting 'bid' or 'dpd' choses which decimal floating point format to use + --enable-host-shared build host code as shared libraries Some influential environment variables: CC C compiler command @@ -4889,6 +4892,16 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h esac +# Enable --enable-host-shared. +# Check whether --enable-host-shared was given. +if test "${enable_host_shared+set}" = set; then : + enableval=$enable_host_shared; PICFLAG=-fPIC +else + PICFLAG= +fi + + + # Output. ac_config_headers="$ac_config_headers config.h:config.in" diff --git a/libdecnumber/configure.ac b/libdecnumber/configure.ac index 6cfc803..dd0499c 100644 --- a/libdecnumber/configure.ac +++ b/libdecnumber/configure.ac @@ -95,6 +95,13 @@ AC_SUBST(ADDITIONAL_OBJS) AC_C_BIGENDIAN +# Enable --enable-host-shared. +AC_ARG_ENABLE(host-shared, +[AS_HELP_STRING([--enable-host-shared], + [build host code as shared libraries])], +[PICFLAG=-fPIC], [PICFLAG=]) +AC_SUBST(PICFLAG) + # Output. AC_CONFIG_HEADERS(config.h:config.in, [echo timestamp > stamp-h1]) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 89e108a..7250dc1 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,13 @@ +2013-10-15 David Malcolm + + * configure.ac: If --enable-host-shared, use -fPIC. + * configure: Regenerate. + +2013-10-11 Paul Pluzhnikov + + * cp-demangle.c (d_name): Demangle local-source-names. + * testsuite/demangle-expected: New test. + 2013-09-10 Paolo Carlini PR bootstrap/58386 diff --git a/libiberty/configure b/libiberty/configure index e601ccd..b71141a 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -4963,6 +4963,12 @@ case "${enable_shared}" in "") shared=no ;; *) shared=yes ;; esac + +# ...unless --enable-host-shared was passed from top-level config: +if [ "${enable_host_shared}" = "yes" ]; then + shared=yes +fi + if [ "${shared}" != "yes" ]; then PICFLAG= fi diff --git a/libiberty/configure.ac b/libiberty/configure.ac index fcea46f..4ad88a9 100644 --- a/libiberty/configure.ac +++ b/libiberty/configure.ac @@ -225,6 +225,12 @@ case "${enable_shared}" in "") shared=no ;; *) shared=yes ;; esac + +# ...unless --enable-host-shared was passed from top-level config: +if [[ "${enable_host_shared}" = "yes" ]]; then + shared=yes +fi + if [[ "${shared}" != "yes" ]]; then PICFLAG= fi diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 70f5438..0398982 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -1276,7 +1276,6 @@ d_name (struct d_info *di) case 'Z': return d_local_name (di); - case 'L': case 'U': return d_unqualified_name (di); @@ -1323,6 +1322,7 @@ d_name (struct d_info *di) return dc; } + case 'L': default: dc = d_unqualified_name (di); if (d_peek_char (di) == 'I') diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 1259e4a..b0bfcbb 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -4291,3 +4291,6 @@ void m(void (A::*)() &&) --format=gnu-v3 _Z1nIM1AKFvvREEvT_ void n(void (A::*)() const &) +--format=gnu-v3 +_ZL1fIiEvv +void f() -- 2.7.4