Bug 15968 was fixed by commit 0748546f660d27a2ad29fa6174d456e2f6490758.

[jlayton/glibc.git] / extra-lib.mk

diff --git a/extra-lib.mk b/extra-lib.mk
index ad9f28cc652ae5f6cef934c29d128fce6b6117fc..fd8812cb21581af6434b6f8ada9963546072610e 100644 (file)
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -3,13 +3,20 @@
 # is initialized first to $(extra-libs) so that with each
 # inclusion, we advance $(lib) to the next library name (e.g. libfoo).
 # The variable $($(lib)-routines) defines the list of modules
-# to be included in that library.
+# to be included in that library.  A sysdep Makefile can add to
+# $(lib)-sysdep_routines to include additional modules.
 
 lib := $(firstword $(extra-libs-left))
 extra-libs-left := $(filter-out $(lib),$(extra-libs-left))
 
 object-suffixes-$(lib) := $(filter-out $($(lib)-inhibit-o),$(object-suffixes))
 
+ifneq (,$($(lib)-static-only-routines))
+ifneq (,$(filter yes%,$(build-shared)$($(lib).so-version)))
+object-suffixes-$(lib) += $(filter-out $($(lib)-inhibit-o),.oS)
+endif
+endif
+
 ifneq (,$(object-suffixes-$(lib)))
 
 # Make sure these are simply-expanded variables before we append to them,
@@ -17,10 +24,23 @@ ifneq (,$(object-suffixes-$(lib)))
 install-lib := $(install-lib)
 extra-objs := $(extra-objs)
 
+# The modules that go in $(lib).
+all-$(lib)-routines := $($(lib)-routines) $($(lib)-sysdep_routines)
+
 # 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,$(object-suffixes-$(lib)),\
-                       $(patsubst %,%$o,$($(lib)-routines)))
+extra-objs += $(foreach o,$(filter-out .os .oS,$(object-suffixes-$(lib))),\
+                       $(patsubst %,%$o,$(filter-out \
+                                          $($(lib)-shared-only-routines),\
+                                          $(all-$(lib)-routines))))
+ifneq (,$(filter .os,$(object-suffixes-$(lib))))
+extra-objs += $(patsubst %,%.os,$(filter-out $($(lib)-static-only-routines),\
+                                            $(all-$(lib)-routines)))
+endif
+ifneq (,$(filter .oS,$(object-suffixes-$(lib))))
+extra-objs += $(patsubst %,%.oS,$(filter $($(lib)-static-only-routines),\
+                                        $(all-$(lib)-routines)))
+endif
 alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
                             $(objpfx)$(patsubst %,$(libtype$o),\
                             $(lib:lib%=%)))
@@ -36,20 +56,54 @@ endif
 
 # The linked shared library is never a dependent of lib-noranlib,
 # because linking it will depend on libc.so already being built.
-ifneq (,$(filter .so,$(object-suffixes-$(lib))))
+ifneq (,$(filter .os,$(object-suffixes-$(lib))))
 others: $(objpfx)$(lib).so$($(lib).so-version)
 endif
 
 
 # Use o-iterator.mk to generate a rule for each flavor of library.
+ifneq (,$(filter-out .os .oS,$(object-suffixes-$(lib))))
 define o-iterator-doit
 $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
-  $($(lib)-routines:%=$(objpfx)%$o); $$(build-extra-lib)
+  $(patsubst %,$(objpfx)%$o,\
+            $(filter-out $($(lib)-shared-only-routines),\
+                         $(all-$(lib)-routines))); \
+       $$(build-extra-lib)
 endef
-object-suffixes-left = $(object-suffixes-$(lib))
-include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-$(lib)))
+object-suffixes-left = $(filter-out .os .oS,$(object-suffixes-$(lib)))
+include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left))
+endif
 
+ifneq (,$(filter .os,$(object-suffixes-$(lib))))
+$(objpfx)$(patsubst %,$(libtype.os),$(lib:lib%=%)): \
+  $(patsubst %,$(objpfx)%.os,\
+            $(filter-out $($(lib)-static-only-routines),\
+                         $(all-$(lib)-routines)))
+       $(build-extra-lib)
+endif
+
+ifneq (,$(filter .oS,$(object-suffixes-$(lib))))
+$(objpfx)$(patsubst %,$(libtype.oS),$(lib:lib%=%)): \
+  $(patsubst %,$(objpfx)%.oS,\
+            $(filter $($(lib)-static-only-routines),\
+                     $(all-$(lib)-routines)))
+       $(build-extra-lib)
+endif
+
+ifeq ($(build-shared),yes)
 # Add the version script to the dependencies of the shared library.
-$(objpfx)$(lib).so: $($(lib)-map)
+$(objpfx)$(lib).so: $(firstword $($(lib)-map) \
+                               $(addprefix $(common-objpfx), \
+                                           $(filter $(lib).map, \
+                                                    $(version-maps))))
+endif
 
 endif
+
+# This will define `libof-ROUTINE := LIB' for each of the routines.
+cpp-srcs-left := $($(lib)-routines) $($(lib)-sysdep_routines)
+ifneq (,$(cpp-srcs-left))
+include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+endif
+
+CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib)