[binutils-gdb] [gdb/build] Fix build breaker with --enable-shared

[binutils-gdb] [gdb/build] Fix build breaker with --enable-shared

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=95127faf50eef65b381dd1e5eb7c7db43915e54c

commit 95127faf50eef65b381dd1e5eb7c7db43915e54c
Author: Tom de Vries <tdevries@suse.de>
Date:   Mon Jun 27 15:36:19 2022 +0200

    [gdb/build] Fix build breaker with --enable-shared
    
    When building gdb with --enable-shared, I run into:
    ...
    ld: build/zlib/libz.a(libz_a-inffast.o): relocation R_X86_64_32S against \
      `.rodata' can not be used when making a shared object; recompile with -fPIC
    ld: build/zlib/libz.a(libz_a-inflate.o): warning: relocation against \
      `inflateResetKeep' in read-only section `.text'
    collect2: error: ld returned 1 exit status
    make[3]: *** [libbfd.la] Error 1
    ...
    
    This is a regression since commit a08bdb159bb ("[gdb/build] Fix gdbserver
    build with -fsanitize=thread").
    
    The problem is that a single case statement in configure is shared to handle
    special requirements for both the host libiberty and host zlib, which has the
    effect that only one is handled.
    
    Fix this by handling libiberty and zlib each in its own case statement.
    
    Build on x86_64-linux, with and without --enable-shared.
    
    ChangeLog:
    
    2022-06-27  Tom de Vries  <tdevries@suse.de>
    
            * configure.ac: Set extra_host_libiberty_configure_flags and
            extra_host_zlib_configure_flags in separate case statements.
            * configure: Regenerate.

Diff:
---
 configure    | 8 ++++++--
 configure.ac | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index aac80b88d70..be433ef6d5d 100755
--- a/configure
+++ b/configure
@@ -6962,13 +6962,18 @@ fi
 
 # Sometimes we have special requirements for the host libiberty.
 extra_host_libiberty_configure_flags=
-extra_host_zlib_configure_flags=
 case " $configdirs " in
   *" lto-plugin "* | *" libcc1 "* | *" gdbserver "*)
     # When these are to be built as shared libraries, the same applies to
     # libiberty.
     extra_host_libiberty_configure_flags=--enable-shared
     ;;
+esac
+
+
+# Sometimes we have special requirements for the host zlib.
+extra_host_zlib_configure_flags=
+case " $configdirs " in
   *" bfd "*)
     # When bfd is to be built as a shared library, the same applies to
     # zlib.
@@ -6979,7 +6984,6 @@ case " $configdirs " in
 esac
 
 
-
 # Produce a warning message for the subdirs we can't configure.
 # This isn't especially interesting in the Cygnus tree, but in the individual
 # FSF releases, it's important to let people know when their machine isn't
diff --git a/configure.ac b/configure.ac
index 29f74d10b5a..1651cbf3b02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2342,13 +2342,18 @@ fi
 
 # Sometimes we have special requirements for the host libiberty.
 extra_host_libiberty_configure_flags=
-extra_host_zlib_configure_flags=
 case " $configdirs " in
   *" lto-plugin "* | *" libcc1 "* | *" gdbserver "*)
     # When these are to be built as shared libraries, the same applies to
     # libiberty.
     extra_host_libiberty_configure_flags=--enable-shared
     ;;
+esac
+AC_SUBST(extra_host_libiberty_configure_flags)
+
+# Sometimes we have special requirements for the host zlib.
+extra_host_zlib_configure_flags=
+case " $configdirs " in
   *" bfd "*)
     # When bfd is to be built as a shared library, the same applies to
     # zlib.
@@ -2357,7 +2362,6 @@ case " $configdirs " in
     fi
     ;;
 esac
-AC_SUBST(extra_host_libiberty_configure_flags)
 AC_SUBST(extra_host_zlib_configure_flags)
 
 # Produce a warning message for the subdirs we can't configure.