Use THREAD_GETMEM and THREAD_SETMEM to access the elements of the

[kopensolaris-gnu/glibc.git] / extra-lib.mk

diff --git a/extra-lib.mk b/extra-lib.mk
index 353b576..87d4fa3 100644 (file)
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -8,22 +8,53 @@
 lib := $(firstword $(extra-libs-left))
 extra-libs-left := $(filter-out $(lib),$(extra-libs-left))
 
 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 (,$(object-suffixes-$(lib)))
+
+# Make sure these are simply-expanded variables before we append to them,
+# since we want the expressions we append to be expanded right now.
+install-lib := $(install-lib)
+extra-objs := $(extra-objs)
+

 # Add each flavor of library to the lists of things to build and install.
 # Add each flavor of library to the lists of things to build and install.

-install-lib += $(foreach o,$(object-suffixes),$(lib:lib%=$(libtype$o)))
-extra-objs += $(foreach o,$(object-suffixes),$($(lib)-routines:=$o))
-alltypes-$(lib) = $(foreach o,$(object-suffixes),\
-                           $(objpfx)$(patsubst %,$(libtype$o),\
-                           $(lib:lib%=%)))
+install-lib += $(foreach o,$(object-suffixes-$(lib)),$(lib:lib%=$(libtype$o)))
+extra-objs += $(foreach o,$(object-suffixes-$(lib)),\
+                       $(patsubst %,%$o,$($(lib)-routines)))
+alltypes-$(lib) := $(foreach o,$(object-suffixes-$(lib)),\
+                            $(objpfx)$(patsubst %,$(libtype$o),\
+                            $(lib:lib%=%)))
+
+ifeq (,$(filter $(lib),$(extra-libs-others)))
+lib-noranlib: $(alltypes-$(lib))

 ifeq (yes,$(build-shared))
 ifeq (yes,$(build-shared))

-alltypes-$(lib) += $(objpfx)$(lib).so
+lib-noranlib: $(objpfx)$(lib).so$($(lib).so-version)
+endif
+else
+others: $(alltypes-$(lib))
+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 .os,$(object-suffixes-$(lib))))
+others: $(objpfx)$(lib).so$($(lib).so-version)

 endif
 
 endif
 

-lib-noranlib: $(alltypes-$(lib))

 
 # Use o-iterator.mk to generate a rule for each flavor of library.
 define o-iterator-doit
 $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
   $($(lib)-routines:%=$(objpfx)%$o); $$(build-extra-lib)
 endef
 
 # Use o-iterator.mk to generate a rule for each flavor of library.
 define o-iterator-doit
 $(objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
   $($(lib)-routines:%=$(objpfx)%$o); $$(build-extra-lib)
 endef

-object-suffixes-left := $(filter-out $($(lib)-inhibit-o),$(object-suffixes))
-include $(o-iterator)
+object-suffixes-left = $(object-suffixes-$(lib))
+include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-$(lib)))
+
+ifeq ($(versioning),yes)
+# Add the version script to the dependencies of the shared library.
+$(objpfx)$(lib).so: $(firstword $($(lib)-map) \
+                               $(addprefix $(common-objpfx), \
+                                           $(filter $(lib).map, \
+                                                    $(version-maps))))
+endif
+
+endif