diff options
| author | Nick Clifton <nickc@redhat.com> | 2008-10-22 14:45:34 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2008-10-22 14:45:34 +0000 |
| commit | ce24679b2301e6fe44ef085b6a44639ecc999d74 (patch) | |
| tree | 4a696d70d9fa9e0e09f95996539d807db3a389a4 | |
| parent | 1ef641cbd2cf51fc27383f999f96ad7fba5d0a4f (diff) | |
| download | binutils-redhat-ce24679b2301e6fe44ef085b6a44639ecc999d74.tar.gz | |
PR 6937
* configure.in (SHARED_LIBADD): Revert previous change.
Add a comment explaining why.
(SHARED_DEPENDENCIES): Revert previous change.
* configure: Regenerate.
| -rw-r--r-- | opcodes/ChangeLog | 8 | ||||
| -rwxr-xr-x | opcodes/configure | 8 | ||||
| -rw-r--r-- | opcodes/configure.in | 8 |
3 files changed, 20 insertions, 4 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 3b83f4bec3..b2d8a36604 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,11 @@ +2008-10-22 Nick Clifton <nickc@redhat.com> + + PR 6937 + * configure.in (SHARED_LIBADD): Revert previous change. + Add a comment explaining why. + (SHARED_DEPENDENCIES): Revert previous change. + * configure: Regenerate. + 2008-10-10 Nick Clifton <nickc@redhat.com> PR 6937 diff --git a/opcodes/configure b/opcodes/configure index 33c246b22c..90291a9423 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -12436,10 +12436,14 @@ if test "$enable_shared" = "yes"; then SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl" ;; *) - SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so -Wl,`pwd`/../libiberty/libiberty.a" + # It is tempting to include libiberty here as well, but + # that library is only built as a static version. + # Including it here would insert text relocations into + # the opcodes library, which is undesirable. + SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so" ;; esac - SHARED_DEPENDENCIES="../bfd/libbfd.la ../libiberty/libiberty.a" + SHARED_DEPENDENCIES="../bfd/libbfd.la" ;; esac fi diff --git a/opcodes/configure.in b/opcodes/configure.in index 061bb716a2..1efeb3f95e 100644 --- a/opcodes/configure.in +++ b/opcodes/configure.in @@ -118,10 +118,14 @@ if test "$enable_shared" = "yes"; then SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.sl" ;; *) - SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so -Wl,`pwd`/../libiberty/libiberty.a" + # It is tempting to include libiberty here as well, but + # that library is only built as a static version. + # Including it here would insert text relocations into + # the opcodes library, which is undesirable. + SHARED_LIBADD="-Wl,`pwd`/../bfd/.libs/libbfd.so" ;; esac - SHARED_DEPENDENCIES="../bfd/libbfd.la ../libiberty/libiberty.a" + SHARED_DEPENDENCIES="../bfd/libbfd.la" ;; esac fi |