Attachment #434454 for bug #583216





ifneq (,$($(lib)-static-only-routines))
ifneq (,$(filter yes%,$(build-shared)$($(lib).so-version)))
object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.ons)
endif
endif



# 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 .ons,$(object-suffixes-$(lib))),\
			$(patsubst %,%$o,$(filter-out \
					   $($(lib)-shared-only-routines),\
					   $(all-$(lib)-routines))))

extra-objs += $(patsubst %,%.os,$(filter-out $($(lib)-static-only-routines),\
					     $(all-$(lib)-routines)))
endif
ifneq (,$(filter .ons,$(object-suffixes-$(lib))))
extra-objs += $(patsubst %,%.ons,$(filter $($(lib)-static-only-routines),\
					 $(all-$(lib)-routines)))
endif
alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\



# Use o-iterator.mk to generate a rule for each flavor of library.
ifneq (,$(filter-out .os .ons,$(object-suffixes-$(lib))))
define o-iterator-doit
$(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
  $(patsubst %,$(objpfx)%$o,\

			  $(all-$(lib)-routines))); \
	$$(build-extra-lib)
endef
object-suffixes-left = $(filter-out .os .ons,$(object-suffixes-$(lib)))
include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left))
endif


	$(build-extra-lib)
endif

ifneq (,$(filter .ons,$(object-suffixes-$(lib))))
$(objpfx)$(patsubst %,$(libtype.ons),$(lib:lib%=%)): \
  $(patsubst %,$(objpfx)%.ons,\
	     $(filter $($(lib)-static-only-routines),\
		      $(all-$(lib)-routines)))
	$(build-extra-lib)




link-libc-tests-rpath-link = $(link-libc-rpath-link)
endif
link-libc-before-gnulib = $(common-objpfx)libc.so$(libc.so-version) \
			  $(common-objpfx)$(patsubst %,$(libtype.ons),c) \
			  $(as-needed) $(elf-objpfx)ld.so \
			  $(no-as-needed)
link-libc = $(link-libc-rpath-link) $(link-libc-before-gnulib) $(gnulib)

# 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 .ons
object-suffixes :=
CPPFLAGS-.o = $(pic-default)
CFLAGS-.o = $(filter %frame-pointer,$(+cflags))


ifeq (yes,$(build-shared))
# Build special library that contains the static-only routines for libc.
object-suffixes-for-libc += .ons

# 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-.ons = $(CFLAGS-.o) $(PIC-ccflag)
CPPFLAGS-.ons = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1
libtype.ons = lib%_nonshared.a
endif

# The assembler can generate debug information too.




endif
endif

elide-routines.ons += $(filter-out $(static-only-routines),\
				  $(routines) $(aux) $(sysdep_routines))
elide-routines.os += $(static-only-routines)



+depfiles := $(sources:.c=.d) \
	     $(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \
	     $(patsubst %.ons,%.d,$(filter %.ons,$(extra-objs))) \
	     $(patsubst %.o,%.d,$(filter %.o,$(extra-test-objs:.os=.o))) \
	     $(addsuffix .d,$(tests) $(xtests) $(test-srcs))
ifeq ($(build-programs),yes)

install: $(inst_libdir)/libc.so
$(inst_libdir)/libc.so: $(common-objpfx)format.lds \
			$(common-objpfx)libc.so$(libc.so-version) \
			$(inst_libdir)/$(patsubst %,$(libtype.ons),\
						  $(libprefix)$(libc-name)) \
			$(+force)
	(echo '/* GNU ld script';\

	 echo '   the static library, so try that secondarily.  */';\
	 cat $<; \
	 echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
	      '$(libdir)/$(patsubst %,$(libtype.ons),$(libprefix)$(libc-name))'\
	      ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \
	) > $@.new
	mv -f $@.new $@

Lines 428-434 Link Here

(-)glibc-2.23/nptl/Makefile.orig (-2 / +2 lines)
428		428
429	$(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \	429	$(inst_libdir)/libpthread.so: $(common-objpfx)format.lds \
430	$(objpfx)libpthread.so$(libpthread.so-version) \	430	$(objpfx)libpthread.so$(libpthread.so-version) \
431	$(inst_libdir)/$(patsubst %,$(libtype.oS),\	431	$(inst_libdir)/$(patsubst %,$(libtype.ons),\
432	$(libprefix)pthread) \	432	$(libprefix)pthread) \
433	$(+force)	433	$(+force)
434	(echo '/* GNU ld script';\	434	(echo '/* GNU ld script';\
Lines 436-442 Link Here
436	echo ' the static library, so try that secondarily. */';\	436	echo ' the static library, so try that secondarily. */';\
437	cat $<; \	437	cat $<; \
438	echo 'GROUP ( $(slibdir)/libpthread.so$(libpthread.so-version)' \	438	echo 'GROUP ( $(slibdir)/libpthread.so$(libpthread.so-version)' \
439	'$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)pthread)'\	439	'$(libdir)/$(patsubst %,$(libtype.ons),$(libprefix)pthread)'\
440	')' \	440	')' \
441	) > $@.new	441	) > $@.new
442	mv -f $@.new $@	442	mv -f $@.new $@

Lines 5-14 Link Here

(-)glibc-2.23/sysdeps/i386/i686/Makefile.orig (-2 / +2 lines)
5	CFLAGS-.os += -Wa,-mtune=i686	5	CFLAGS-.os += -Wa,-mtune=i686
6	CFLAGS-.op += -Wa,-mtune=i686	6	CFLAGS-.op += -Wa,-mtune=i686
7	CFLAGS-.og += -Wa,-mtune=i686	7	CFLAGS-.og += -Wa,-mtune=i686
8	CFLAGS-.oS += -Wa,-mtune=i686	8	CFLAGS-.ons += -Wa,-mtune=i686
9		9
10	ASFLAGS-.o += -Wa,-mtune=i686	10	ASFLAGS-.o += -Wa,-mtune=i686
11	ASFLAGS-.os += -Wa,-mtune=i686	11	ASFLAGS-.os += -Wa,-mtune=i686
12	ASFLAGS-.op += -Wa,-mtune=i686	12	ASFLAGS-.op += -Wa,-mtune=i686
13	ASFLAGS-.og += -Wa,-mtune=i686	13	ASFLAGS-.og += -Wa,-mtune=i686
14	ASFLAGS-.oS += -Wa,-mtune=i686	14	ASFLAGS-.ons += -Wa,-mtune=i686

Lines 44-50 Link Here

(-)glibc-2.23/sysdeps/ieee754/ldbl-opt/Makefile.orig (-1 / +1 lines)
44	libnldbl-routines = $(libnldbl-calls:%=nldbl-%)	44	libnldbl-routines = $(libnldbl-calls:%=nldbl-%)
45	libnldbl-inhibit-o = $(object-suffixes)	45	libnldbl-inhibit-o = $(object-suffixes)
46	libnldbl-static-only-routines = $(libnldbl-routines)	46	libnldbl-static-only-routines = $(libnldbl-routines)
47	extra-objs += $(addsuffix .oS, $(libnldbl-routines))	47	extra-objs += $(addsuffix .ons, $(libnldbl-routines))
48		48
49	CFLAGS-nldbl-acos.c = -fno-builtin-acosl	49	CFLAGS-nldbl-acos.c = -fno-builtin-acosl
50	CFLAGS-nldbl-acosh.c = -fno-builtin-acoshl	50	CFLAGS-nldbl-acosh.c = -fno-builtin-acoshl




ASFLAGS-.os += -Wa,-Av9d
ASFLAGS-.op += -Wa,-Av9d
ASFLAGS-.og += -Wa,-Av9d
ASFLAGS-.ons += -Wa,-Av9d
else
ASFLAGS-.o += -Wa,-Av9a
ASFLAGS-.os += -Wa,-Av9a
ASFLAGS-.op += -Wa,-Av9a
ASFLAGS-.og += -Wa,-Av9a
ASFLAGS-.ons += -Wa,-Av9a
endif

# nscd uses atomic_spin_nop which in turn requires cpu_relax

Lines 7-13 Link Here

(-)glibc-2.23/sysdeps/sparc/sparc64/Makefile.orig (-1 / +1 lines)
7	ASFLAGS-.os += -Wa,-Av9d	7	ASFLAGS-.os += -Wa,-Av9d
8	ASFLAGS-.op += -Wa,-Av9d	8	ASFLAGS-.op += -Wa,-Av9d
9	ASFLAGS-.og += -Wa,-Av9d	9	ASFLAGS-.og += -Wa,-Av9d
10	ASFLAGS-.oS += -Wa,-Av9d	10	ASFLAGS-.ons += -Wa,-Av9d
11	endif	11	endif
12		12
13	# nscd uses atomic_spin_nop which in turn requires cpu_relax	13	# nscd uses atomic_spin_nop which in turn requires cpu_relax

Return to bug 583216

Lines 496-502 Link Here

(-)glibc-2.23/Makeconfig.orig (-6 / +6 lines)
496	link-libc-tests-rpath-link = $(link-libc-rpath-link)	496	link-libc-tests-rpath-link = $(link-libc-rpath-link)
497	endif	497	endif
498	link-libc-before-gnulib = $(common-objpfx)libc.so$(libc.so-version) \	498	link-libc-before-gnulib = $(common-objpfx)libc.so$(libc.so-version) \
499	$(common-objpfx)$(patsubst %,$(libtype.oS),c) \	499	$(common-objpfx)$(patsubst %,$(libtype.ons),c) \
500	$(as-needed) $(elf-objpfx)ld.so \	500	$(as-needed) $(elf-objpfx)ld.so \
501	$(no-as-needed)	501	$(no-as-needed)
502	link-libc = $(link-libc-rpath-link) $(link-libc-before-gnulib) $(gnulib)	502	link-libc = $(link-libc-rpath-link) $(link-libc-before-gnulib) $(gnulib)
Lines 904-910 Link Here
904	# The compilation rules use $(CPPFLAGS-${SUFFIX}) and $(CFLAGS-${SUFFIX})	904	# The compilation rules use $(CPPFLAGS-${SUFFIX}) and $(CFLAGS-${SUFFIX})
905	# to pass different flags for each flavor.	905	# to pass different flags for each flavor.
906	libtypes = $(foreach o,$(object-suffixes-for-libc),$(libtype$o))	906	libtypes = $(foreach o,$(object-suffixes-for-libc),$(libtype$o))
907	all-object-suffixes := .o .os .op .og .oS	907	all-object-suffixes := .o .os .op .og .ons
908	object-suffixes :=	908	object-suffixes :=
909	CPPFLAGS-.o = $(pic-default)	909	CPPFLAGS-.o = $(pic-default)
910	CFLAGS-.o = $(filter %frame-pointer,$(+cflags))	910	CFLAGS-.o = $(filter %frame-pointer,$(+cflags))
Lines 943-956 Link Here
943		943
944	ifeq (yes,$(build-shared))	944	ifeq (yes,$(build-shared))
945	# Build special library that contains the static-only routines for libc.	945	# Build special library that contains the static-only routines for libc.
946	object-suffixes-for-libc += .oS	946	object-suffixes-for-libc += .ons
947		947
948	# Must build the routines as PIC, though, because they can end up in (users')	948	# Must build the routines as PIC, though, because they can end up in (users')
949	# shared objects. We don't want to use CFLAGS-os because users may, for	949	# shared objects. We don't want to use CFLAGS-os because users may, for
950	# example, make that processor-specific.	950	# example, make that processor-specific.
951	CFLAGS-.oS = $(CFLAGS-.o) $(PIC-ccflag)	951	CFLAGS-.ons = $(CFLAGS-.o) $(PIC-ccflag)
952	CPPFLAGS-.oS = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1	952	CPPFLAGS-.ons = $(CPPFLAGS-.o) -DPIC -DLIBC_NONSHARED=1
953	libtype.oS = lib%_nonshared.a	953	libtype.ons = lib%_nonshared.a
954	endif	954	endif
955		955
956	# The assembler can generate debug information too.	956	# The assembler can generate debug information too.

Lines 465-471 Link Here

(-)glibc-2.23/Makerules.orig (-4 / +4 lines)
465	endif	465	endif
466	endif	466	endif
467		467
468	elide-routines.oS += $(filter-out $(static-only-routines),\	468	elide-routines.ons += $(filter-out $(static-only-routines),\
469	$(routines) $(aux) $(sysdep_routines))	469	$(routines) $(aux) $(sysdep_routines))
470	elide-routines.os += $(static-only-routines)	470	elide-routines.os += $(static-only-routines)
471		471
Lines 744-750 Link Here
744		744
745	+depfiles := $(sources:.c=.d) \	745	+depfiles := $(sources:.c=.d) \
746	$(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \	746	$(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \
747	$(patsubst %.oS,%.d,$(filter %.oS,$(extra-objs))) \	747	$(patsubst %.ons,%.d,$(filter %.ons,$(extra-objs))) \
748	$(patsubst %.o,%.d,$(filter %.o,$(extra-test-objs:.os=.o))) \	748	$(patsubst %.o,%.d,$(filter %.o,$(extra-test-objs:.os=.o))) \
749	$(addsuffix .d,$(tests) $(xtests) $(test-srcs))	749	$(addsuffix .d,$(tests) $(xtests) $(test-srcs))
750	ifeq ($(build-programs),yes)	750	ifeq ($(build-programs),yes)
Lines 1055-1061 Link Here
1055	install: $(inst_libdir)/libc.so	1055	install: $(inst_libdir)/libc.so
1056	$(inst_libdir)/libc.so: $(common-objpfx)format.lds \	1056	$(inst_libdir)/libc.so: $(common-objpfx)format.lds \
1057	$(common-objpfx)libc.so$(libc.so-version) \	1057	$(common-objpfx)libc.so$(libc.so-version) \
1058	$(inst_libdir)/$(patsubst %,$(libtype.oS),\	1058	$(inst_libdir)/$(patsubst %,$(libtype.ons),\
1059	$(libprefix)$(libc-name)) \	1059	$(libprefix)$(libc-name)) \
1060	$(+force)	1060	$(+force)
1061	(echo '/* GNU ld script';\	1061	(echo '/* GNU ld script';\
Lines 1063-1069 Link Here
1063	echo ' the static library, so try that secondarily. */';\	1063	echo ' the static library, so try that secondarily. */';\
1064	cat $<; \	1064	cat $<; \
1065	echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \	1065	echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
1066	'$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\	1066	'$(libdir)/$(patsubst %,$(libtype.ons),$(libprefix)$(libc-name))'\
1067	' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \	1067	' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \
1068	) > $@.new	1068	) > $@.new
1069	mv -f $@.new $@	1069	mv -f $@.new $@

Lines 13-19 Link Here

(-)glibc-2.23/extra-lib.mk.orig (-9 / +9 lines)
13		13
14	ifneq (,$($(lib)-static-only-routines))	14	ifneq (,$($(lib)-static-only-routines))
15	ifneq (,$(filter yes%,$(build-shared)$($(lib).so-version)))	15	ifneq (,$(filter yes%,$(build-shared)$($(lib).so-version)))
16	object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.oS)	16	object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.ons)
17	endif	17	endif
18	endif	18	endif
19		19
Lines 29-35 Link Here
29		29
30	# Add each flavor of library to the lists of things to build and install.	30	# Add each flavor of library to the lists of things to build and install.
31	install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o)))	31	install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o)))
32	extra-objs += $(foreach o,$(filter-out .os .oS,$(object-suffixes-$(lib))),\	32	extra-objs += $(foreach o,$(filter-out .os .ons,$(object-suffixes-$(lib))),\
33	$(patsubst %,%$o,$(filter-out \	33	$(patsubst %,%$o,$(filter-out \
34	$($(lib)-shared-only-routines),\	34	$($(lib)-shared-only-routines),\
35	$(all-$(lib)-routines))))	35	$(all-$(lib)-routines))))
Lines 37-44 Link Here
37	extra-objs += $(patsubst %,%.os,$(filter-out $($(lib)-static-only-routines),\	37	extra-objs += $(patsubst %,%.os,$(filter-out $($(lib)-static-only-routines),\
38	$(all-$(lib)-routines)))	38	$(all-$(lib)-routines)))
39	endif	39	endif
40	ifneq (,$(filter .oS,$(object-suffixes-$(lib))))	40	ifneq (,$(filter .ons,$(object-suffixes-$(lib))))
41	extra-objs += $(patsubst %,%.oS,$(filter $($(lib)-static-only-routines),\	41	extra-objs += $(patsubst %,%.ons,$(filter $($(lib)-static-only-routines),\
42	$(all-$(lib)-routines)))	42	$(all-$(lib)-routines)))
43	endif	43	endif
44	alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\	44	alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
Lines 62-68 Link Here
62		62
63		63
64	# Use o-iterator.mk to generate a rule for each flavor of library.	64	# Use o-iterator.mk to generate a rule for each flavor of library.
65	ifneq (,$(filter-out .os .oS,$(object-suffixes-$(lib))))	65	ifneq (,$(filter-out .os .ons,$(object-suffixes-$(lib))))
66	define o-iterator-doit	66	define o-iterator-doit
67	$(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \	67	$(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
68	$(patsubst %,$(objpfx)%$o,\	68	$(patsubst %,$(objpfx)%$o,\
Lines 70-76 Link Here
70	$(all-$(lib)-routines))); \	70	$(all-$(lib)-routines))); \
71	$$(build-extra-lib)	71	$$(build-extra-lib)
72	endef	72	endef
73	object-suffixes-left = $(filter-out .os .oS,$(object-suffixes-$(lib)))	73	object-suffixes-left = $(filter-out .os .ons,$(object-suffixes-$(lib)))
74	include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left))	74	include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left))
75	endif	75	endif
76		76
Lines 82-90 Link Here
82	$(build-extra-lib)	82	$(build-extra-lib)
83	endif	83	endif
84		84
85	ifneq (,$(filter .oS,$(object-suffixes-$(lib))))	85	ifneq (,$(filter .ons,$(object-suffixes-$(lib))))
86	$(objpfx)$(patsubst %,$(libtype.oS),$(lib:lib%=%)): \	86	$(objpfx)$(patsubst %,$(libtype.ons),$(lib:lib%=%)): \
87	$(patsubst %,$(objpfx)%.oS,\	87	$(patsubst %,$(objpfx)%.ons,\
88	$(filter $($(lib)-static-only-routines),\	88	$(filter $($(lib)-static-only-routines),\
89	$(all-$(lib)-routines)))	89	$(all-$(lib)-routines)))
90	$(build-extra-lib)	90	$(build-extra-lib)

Lines 5-17 Link Here

(-)glibc-2.23/sysdeps/sparc/sparc32/sparcv9/Makefile.orig (-2 / +2 lines)
5	ASFLAGS-.os += -Wa,-Av9d	5	ASFLAGS-.os += -Wa,-Av9d
6	ASFLAGS-.op += -Wa,-Av9d	6	ASFLAGS-.op += -Wa,-Av9d
7	ASFLAGS-.og += -Wa,-Av9d	7	ASFLAGS-.og += -Wa,-Av9d
8	ASFLAGS-.oS += -Wa,-Av9d	8	ASFLAGS-.ons += -Wa,-Av9d
9	else	9	else
10	ASFLAGS-.o += -Wa,-Av9a	10	ASFLAGS-.o += -Wa,-Av9a
11	ASFLAGS-.os += -Wa,-Av9a	11	ASFLAGS-.os += -Wa,-Av9a
12	ASFLAGS-.op += -Wa,-Av9a	12	ASFLAGS-.op += -Wa,-Av9a
13	ASFLAGS-.og += -Wa,-Av9a	13	ASFLAGS-.og += -Wa,-Av9a
14	ASFLAGS-.oS += -Wa,-Av9a	14	ASFLAGS-.ons += -Wa,-Av9a
15	endif	15	endif
16		16
17	# nscd uses atomic_spin_nop which in turn requires cpu_relax	17	# nscd uses atomic_spin_nop which in turn requires cpu_relax