diff options
| author | DJ Delorie <dj@delorie.com> | 2013-10-16 00:29:44 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2013-10-16 00:29:44 +0000 |
| commit | 73164d1d959e7216a525e5f09ca6651ef1efe92d (patch) | |
| tree | 23a193453e88c7aabc68438d38bb81019a1d51c4 | |
| parent | e5350e180e3374520d230796733970f9d07ec0a4 (diff) | |
| download | binutils-redhat-73164d1d959e7216a525e5f09ca6651ef1efe92d.tar.gz | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 10 | ||||
| -rwxr-xr-x | libiberty/configure | 6 | ||||
| -rw-r--r-- | libiberty/configure.ac | 6 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 2 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 3 |
5 files changed, 26 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 89e108a8da..7250dc1f49 100644 --- 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 e601ccd99f..b71141a98b 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 fcea46f6c7..4ad88a984d 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 70f54389c8..03989821b4 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 1259e4a9f4..b0bfcbb633 100644 --- 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>() |