diff -Naur glibc-2.11.orig/extra-lib.mk glibc-2.11/extra-lib.mk --- glibc-2.11.orig/extra-lib.mk 2009-10-30 12:17:08.000000000 -0500 +++ glibc-2.11/extra-lib.mk 2010-01-04 10:23:23.000000000 -0500 @@ -13,7 +13,7 @@ ifneq (,$($(lib)-static-only-routines)) ifneq (,$(filter yesyes%,$(build-shared)$(elf)$($(lib).so-version))) -object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.oS) +object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.oST) endif endif @@ -29,7 +29,7 @@ # Add each flavor of library to the lists of things to build and install. install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o))) -extra-objs += $(foreach o,$(filter-out .os .oS,$(object-suffixes-$(lib))),\ +extra-objs += $(foreach o,$(filter-out .os .oST,$(object-suffixes-$(lib))),\ $(patsubst %,%$o,$(filter-out \ $($(lib)-shared-only-routines),\ $(all-$(lib)-routines)))) @@ -57,7 +57,7 @@ # Use o-iterator.mk to generate a rule for each flavor of library. -ifneq (,$(filter-out .os .oS,$(object-suffixes-$(lib)))) +ifneq (,$(filter-out .os .oST,$(object-suffixes-$(lib)))) define o-iterator-doit $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \ $(patsubst %,$(objpfx)%$o,\ @@ -65,7 +65,7 @@ $(all-$(lib)-routines))); \ $$(build-extra-lib) endef -object-suffixes-left = $(filter-out .os .oS,$(object-suffixes-$(lib))) +object-suffixes-left = $(filter-out .os .oST,$(object-suffixes-$(lib))) include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left)) endif @@ -77,9 +77,9 @@ $(build-extra-lib) endif -ifneq (,$(filter .oS,$(object-suffixes-$(lib)))) -$(objpfx)$(patsubst %,$(libtype.oS),$(lib:lib%=%)): \ - $(patsubst %,$(objpfx)%.oS,\ +ifneq (,$(filter .oST,$(object-suffixes-$(lib)))) +$(objpfx)$(patsubst %,$(libtype.oST),$(lib:lib%=%)): \ + $(patsubst %,$(objpfx)%.oST,\ $(filter $($(lib)-static-only-routines),\ $(all-$(lib)-routines))) $(build-extra-lib) diff -Naur glibc-2.11.orig/Makeconfig glibc-2.11/Makeconfig --- glibc-2.11.orig/Makeconfig 2009-10-30 12:17:08.000000000 -0500 +++ glibc-2.11/Makeconfig 2010-01-04 10:23:23.000000000 -0500 @@ -484,7 +484,7 @@ # run the linked programs. link-libc = -Wl,-rpath-link=$(rpath-link) \ $(common-objpfx)libc.so$(libc.so-version) \ - $(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib) + $(common-objpfx)$(patsubst %,$(libtype.oST),c) $(gnulib) # This is how to find at build-time things that will be installed there. rpath-dirs = math elf dlfcn nss nis rt resolv crypt endif @@ -707,7 +707,7 @@ # The compilation rules use $(CPPFLAGS-${SUFFIX}) and $(CFLAGS-${SUFFIX}) # to pass different flags for each flavor. libtypes = $(foreach o,$(object-suffixes-for-libc),$(libtype$o)) -all-object-suffixes := .o .os .op .og .ob .oS +all-object-suffixes := .o .os .op .og .ob .oST object-suffixes := CPPFLAGS-.o = $(pic-default) CFLAGS-.o = $(filter %frame-pointer,$(+cflags)) @@ -767,14 +767,14 @@ ifeq (yes,$(build-shared)) # Build special library that contains the static-only routines for libc. -object-suffixes-for-libc += .oS +object-suffixes-for-libc += .oST # Must build the routines as PIC, though, because they can end up in (users') # shared objects. We don't want to use CFLAGS-os because users may, for # example, make that processor-specific. -CFLAGS-.oS = $(CFLAGS-.o) $(PIC-ccflag) -CPPFLAGS-.oS = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1 -libtype.oS = lib%_nonshared.a +CFLAGS-.oST = $(CFLAGS-.o) $(PIC-ccflag) +CPPFLAGS-.oST = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1 +libtype.oST = lib%_nonshared.a endif # The assembler can generate debug information too. diff -Naur glibc-2.11.orig/Makerules glibc-2.11/Makerules --- glibc-2.11.orig/Makerules 2009-10-30 12:17:08.000000000 -0500 +++ glibc-2.11/Makerules 2010-01-04 10:23:23.000000000 -0500 @@ -403,7 +403,7 @@ # Bounded pointer thunks are only built for *.ob elide-bp-thunks = $(addprefix $(bppfx),$(bp-thunks)) -elide-routines.oS += $(filter-out $(static-only-routines),\ +elide-routines.oST += $(filter-out $(static-only-routines),\ $(routines) $(aux) $(sysdep_routines)) \ $(elide-bp-thunks) elide-routines.os += $(static-only-routines) $(elide-bp-thunks) @@ -970,7 +970,7 @@ install: $(inst_libdir)/libc.so $(inst_libdir)/libc.so: $(common-objpfx)format.lds \ $(common-objpfx)libc.so$(libc.so-version) \ - $(inst_libdir)/$(patsubst %,$(libtype.oS),\ + $(inst_libdir)/$(patsubst %,$(libtype.oST),\ $(libprefix)$(libc-name)) \ $(+force) (echo '/* GNU ld script';\ @@ -978,7 +978,7 @@ echo ' the static library, so try that secondarily. */';\ cat $<; \ echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \ - '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\ + '$(libdir)/$(patsubst %,$(libtype.oST),$(libprefix)$(libc-name))'\ ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \ ) > $@.new mv -f $@.new $@ diff -Naur glibc-2.11.orig/nptl/Makefile glibc-2.11/nptl/Makefile --- glibc-2.11.orig/nptl/Makefile 2009-10-30 12:17:08.000000000 -0500 +++ glibc-2.11/nptl/Makefile 2010-01-04 10:23:23.000000000 -0500 @@ -374,7 +374,7 @@ $(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \ $(objpfx)libpthread.so$(libpthread.so-version) \ - $(inst_libdir)/$(patsubst %,$(libtype.oS),\ + $(inst_libdir)/$(patsubst %,$(libtype.oST),\ $(libprefix)pthread) \ $(+force) (echo '/* GNU ld script';\ @@ -382,7 +382,7 @@ echo ' the static library, so try that secondarily. */';\ cat $<; \ echo 'GROUP ( $(slibdir)/libpthread.so$(libpthread.so-version)' \ - '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)pthread)'\ + '$(libdir)/$(patsubst %,$(libtype.oST),$(libprefix)pthread)'\ ')' \ ) > $@.new mv -f $@.new $@ diff -Naur glibc-2.11.orig/sysdeps/sparc/sparc32/sparcv9/Makefile glibc-2.11/sysdeps/sparc/sparc32/sparcv9/Makefile --- glibc-2.11.orig/sysdeps/sparc/sparc32/sparcv9/Makefile 2009-10-30 12:17:08.000000000 -0500 +++ glibc-2.11/sysdeps/sparc/sparc32/sparcv9/Makefile 2010-01-04 10:23:23.000000000 -0500 @@ -10,4 +10,4 @@ ASFLAGS-.op += -Wa,-Av9a ASFLAGS-.og += -Wa,-Av9a ASFLAGS-.ob += -Wa,-Av9a -ASFLAGS-.oS += -Wa,-Av9a +ASFLAGS-.oST += -Wa,-Av9a