From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30014 invoked by alias); 8 May 2004 16:58:52 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 29998 invoked from network); 8 May 2004 16:58:52 -0000 Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.15.26) by sourceware.org with SMTP; 8 May 2004 16:58:52 -0000 Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id i48EkN3j008951; Sat, 8 May 2004 16:46:23 +0200 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i48EkNQn008949; Sat, 8 May 2004 16:46:23 +0200 Date: Sat, 08 May 2004 16:58:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Fix -lgcc_s configury with multilib compilers Message-ID: <20040508144622.GT5191@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Mutt/1.4i X-SW-Source: 2004-05/txt/msg00018.txt.bz2 Hi! libgcc_s.so.1 isn't always -lgcc_s, e.g. for x86-64 gcc -m32 it is -lgcc_s_32 etc. This patch makes it possible to build 32-bit glibc on x86-64 with x86-64 gcc (and similarly on other arches). All that is needed is: CC=3D"gcc -m32" CXX=3D"g++ -m32" ../configure ... --target i686-pc-linux ... 2004-05-08 Jakub Jelinek * configure.in (libc_cv_libgcc_s_suffix): New check. (libc_cv_as_needed): Use -lgcc_s$libc_cv_libgcc_s_suffix. * config.make.in (libgcc_s_suffix): Set. * Makeconfig (libgcc_eh): Use -lgcc_s$(libgcc_s_suffix). * configure: Rebuilt. --- libc/configure.in.jj 2004-04-21 10:05:58.000000000 +0200 +++ libc/configure.in 2004-04-29 14:50:24.982280886 +0200 @@ -1315,14 +1315,29 @@ EOF rm -f conftest*]) AC_SUBST(libc_cv_Bgroup) =20 + AC_CACHE_CHECK(for libgcc_s suffix, + libc_cv_libgcc_s_suffix, [dnl + cat > conftest.c <&1 >/dev/null \ + | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'` +changequote([,])dnl + rm -f conftest*]) + AC_SUBST(libc_cv_libgcc_s_suffix) + AC_CACHE_CHECK(for --as-needed option, libc_cv_as_needed, [dnl cat > conftest.c <&AS_MESSAGE_LOG_FD]) + -shared -o conftest.so conftest.c + -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed + -nostdlib 1>&AS_MESSAGE_LOG_FD]) then libc_cv_as_needed=3Dyes else --- libc/config.make.in.jj 2004-04-13 10:42:50.000000000 +0200 +++ libc/config.make.in 2004-04-29 14:48:38.149426724 +0200 @@ -47,6 +47,7 @@ have-initfini =3D @libc_cv_have_initfini@ have-z-relro =3D @libc_cv_z_relro@ have-Bgroup =3D @libc_cv_Bgroup@ have-as-needed =3D @libc_cv_as_needed@ +libgcc_s_suffix =3D @libc_cv_libgcc_s_suffix@ need-nopic-initfini =3D @nopic_initfini@ with-fp =3D @with_fp@ with-cvs =3D @with_cvs@ --- libc/Makeconfig.jj 2004-04-21 10:10:03.000000000 +0200 +++ libc/Makeconfig 2004-04-29 14:49:02.324094309 +0200 @@ -520,7 +520,7 @@ ifndef gnulib ifneq ($(have-as-needed),yes) libgcc_eh :=3D -lgcc_eh else - libgcc_eh :=3D -Wl,--as-needed -lgcc_s -Wl,--no-as-needed + libgcc_eh :=3D -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) -Wl,--no-as-need= ed endif ifneq ($(have-cc-with-libunwind),yes) gnulib :=3D -lgcc $(libgcc_eh) --- libc/configure.jj 2004-04-29 11:34:14.000000000 +0200 +++ libc/configure 2004-04-29 14:50:28.265692455 +0200 @@ -313,7 +313,7 @@ ac_includes_default=3D"\ # include #endif" =20 -ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE= _VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transf= orm_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir locals= tatedir libdir includedir oldincludedir infodir mandir build_alias host_ali= as target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_chec= k_abi oldest_abi bindnow subdirs force_install all_warnings build build_cpu= build_vendor build_os host host_cpu host_vendor host_os base_machine sysna= mes INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPF= LAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR= OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOC= ONF SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_= cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_di= rective libc_cv_initfinit_array libc_cv_cc_with_libunwind libc_cv_z_nodelet= e libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup lib= c_cv_as_needed ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_= cv_fpie fno_unit_at_a_time libc_cv_have_initfini libc_cv_cpp_asm_debuginfo = no_whole_archive exceptions LIBGD EGREP sizeof_long_double libc_cv_gcc_unwi= nd_find_fde uname_sysname uname_release uname_version old_glibc_headers lib= c_cv_slibdir libc_cv_localedir libc_cv_sysconfdir libc_cv_rootsbindir libc_= cv_forced_unwind use_ldconfig ldd_rewrite_script gnu_ld gnu_as elf xcoff st= atic shared pic_default profile omitfp bounded static_nss nopic_initfini DE= FINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS' +ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE= _VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transf= orm_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir locals= tatedir libdir includedir oldincludedir infodir mandir build_alias host_ali= as target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_chec= k_abi oldest_abi bindnow subdirs force_install all_warnings build build_cpu= build_vendor build_os host host_cpu host_vendor host_os base_machine sysna= mes INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPF= LAGS ac_ct_CC OBJEXT BUILD_CC cross_compiling CPP CXX CXXFLAGS ac_ct_CXX AR= OBJDUMP RANLIB ac_ct_RANLIB MIG AS LD PWD_P MAKE MSGFMT MAKEINFO SED AUTOC= ONF SYSINCLUDES libc_cv_gcc_static_libgcc BASH libc_cv_have_bash2 KSH libc_= cv_have_ksh AWK PERL INSTALL_INFO BISON VERSIONING libc_cv_asm_protected_di= rective libc_cv_initfinit_array libc_cv_cc_with_libunwind libc_cv_z_nodelet= e libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_z_relro libc_cv_Bgroup lib= c_cv_libgcc_s_suffix libc_cv_as_needed ASFLAGS_config libc_cv_z_combreloc l= ibc_cv_z_execstack libc_cv_fpie fno_unit_at_a_time libc_cv_have_initfini li= bc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD EGREP sizeof_long= _double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_versi= on old_glibc_headers libc_cv_slibdir libc_cv_localedir libc_cv_sysconfdir l= ibc_cv_rootsbindir libc_cv_forced_unwind use_ldconfig ldd_rewrite_script gn= u_ld gnu_as elf xcoff static shared pic_default profile omitfp bounded stat= ic_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEA= SE LIBOBJS LTLIBOBJS' ac_subst_files=3D'' =20 # Initialize some variables set by options. @@ -5556,6 +5556,24 @@ echo "$as_me:$LINENO: result: $libc_cv_B echo "${ECHO_T}$libc_cv_Bgroup" >&6 =20 =20 + echo "$as_me:$LINENO: checking for libgcc_s suffix" >&5 +echo $ECHO_N "checking for libgcc_s suffix... $ECHO_C" >&6 +if test "${libc_cv_libgcc_s_suffix+set}" =3D set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat > conftest.c <&1 >/dev/null \ + | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'` + rm -f conftest* +fi +echo "$as_me:$LINENO: result: $libc_cv_libgcc_s_suffix" >&5 +echo "${ECHO_T}$libc_cv_libgcc_s_suffix" >&6 + + echo "$as_me:$LINENO: checking for --as-needed option" >&5 echo $ECHO_N "checking for --as-needed option... $ECHO_C" >&6 if test "${libc_cv_as_needed+set}" =3D set; then @@ -5565,8 +5583,9 @@ else int main (void) { return 0; } EOF if { ac_try=3D'${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS - -shared -o conftest.so conftest.c -lgcc_s - -Wl,--as-needed -nostdlib 1>&5' + -shared -o conftest.so conftest.c + -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed + -nostdlib 1>&5' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=3D$? @@ -8244,6 +8263,7 @@ s,@libc_cv_z_nodlopen@,$libc_cv_z_nodlop s,@libc_cv_z_initfirst@,$libc_cv_z_initfirst,;t t s,@libc_cv_z_relro@,$libc_cv_z_relro,;t t s,@libc_cv_Bgroup@,$libc_cv_Bgroup,;t t +s,@libc_cv_libgcc_s_suffix@,$libc_cv_libgcc_s_suffix,;t t s,@libc_cv_as_needed@,$libc_cv_as_needed,;t t s,@ASFLAGS_config@,$ASFLAGS_config,;t t s,@libc_cv_z_combreloc@,$libc_cv_z_combreloc,;t t Jakub