merge from gcc

diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index fb88bcc5c286bc6d9af1dddf0f112eeb16ea0898..52b517854a2ea0eb224886a304bf64d5daded311 100644 (file)
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-15  David Malcolm  <dmalcolm@redhat.com>
+
+       * 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  <simonb@google.com>
 
        * configure.ac: Add AC_CONFIG_AUX_DIR.

diff --git a/libdecnumber/Makefile.in b/libdecnumber/Makefile.in
index e67ff272f72aa4e286c8d7d1ad66c74e879ea083..b6f3842b0d28c04df64ee49c1f0d9fda7fcfc763 100644 (file)
--- 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 4a1896e1b97a3239058bb9e17fbd4d736cc6ff14..2720f46ff7f2aaeb27d9349e5af434c72ea86466 100755 (executable)
--- 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 6cfc8033eae76937b32d6f63117da473882cecf8..dd0499c43f66f592e9de88dbe5b78e26afec766e 100644 (file)
--- 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 89e108a8da6a00c145a7d3c36aefdaa5faea9732..7250dc1f4900f8ec34d878e994a5c61e2e3d30b1 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,13 @@
+2013-10-15  David Malcolm  <dmalcolm@redhat.com>
+
+       * configure.ac: If --enable-host-shared, use -fPIC.
+       * configure: Regenerate.
+
+2013-10-11  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+       * cp-demangle.c (d_name): Demangle local-source-names.
+       * testsuite/demangle-expected: New test.
+
 2013-09-10  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR bootstrap/58386

diff --git a/libiberty/configure b/libiberty/configure
index e601ccd99f48869a156d1835a8bf5ab3cab1417d..b71141a98b05bd388dfd08301391dda06b9da38e 100755 (executable)
--- 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 fcea46f6c7bbe7ec631421ecdbf663742a20e42d..4ad88a984d7c28ddce3842f0da934b591e19a2f1 100644 (file)
--- 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 70f54389c892957a113f627c4cfc806a79f63afb..03989821b44ada11c527f22a0afecd5f84b50c79 100644 (file)
--- 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 1259e4a9f495fe2dcff1cda674ed6cc8270fa577..b0bfcbb633433b2c534d95cc5dd41d6c504ef21e 100644 (file)
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -4291,3 +4291,6 @@ void m<void () &&>(void (A::*)() &&)
 --format=gnu-v3
 _Z1nIM1AKFvvREEvT_
 void n<void (A::*)() const &>(void (A::*)() const &)
+--format=gnu-v3
+_ZL1fIiEvv
+void f<int>()