From 498031085659f4d8c75aebfba383344e9ea36f47 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 2 Dec 2003 07:37:28 +0000 Subject: * config.make.in (fno-unit-at-a-time): Define. * configure.in: Add test for -fno-unit-at-a-time. Fix text for -fpie. * csu/Makefile (CFLAGS-initfini.s): Add $(fno_unit_at_a_time). * locale/Makefile (CFLAGS-loadlocale.c): Likewise. For linuxthreads: * Makefile (CFLAGS-pt-initfini.s): Add $(fno_unit_at_a_time). * sysdeps/unix/sysv/linux/x86_64/Makefile (CFLAGS-pt-initfini.s): Likewise. For nptl: * Makefile (CFLAGS-pt-initfini.s): Add $(fno_unit_at_a_time). * sysdeps/unix/sysv/linux/x86_64/Makefile (CFLAGS-pt-initfini.s): Likewise. --- config.make.in | 1 + configure | 33 +++++++++++++++++++++- configure.in | 18 ++++++++++++ csu/Makefile | 2 +- linuxthreads/Makefile | 2 +- .../sysdeps/unix/sysv/linux/x86_64/Makefile | 3 +- locale/Makefile | 1 + nptl/Makefile | 2 +- nptl/sysdeps/unix/sysv/linux/x86_64/Makefile | 3 +- 9 files changed, 59 insertions(+), 6 deletions(-) diff --git a/config.make.in b/config.make.in index 8b5d2c4353..39fe65a5aa 100644 --- a/config.make.in +++ b/config.make.in @@ -55,6 +55,7 @@ have-cpp-asm-debuginfo = @libc_cv_cpp_asm_debuginfo@ enable-check-abi = @enable_check_abi@ have-forced-unwind = @libc_cv_forced_unwind@ have-fpie = @libc_cv_fpie@ +fno-unit-at-a-time = @fno_unit_at_a_time@ static-libgcc = @libc_cv_gcc_static_libgcc@ diff --git a/configure b/configure index e54db9801d..5c48011c4b 100755 --- a/configure +++ b/configure @@ -312,7 +312,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi subdirs force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS 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 AUTOCONF CCVERSION 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_directive libc_cv_initfinit_array libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_Bgroup ASFLAGS_config libc_cv_z_combreloc libc_cv_z_execstack libc_cv_fpie libc_cv_have_initfini libc_cv_cpp_asm_debuginfo no_whole_archive exceptions LIBGD EGREP sizeof_long_double libc_cv_gcc_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_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 static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS with_fp with_cvs enable_check_abi oldest_abi subdirs force_install all_warnings build build_cpu build_vendor build_os host host_cpu host_vendor host_os base_machine sysnames INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CC CFLAGS LDFLAGS CPPFLAGS 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 AUTOCONF CCVERSION 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_directive libc_cv_initfinit_array libc_cv_z_nodelete libc_cv_z_nodlopen libc_cv_z_initfirst libc_cv_Bgroup 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_unwind_find_fde uname_sysname uname_release uname_version old_glibc_headers libc_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 static shared pic_default profile omitfp bounded static_nss nopic_initfini DEFINES linux_doors mach_interface_list VERSION RELEASE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -5428,6 +5428,7 @@ if test "${libc_cv_fpie+set}" = set; then else cat > conftest.c <&6 fi +echo "$as_me:$LINENO: checking for -fno-unit-at-a-time" >&5 +echo $ECHO_N "checking for -fno-unit-at-a-time... $ECHO_C" >&6 +if test "${libc_cv_fno_unit_at_a_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat > conftest.c <&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } +then + libc_cv_fno_unit_at_a_time=yes +else + libc_cv_fno_unit_at_a_time=no +fi +rm -f conftest* +fi +echo "$as_me:$LINENO: result: $libc_cv_fno_unit_at_a_time" >&5 +echo "${ECHO_T}$libc_cv_fno_unit_at_a_time" >&6 +if test $libc_cv_fno_unit_at_a_time = yes; then + fno_unit_at_a_time=-fno-unit-at-a-time +fi + + if test $elf != yes; then echo "$as_me:$LINENO: checking for .init and .fini sections" >&5 echo $ECHO_N "checking for .init and .fini sections... $ECHO_C" >&6 @@ -7834,6 +7864,7 @@ s,@ASFLAGS_config@,$ASFLAGS_config,;t t s,@libc_cv_z_combreloc@,$libc_cv_z_combreloc,;t t s,@libc_cv_z_execstack@,$libc_cv_z_execstack,;t t s,@libc_cv_fpie@,$libc_cv_fpie,;t t +s,@fno_unit_at_a_time@,$fno_unit_at_a_time,;t t s,@libc_cv_have_initfini@,$libc_cv_have_initfini,;t t s,@libc_cv_cpp_asm_debuginfo@,$libc_cv_cpp_asm_debuginfo,;t t s,@no_whole_archive@,$no_whole_archive,;t t diff --git a/configure.in b/configure.in index 9314a3223a..5dab7d6960 100644 --- a/configure.in +++ b/configure.in @@ -1359,6 +1359,7 @@ EOF AC_CACHE_CHECK(for -fpie, libc_cv_fpie, [dnl cat > conftest.c <&AS_MESSAGE_LOG_FD]) @@ -1372,6 +1373,23 @@ EOF AC_SUBST(libc_cv_fpie) fi +AC_CACHE_CHECK(for -fno-unit-at-a-time, libc_cv_fno_unit_at_a_time, [dnl +cat > conftest.c <&AS_MESSAGE_LOG_FD]) +then + libc_cv_fno_unit_at_a_time=yes +else + libc_cv_fno_unit_at_a_time=no +fi +rm -f conftest*]) +if test $libc_cv_fno_unit_at_a_time = yes; then + fno_unit_at_a_time=-fno-unit-at-a-time +fi +AC_SUBST(fno_unit_at_a_time) + if test $elf != yes; then AC_CACHE_CHECK(for .init and .fini sections, libc_cv_have_initfini, [AC_TRY_COMPILE(, [asm (".section .init"); diff --git a/csu/Makefile b/csu/Makefile index 9127aba08a..b1fd32d7a6 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -104,7 +104,7 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ -CFLAGS-initfini.s = -g0 -fPIC -fno-inline-functions +CFLAGS-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time) vpath initfini.c $(full_config_sysdirs) diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index 8fea64f6fc..f3a9c02e5f 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -101,7 +101,7 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn -CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions +CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time) endif librt-tests = ex10 ex11 diff --git a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile index 044c07c31c..b5e5d5d480 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile +++ b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile @@ -1,3 +1,4 @@ ifeq ($(subdir),linuxthreads) -CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions -fno-asynchronous-unwind-tables +CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions \ + -fno-asynchronous-unwind-tables $(fno-unit-at-a-time) endif diff --git a/locale/Makefile b/locale/Makefile index 2f2d2ba5f1..b493c1c9b9 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -100,6 +100,7 @@ locale-CPPFLAGS := -DLOCALE_PATH='$(localepath)' \ CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts CFLAGS-charmap-dir.c = -Wno-write-strings +CFLAGS-loadlocale.c = $(fno-unit-at-a-time) # This makes sure -DNOT_IN_libc is passed for all these modules. cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \ diff --git a/nptl/Makefile b/nptl/Makefile index 138ff4723c..d50ae0a794 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -312,7 +312,7 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn -CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions +CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time) endif CFLAGS-flockfile.c = -D_IO_MTSAFE_IO diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile b/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile index d3e5eb54d7..b32ce29eff 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/Makefile @@ -1,3 +1,4 @@ ifeq ($(subdir),nptl) -CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions -fno-asynchronous-unwind-tables +CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions \ + -fno-asynchronous-unwind-tables $(fno-unit-at-a-time) endif -- cgit v1.2.3