summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-12-23 11:17:18 +0000
committerRoland McGrath <roland@gnu.org>2002-12-23 11:17:18 +0000
commitc823a4d21b76fbc6cf86503d23e3cd55384644ce (patch)
tree6a61fb4da98c47f12d37455776b30543b51d9a3e
parentb27b002d5b85b8628f19f65886d25a342c6cbc18 (diff)
downloadglibc-c823a4d21b76fbc6cf86503d23e3cd55384644ce.tar.gz
glibc-c823a4d21b76fbc6cf86503d23e3cd55384644ce.tar.xz
glibc-c823a4d21b76fbc6cf86503d23e3cd55384644ce.zip
* scripts/abilist.awk: Produce a more compact format, divided into
	stanzas for each version set, the set name listed only once.
	* scripts/extract-abilist.awk: New file.
	* scripts/merge-abilist.awk: New file.
	* Makerules (check-abi-%, update-abi-%): New pattern rules.
	(update-abi, check-abi): New targets.
	* Makefile (+subdir_targets): Add subdir_{check,update}-abi.

	* Makerules (%.symlist): Use LC_ALL=C when running awk script.
-rw-r--r--ChangeLog12
-rw-r--r--Makefile2
-rw-r--r--Makerules2588
-rw-r--r--scripts/abilist.awk70
-rw-r--r--scripts/extract-abilist.awk44
-rw-r--r--scripts/merge-abilist.awk129
6 files changed, 1556 insertions, 1289 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fdb8d9316..3f9a81fa91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
+2002-12-23  Roland McGrath  <roland@redhat.com>
+
+	* scripts/abilist.awk: Produce a more compact format, divided into
+	stanzas for each version set, the set name listed only once.
+	* scripts/extract-abilist.awk: New file.
+	* scripts/merge-abilist.awk: New file.
+	* Makerules (check-abi-%, update-abi-%): New pattern rules.
+	(update-abi, check-abi): New targets.
+	* Makefile (+subdir_targets): Add subdir_{check,update}-abi.
+
 2002-12-19  Roland McGrath  <roland@redhat.com>
 
+	* Makerules (%.symlist): Use LC_ALL=C when running awk script.
+
 	* sysdeps/unix/sysv/linux/i386/brk.c (__brk): Cast result of
 	INTERNAL_SYSCALL.
 
diff --git a/Makefile b/Makefile
index 16ef0e9636..3a92ccb192 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ endif # $(AUTOCONF) = no
 +subdir_targets	:= subdir_lib objects objs others subdir_mostlyclean	\
 		   subdir_clean subdir_distclean subdir_realclean	\
 		   tests xtests subdir_lint.out				\
-		   subdir_distinfo					\
+		   subdir_update-abi subdir_check-abi subdir_distinfo	\
 		   subdir_echo-headers subdir_echo-distinfo		\
 		   subdir_install					\
 		   subdir_testclean					\
diff --git a/Makerules b/Makerules
index d4e75c88cc..59ca6dc2dc 100644
--- a/Makerules
+++ b/Makerules
@@ -1,1278 +1,1310 @@
-# Copyright (C) 1991-1999,2000,01,02 Free Software Foundation, Inc.
-# This file is part of the GNU C Library.
-
-# The GNU C Library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# The GNU C Library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-#
-#	Common rules for making the GNU C library.  This file is included
-#	by the top-level Makefile and by all subdirectory makefiles
-#	(through Rules).
-#
-ifneq (,)
-This makefile requires GNU Make.
-endif
-
-REQUIRED_MAKE_VERSION = 3.74
-REAL_MAKE_VERSION = $(firstword $(MAKE_VERSION))
-
-ifneq ($(REQUIRED_MAKE_VERSION), \
-       $(firstword $(sort $(REAL_MAKE_VERSION) $(REQUIRED_MAKE_VERSION))))
-Wrong GNU Make version.  See above for the version needed.
-endif
-
-
-ifdef	subdir
-..	:= ../
-endif	# subdir
-
-# If `sources' was defined by the parent makefile, undefine it so
-# we will later get it from wildcard search in this directory.
-ifneq	"$(findstring env,$(origin sources))" ""
-sources :=
-endif
-
-oPATH := $(PATH)
-PATH := this definition should take precedence over $(oPATH)
-ifeq ($(PATH),$(oPATH))
-You must not use the -e flag when building the GNU C library.
-else
-PATH := $(oPATH)
-endif
-
-ifndef +included-Makeconfig
-include $(..)Makeconfig
-endif
-
-# `configure' writes a definition of `config-sysdirs' in `config.make'.
-sysdirs = $(strip $(full_config_sysdirs))
-
-+sysdir_pfx = $(common-objpfx)
-
-export sysdirs := $(sysdirs)
-
-+sysdep_dirs := $(full_config_sysdirs)
-ifdef objdir
-+sysdep_dirs := $(objdir) $(+sysdep_dirs)
-endif
-
-# Add -I switches to get the right sysdep directories.
-# `+includes' in Makeconfig references $(+sysdep-includes).
-+sysdep-includes := $(addprefix -I,$(+sysdep_dirs))
-
-# This variable is used in ``include $(o-iterator)'' after defining
-# $(o-iterator-doit) to produce some desired rule using $o for the object
-# suffix, and setting $(object-suffixes-left) to $(object-suffixes); a copy
-# is produced for each object suffix in use.
-o-iterator = $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left))
-
-# Include any system-specific makefiles.
-
-# This is here so things in sysdep Makefiles can easily depend on foo.h as
-# appropriate and not worry about where foo.h comes from, which may be
-# system dependent and not known by that Makefile.
-vpath %.h $(subst $(empty) ,:,$(strip $(common-objpfx) $(objpfx) \
-				      $(+sysdep_dirs) $(..)))
-
-# The same is true for RPC source files.
-vpath %.x $(subst $(empty) ,:,$(strip $(common-objpfx) $(objpfx) \
-				      $(+sysdep_dirs) $(..)))
-
-# Some sysdep makefiles use this to distinguish being included here from
-# being included individually by a subdir makefile (hurd/Makefile needs this).
-in-Makerules := yes
-
-sysdep-makefiles := $(wildcard $(full_config_sysdirs:=/Makefile))
-ifneq (,$(sysdep-makefiles))
-include $(sysdep-makefiles)
-endif
-
-
-# Reorder before-compile so that mach things come first, and hurd things
-# second, before all else.  The mach and hurd subdirectories have many
-# generated header files which the much of rest of the library depends on,
-# so it is best to build them first (and mach before hurd, at that).
-before-compile := $(filter $(common-objpfx)mach% $(common-objpfx)hurd%,\
-			   $(before-compile)) \
-		  $(filter-out $(common-objpfx)mach% $(common-objpfx)hurd%,\
-			       $(before-compile))
-
-# Even before that, we need abi-versions.h which is generated right here.
-ifeq ($(versioning),yes)
-ifndef avoid-generated
-before-compile := $(common-objpfx)abi-versions.h $(before-compile)
-$(common-objpfx)abi-versions.h: $(..)scripts/abi-versions.awk \
-				$(common-objpfx)Versions.all
-	LC_ALL=C $(AWK) -v oldest_abi=$(oldest-abi) -f $^ > $@T
-	mv -f $@T $@
-
-$(common-objpfx)%.latest: $(common-objpfx)abi-versions.h
-	sed -n '/ VERSION_$*_/{s/^.*_\([A-Z0-9_]*\).*$$/\1/;h;};$${g;p;}' \
-	    $(common-objpfx)abi-versions.h > $@T
-	mv -f $@T $@
-endif # avoid-generated
-endif # $(versioning) = yes
-
-# When we have no deps pass doing it, then make sure the subdirectory
-# for object files gets created.
-ifdef no_deps
-ifdef objpfx
-before-compile += $(objpfx).
-$(objpfx).:
-	$(make-target-directory)
-endif
-endif
-
-# Remove existing files from `before-compile'.  Things are added there when
-# they must exist for dependency generation to work right, but once they
-# exist there is no further need for every single file to depend on them,
-# and those gratuitous dependencies result in many gratuitous
-# recompilations.
-before-compile := $(filter-out $(wildcard $(before-compile)),$(before-compile))
-
-# Don't let any before-compile file be an intermediate and get removed.
-ifdef before-compile
-$(before-compile):
-endif
-
-# If a makefile needs to do something conditional on something that
-# can only be figured out from headers, write a FOO.make.c input
-# file that uses cpp contructs and contains @@@ LINE @@@ for each LINE
-# to emit in the generated makefile, and use -include $(common-objpfx)FOO.make.
-$(common-objpfx)%.make: $(..)%.make.c $(..)Makerules
-	rm -f $@T $@.dT
-	(echo '# Generated from $*.make.c by Makerules.'; \
-	 SUNPRO_DEPENDENCIES='$@.dT $$(common-objpfx)$*.make' \
-	 $(CC) $(CFLAGS) $(CPPFLAGS) -E $< \
-	 | sed -n '/@@@/{s/@@@[	 ]*\(.*\)@@@/\1/;s/[	 ]*$$//p;}'; \
-	 echo 'common-generated += $(@F)'; \
-	 cat $@.dT; rm -f $@.dT) > $@T
-	mv -f $@T $@
-
-# Generate an ordered list of implicit rules which find the source files in
-# each sysdep directory.  The old method was to use vpath to search all the
-# sysdep directories.  However, that had the problem that a .S file in a
-# later directory would be chosen over a .c file in an earlier directory,
-# which does not preserve the desired sysdeps ordering behavior.
-
-# When making the list of .d files to include, we can't know which ones
-# have source in .s files, and thus do not in fact need a .d file.
-# So we must define rules to make .d files for .s files.
-define make-dummy-dep
-$(addprefix ln $(common-objpfx)dummy.d ,$(filter-out $(wildcard $@),$@))
-endef
-$(common-objpfx)dummy.d:
-	echo '# .s files cannot contain includes, so they need no deps.' > $@
-
-# It matters that this set of rules, for compiling from sources in
-# the current directory (the $srcdir/$subdir) come before the
-# generated sysdep rules in included from sysd-rules below.  When
-# compiling in the source tree, generated sources go into the current
-# directory, and those should be chosen before any sources in sysdeps.
-define o-iterator-doit
-$(objpfx)%$o: %.S $(before-compile); $$(compile-command.S)
-endef
-object-suffixes-left := $(all-object-suffixes)
-include $(o-iterator)
-$(objpfx)%.d: %.S $(before-compile); $(+make-deps)
-
-define o-iterator-doit
-$(objpfx)%$o: %.s $(before-compile); $$(compile-command.s)
-endef
-object-suffixes-left := $(all-object-suffixes)
-include $(o-iterator)
-$(objpfx)%.d: %.s $(common-objpfx)dummy.d; $(make-dummy-dep)
-
-define o-iterator-doit
-$(objpfx)%$o: %.c $(before-compile); $$(compile-command.c)
-endef
-object-suffixes-left := $(all-object-suffixes)
-include $(o-iterator)
-$(objpfx)%.d: %.c $(before-compile); $(+make-deps)
-
-# Omit the objpfx rules when building in the source tree, because
-# objpfx is empty and so these rules just override the ones above.
-ifdef objpfx
-# Define first rules to find the source files in $(objpfx).
-# Generated source files will end up there.
-define o-iterator-doit
-$(objpfx)%$o: $(objpfx)%.S $(before-compile); $$(compile-command.S)
-endef
-object-suffixes-left := $(all-object-suffixes)
-include $(o-iterator)
-$(objpfx)%.d: $(objpfx)%.S $(before-compile); $(+make-deps)
-
-define o-iterator-doit
-$(objpfx)%$o: $(objpfx)%.s $(before-compile); $$(compile-command.s)
-endef
-object-suffixes-left := $(all-object-suffixes)
-include $(o-iterator)
-$(objpfx)%.d: $(objpfx)%.s $(common-objpfx)dummy.d; $(make-dummy-dep)
-
-define o-iterator-doit
-$(objpfx)%$o: $(objpfx)%.c $(before-compile); $$(compile-command.c)
-endef
-object-suffixes-left := $(all-object-suffixes)
-include $(o-iterator)
-$(objpfx)%.d: $(objpfx)%.c $(before-compile); $(+make-deps)
-endif
-
-# System-dependent makefiles can put in `inhibit-sysdep-asm' wildcard
-# patterns matching sysdep directories whose assembly source files should
-# be suppressed.
-ifdef inhibit-sysdep-asm
-define open-check-inhibit-asm
-case $$sysdir in $(subst $(empty) ,|,$(inhibit-sysdep-asm))) : ;; *)
-endef
-close-check-inhibit-asm = ;; esac ;
-endif
-
--include $(+sysdir_pfx)sysd-rules
-ifneq ($(sysd-rules-sysdirs),$(config-sysdirs))
-# The value of $(+sysdep_dirs) the sysd-rules was computed for
-# differs from the one we are using now.  So force a rebuild of sysd-rules.
-sysd-rules-force = FORCE
-FORCE:
-endif
-$(+sysdir_pfx)sysd-rules: $(+sysdir_pfx)config.make $(..)Makerules \
-			  $(wildcard $(foreach dir,$(sysdirs),\
-					       $(dir)/Makefile))\
-			  $(sysd-rules-force)
-	-@rm -f $@T
-	(echo 'sysd-rules-sysdirs := $(config-sysdirs)';		      \
-	 for dir in $(config-sysdirs:%='$$(..)%'); do			      \
-	   for o in $(all-object-suffixes); do \
-	     $(open-check-inhibit-asm) \
-	     echo "\$$(objpfx)%$$o: $$dir/%.S \$$(before-compile); \
-		  \$$(compile-command.S)";				      \
-	     echo "\$$(objpfx)%$$o: $$dir/%.s \$$(before-compile); \
-		  \$$(compile-command.s)";			              \
-	     echo "\$$(objpfx)rtld-%$$o: $$dir/%.S \$$(before-compile); \
-		  \$$(compile-command.S)";				      \
-	     echo "\$$(objpfx)rtld-%$$o: $$dir/%.s \$$(before-compile); \
-		  \$$(compile-command.s)";			              \
-	     echo "\$$(objpfx)ptw-%$$o: $$dir/%.S \$$(before-compile); \
-		  \$$(compile-command.S)";				      \
-	     echo "\$$(objpfx)ptw-%$$o: $$dir/%.s \$$(before-compile); \
-		  \$$(compile-command.s)";			              \
-	     $(close-check-inhibit-asm)	\
-	     echo "\$$(objpfx)%$$o: $$dir/%.c \$$(before-compile); \
-		  \$$(compile-command.c)";				      \
-	     echo "\$$(objpfx)rtld-%$$o: $$dir/%.c \$$(before-compile); \
-		  \$$(compile-command.c)";				      \
-	     echo "\$$(objpfx)ptw-%$$o: $$dir/%.c \$$(before-compile); \
-		  \$$(compile-command.c)";				      \
-	   done; \
-	   $(open-check-inhibit-asm) \
-	   echo "\$$(objpfx)%.d: $$dir/%.s \$$(common-objpfx)dummy.d; \
-		\$$(make-dummy-dep)";			       \
-	   echo "\$$(objpfx)rtld-%.d: $$dir/%.s \$$(common-objpfx)dummy.d; \
-		\$$(make-dummy-dep)";			       \
-	   echo "\$$(objpfx)ptw-%.d: $$dir/%.s \$$(common-objpfx)dummy.d; \
-		\$$(make-dummy-dep)";			       \
-	   echo "\$$(objpfx)%.d: $$dir/%.S \$$(before-compile); \
-		\$$(+make-deps)";					      \
-	   echo "\$$(objpfx)rtld-%.d: $$dir/%.S \$$(before-compile); \
-		\$$(+make-deps)";					      \
-	   echo "\$$(objpfx)ptw-%.d: $$dir/%.S \$$(before-compile); \
-		\$$(+make-deps)";					      \
-	   $(close-check-inhibit-asm)	\
-	   echo "\$$(objpfx)%.d: $$dir/%.c \$$(before-compile); \
-		\$$(+make-deps)";					      \
-	   echo "\$$(objpfx)rtld-%.d: $$dir/%.c \$$(before-compile); \
-		\$$(+make-deps)";					      \
-	   echo "\$$(objpfx)ptw-%.d: $$dir/%.c \$$(before-compile); \
-		\$$(+make-deps)";					      \
-	   echo "\$$(objpfx)m_%.S: $$dir/s_%.S; \$$(+make-include-of-dep)";   \
-	   echo "\$$(objpfx)m_%.c: $$dir/s_%.c; \$$(+make-include-of-dep)";   \
-	 done;								      \
-	 echo 'sysd-rules-done = t') > $@T
-	mv -f $@T $@
-
-ifndef sysd-rules-done
-# Don't do deps until this exists, because it provides rules to make the deps.
-no_deps=t
-endif
-
-# This is used by the m_%.[Sc] pattern rules in sysd-rules.
-define +make-include-of-dep
-echo '#include <$<>' > $@T
-mv -f $@T $@
-endef
-
-# Generate version maps, but wait until sysdep-subdirs is known
-ifeq ($(sysd-sorted-done),t)
-ifeq ($(versioning),yes)
--include $(common-objpfx)sysd-versions
-$(addprefix $(common-objpfx),$(version-maps)): $(common-objpfx)sysd-versions
-common-generated += $(version-maps)
-postclean-generated += sysd-versions Versions.all abi-versions.h \
-		       Versions.def.v.i Versions.def.v Versions.v.i Versions.v
-
-ifndef avoid-generated
-ifneq ($(sysd-versions-subdirs),$(all-subdirs) $(config-sysdirs))
-sysd-versions-force = FORCE
-FORCE:
-endif
-# See %.v/%.v.i implicit rules in Makeconfig.
-$(common-objpfx)Versions.def.v.i: $(..)Versions.def \
-				  $(wildcard $(add-ons:%=$(..)%/Versions.def))
-$(common-objpfx)Versions.all: $(..)scripts/firstversions.awk \
-			      $(common-objpfx)soversions.i \
-			      $(common-objpfx)Versions.def.v
-	{ while read lib version setname; do \
-	    test -z "$$setname" || echo "$$lib : $$setname"; \
-	  done < $(word 2,$^); \
-	  cat $(word 3,$^); \
-	} | LC_ALL=C $(AWK) -f $< > $@T
-	mv -f $@T $@
-# See %.v/%.v.i implicit rules in Makeconfig.
-$(common-objpfx)Versions.v.i: $(wildcard $(all-subdirs:%=$(..)%/Versions)) \
-			      $(wildcard $(sysdirs:%=%/Versions)) \
-			      $(common-objpfx)abi-versions.h \
-			      $(sysd-versions-force)
-$(common-objpfx)sysd-versions: $(common-objpfx)Versions.all \
-			       $(common-objpfx)Versions.v \
-			       $(..)scripts/versions.awk
-	( echo 'sysd-versions-subdirs = $(all-subdirs) $(config-sysdirs)' ; \
-	  cat $(word 2,$^) \
-	  | LC_ALL=C $(AWK) -v buildroot=$(common-objpfx) -v defsfile=$< \
-			    -v move_if_change='$(move-if-change)' \
-			    -f $(word 3,$^); \
-	) > $@T
-	mv -f $@T $@
-endif # avoid-generated
-endif # $(versioning) = yes
-endif # sysd-sorted-done
-
-
-ifndef compile-command.S
-compile-command.S = $(compile.S) $(OUTPUT_OPTION)
-endif
-ifndef compile-command.s
-compile-command.s = $(COMPILE.s) $< $(OUTPUT_OPTION)
-endif
-ifndef compile-command.c
-compile-command.c = $(compile.c) $(OUTPUT_OPTION)
-endif
-
-# GCC can grok options after the file name, and it looks nicer that way.
-compile.c = $(CC) $< -c $(CFLAGS) $(CPPFLAGS)
-compile.S = \
-  $(CC) $< -c $(CPPFLAGS) -DASSEMBLER $(asm-CPPFLAGS) $(ASFLAGS-$(suffix $@))
-COMPILE.S = \
-  $(CC) -c $(CPPFLAGS) -DASSEMBLER $(asm-CPPFLAGS) $(ASFLAGS-$(suffix $@))
-COMPILE.s = $(filter-out -pipe,$(CC)) -c $(ASFLAGS)
-
-# If we want to generate MD5 checksums for the sources do this now.
-ifeq ($(md5),yes)
-generate-md5 = ; rm -f $(@:.d=.md5); \
-$(CC) -E $< $(CFLAGS) $(CPPFLAGS) $($(<:$*.%=%)-CPPFLAGS) | \
-sed '/^\#/d;/^[[:space:]]*$$/d' | md5sum > $(@:.d=.md5)
-else
-generate-md5 =
-endif
-
-# We need this for the output to go in the right place.  It will default to
-# empty if make was configured to work with a cc that can't grok -c and -o
-# together.  You can't compile the C library with such a compiler.
-OUTPUT_OPTION = -o $@
-
-# We need the $(CFLAGS) to be in there to have the right predefines during
-# the dependency run for C sources.  But having it for assembly sources can
-# get the wrong predefines.
-S-CPPFLAGS = $(asm-CPPFLAGS)
-define +make-deps
-$(make-target-directory)
-$(+mkdep) $< $(if $(filter %.c,$<),$(CFLAGS)) \
-	     $(CPPFLAGS) $($(<:$*.%=%)-CPPFLAGS) | sed \
--e 's,$(subst .,\.,$*)\.o,$(foreach o,$(all-object-suffixes),$(@:.d=$o)) $@,' \
-$(sed-remove-objpfx) > $(@:.d=.T)
-mv -f $(@:.d=.T) $@ $(generate-md5)
-endef
-ifneq (,$(objpfx))
-# Continuation lines here are dangerous because they introduce spaces!
-define sed-remove-objpfx
--e 's@ $(subst .,\.,$(subst @,\@,$(common-objpfx)))@ $$(common-objpfx)@g' \
--e 's@^$(subst .,\.,$(subst @,\@,$(common-objpfx)))@$$(common-objpfx)@g'
-endef
-endif
-
-# Modify the list of routines we build for different targets
-
-ifeq (yesyes,$(build-shared)$(elf))
-ifndef libc.so-version
-# Undefine this because it can't work when we libc.so is unversioned.
-static-only-routines =
-endif
-endif
-
-# Bounded pointer thunks are only built for *.ob
-elide-bp-thunks = $(addprefix $(bppfx),$(bp-thunks))
-
-elide-routines.oS += $(filter-out $(static-only-routines),\
-				  $(routines) $(aux) $(sysdep_routines)) \
-		     $(elide-bp-thunks)
-elide-routines.os += $(static-only-routines) $(elide-bp-thunks)
-
-# If we have versioned code we don't need the old versions in any of the
-# static libraries.
-elide-routines.o  += $(shared-only-routines) $(elide-bp-thunks)
-elide-routines.op += $(shared-only-routines) $(elide-bp-thunks)
-elide-routines.og += $(shared-only-routines) $(elide-bp-thunks)
-elide-routines.ob += $(shared-only-routines)
-
-# Shared library building.
-
-ifeq (yes,$(build-shared))
-
-# Reference map file only when versioning is selected and a map file name
-# is given.
-ifeq ($(versioning),yes)
-map-file = $(firstword $($(@F:.so=-map)) \
-		       $(addprefix $(common-objpfx), \
-				   $(filter $(@F:.so=.map),$(version-maps))))
-load-map-file = $(map-file:%=-Wl,--version-script=%)
-endif
-
-# Pattern rule to build a shared object from an archive of PIC objects.
-# This must come after the installation rules so Make doesn't try to
-# build shared libraries in place from the installed *_pic.a files.
-# $(LDLIBS-%.so) may contain -l switches to generate run-time dependencies
-# on other shared objects.
-lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(+interp)
-ifneq (,$(findstring aix,$(config-os)))
-	(echo '#!'; \
-	 dump -g $< | sed '1,6d' | cut -f2 | sort | uniq) > $(<:a=exp)
-endif
-	$(build-shlib)
-
-ifeq ($(elf),yes)
-define build-shlib-helper
-$(LINK.o) -shared $(static-libgcc) -Wl,-O1 $(sysdep-LDFLAGS) $(config-LDFLAGS) \
-	  $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
-	  $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
-	  -Wl,-soname=lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \
-	  $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \
-	  -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link)
-endef
-else
-ifneq (,$(findstring aix,$(config-os)))
-define build-shlib-helper
-$(LINK.o) -Wl,-G,-bM:SRE,-bnoentry,-bE:$(<:a=exp) \
-	  $(sysdep-LDFLAGS) $(config-LDFLAGS) $(extra-B-$(@F:lib%.so=%).so) \
-	  $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
-	  $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \
-	  -L$(subst :, -L,$(rpath-link))
-endef
-else
-endif
-endif
-
-ifeq (yes,$(elf))
-# binutils only position loadable notes into the first page for binaries,
-# not for shared objects
-define build-shlib
-$(build-shlib-helper) \
-	  -o $@.new $(csu-objpfx)abi-note.o -Wl,--verbose \
-	  $(LDLIBS-$(@F:lib%.so=%).so) 2>&1 | \
-	  sed -e '/^=========/,/^=========/!d;/^=========/d' \
-	      -e 's/^.*\.hash[ 	]*:.*$$/  .note.ABI-tag : { *(.note.ABI-tag) } &/' \
-	      $(LDSEDCMD-$(@F:lib%.so=%).so) > $@.lds
-rm -f $@.new
-$(build-shlib-helper) -o $@ -T $@.lds \
-	  $(csu-objpfx)abi-note.o $(build-shlib-objlist)
-rm -f $@.lds
-endef
-else
-ifneq (,$(findstring aix,$(config-os)))
-define build-shlib
-$(build-shlib-helper) \
-	-o $@ \
-	$(filter-out $(map-file) $(+preinit) $(+postinit),$^) \
-	$(no-whole-archive) $(LDLIBS-$(@F:lib%.so=%).so)
-endef
-define build-shlib
-$(build-shlib-helper) \
-	  $(build-shlib-objlist)
-endef
-endif
-endif
-
-ifneq (,$(findstring aix,$(config-os)))
-define build-module-helper
-$(LINK.o) -Wl,-G -Wl,-bM:SRE -Wl,-bnoentry -Wl,-bexpall \
-	  $(sysdep-LDFLAGS) $(config-LDFLAGS) \
-	  $(load-map-file) \
-	  $(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \
-	  -L$(subst :, -L,$(rpath-link)) -Wl,-L=$(rpath-link)
-endef
-else
-define build-module-helper
-$(LINK.o) -shared $(static-libgcc) $(sysdep-LDFLAGS) $(config-LDFLAGS) \
-	  -B$(csu-objpfx) $(load-map-file) \
-	  $(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \
-	  -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link)
-endef
-endif
-
-# This macro is similar to build-shlib but it does not define a soname
-# and it does not depend on the destination name to start with `lib'.
-ifeq (yes,$(elf))
-# binutils only position loadable notes into the first page for binaries,
-# not for shared objects
-define build-module
-$(build-module-helper) \
-	  -o $@.new $(csu-objpfx)abi-note.o -Wl,--verbose \
-	  $(LDLIBS-$(@F:lib%.so=%).so) 2>&1 | \
-	  sed -e '/^=========/,/^=========/!d;/^=========/d' \
-	      -e 's/^.*\.hash[ 	]*:.*$$/  .note.ABI-tag : { *(.note.ABI-tag) } &/' \
-	  > $@.lds
-rm -f $@.new
-$(build-module-helper) -o $@ -T $@.lds \
-	  $(csu-objpfx)abi-note.o $(build-module-objlist)
-rm -f $@.lds
-endef
-else
-ifneq (,$(findstring aix,$(config-os)))
-define build-module
-$(build-module-helper) \
-	  -o $@ \
-	  $(filter-out $(map-file) $(+preinit) $(+postinit),$^) \
-	  $(no-whole-archive) $(LDLIBS-$(@F:%.so=%).so)
-endef
-else
-define build-module
-define build-module
-$(build-module-helper) \
-	  -o $@ \
-	  $(build-module-objlist)
-endef
-endif
-endif
-
-build-module-helper-objlist = \
-	$(patsubst %_pic.a,$(whole-archive) %_pic.a $(no-whole-archive),\
-		   $(filter-out $(map-file) $(+preinit) $(+postinit),$^))
-whole-archive := -Wl,--whole-archive
-
-build-module-objlist = $(build-module-helper-objlist) $(LDLIBS-$(@F:%.so=%).so)
-build-shlib-objlist = $(build-module-helper-objlist) \
-		      $(LDLIBS-$(@F:lib%.so=%).so)
-
-# Don't try to use -lc when making libc.so itself.
-# Also omits crti.o and crtn.o, which we do not want
-# since we define our own `.init' section specially.
-LDFLAGS-c.so = -nostdlib -nostartfiles
-# But we still want to link libc.so against $(gnulib).
-LDLIBS-c.so += $(gnulib)
-# Give libc.so an entry point and make it directly runnable itself.
-LDFLAGS-c.so += -e __libc_main
-# Force the backward compatibility EH functions to be linked.
-LDFLAGS-c.so += -u __register_frame
-# Pre-link the objects of libc_pic.a so that we can locally resolve
-# COMMON symbols before we link against ld.so.  This is because ld.so
-# contains some of libc_pic.a already, which will prevent the COMMONs
-# from being allocated in libc.so, which introduces evil dependencies
-# between libc.so and ld.so, which can make it impossible to upgrade.
-ifeq ($(elf),yes)
-$(common-objpfx)libc_pic.os: $(common-objpfx)libc_pic.a
-	$(LINK.o) -nostdlib -nostartfiles -r -o $@ \
-	$(LDFLAGS-c_pic.os) -Wl,-d -Wl,--whole-archive $^
-LDSEDCMD-c.so = -e 's/^.*\*(\.dynbss).*$$/& __start___libc_freeres_ptrs = .; *(__libc_freeres_ptrs) __stop___libc_freeres_ptrs = .;/'
-# Use our own special initializer and finalizer files for libc.so.
-$(common-objpfx)libc.so: $(elfobjdir)/soinit.os \
-			 $(common-objpfx)libc_pic.os \
-			 $(elfobjdir)/sofini.os \
-			 $(elfobjdir)/interp.os $(elfobjdir)/ld.so
-	$(build-shlib)
-ifeq ($(versioning),yes)
-$(common-objpfx)libc.so: $(common-objpfx)libc.map
-endif
-common-generated += libc.so libc_pic.os
-ifdef libc.so-version
-$(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so
-	$(make-link)
-common-generated += libc.so$(libc.so-version)
-endif
-endif
-else
-ifneq (,$(findstring aix,$(config-os)))
-$(common-objpfx)libc.so: $(common-objpfx)libc_pic.a
-	@rm -f $@
-	(echo '#!'; \
-	 dump -g $^ | sed '1,6d' | cut -f2 | sort | uniq) > $(^:a=exp)
-	sed '/__mulh/d;/__mull/d;/__divss/d;/__divus/d;/__quoss/d;/__quous/d' \
-	    /lib/syscalls.exp > $(common-objpfx)syscalls.exp
-	$(LINK.o) -G -bM:SRE -bnoentry -bE:$(^:a=exp) \
-		  -bE:$(common-objpfx)syscalls.exp \
-		  -bI:$(common-objpfx)syscalls.exp \
-		  -L$(common-objpfx) -o $@ $^
-# AIX runtime ld wants libc.so to be libc.a(shr.o) hardwired
-	cp $@ $(common-objpfx)shr.o
-	$(AR) $(ARFLAGS) $(common-objpfx)libc.a $(common-objpfx)shr.o
-endif
-endif
-
-# Figure out the source filenames in this directory.
-
-override sources := $(addsuffix .c,\
-			$(filter-out $(elided-routines),\
-			    $(routines) $(aux) \
-			    $(sysdep_routines)))
-sysdep_routines := $(sysdep_routines)
-
-headers := $(headers) $(sysdep_headers)
-
-# This is the list of all object files, gotten by
-# replacing every ".c" in `sources' with a ".o".
-# We also add bounded-pointer thunks, which are later
-# elided for all suffixes except for `.ob'.
-override objects := $(addprefix $(objpfx),$(sources:.c=.o) \
-		      $(patsubst %,$(bppfx)%.o,\
-			$(filter $(routines) $(sysdep_routines),$(bp-thunks))))
-
-
-# The makefile may define $(extra-libs) with `libfoo libbar'
-# to build libfoo.a et al from the modules listed in $(libfoo-routines).
-ifdef extra-libs
-# extra-lib.mk is included once for each extra lib to define rules
-# to build it, and to add its objects to the various variables.
-# During its evaluation, $(lib) is set to the name of the library.
-extra-libs-left := $(extra-libs)
-include $(patsubst %,$(..)extra-lib.mk,$(extra-libs))
-endif
-
-+depfiles := $(sources:.c=.d) \
-	     $(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \
-	     $(addsuffix .d,$(tests) $(xtests) $(test-srcs))
-ifeq ($(build-programs),yes)
-+depfiles += $(addsuffix .d,$(others) $(sysdep-others))
-endif
-+depfiles := $(addprefix $(objpfx),\
-			 $(filter-out $(addsuffix .d,$(omit-deps)),\
-				      $(+depfiles)))
-
-ifdef +depfiles
-ifneq ($(no_deps),t)
--include $(+depfiles)
-endif
-endif
-
-# Maximize efficiency by minimizing the number of rules.
-.SUFFIXES:	# Clear the suffix list.  We don't use suffix rules.
-# Don't define any builtin rules.
-MAKEFLAGS := $(MAKEFLAGS)r
-
-# Generic rule for making directories.
-%/:
-# mkdir isn't smart enough to strip a trailing /.
-	mkdir $(@:%/=%)
-
-# Make sure that object files are not removed
-# when they are intermediates between sources and library members.
-.PRECIOUS: $(addprefix $(objpfx)%,$(all-object-suffixes))
-
-# Make sure that the parent library archive is never removed.
-.PRECIOUS: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c))
-
-# Use the verbose option of ar and tar when not running silently.
-ifeq	"$(findstring s,$(MAKEFLAGS))" ""	# if not -s
-verbose := v
-else	   					# -s
-verbose	:=
-endif						# not -s
-
-ARFLAGS := r$(verbose)
-CREATE_ARFLAGS := cru$(verbose)
-
-# This makes all the object files in the parent library archive.
-
-.PHONY: lib lib-noranlib
-lib: lib-noranlib $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c))
-lib-noranlib: libobjs
-
-# For object-suffix $o, the list of objects with that suffix.
-# Makefiles can define `elide-routines.so = foo' to leave foo.so out.
-o-objects = $(patsubst %.o,%$o,$(filter-out $(patsubst %,$(objpfx)%.o,\
-						       $(elide-routines$o)),\
-					    $(objects))) \
-	    $(addprefix $(objpfx),$(o-objects$o))
-
-others: $(addprefix $(objpfx),$(install-lib))
-
-ifndef objects
-
-# Create the stamp$o files to keep the parent makefile happy.
-subdir_lib: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o)
-$(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o):
-	$(make-target-directory)
-	rm -f $@; > $@
-else
-
-# Define explicit rules to update each $(objpfx)stamp.SUFFIX
-# timestamp file; these rules (one explicit rule is generated for each
-# object suffix) write a list of objects to update in the stamp file.
-# The parent will then actually add them all to the archive in the
-# archive rule, below.
-define o-iterator-doit
-$(objpfx)stamp$o: $(o-objects); $$(do-stamp)
-endef
-define do-stamp
-echo '$(patsubst $(objpfx)%,$(addsuffix /,$(subdir))%,$^)' > $@T
-mv -f $@T $@
-endef
-object-suffixes-left := $(object-suffixes-for-libc)
-include $(o-iterator)
-
-endif
-
-# Now define explicit rules to build the library archives; these depend
-# on the stamp files built above.
-define o-iterator-doit
-$(common-objpfx)$(patsubst %,$(libtype$o),c): \
-		$(subdirs-stamp-o) $(common-objpfx)stamp$o; $$(do-makelib)
-endef
-define do-makelib
-cd $(common-objdir) && \
-$(AR) $(CREATE_ARFLAGS) $(@F) `cat $(patsubst $(common-objpfx)%,%,$^)`
-$(RANLIB) $@
-endef
-subdirs-stamps := $(foreach d,$(subdirs),$(common-objpfx)$d/stamp%)
-subdirs-stamp-o = $(subst %,$o,$(subdirs-stamps))
-ifndef subdir
-$(subdirs-stamps): subdir_lib;
-endif
-object-suffixes-left = $(object-suffixes-for-libc)
-include $(o-iterator)
-
-
-# This makes all the object files.
-.PHONY: objects objs libobjs extra-objs
-objects objs: libobjs extra-objs
-libobjs: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o)
-extra-objs: $(addprefix $(objpfx),$(extra-objs))
-
-# Canned sequence for building an extra library archive.
-define build-extra-lib
-$(patsubst %/,cd % &&,$(objpfx)) \
-$(AR) $(CREATE_ARFLAGS) $(@:$(objpfx)%=%) \
-      $(patsubst $(objpfx)%,%,$^)
-$(RANLIB) $@
-endef
-
-# Installation.
-
-.PHONY: force-install
-force-install:
-
-# $(install-lib) are installed from the object directory into $(libdir);
-# files in $(install-lib) matching `lib%.a' are ranlib'd after installation
-# unless they also appear in $(non-lib.a).  $(install-data) are installed
-# as they are into $(datadir).  $(headers) are installed as they are in
-# $(includedir).  $(install-bin), $(install-bin-script) and $(install-sbin)
-# are installed from the object directory into $(bindir), $(bindir) and
-# $(sbindir), respectively.  $(install-others) are absolute path names of
-# files to install; rules to install them are defined elsewhere.
-
-# The simple library name to install libc.a under.
-# This could be defined by a sysdep Makefile.
-ifndef libc-name
-libc-name := c
-endif
-
-define do-install
-$(make-target-directory)
-$(INSTALL_DATA) $< $@
-endef
-
-# Make the target directory if it doesn't exist, using the `mkinstalldirs'
-# script that does `mkdir -p' even if `mkdir' doesn't support that flag.
-define make-target-directory
-$(addprefix $(..)./scripts/mkinstalldirs ,\
-	    $(filter-out $(wildcard $(@D:%/=%)),$(@D:%/=%)))
-endef
-
-# Any directory (parent or subdir) should install libc.a; this way
-# "make install" in a subdir is guaranteed to install everything it changes.
-installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\
-			     $(inst_libdir)/$(patsubst %,$(libtype$o),\
-						     $(libprefix)$(libc-name)))
-install: $(installed-libcs)
-$(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force)
-	$(make-target-directory)
-	$(INSTALL_DATA) $(common-objpfx)lib$(*:$(libc-name)%=c%) $@
-# Running ranlib after installing makes the __.SYMDEF time stamp up to
-# date, which avoids messages from some linkers.
-	$(RANLIB) $@
-
-define do-install-program
-$(make-target-directory)
-$(INSTALL_PROGRAM) $< $@.new
-mv -f $@.new $@
-endef
-
-define do-install-script
-$(make-target-directory)
-$(INSTALL_SCRIPT) $< $@.new
-mv -f $@.new $@
-endef
-
-install-lib.so := $(filter %.so,$(install-lib:%_pic.a=%.so))
-install-lib := $(filter-out %.so %_pic.a,$(install-lib))
-
-ifeq (yes,$(build-shared))
-# Find which .so's have versions.
-versioned := $(strip $(foreach so,$(install-lib.so),\
-			       $(patsubst %,$(so),$($(so)-version))))
-
-install-lib.so-versioned := $(filter $(versioned), $(install-lib.so))
-install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
-
-install-lib-nosubdir: $(install-lib.so-versioned:%=$(inst_libdir)/%) \
-		      $(install-lib.so-unversioned:%=$(inst_slibdir)/%)
-
-# Install all the unversioned shared libraries.
-$(install-lib.so-unversioned:%=$(inst_slibdir)/%): $(inst_slibdir)/%.so: \
-    $(objpfx)%.so $(+force)
-	$(do-install-program)
-
-ifneq ($(findstring -s,$(LN_S)),)
-define make-link
-rm -f $@.new
-$(SHELL) $(..)scripts/rellns-sh $< $@.new
-mv -f $@.new $@
-endef
-else
-# If we have no symbolic links don't bother with rellns-sh.
-define make-link
-rm -f $@.new
-$(LN_S) $< $@.new
-mv -f $@.new $@
-endef
-endif
-
-ifeq (yes,$(build-shared))
-ifeq (no,$(cross-compiling))
-symbolic-link-prog := $(common-objpfx)elf/sln
-symbolic-link-list := $(common-objpfx)elf/symlink.list
-define make-shlib-link
-echo $(<F) $@ >> $(symbolic-link-list)
-endef
-else # cross-compiling
-# We need a definition that can be used by elf/Makefile's install rules.
-symbolic-link-prog = $(LN_S)
-endif
-endif
-ifndef make-shlib-link
-define make-shlib-link
-rm -f $@
-$(LN_S) $(<F) $@
-endef
-endif
-
-ifdef libc.so-version
-# For a library specified to be version N, install three files:
-# libc.so	->	libc.so.N	(e.g. libc.so.6)
-# libc.so.6	->	libc-VERSION.so	(e.g. libc-1.10.so)
-
-$(inst_slibdir)/libc.so$(libc.so-version): $(inst_slibdir)/libc-$(version).so \
-					   $(+force)
-	$(make-shlib-link)
-$(inst_slibdir)/libc-$(version).so: $(common-objpfx)libc.so $(+force)
-	$(do-install-program)
-install: $(inst_slibdir)/libc.so$(libc.so-version)
-
-# This fragment of linker script gives the OUTPUT_FORMAT statement
-# for the configuration we are building.  We put this statement into
-# the linker scripts we install for -lc et al so that they will not be
-# used by a link for a different format on a multi-architecture system.
-$(common-objpfx)format.lds: $(..)scripts/output-format.sed \
-			    $(common-objpfx)config.make \
-			    $(common-objpfx)config.h $(..)Makerules
-	$(LINK.o) -shared $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS.so) \
-		  -x c /dev/null -o $@.so -Wl,--verbose -v 2>&1 \
-	| sed -n -f $< > $@.new
-	rm -f $@.so
-	mv -f $@.new $@
-common-generated += format.lds
-
-ifndef subdir
-# What we install as libc.so for programs to link against is in fact a
-# link script.  It contains references for the various libraries we need.
-# The libc.so object is not complete since some functions are only defined
-# in libc_nonshared.a.
-# We need to use absolute paths since otherwise local copies (if they exist)
-# of the files are taken by the linker.
-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),\
-						  $(libprefix)$(libc-name)) \
-			$(+force)
-	(echo '/* GNU ld script';\
-	 echo '   Use the shared library, but some functions are only in';\
-	 echo '   the static library, so try that secondarily.  */';\
-	 cat $<; \
-	 echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \
-	      '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
-	      ')' \
-	) > $@.new
-	mv -f $@.new $@
-
-endif
-
-else
-install: $(inst_slibdir)/libc.so
-$(inst_slibdir)/libc.so: $(common-objpfx)libc.so $(+force)
-	$(do-install-program)
-endif
-
-ifneq (,$(versioned))
-# Produce three sets of rules as above for all the smaller versioned libraries.
-
-define o-iterator-doit
-$(inst_libdir)/$o: $(inst_slibdir)/$o$($o-version) $(+force); $$(make-link)
-endef
-object-suffixes-left := $(versioned)
-include $(o-iterator)
-
-# Make symlinks in the build directory, because the versioned names might
-# be referenced by a DT_NEEDED in another library.
-define o-iterator-doit
-$(objpfx)$o$($o-version): $(objpfx)$o; $$(make-link)
-endef
-object-suffixes-left := $(versioned)
-include $(o-iterator)
-
-generated += $(foreach o,$(versioned),$o$($o-version))
-
-ifeq (,$($(subdir)-version))
-define o-iterator-doit
-$(inst_slibdir)/$o$($o-version): $(inst_slibdir)/$(o:.so=)-$(version).so \
-				 $(+force);
-	$$(make-shlib-link)
-endef
-object-suffixes-left := $(versioned)
-include $(o-iterator)
-
-define o-iterator-doit
-$(inst_slibdir)/$(o:.so=)-$(version).so: $(objpfx)$o $(+force);
-	$$(do-install-program)
-endef
-object-suffixes-left := $(versioned)
-include $(o-iterator)
-else
-define o-iterator-doit
-$(inst_slibdir)/$o$($o-version): \
-  $(inst_slibdir)/$(o:.so=)-$($(subdir)-version).so $(+force);
-	$$(make-shlib-link)
-endef
-object-suffixes-left := $(versioned)
-include $(o-iterator)
-
-define o-iterator-doit
-$(inst_slibdir)/$(o:.so=)-$($(subdir)-version).so: $(objpfx)$o $(+force);
-	$$(do-install-program)
-endef
-object-suffixes-left := $(versioned)
-include $(o-iterator)
-endif
-endif
-
-define do-install-so
-$(do-install-program)
-$(patsubst %,ln -s -f $(@F) $(@D)/$(patsubst %$*.so,%,$(<F))$(libprefix)$*.so,\
-	   $(filter-out %.so,$@))
-endef
-
-so-versions := $(sort $(foreach so,$(install-lib.so),.so$($(so)-version)))
-$(foreach v,$(so-versions),\
-	  $(inst_slibdir)/lib$(libprefix)%$v): $(common-objpfx)lib%.so \
-					       $(+force)
-	$(do-install-so)
-$(foreach v,$(so-versions),\
-	  $(inst_slibdir)/$(libprefix)%$v): $(common-objpfx)%.so $(+force)
-	$(do-install-so)
-endif
-
-ifdef install-bin
-$(addprefix $(inst_bindir)/,$(install-bin)): \
-    $(inst_bindir)/%: $(objpfx)% $(+force)
-	$(do-install-program)
-endif
-ifdef install-bin-script
-$(addprefix $(inst_bindir)/,$(install-bin-script)): \
-    $(inst_bindir)/%: $(objpfx)% $(+force)
-	$(do-install-script)
-endif
-ifdef install-rootsbin
-$(addprefix $(inst_rootsbindir)/,$(install-rootsbin)): \
-   $(inst_rootsbindir)/%: $(objpfx)% $(+force)
-	$(do-install-program)
-endif
-ifdef install-sbin
-$(addprefix $(inst_sbindir)/,$(install-sbin)): \
-    $(inst_sbindir)/%: $(objpfx)% $(+force)
-	$(do-install-program)
-endif
-ifdef install-lib
-install-lib.a := $(filter lib%.a,$(install-lib))
-install-lib-non.a := $(filter-out lib%.a,$(install-lib))
-ifdef install-lib-non.a
-$(addprefix $(inst_libdir)/$(libprefix),$(install-lib-non.a)): \
-  $(inst_libdir)/$(libprefix)%: $(objpfx)% $(+force)
-	$(do-install)
-endif
-ifdef install-lib.a
-$(install-lib.a:lib%.a=$(inst_libdir)/lib$(libprefix)%.a): \
-  $(inst_libdir)/lib$(libprefix)%.a: $(objpfx)lib%.a $(+force)
-	$(do-install)
-	$(patsubst %,$(RANLIB) $@,$(filter-out $(non-lib.a),$(<F)))
-endif
-endif
-ifdef install-data
-$(addprefix $(inst_datadir)/,$(install-data)): $(inst_datadir)/%: % $(+force)
-	$(do-install)
-endif
-headers := $(strip $(headers))
-ifdef headers
-$(addprefix $(inst_includedir)/,$(headers)): $(inst_includedir)/%: % $(+force)
-	$(do-install)
-endif	# headers
-
-.PHONY: install-bin-nosubdir install-bin-script-nosubdir \
-	install-rootsbin-nosubdir install-sbin-nosubdir install-lib-nosubdir \
-	install-data-nosubdir install-headers-nosubdir
-install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin))
-install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script))
-install-rootsbin-nosubdir: \
-	$(addprefix $(inst_rootsbindir)/,$(install-rootsbin))
-install-sbin-nosubdir: $(addprefix $(inst_sbindir)/,$(install-sbin))
-install-lib-nosubdir: $(addprefix $(inst_libdir)/,\
-		       $(patsubst lib%.a,lib$(libprefix)%.a,$(install-lib.a)) \
-		       $(addprefix $(libprefix),$(install-lib-non.a)))
-install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data))
-install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers))
-install-others-nosubdir: $(install-others)
-
-# We need all the `-nosubdir' targets so that `install' in the parent
-# doesn't depend on several things which each iterate over the subdirs.
-# This rule makes `install-FOO' always use `install-FOO-nosubdir' as a
-# subroutine.  Then in the parent `install-FOO' also causes subdir makes.
-install-%:: install-%-nosubdir ;
-
-.PHONY: install install-no-libc.a-nosubdir
-ifeq ($(build-programs),yes)
-install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir\
-			    install-bin-nosubdir install-bin-script-nosubdir \
-			    install-lib-nosubdir install-others-nosubdir \
-			    install-rootsbin-nosubdir install-sbin-nosubdir
-else
-install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir\
-			    install-lib-nosubdir install-others-nosubdir
-endif
-install: install-no-libc.a-nosubdir
-
-# Command to compile $< in $(objdir) using the native libraries.
-define native-compile
-$(make-target-directory)
-$(patsubst %/,cd % &&,$(objpfx)) \
-$(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \
-	    $(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(@F)
-endef
-
-# Command to compile $< in $(common-objdir) using the native libraries.
-# We must cd to $(objdir) anyway so that $(..)config.h is valid.
-define common-objdir-compile
-$(patsubst %/,cd % &&,$(objpfx)) \
-$(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \
-	    $(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(..)$(@F)
-endef
-
-# We always want to use configuration definitions.
-# Note that this is only used for commands running in $(objpfx).
-ALL_BUILD_CFLAGS = $(BUILD_CFLAGS) -include $(..)config.h
-
-# Support the GNU standard name for this target.
-.PHONY: check
-check: tests
-# Special target to run tests which cannot be run unconditionally.
-# Maintainers should use this target.
-.PHONY: xcheck
-xcheck: xtests
-
-all-nonlib = $(strip $(tests) $(xtests) $(test-srcs) $(test-extras) $(others))
-ifneq (,$(all-nonlib))
-cpp-srcs-left = $(all-nonlib:=.c)
-lib := nonlib
-include $(patsubst %,$(..)cppflags-iterator.mk,$(all-nonlib))
-endif
-
-# The include magic above causes those files to use this variable for flags.
-CPPFLAGS-nonlib = -DNOT_IN_libc=1
-
-
-ifeq ($(versioning),yes)
-# Generate normalized lists of symbols, versions, and data sizes.
-# This is handy for checking against existing library binaries.
-
-%.symlist: $(..)scripts/abilist.awk %.dynsym
-	$(AWK) -f $^ > $@T
-	mv -f $@T $@
-
-%.dynsym: %.so
-	$(OBJDUMP) --dynamic-syms $< > $@T
-	mv -f $@T $@
-
-tests: $(patsubst %.so,$(objpfx)%.symlist,$(install-lib.so-versioned))
-generated += $(install-lib.so-versioned:.so=.symlist)
-
-ifeq ($(subdir),elf)
-tests: $(common-objpfx)libc.symlist
-common-generated += libc.symlist
-endif
-endif
-
-.PHONY: TAGS
-TAGS: $(objpfx)distinfo $(..)MakeTAGS
-	$(MAKE) $(addprefix -f ,$^) $@
-
-$(..)po/%.pot: $(objpfx)distinfo $(..)MakeTAGS FORCE
-	$(MAKE) $(addprefix -f ,$(filter-out FORCE,$^)) $@
-FORCE:
-
-
-.PHONY: echo-headers
-echo-headers:
-	@echo $(headers)
-
-
-# Common cleaning targets.
-
-.PHONY: common-mostlyclean common-clean mostlyclean clean do-tests-clean
-clean: common-clean
-mostlyclean: common-mostlyclean
-
-do-tests-clean:
-	-rm -f $(addprefix $(objpfx),$(addsuffix .out,$(tests) $(xtests) \
-						      $(test-srcs)) \
-				     $(addsuffix -bp.out,$(tests) $(xtests) \
-							 $(test-srcs)))
-
-# Remove the object files.
-common-mostlyclean:
-	-rm -f $(addprefix $(objpfx),$(tests) $(xtests) $(test-srcs) \
-				     $(others) $(sysdep-others) stubs \
-				     $(addsuffix .o,$(tests) $(xtests) \
-						    $(test-srcs) $(others) \
-						    $(sysdep-others)) \
-				     $(addsuffix -bp,$(tests) $(xtests) \
-						     $(test-srcs)) \
-				     $(addsuffix .out,$(tests) $(xtests) \
-						      $(test-srcs)) \
-				     $(addsuffix -bp.out,$(tests) $(xtests) \
-							 $(test-srcs)))
-	-rm -f $(addprefix $(objpfx),$(extra-objs) $(install-lib) \
-				     $(install-lib.so) \
-				     $(install-lib.so:%.so=%_pic.a))
-	-rm -f core
-	-rm -f $(objpfx)rtld-*.os
-	$(rmobjs)
-define rmobjs
-$(foreach o,$(object-suffixes-for-libc),
--rm -f $(objpfx)stamp$o $(o-objects))
-endef
-
-# Also remove the dependencies and generated source files.
-common-clean: common-mostlyclean
-	-rm -f $(addprefix $(objpfx),$(generated)) $(+depfiles)
-	-rm -f $(objpfx)rtld-*.d
-	-rm -fr $(addprefix $(objpfx),$(generated-dirs))
-	-rm -f $(addprefix $(common-objpfx),$(common-generated))
-	-rm -f $(objpfx)distinfo
-
-# Produce a file `stubs' which contains `#define __stub_FUNCTION'
-# for each function which is a stub.  We grovel over all the .d files
-# looking for references to <stub-tag.h>.  Then we grovel over each
-# referenced source file to see what stub function it defines.
-
-ifdef objpfx
-.PHONY: stubs # The parent Makefile calls this target.
-stubs: $(objpfx)stubs
-endif
-s = $(sysdep_dir)/generic
-$(objpfx)stubs: $(+depfiles)
-# Use /dev/null since `...` might expand to empty.
-	(s=`cd $s && $(PWD_P)`; \
-	 $(patsubst %/,cd % &&,$(objpfx)) \
-	 sed -n 's/^stub_warning *(\([^)]*\).*$$/#define __stub_\1/p' \
-	  `sed -n -e '\@ $s/[^ ]*\.c@{; s@^.* $s/\([^ ]*\.c\).*$$@'"$$s"'/\1@; h; }' \
-		-e '/stub-tag\.h/{; g; p; }' \
-		  $(patsubst $(objpfx)%,%,$^) /dev/null` \
-	     /dev/null) > $@T
-	mv -f $@T $@
-
-# Make the distribution tar file.
-
-.PHONY: dist
-dist: $(objpfx)distinfo $(..)Make-dist
-	$(MAKE) -f $< -f $(word 2,$^) $(Make-dist-args)
-
-# Avoid depending on source files found in sysdeps dirs,
-# because the references affect implicit rule selection.
-dist: $(filter-out %.c %.S %.s,$(distribute))
-
-# We used to simply export all these variables, but that frequently made the
-# environment get too large.  Instead, we write all the information into
-# a generated makefile fragment `distinfo', and then include it with -f in
-# the sub-make that makes the distribution (above).
-$(objpfx)distinfo: Makefile $(..)Makerules \
-		   $(wildcard $(foreach dir,$(sysdirs),$(dir)/Makefile))
-	$(make-target-directory)
-	$(distinfo-vars)
-	mv -f $@.new $@
-.PHONY: subdir_distinfo
-subdir_distinfo: $(objpfx)distinfo
-
-define distinfo-vars
-rm -f $@.new
-echo > $@.new 'subdir := $(subdir)'
-$(foreach var,subdir-dirs sources elided-routines sysdep_routines \
-	      headers sysdep_headers distribute dont_distribute generated \
-	      others tests xtests test-srcs extra-libs versioned \
-	      $(extra-libs:%=%-routines) \
-	      $(addprefix install-,lib lib.so data bin bin-script sbin others),
-echo >> $@.new '$(subdir)-$(var) := $($(var))'
-echo >> $@.new '$(var) = $$($(subdir)-$(var))')
-endef
-
-ifneq (,$(strip $(gpl2lgpl)))
-ifneq (,$(wildcard $(..)gpl2lgpl.sed))
-# Snarf from the master source and frob the copying notice.
-$(gpl2lgpl): %: $(..)gpl2lgpl.sed /home/gd/gnu/lib/%
-	sed -f $^ > $@-tmp
-# So I don't edit them by mistake.
-	chmod a-w $@-tmp
-	mv -f $@-tmp $@
-ifeq ($(with-cvs),yes)
-	test ! -d CVS || cvs $(CVSOPTS) commit -m'Updated from $^' $@
-endif
-endif
-endif
-
-# Local Variables:
-# mode: makefile
-# End:
+# Copyright (C) 1991-1999,2000,01,02 Free Software Foundation, Inc.

+# This file is part of the GNU C Library.

+

+# The GNU C Library is free software; you can redistribute it and/or

+# modify it under the terms of the GNU Lesser General Public

+# License as published by the Free Software Foundation; either

+# version 2.1 of the License, or (at your option) any later version.

+

+# The GNU C Library is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+# Lesser General Public License for more details.

+

+# You should have received a copy of the GNU Lesser General Public

+# License along with the GNU C Library; if not, write to the Free

+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA

+# 02111-1307 USA.

+

+#

+#	Common rules for making the GNU C library.  This file is included

+#	by the top-level Makefile and by all subdirectory makefiles

+#	(through Rules).

+#

+ifneq (,)

+This makefile requires GNU Make.

+endif

+

+REQUIRED_MAKE_VERSION = 3.74

+REAL_MAKE_VERSION = $(firstword $(MAKE_VERSION))

+

+ifneq ($(REQUIRED_MAKE_VERSION), \

+       $(firstword $(sort $(REAL_MAKE_VERSION) $(REQUIRED_MAKE_VERSION))))

+Wrong GNU Make version.  See above for the version needed.

+endif

+

+

+ifdef	subdir

+..	:= ../

+endif	# subdir

+

+# If `sources' was defined by the parent makefile, undefine it so

+# we will later get it from wildcard search in this directory.

+ifneq	"$(findstring env,$(origin sources))" ""

+sources :=

+endif

+

+oPATH := $(PATH)

+PATH := this definition should take precedence over $(oPATH)

+ifeq ($(PATH),$(oPATH))

+You must not use the -e flag when building the GNU C library.

+else

+PATH := $(oPATH)

+endif

+

+ifndef +included-Makeconfig

+include $(..)Makeconfig

+endif

+

+# `configure' writes a definition of `config-sysdirs' in `config.make'.

+sysdirs = $(strip $(full_config_sysdirs))

+

++sysdir_pfx = $(common-objpfx)

+

+export sysdirs := $(sysdirs)

+

++sysdep_dirs := $(full_config_sysdirs)

+ifdef objdir

++sysdep_dirs := $(objdir) $(+sysdep_dirs)

+endif

+

+# Add -I switches to get the right sysdep directories.

+# `+includes' in Makeconfig references $(+sysdep-includes).

++sysdep-includes := $(addprefix -I,$(+sysdep_dirs))

+

+# This variable is used in ``include $(o-iterator)'' after defining

+# $(o-iterator-doit) to produce some desired rule using $o for the object

+# suffix, and setting $(object-suffixes-left) to $(object-suffixes); a copy

+# is produced for each object suffix in use.

+o-iterator = $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-left))

+

+# Include any system-specific makefiles.

+

+# This is here so things in sysdep Makefiles can easily depend on foo.h as

+# appropriate and not worry about where foo.h comes from, which may be

+# system dependent and not known by that Makefile.

+vpath %.h $(subst $(empty) ,:,$(strip $(common-objpfx) $(objpfx) \

+				      $(+sysdep_dirs) $(..)))

+

+# The same is true for RPC source files.

+vpath %.x $(subst $(empty) ,:,$(strip $(common-objpfx) $(objpfx) \

+				      $(+sysdep_dirs) $(..)))

+

+# Some sysdep makefiles use this to distinguish being included here from

+# being included individually by a subdir makefile (hurd/Makefile needs this).

+in-Makerules := yes

+

+sysdep-makefiles := $(wildcard $(full_config_sysdirs:=/Makefile))

+ifneq (,$(sysdep-makefiles))

+include $(sysdep-makefiles)

+endif

+

+

+# Reorder before-compile so that mach things come first, and hurd things

+# second, before all else.  The mach and hurd subdirectories have many

+# generated header files which the much of rest of the library depends on,

+# so it is best to build them first (and mach before hurd, at that).

+before-compile := $(filter $(common-objpfx)mach% $(common-objpfx)hurd%,\

+			   $(before-compile)) \

+		  $(filter-out $(common-objpfx)mach% $(common-objpfx)hurd%,\

+			       $(before-compile))

+

+# Even before that, we need abi-versions.h which is generated right here.

+ifeq ($(versioning),yes)

+ifndef avoid-generated

+before-compile := $(common-objpfx)abi-versions.h $(before-compile)

+$(common-objpfx)abi-versions.h: $(..)scripts/abi-versions.awk \

+				$(common-objpfx)Versions.all

+	LC_ALL=C $(AWK) -v oldest_abi=$(oldest-abi) -f $^ > $@T

+	mv -f $@T $@

+

+$(common-objpfx)%.latest: $(common-objpfx)abi-versions.h

+	sed -n '/ VERSION_$*_/{s/^.*_\([A-Z0-9_]*\).*$$/\1/;h;};$${g;p;}' \

+	    $(common-objpfx)abi-versions.h > $@T

+	mv -f $@T $@

+endif # avoid-generated

+endif # $(versioning) = yes

+

+# When we have no deps pass doing it, then make sure the subdirectory

+# for object files gets created.

+ifdef no_deps

+ifdef objpfx

+before-compile += $(objpfx).

+$(objpfx).:

+	$(make-target-directory)

+endif

+endif

+

+# Remove existing files from `before-compile'.  Things are added there when

+# they must exist for dependency generation to work right, but once they

+# exist there is no further need for every single file to depend on them,

+# and those gratuitous dependencies result in many gratuitous

+# recompilations.

+before-compile := $(filter-out $(wildcard $(before-compile)),$(before-compile))

+

+# Don't let any before-compile file be an intermediate and get removed.

+ifdef before-compile

+$(before-compile):

+endif

+

+# If a makefile needs to do something conditional on something that

+# can only be figured out from headers, write a FOO.make.c input

+# file that uses cpp contructs and contains @@@ LINE @@@ for each LINE

+# to emit in the generated makefile, and use -include $(common-objpfx)FOO.make.

+$(common-objpfx)%.make: $(..)%.make.c $(..)Makerules

+	rm -f $@T $@.dT

+	(echo '# Generated from $*.make.c by Makerules.'; \

+	 SUNPRO_DEPENDENCIES='$@.dT $$(common-objpfx)$*.make' \

+	 $(CC) $(CFLAGS) $(CPPFLAGS) -E $< \

+	 | sed -n '/@@@/{s/@@@[	 ]*\(.*\)@@@/\1/;s/[	 ]*$$//p;}'; \

+	 echo 'common-generated += $(@F)'; \

+	 cat $@.dT; rm -f $@.dT) > $@T

+	mv -f $@T $@

+

+# Generate an ordered list of implicit rules which find the source files in

+# each sysdep directory.  The old method was to use vpath to search all the

+# sysdep directories.  However, that had the problem that a .S file in a

+# later directory would be chosen over a .c file in an earlier directory,

+# which does not preserve the desired sysdeps ordering behavior.

+

+# When making the list of .d files to include, we can't know which ones

+# have source in .s files, and thus do not in fact need a .d file.

+# So we must define rules to make .d files for .s files.

+define make-dummy-dep

+$(addprefix ln $(common-objpfx)dummy.d ,$(filter-out $(wildcard $@),$@))

+endef

+$(common-objpfx)dummy.d:

+	echo '# .s files cannot contain includes, so they need no deps.' > $@

+

+# It matters that this set of rules, for compiling from sources in

+# the current directory (the $srcdir/$subdir) come before the

+# generated sysdep rules in included from sysd-rules below.  When

+# compiling in the source tree, generated sources go into the current

+# directory, and those should be chosen before any sources in sysdeps.

+define o-iterator-doit

+$(objpfx)%$o: %.S $(before-compile); $$(compile-command.S)

+endef

+object-suffixes-left := $(all-object-suffixes)

+include $(o-iterator)

+$(objpfx)%.d: %.S $(before-compile); $(+make-deps)

+

+define o-iterator-doit

+$(objpfx)%$o: %.s $(before-compile); $$(compile-command.s)

+endef

+object-suffixes-left := $(all-object-suffixes)

+include $(o-iterator)

+$(objpfx)%.d: %.s $(common-objpfx)dummy.d; $(make-dummy-dep)

+

+define o-iterator-doit

+$(objpfx)%$o: %.c $(before-compile); $$(compile-command.c)

+endef

+object-suffixes-left := $(all-object-suffixes)

+include $(o-iterator)

+$(objpfx)%.d: %.c $(before-compile); $(+make-deps)

+

+# Omit the objpfx rules when building in the source tree, because

+# objpfx is empty and so these rules just override the ones above.

+ifdef objpfx

+# Define first rules to find the source files in $(objpfx).

+# Generated source files will end up there.

+define o-iterator-doit

+$(objpfx)%$o: $(objpfx)%.S $(before-compile); $$(compile-command.S)

+endef

+object-suffixes-left := $(all-object-suffixes)

+include $(o-iterator)

+$(objpfx)%.d: $(objpfx)%.S $(before-compile); $(+make-deps)

+

+define o-iterator-doit

+$(objpfx)%$o: $(objpfx)%.s $(before-compile); $$(compile-command.s)

+endef

+object-suffixes-left := $(all-object-suffixes)

+include $(o-iterator)

+$(objpfx)%.d: $(objpfx)%.s $(common-objpfx)dummy.d; $(make-dummy-dep)

+

+define o-iterator-doit

+$(objpfx)%$o: $(objpfx)%.c $(before-compile); $$(compile-command.c)

+endef

+object-suffixes-left := $(all-object-suffixes)

+include $(o-iterator)

+$(objpfx)%.d: $(objpfx)%.c $(before-compile); $(+make-deps)

+endif

+

+# System-dependent makefiles can put in `inhibit-sysdep-asm' wildcard

+# patterns matching sysdep directories whose assembly source files should

+# be suppressed.

+ifdef inhibit-sysdep-asm

+define open-check-inhibit-asm

+case $$sysdir in $(subst $(empty) ,|,$(inhibit-sysdep-asm))) : ;; *)

+endef

+close-check-inhibit-asm = ;; esac ;

+endif

+

+-include $(+sysdir_pfx)sysd-rules

+ifneq ($(sysd-rules-sysdirs),$(config-sysdirs))

+# The value of $(+sysdep_dirs) the sysd-rules was computed for

+# differs from the one we are using now.  So force a rebuild of sysd-rules.

+sysd-rules-force = FORCE

+FORCE:

+endif

+$(+sysdir_pfx)sysd-rules: $(+sysdir_pfx)config.make $(..)Makerules \

+			  $(wildcard $(foreach dir,$(sysdirs),\

+					       $(dir)/Makefile))\

+			  $(sysd-rules-force)

+	-@rm -f $@T

+	(echo 'sysd-rules-sysdirs := $(config-sysdirs)';		      \

+	 for dir in $(config-sysdirs:%='$$(..)%'); do			      \

+	   for o in $(all-object-suffixes); do \

+	     $(open-check-inhibit-asm) \

+	     echo "\$$(objpfx)%$$o: $$dir/%.S \$$(before-compile); \

+		  \$$(compile-command.S)";				      \

+	     echo "\$$(objpfx)%$$o: $$dir/%.s \$$(before-compile); \

+		  \$$(compile-command.s)";			              \

+	     echo "\$$(objpfx)rtld-%$$o: $$dir/%.S \$$(before-compile); \

+		  \$$(compile-command.S)";				      \

+	     echo "\$$(objpfx)rtld-%$$o: $$dir/%.s \$$(before-compile); \

+		  \$$(compile-command.s)";			              \

+	     echo "\$$(objpfx)ptw-%$$o: $$dir/%.S \$$(before-compile); \

+		  \$$(compile-command.S)";				      \

+	     echo "\$$(objpfx)ptw-%$$o: $$dir/%.s \$$(before-compile); \

+		  \$$(compile-command.s)";			              \

+	     $(close-check-inhibit-asm)	\

+	     echo "\$$(objpfx)%$$o: $$dir/%.c \$$(before-compile); \

+		  \$$(compile-command.c)";				      \

+	     echo "\$$(objpfx)rtld-%$$o: $$dir/%.c \$$(before-compile); \

+		  \$$(compile-command.c)";				      \

+	     echo "\$$(objpfx)ptw-%$$o: $$dir/%.c \$$(before-compile); \

+		  \$$(compile-command.c)";				      \

+	   done; \

+	   $(open-check-inhibit-asm) \

+	   echo "\$$(objpfx)%.d: $$dir/%.s \$$(common-objpfx)dummy.d; \

+		\$$(make-dummy-dep)";			       \

+	   echo "\$$(objpfx)rtld-%.d: $$dir/%.s \$$(common-objpfx)dummy.d; \

+		\$$(make-dummy-dep)";			       \

+	   echo "\$$(objpfx)ptw-%.d: $$dir/%.s \$$(common-objpfx)dummy.d; \

+		\$$(make-dummy-dep)";			       \

+	   echo "\$$(objpfx)%.d: $$dir/%.S \$$(before-compile); \

+		\$$(+make-deps)";					      \

+	   echo "\$$(objpfx)rtld-%.d: $$dir/%.S \$$(before-compile); \

+		\$$(+make-deps)";					      \

+	   echo "\$$(objpfx)ptw-%.d: $$dir/%.S \$$(before-compile); \

+		\$$(+make-deps)";					      \

+	   $(close-check-inhibit-asm)	\

+	   echo "\$$(objpfx)%.d: $$dir/%.c \$$(before-compile); \

+		\$$(+make-deps)";					      \

+	   echo "\$$(objpfx)rtld-%.d: $$dir/%.c \$$(before-compile); \

+		\$$(+make-deps)";					      \

+	   echo "\$$(objpfx)ptw-%.d: $$dir/%.c \$$(before-compile); \

+		\$$(+make-deps)";					      \

+	   echo "\$$(objpfx)m_%.S: $$dir/s_%.S; \$$(+make-include-of-dep)";   \

+	   echo "\$$(objpfx)m_%.c: $$dir/s_%.c; \$$(+make-include-of-dep)";   \

+	 done;								      \

+	 echo 'sysd-rules-done = t') > $@T

+	mv -f $@T $@

+

+ifndef sysd-rules-done

+# Don't do deps until this exists, because it provides rules to make the deps.

+no_deps=t

+endif

+

+# This is used by the m_%.[Sc] pattern rules in sysd-rules.

+define +make-include-of-dep

+echo '#include <$<>' > $@T

+mv -f $@T $@

+endef

+

+# Generate version maps, but wait until sysdep-subdirs is known

+ifeq ($(sysd-sorted-done),t)

+ifeq ($(versioning),yes)

+-include $(common-objpfx)sysd-versions

+$(addprefix $(common-objpfx),$(version-maps)): $(common-objpfx)sysd-versions

+common-generated += $(version-maps)

+postclean-generated += sysd-versions Versions.all abi-versions.h \

+		       Versions.def.v.i Versions.def.v Versions.v.i Versions.v

+

+ifndef avoid-generated

+ifneq ($(sysd-versions-subdirs),$(all-subdirs) $(config-sysdirs))

+sysd-versions-force = FORCE

+FORCE:

+endif

+# See %.v/%.v.i implicit rules in Makeconfig.

+$(common-objpfx)Versions.def.v.i: $(..)Versions.def \

+				  $(wildcard $(add-ons:%=$(..)%/Versions.def))

+$(common-objpfx)Versions.all: $(..)scripts/firstversions.awk \

+			      $(common-objpfx)soversions.i \

+			      $(common-objpfx)Versions.def.v

+	{ while read lib version setname; do \

+	    test -z "$$setname" || echo "$$lib : $$setname"; \

+	  done < $(word 2,$^); \

+	  cat $(word 3,$^); \

+	} | LC_ALL=C $(AWK) -f $< > $@T

+	mv -f $@T $@

+# See %.v/%.v.i implicit rules in Makeconfig.

+$(common-objpfx)Versions.v.i: $(wildcard $(all-subdirs:%=$(..)%/Versions)) \

+			      $(wildcard $(sysdirs:%=%/Versions)) \

+			      $(common-objpfx)abi-versions.h \

+			      $(sysd-versions-force)

+$(common-objpfx)sysd-versions: $(common-objpfx)Versions.all \

+			       $(common-objpfx)Versions.v \

+			       $(..)scripts/versions.awk

+	( echo 'sysd-versions-subdirs = $(all-subdirs) $(config-sysdirs)' ; \

+	  cat $(word 2,$^) \

+	  | LC_ALL=C $(AWK) -v buildroot=$(common-objpfx) -v defsfile=$< \

+			    -v move_if_change='$(move-if-change)' \

+			    -f $(word 3,$^); \

+	) > $@T

+	mv -f $@T $@

+endif # avoid-generated

+endif # $(versioning) = yes

+endif # sysd-sorted-done

+

+

+ifndef compile-command.S

+compile-command.S = $(compile.S) $(OUTPUT_OPTION)

+endif

+ifndef compile-command.s

+compile-command.s = $(COMPILE.s) $< $(OUTPUT_OPTION)

+endif

+ifndef compile-command.c

+compile-command.c = $(compile.c) $(OUTPUT_OPTION)

+endif

+

+# GCC can grok options after the file name, and it looks nicer that way.

+compile.c = $(CC) $< -c $(CFLAGS) $(CPPFLAGS)

+compile.S = \

+  $(CC) $< -c $(CPPFLAGS) -DASSEMBLER $(asm-CPPFLAGS) $(ASFLAGS-$(suffix $@))

+COMPILE.S = \

+  $(CC) -c $(CPPFLAGS) -DASSEMBLER $(asm-CPPFLAGS) $(ASFLAGS-$(suffix $@))

+COMPILE.s = $(filter-out -pipe,$(CC)) -c $(ASFLAGS)

+

+# If we want to generate MD5 checksums for the sources do this now.

+ifeq ($(md5),yes)

+generate-md5 = ; rm -f $(@:.d=.md5); \

+$(CC) -E $< $(CFLAGS) $(CPPFLAGS) $($(<:$*.%=%)-CPPFLAGS) | \

+sed '/^\#/d;/^[[:space:]]*$$/d' | md5sum > $(@:.d=.md5)

+else

+generate-md5 =

+endif

+

+# We need this for the output to go in the right place.  It will default to

+# empty if make was configured to work with a cc that can't grok -c and -o

+# together.  You can't compile the C library with such a compiler.

+OUTPUT_OPTION = -o $@

+

+# We need the $(CFLAGS) to be in there to have the right predefines during

+# the dependency run for C sources.  But having it for assembly sources can

+# get the wrong predefines.

+S-CPPFLAGS = $(asm-CPPFLAGS)

+define +make-deps

+$(make-target-directory)

+$(+mkdep) $< $(if $(filter %.c,$<),$(CFLAGS)) \

+	     $(CPPFLAGS) $($(<:$*.%=%)-CPPFLAGS) | sed \

+-e 's,$(subst .,\.,$*)\.o,$(foreach o,$(all-object-suffixes),$(@:.d=$o)) $@,' \

+$(sed-remove-objpfx) > $(@:.d=.T)

+mv -f $(@:.d=.T) $@ $(generate-md5)

+endef

+ifneq (,$(objpfx))

+# Continuation lines here are dangerous because they introduce spaces!

+define sed-remove-objpfx

+-e 's@ $(subst .,\.,$(subst @,\@,$(common-objpfx)))@ $$(common-objpfx)@g' \

+-e 's@^$(subst .,\.,$(subst @,\@,$(common-objpfx)))@$$(common-objpfx)@g'

+endef

+endif

+

+# Modify the list of routines we build for different targets

+

+ifeq (yesyes,$(build-shared)$(elf))

+ifndef libc.so-version

+# Undefine this because it can't work when we libc.so is unversioned.

+static-only-routines =

+endif

+endif

+

+# Bounded pointer thunks are only built for *.ob

+elide-bp-thunks = $(addprefix $(bppfx),$(bp-thunks))

+

+elide-routines.oS += $(filter-out $(static-only-routines),\

+				  $(routines) $(aux) $(sysdep_routines)) \

+		     $(elide-bp-thunks)

+elide-routines.os += $(static-only-routines) $(elide-bp-thunks)

+

+# If we have versioned code we don't need the old versions in any of the

+# static libraries.

+elide-routines.o  += $(shared-only-routines) $(elide-bp-thunks)

+elide-routines.op += $(shared-only-routines) $(elide-bp-thunks)

+elide-routines.og += $(shared-only-routines) $(elide-bp-thunks)

+elide-routines.ob += $(shared-only-routines)

+

+# Shared library building.

+

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

+

+# Reference map file only when versioning is selected and a map file name

+# is given.

+ifeq ($(versioning),yes)

+map-file = $(firstword $($(@F:.so=-map)) \

+		       $(addprefix $(common-objpfx), \

+				   $(filter $(@F:.so=.map),$(version-maps))))

+load-map-file = $(map-file:%=-Wl,--version-script=%)

+endif

+

+# Pattern rule to build a shared object from an archive of PIC objects.

+# This must come after the installation rules so Make doesn't try to

+# build shared libraries in place from the installed *_pic.a files.

+# $(LDLIBS-%.so) may contain -l switches to generate run-time dependencies

+# on other shared objects.

+lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(+interp)

+ifneq (,$(findstring aix,$(config-os)))

+	(echo '#!'; \

+	 dump -g $< | sed '1,6d' | cut -f2 | sort | uniq) > $(<:a=exp)

+endif

+	$(build-shlib)

+

+ifeq ($(elf),yes)

+define build-shlib-helper

+$(LINK.o) -shared $(static-libgcc) -Wl,-O1 $(sysdep-LDFLAGS) $(config-LDFLAGS) \

+	  $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \

+	  $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \

+	  -Wl,-soname=lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \

+	  $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \

+	  -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link)

+endef

+else

+ifneq (,$(findstring aix,$(config-os)))

+define build-shlib-helper

+$(LINK.o) -Wl,-G,-bM:SRE,-bnoentry,-bE:$(<:a=exp) \

+	  $(sysdep-LDFLAGS) $(config-LDFLAGS) $(extra-B-$(@F:lib%.so=%).so) \

+	  $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \

+	  $(LDFLAGS.so) $(LDFLAGS-$(@F:lib%.so=%).so) \

+	  -L$(subst :, -L,$(rpath-link))

+endef

+else

+endif

+endif

+

+ifeq (yes,$(elf))

+# binutils only position loadable notes into the first page for binaries,

+# not for shared objects

+define build-shlib

+$(build-shlib-helper) \

+	  -o $@.new $(csu-objpfx)abi-note.o -Wl,--verbose \

+	  $(LDLIBS-$(@F:lib%.so=%).so) 2>&1 | \

+	  sed -e '/^=========/,/^=========/!d;/^=========/d' \

+	      -e 's/^.*\.hash[ 	]*:.*$$/  .note.ABI-tag : { *(.note.ABI-tag) } &/' \

+	      $(LDSEDCMD-$(@F:lib%.so=%).so) > $@.lds

+rm -f $@.new

+$(build-shlib-helper) -o $@ -T $@.lds \

+	  $(csu-objpfx)abi-note.o $(build-shlib-objlist)

+rm -f $@.lds

+endef

+else

+ifneq (,$(findstring aix,$(config-os)))

+define build-shlib

+$(build-shlib-helper) \

+	-o $@ \

+	$(filter-out $(map-file) $(+preinit) $(+postinit),$^) \

+	$(no-whole-archive) $(LDLIBS-$(@F:lib%.so=%).so)

+endef

+define build-shlib

+$(build-shlib-helper) \

+	  $(build-shlib-objlist)

+endef

+endif

+endif

+

+ifneq (,$(findstring aix,$(config-os)))

+define build-module-helper

+$(LINK.o) -Wl,-G -Wl,-bM:SRE -Wl,-bnoentry -Wl,-bexpall \

+	  $(sysdep-LDFLAGS) $(config-LDFLAGS) \

+	  $(load-map-file) \

+	  $(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \

+	  -L$(subst :, -L,$(rpath-link)) -Wl,-L=$(rpath-link)

+endef

+else

+define build-module-helper

+$(LINK.o) -shared $(static-libgcc) $(sysdep-LDFLAGS) $(config-LDFLAGS) \

+	  -B$(csu-objpfx) $(load-map-file) \

+	  $(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \

+	  -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link)

+endef

+endif

+

+# This macro is similar to build-shlib but it does not define a soname

+# and it does not depend on the destination name to start with `lib'.

+ifeq (yes,$(elf))

+# binutils only position loadable notes into the first page for binaries,

+# not for shared objects

+define build-module

+$(build-module-helper) \

+	  -o $@.new $(csu-objpfx)abi-note.o -Wl,--verbose \

+	  $(LDLIBS-$(@F:lib%.so=%).so) 2>&1 | \

+	  sed -e '/^=========/,/^=========/!d;/^=========/d' \

+	      -e 's/^.*\.hash[ 	]*:.*$$/  .note.ABI-tag : { *(.note.ABI-tag) } &/' \

+	  > $@.lds

+rm -f $@.new

+$(build-module-helper) -o $@ -T $@.lds \

+	  $(csu-objpfx)abi-note.o $(build-module-objlist)

+rm -f $@.lds

+endef

+else

+ifneq (,$(findstring aix,$(config-os)))

+define build-module

+$(build-module-helper) \

+	  -o $@ \

+	  $(filter-out $(map-file) $(+preinit) $(+postinit),$^) \

+	  $(no-whole-archive) $(LDLIBS-$(@F:%.so=%).so)

+endef

+else

+define build-module

+define build-module

+$(build-module-helper) \

+	  -o $@ \

+	  $(build-module-objlist)

+endef

+endif

+endif

+

+build-module-helper-objlist = \

+	$(patsubst %_pic.a,$(whole-archive) %_pic.a $(no-whole-archive),\

+		   $(filter-out $(map-file) $(+preinit) $(+postinit),$^))

+whole-archive := -Wl,--whole-archive

+

+build-module-objlist = $(build-module-helper-objlist) $(LDLIBS-$(@F:%.so=%).so)

+build-shlib-objlist = $(build-module-helper-objlist) \

+		      $(LDLIBS-$(@F:lib%.so=%).so)

+

+# Don't try to use -lc when making libc.so itself.

+# Also omits crti.o and crtn.o, which we do not want

+# since we define our own `.init' section specially.

+LDFLAGS-c.so = -nostdlib -nostartfiles

+# But we still want to link libc.so against $(gnulib).

+LDLIBS-c.so += $(gnulib)

+# Give libc.so an entry point and make it directly runnable itself.

+LDFLAGS-c.so += -e __libc_main

+# Force the backward compatibility EH functions to be linked.

+LDFLAGS-c.so += -u __register_frame

+# Pre-link the objects of libc_pic.a so that we can locally resolve

+# COMMON symbols before we link against ld.so.  This is because ld.so

+# contains some of libc_pic.a already, which will prevent the COMMONs

+# from being allocated in libc.so, which introduces evil dependencies

+# between libc.so and ld.so, which can make it impossible to upgrade.

+ifeq ($(elf),yes)

+$(common-objpfx)libc_pic.os: $(common-objpfx)libc_pic.a

+	$(LINK.o) -nostdlib -nostartfiles -r -o $@ \

+	$(LDFLAGS-c_pic.os) -Wl,-d -Wl,--whole-archive $^

+LDSEDCMD-c.so = -e 's/^.*\*(\.dynbss).*$$/& __start___libc_freeres_ptrs = .; *(__libc_freeres_ptrs) __stop___libc_freeres_ptrs = .;/'

+# Use our own special initializer and finalizer files for libc.so.

+$(common-objpfx)libc.so: $(elfobjdir)/soinit.os \

+			 $(common-objpfx)libc_pic.os \

+			 $(elfobjdir)/sofini.os \

+			 $(elfobjdir)/interp.os $(elfobjdir)/ld.so

+	$(build-shlib)

+ifeq ($(versioning),yes)

+$(common-objpfx)libc.so: $(common-objpfx)libc.map

+endif

+common-generated += libc.so libc_pic.os

+ifdef libc.so-version

+$(common-objpfx)libc.so$(libc.so-version): $(common-objpfx)libc.so

+	$(make-link)

+common-generated += libc.so$(libc.so-version)

+endif

+endif

+else

+ifneq (,$(findstring aix,$(config-os)))

+$(common-objpfx)libc.so: $(common-objpfx)libc_pic.a

+	@rm -f $@

+	(echo '#!'; \

+	 dump -g $^ | sed '1,6d' | cut -f2 | sort | uniq) > $(^:a=exp)

+	sed '/__mulh/d;/__mull/d;/__divss/d;/__divus/d;/__quoss/d;/__quous/d' \

+	    /lib/syscalls.exp > $(common-objpfx)syscalls.exp

+	$(LINK.o) -G -bM:SRE -bnoentry -bE:$(^:a=exp) \

+		  -bE:$(common-objpfx)syscalls.exp \

+		  -bI:$(common-objpfx)syscalls.exp \

+		  -L$(common-objpfx) -o $@ $^

+# AIX runtime ld wants libc.so to be libc.a(shr.o) hardwired

+	cp $@ $(common-objpfx)shr.o

+	$(AR) $(ARFLAGS) $(common-objpfx)libc.a $(common-objpfx)shr.o

+endif

+endif

+

+# Figure out the source filenames in this directory.

+

+override sources := $(addsuffix .c,\

+			$(filter-out $(elided-routines),\

+			    $(routines) $(aux) \

+			    $(sysdep_routines)))

+sysdep_routines := $(sysdep_routines)

+

+headers := $(headers) $(sysdep_headers)

+

+# This is the list of all object files, gotten by

+# replacing every ".c" in `sources' with a ".o".

+# We also add bounded-pointer thunks, which are later

+# elided for all suffixes except for `.ob'.

+override objects := $(addprefix $(objpfx),$(sources:.c=.o) \

+		      $(patsubst %,$(bppfx)%.o,\

+			$(filter $(routines) $(sysdep_routines),$(bp-thunks))))

+

+

+# The makefile may define $(extra-libs) with `libfoo libbar'

+# to build libfoo.a et al from the modules listed in $(libfoo-routines).

+ifdef extra-libs

+# extra-lib.mk is included once for each extra lib to define rules

+# to build it, and to add its objects to the various variables.

+# During its evaluation, $(lib) is set to the name of the library.

+extra-libs-left := $(extra-libs)

+include $(patsubst %,$(..)extra-lib.mk,$(extra-libs))

+endif

+

++depfiles := $(sources:.c=.d) \

+	     $(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \

+	     $(addsuffix .d,$(tests) $(xtests) $(test-srcs))

+ifeq ($(build-programs),yes)

++depfiles += $(addsuffix .d,$(others) $(sysdep-others))

+endif

++depfiles := $(addprefix $(objpfx),\

+			 $(filter-out $(addsuffix .d,$(omit-deps)),\

+				      $(+depfiles)))

+

+ifdef +depfiles

+ifneq ($(no_deps),t)

+-include $(+depfiles)

+endif

+endif

+

+# Maximize efficiency by minimizing the number of rules.

+.SUFFIXES:	# Clear the suffix list.  We don't use suffix rules.

+# Don't define any builtin rules.

+MAKEFLAGS := $(MAKEFLAGS)r

+

+# Generic rule for making directories.

+%/:

+# mkdir isn't smart enough to strip a trailing /.

+	mkdir $(@:%/=%)

+

+# Make sure that object files are not removed

+# when they are intermediates between sources and library members.

+.PRECIOUS: $(addprefix $(objpfx)%,$(all-object-suffixes))

+

+# Make sure that the parent library archive is never removed.

+.PRECIOUS: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c))

+

+# Use the verbose option of ar and tar when not running silently.

+ifeq	"$(findstring s,$(MAKEFLAGS))" ""	# if not -s

+verbose := v

+else	   					# -s

+verbose	:=

+endif						# not -s

+

+ARFLAGS := r$(verbose)

+CREATE_ARFLAGS := cru$(verbose)

+

+# This makes all the object files in the parent library archive.

+

+.PHONY: lib lib-noranlib

+lib: lib-noranlib $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c))

+lib-noranlib: libobjs

+

+# For object-suffix $o, the list of objects with that suffix.

+# Makefiles can define `elide-routines.so = foo' to leave foo.so out.

+o-objects = $(patsubst %.o,%$o,$(filter-out $(patsubst %,$(objpfx)%.o,\

+						       $(elide-routines$o)),\

+					    $(objects))) \

+	    $(addprefix $(objpfx),$(o-objects$o))

+

+others: $(addprefix $(objpfx),$(install-lib))

+

+ifndef objects

+

+# Create the stamp$o files to keep the parent makefile happy.

+subdir_lib: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o)

+$(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o):

+	$(make-target-directory)

+	rm -f $@; > $@

+else

+

+# Define explicit rules to update each $(objpfx)stamp.SUFFIX

+# timestamp file; these rules (one explicit rule is generated for each

+# object suffix) write a list of objects to update in the stamp file.

+# The parent will then actually add them all to the archive in the

+# archive rule, below.

+define o-iterator-doit

+$(objpfx)stamp$o: $(o-objects); $$(do-stamp)

+endef

+define do-stamp

+echo '$(patsubst $(objpfx)%,$(addsuffix /,$(subdir))%,$^)' > $@T

+mv -f $@T $@

+endef

+object-suffixes-left := $(object-suffixes-for-libc)

+include $(o-iterator)

+

+endif

+

+# Now define explicit rules to build the library archives; these depend

+# on the stamp files built above.

+define o-iterator-doit

+$(common-objpfx)$(patsubst %,$(libtype$o),c): \

+		$(subdirs-stamp-o) $(common-objpfx)stamp$o; $$(do-makelib)

+endef

+define do-makelib

+cd $(common-objdir) && \

+$(AR) $(CREATE_ARFLAGS) $(@F) `cat $(patsubst $(common-objpfx)%,%,$^)`

+$(RANLIB) $@

+endef

+subdirs-stamps := $(foreach d,$(subdirs),$(common-objpfx)$d/stamp%)

+subdirs-stamp-o = $(subst %,$o,$(subdirs-stamps))

+ifndef subdir

+$(subdirs-stamps): subdir_lib;

+endif

+object-suffixes-left = $(object-suffixes-for-libc)

+include $(o-iterator)

+

+

+# This makes all the object files.

+.PHONY: objects objs libobjs extra-objs

+objects objs: libobjs extra-objs

+libobjs: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o)

+extra-objs: $(addprefix $(objpfx),$(extra-objs))

+

+# Canned sequence for building an extra library archive.

+define build-extra-lib

+$(patsubst %/,cd % &&,$(objpfx)) \

+$(AR) $(CREATE_ARFLAGS) $(@:$(objpfx)%=%) \

+      $(patsubst $(objpfx)%,%,$^)

+$(RANLIB) $@

+endef

+

+# Installation.

+

+.PHONY: force-install

+force-install:

+

+# $(install-lib) are installed from the object directory into $(libdir);

+# files in $(install-lib) matching `lib%.a' are ranlib'd after installation

+# unless they also appear in $(non-lib.a).  $(install-data) are installed

+# as they are into $(datadir).  $(headers) are installed as they are in

+# $(includedir).  $(install-bin), $(install-bin-script) and $(install-sbin)

+# are installed from the object directory into $(bindir), $(bindir) and

+# $(sbindir), respectively.  $(install-others) are absolute path names of

+# files to install; rules to install them are defined elsewhere.

+

+# The simple library name to install libc.a under.

+# This could be defined by a sysdep Makefile.

+ifndef libc-name

+libc-name := c

+endif

+

+define do-install

+$(make-target-directory)

+$(INSTALL_DATA) $< $@

+endef

+

+# Make the target directory if it doesn't exist, using the `mkinstalldirs'

+# script that does `mkdir -p' even if `mkdir' doesn't support that flag.

+define make-target-directory

+$(addprefix $(..)./scripts/mkinstalldirs ,\

+	    $(filter-out $(wildcard $(@D:%/=%)),$(@D:%/=%)))

+endef

+

+# Any directory (parent or subdir) should install libc.a; this way

+# "make install" in a subdir is guaranteed to install everything it changes.

+installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\

+			     $(inst_libdir)/$(patsubst %,$(libtype$o),\

+						     $(libprefix)$(libc-name)))

+install: $(installed-libcs)

+$(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force)

+	$(make-target-directory)

+	$(INSTALL_DATA) $(common-objpfx)lib$(*:$(libc-name)%=c%) $@

+# Running ranlib after installing makes the __.SYMDEF time stamp up to

+# date, which avoids messages from some linkers.

+	$(RANLIB) $@

+

+define do-install-program

+$(make-target-directory)

+$(INSTALL_PROGRAM) $< $@.new

+mv -f $@.new $@

+endef

+

+define do-install-script

+$(make-target-directory)

+$(INSTALL_SCRIPT) $< $@.new

+mv -f $@.new $@

+endef

+

+install-lib.so := $(filter %.so,$(install-lib:%_pic.a=%.so))

+install-lib := $(filter-out %.so %_pic.a,$(install-lib))

+

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

+# Find which .so's have versions.

+versioned := $(strip $(foreach so,$(install-lib.so),\

+			       $(patsubst %,$(so),$($(so)-version))))

+

+install-lib.so-versioned := $(filter $(versioned), $(install-lib.so))

+install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))

+

+install-lib-nosubdir: $(install-lib.so-versioned:%=$(inst_libdir)/%) \

+		      $(install-lib.so-unversioned:%=$(inst_slibdir)/%)

+

+# Install all the unversioned shared libraries.

+$(install-lib.so-unversioned:%=$(inst_slibdir)/%): $(inst_slibdir)/%.so: \

+    $(objpfx)%.so $(+force)

+	$(do-install-program)

+

+ifneq ($(findstring -s,$(LN_S)),)

+define make-link

+rm -f $@.new

+$(SHELL) $(..)scripts/rellns-sh $< $@.new

+mv -f $@.new $@

+endef

+else

+# If we have no symbolic links don't bother with rellns-sh.

+define make-link

+rm -f $@.new

+$(LN_S) $< $@.new

+mv -f $@.new $@

+endef

+endif

+

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

+ifeq (no,$(cross-compiling))

+symbolic-link-prog := $(common-objpfx)elf/sln

+symbolic-link-list := $(common-objpfx)elf/symlink.list

+define make-shlib-link

+echo $(<F) $@ >> $(symbolic-link-list)

+endef

+else # cross-compiling

+# We need a definition that can be used by elf/Makefile's install rules.

+symbolic-link-prog = $(LN_S)

+endif

+endif

+ifndef make-shlib-link

+define make-shlib-link

+rm -f $@

+$(LN_S) $(<F) $@

+endef

+endif

+

+ifdef libc.so-version

+# For a library specified to be version N, install three files:

+# libc.so	->	libc.so.N	(e.g. libc.so.6)

+# libc.so.6	->	libc-VERSION.so	(e.g. libc-1.10.so)

+

+$(inst_slibdir)/libc.so$(libc.so-version): $(inst_slibdir)/libc-$(version).so \

+					   $(+force)

+	$(make-shlib-link)

+$(inst_slibdir)/libc-$(version).so: $(common-objpfx)libc.so $(+force)

+	$(do-install-program)

+install: $(inst_slibdir)/libc.so$(libc.so-version)

+

+# This fragment of linker script gives the OUTPUT_FORMAT statement

+# for the configuration we are building.  We put this statement into

+# the linker scripts we install for -lc et al so that they will not be

+# used by a link for a different format on a multi-architecture system.

+$(common-objpfx)format.lds: $(..)scripts/output-format.sed \

+			    $(common-objpfx)config.make \

+			    $(common-objpfx)config.h $(..)Makerules

+	$(LINK.o) -shared $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS.so) \

+		  -x c /dev/null -o $@.so -Wl,--verbose -v 2>&1 \

+	| sed -n -f $< > $@.new

+	rm -f $@.so

+	mv -f $@.new $@

+common-generated += format.lds

+

+ifndef subdir

+# What we install as libc.so for programs to link against is in fact a

+# link script.  It contains references for the various libraries we need.

+# The libc.so object is not complete since some functions are only defined

+# in libc_nonshared.a.

+# We need to use absolute paths since otherwise local copies (if they exist)

+# of the files are taken by the linker.

+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),\

+						  $(libprefix)$(libc-name)) \

+			$(+force)

+	(echo '/* GNU ld script';\

+	 echo '   Use the shared library, but some functions are only in';\

+	 echo '   the static library, so try that secondarily.  */';\

+	 cat $<; \

+	 echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \

+	      '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\

+	      ')' \

+	) > $@.new

+	mv -f $@.new $@

+

+endif

+

+else

+install: $(inst_slibdir)/libc.so

+$(inst_slibdir)/libc.so: $(common-objpfx)libc.so $(+force)

+	$(do-install-program)

+endif

+

+ifneq (,$(versioned))

+# Produce three sets of rules as above for all the smaller versioned libraries.

+

+define o-iterator-doit

+$(inst_libdir)/$o: $(inst_slibdir)/$o$($o-version) $(+force); $$(make-link)

+endef

+object-suffixes-left := $(versioned)

+include $(o-iterator)

+

+# Make symlinks in the build directory, because the versioned names might

+# be referenced by a DT_NEEDED in another library.

+define o-iterator-doit

+$(objpfx)$o$($o-version): $(objpfx)$o; $$(make-link)

+endef

+object-suffixes-left := $(versioned)

+include $(o-iterator)

+

+generated += $(foreach o,$(versioned),$o$($o-version))

+

+ifeq (,$($(subdir)-version))

+define o-iterator-doit

+$(inst_slibdir)/$o$($o-version): $(inst_slibdir)/$(o:.so=)-$(version).so \

+				 $(+force);

+	$$(make-shlib-link)

+endef

+object-suffixes-left := $(versioned)

+include $(o-iterator)

+

+define o-iterator-doit

+$(inst_slibdir)/$(o:.so=)-$(version).so: $(objpfx)$o $(+force);

+	$$(do-install-program)

+endef

+object-suffixes-left := $(versioned)

+include $(o-iterator)

+else

+define o-iterator-doit

+$(inst_slibdir)/$o$($o-version): \

+  $(inst_slibdir)/$(o:.so=)-$($(subdir)-version).so $(+force);

+	$$(make-shlib-link)

+endef

+object-suffixes-left := $(versioned)

+include $(o-iterator)

+

+define o-iterator-doit

+$(inst_slibdir)/$(o:.so=)-$($(subdir)-version).so: $(objpfx)$o $(+force);

+	$$(do-install-program)

+endef

+object-suffixes-left := $(versioned)

+include $(o-iterator)

+endif

+endif

+

+define do-install-so

+$(do-install-program)

+$(patsubst %,ln -s -f $(@F) $(@D)/$(patsubst %$*.so,%,$(<F))$(libprefix)$*.so,\

+	   $(filter-out %.so,$@))

+endef

+

+so-versions := $(sort $(foreach so,$(install-lib.so),.so$($(so)-version)))

+$(foreach v,$(so-versions),\

+	  $(inst_slibdir)/lib$(libprefix)%$v): $(common-objpfx)lib%.so \

+					       $(+force)

+	$(do-install-so)

+$(foreach v,$(so-versions),\

+	  $(inst_slibdir)/$(libprefix)%$v): $(common-objpfx)%.so $(+force)

+	$(do-install-so)

+endif

+

+ifdef install-bin

+$(addprefix $(inst_bindir)/,$(install-bin)): \

+    $(inst_bindir)/%: $(objpfx)% $(+force)

+	$(do-install-program)

+endif

+ifdef install-bin-script

+$(addprefix $(inst_bindir)/,$(install-bin-script)): \

+    $(inst_bindir)/%: $(objpfx)% $(+force)

+	$(do-install-script)

+endif

+ifdef install-rootsbin

+$(addprefix $(inst_rootsbindir)/,$(install-rootsbin)): \

+   $(inst_rootsbindir)/%: $(objpfx)% $(+force)

+	$(do-install-program)

+endif

+ifdef install-sbin

+$(addprefix $(inst_sbindir)/,$(install-sbin)): \

+    $(inst_sbindir)/%: $(objpfx)% $(+force)

+	$(do-install-program)

+endif

+ifdef install-lib

+install-lib.a := $(filter lib%.a,$(install-lib))

+install-lib-non.a := $(filter-out lib%.a,$(install-lib))

+ifdef install-lib-non.a

+$(addprefix $(inst_libdir)/$(libprefix),$(install-lib-non.a)): \

+  $(inst_libdir)/$(libprefix)%: $(objpfx)% $(+force)

+	$(do-install)

+endif

+ifdef install-lib.a

+$(install-lib.a:lib%.a=$(inst_libdir)/lib$(libprefix)%.a): \

+  $(inst_libdir)/lib$(libprefix)%.a: $(objpfx)lib%.a $(+force)

+	$(do-install)

+	$(patsubst %,$(RANLIB) $@,$(filter-out $(non-lib.a),$(<F)))

+endif

+endif

+ifdef install-data

+$(addprefix $(inst_datadir)/,$(install-data)): $(inst_datadir)/%: % $(+force)

+	$(do-install)

+endif

+headers := $(strip $(headers))

+ifdef headers

+$(addprefix $(inst_includedir)/,$(headers)): $(inst_includedir)/%: % $(+force)

+	$(do-install)

+endif	# headers

+

+.PHONY: install-bin-nosubdir install-bin-script-nosubdir \

+	install-rootsbin-nosubdir install-sbin-nosubdir install-lib-nosubdir \

+	install-data-nosubdir install-headers-nosubdir

+install-bin-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin))

+install-bin-script-nosubdir: $(addprefix $(inst_bindir)/,$(install-bin-script))

+install-rootsbin-nosubdir: \

+	$(addprefix $(inst_rootsbindir)/,$(install-rootsbin))

+install-sbin-nosubdir: $(addprefix $(inst_sbindir)/,$(install-sbin))

+install-lib-nosubdir: $(addprefix $(inst_libdir)/,\

+		       $(patsubst lib%.a,lib$(libprefix)%.a,$(install-lib.a)) \

+		       $(addprefix $(libprefix),$(install-lib-non.a)))

+install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data))

+install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers))

+install-others-nosubdir: $(install-others)

+

+# We need all the `-nosubdir' targets so that `install' in the parent

+# doesn't depend on several things which each iterate over the subdirs.

+# This rule makes `install-FOO' always use `install-FOO-nosubdir' as a

+# subroutine.  Then in the parent `install-FOO' also causes subdir makes.

+install-%:: install-%-nosubdir ;

+

+.PHONY: install install-no-libc.a-nosubdir

+ifeq ($(build-programs),yes)

+install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir\

+			    install-bin-nosubdir install-bin-script-nosubdir \

+			    install-lib-nosubdir install-others-nosubdir \

+			    install-rootsbin-nosubdir install-sbin-nosubdir

+else

+install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir\

+			    install-lib-nosubdir install-others-nosubdir

+endif

+install: install-no-libc.a-nosubdir

+

+# Command to compile $< in $(objdir) using the native libraries.

+define native-compile

+$(make-target-directory)

+$(patsubst %/,cd % &&,$(objpfx)) \

+$(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \

+	    $(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(@F)

+endef

+

+# Command to compile $< in $(common-objdir) using the native libraries.

+# We must cd to $(objdir) anyway so that $(..)config.h is valid.

+define common-objdir-compile

+$(patsubst %/,cd % &&,$(objpfx)) \

+$(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \

+	    $(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(..)$(@F)

+endef

+

+# We always want to use configuration definitions.

+# Note that this is only used for commands running in $(objpfx).

+ALL_BUILD_CFLAGS = $(BUILD_CFLAGS) -include $(..)config.h

+

+# Support the GNU standard name for this target.

+.PHONY: check

+check: tests

+# Special target to run tests which cannot be run unconditionally.

+# Maintainers should use this target.

+.PHONY: xcheck

+xcheck: xtests

+

+all-nonlib = $(strip $(tests) $(xtests) $(test-srcs) $(test-extras) $(others))

+ifneq (,$(all-nonlib))

+cpp-srcs-left = $(all-nonlib:=.c)

+lib := nonlib

+include $(patsubst %,$(..)cppflags-iterator.mk,$(all-nonlib))

+endif

+

+# The include magic above causes those files to use this variable for flags.

+CPPFLAGS-nonlib = -DNOT_IN_libc=1

+

+

+ifeq ($(versioning),yes)

+# Generate normalized lists of symbols, versions, and data sizes.

+# This is handy for checking against existing library binaries.

+

+%.symlist: $(..)scripts/abilist.awk %.dynsym

+	LC_ALL=C $(AWK) -f $^ > $@T

+	mv -f $@T $@

+

+%.dynsym: %.so

+	$(OBJDUMP) --dynamic-syms $< > $@T

+	mv -f $@T $@

+

+vpath %.symlist $(objpfx) $(common-objpfx)

+check-abi-%: $(..)scripts/extract-abilist.awk $(common-objpfx)config.make \

+	     %.abilist %.symlist

+	LC_ALL=C \

+	$(AWK) -f $< \

+	       -v 'config=$(config-machine)-$(config-vendor)-$(config-os)' \

+	       $(filter %.abilist,$^) \

+	| diff -pu0 - $(filter %.symlist,$^)

+

+update-abi-%: $(..)scripts/merge-abilist.awk %.abilist %.symlist

+ifndef update-abi-config

+	@echo 'Run $(MAKE) $@ update-abi-config=REGEXP'; exit 2

+else

+	LC_ALL=C $(AWK) -v config=$(update-abi-config) -f $^ > $*.abilist.new

+	mv -f $*.abilist.new $*.abilist

+	@echo '*** Now check $*.abilist changes for correctness ***'

+endif

+

+.PHONY: update-abi check-abi

+update-abi: $(patsubst %.so,update-abi-%,$(install-lib.so-versioned))

+check-abi: $(patsubst %.so,check-abi-%,$(install-lib.so-versioned))

+ifdef subdir

+subdir_check-abi: check-abi

+subdir_update-abi: update-abi

+else

+check-abi: subdir_check-abi

+update-abi: subdir_update-abi

+endif

+

+# Enable this well all the .abilist files are in place.

+#tests: check-abi

+generated += $(install-lib.so-versioned:.so=.symlist)

+

+ifeq ($(subdir),elf)

+check-abi: check-abi-libc

+update-abi: update-abi-libc

+common-generated += libc.symlist

+endif

+

+endif

+

+.PHONY: TAGS

+TAGS: $(objpfx)distinfo $(..)MakeTAGS

+	$(MAKE) $(addprefix -f ,$^) $@

+

+$(..)po/%.pot: $(objpfx)distinfo $(..)MakeTAGS FORCE

+	$(MAKE) $(addprefix -f ,$(filter-out FORCE,$^)) $@

+FORCE:

+

+

+.PHONY: echo-headers

+echo-headers:

+	@echo $(headers)

+

+

+# Common cleaning targets.

+

+.PHONY: common-mostlyclean common-clean mostlyclean clean do-tests-clean

+clean: common-clean

+mostlyclean: common-mostlyclean

+

+do-tests-clean:

+	-rm -f $(addprefix $(objpfx),$(addsuffix .out,$(tests) $(xtests) \

+						      $(test-srcs)) \

+				     $(addsuffix -bp.out,$(tests) $(xtests) \

+							 $(test-srcs)))

+

+# Remove the object files.

+common-mostlyclean:

+	-rm -f $(addprefix $(objpfx),$(tests) $(xtests) $(test-srcs) \

+				     $(others) $(sysdep-others) stubs \

+				     $(addsuffix .o,$(tests) $(xtests) \

+						    $(test-srcs) $(others) \

+						    $(sysdep-others)) \

+				     $(addsuffix -bp,$(tests) $(xtests) \

+						     $(test-srcs)) \

+				     $(addsuffix .out,$(tests) $(xtests) \

+						      $(test-srcs)) \

+				     $(addsuffix -bp.out,$(tests) $(xtests) \

+							 $(test-srcs)))

+	-rm -f $(addprefix $(objpfx),$(extra-objs) $(install-lib) \

+				     $(install-lib.so) \

+				     $(install-lib.so:%.so=%_pic.a))

+	-rm -f core

+	-rm -f $(objpfx)rtld-*.os

+	$(rmobjs)

+define rmobjs

+$(foreach o,$(object-suffixes-for-libc),

+-rm -f $(objpfx)stamp$o $(o-objects))

+endef

+

+# Also remove the dependencies and generated source files.

+common-clean: common-mostlyclean

+	-rm -f $(addprefix $(objpfx),$(generated)) $(+depfiles)

+	-rm -f $(objpfx)rtld-*.d

+	-rm -fr $(addprefix $(objpfx),$(generated-dirs))

+	-rm -f $(addprefix $(common-objpfx),$(common-generated))

+	-rm -f $(objpfx)distinfo

+

+# Produce a file `stubs' which contains `#define __stub_FUNCTION'

+# for each function which is a stub.  We grovel over all the .d files

+# looking for references to <stub-tag.h>.  Then we grovel over each

+# referenced source file to see what stub function it defines.

+

+ifdef objpfx

+.PHONY: stubs # The parent Makefile calls this target.

+stubs: $(objpfx)stubs

+endif

+s = $(sysdep_dir)/generic

+$(objpfx)stubs: $(+depfiles)

+# Use /dev/null since `...` might expand to empty.

+	(s=`cd $s && $(PWD_P)`; \

+	 $(patsubst %/,cd % &&,$(objpfx)) \

+	 sed -n 's/^stub_warning *(\([^)]*\).*$$/#define __stub_\1/p' \

+	  `sed -n -e '\@ $s/[^ ]*\.c@{; s@^.* $s/\([^ ]*\.c\).*$$@'"$$s"'/\1@; h; }' \

+		-e '/stub-tag\.h/{; g; p; }' \

+		  $(patsubst $(objpfx)%,%,$^) /dev/null` \

+	     /dev/null) > $@T

+	mv -f $@T $@

+

+# Make the distribution tar file.

+

+.PHONY: dist

+dist: $(objpfx)distinfo $(..)Make-dist

+	$(MAKE) -f $< -f $(word 2,$^) $(Make-dist-args)

+

+# Avoid depending on source files found in sysdeps dirs,

+# because the references affect implicit rule selection.

+dist: $(filter-out %.c %.S %.s,$(distribute))

+

+# We used to simply export all these variables, but that frequently made the

+# environment get too large.  Instead, we write all the information into

+# a generated makefile fragment `distinfo', and then include it with -f in

+# the sub-make that makes the distribution (above).

+$(objpfx)distinfo: Makefile $(..)Makerules \

+		   $(wildcard $(foreach dir,$(sysdirs),$(dir)/Makefile))

+	$(make-target-directory)

+	$(distinfo-vars)

+	mv -f $@.new $@

+.PHONY: subdir_distinfo

+subdir_distinfo: $(objpfx)distinfo

+

+define distinfo-vars

+rm -f $@.new

+echo > $@.new 'subdir := $(subdir)'

+$(foreach var,subdir-dirs sources elided-routines sysdep_routines \

+	      headers sysdep_headers distribute dont_distribute generated \

+	      others tests xtests test-srcs extra-libs versioned \

+	      $(extra-libs:%=%-routines) \

+	      $(addprefix install-,lib lib.so data bin bin-script sbin others),

+echo >> $@.new '$(subdir)-$(var) := $($(var))'

+echo >> $@.new '$(var) = $$($(subdir)-$(var))')

+endef

+

+ifneq (,$(strip $(gpl2lgpl)))

+ifneq (,$(wildcard $(..)gpl2lgpl.sed))

+# Snarf from the master source and frob the copying notice.

+$(gpl2lgpl): %: $(..)gpl2lgpl.sed /home/gd/gnu/lib/%

+	sed -f $^ > $@-tmp

+# So I don't edit them by mistake.

+	chmod a-w $@-tmp

+	mv -f $@-tmp $@

+ifeq ($(with-cvs),yes)

+	test ! -d CVS || cvs $(CVSOPTS) commit -m'Updated from $^' $@

+endif

+endif

+endif

+

+# Local Variables:

+# mode: makefile

+# End:

diff --git a/scripts/abilist.awk b/scripts/abilist.awk
index 97818344d4..346527ef0b 100644
--- a/scripts/abilist.awk
+++ b/scripts/abilist.awk
@@ -1,8 +1,6 @@
 # This awk script processes the output of objdump --dynamic-syms
 # into a simple format that should not change when the ABI is not changing.
 
-BEGIN { outpipe = "sort" }
-
 # Normalize columns.
 /^[0-9a-fA-F]+      / { sub(/      /, "  -   ") }
 
@@ -13,11 +11,11 @@ $4 == "*UND*" { next }
 $2 == "l" { next }
 
 $2 == "g" || $2 == "w" && NF == 7 {
-  weak = ($2 == "w") ? "weak" : "strong";
+  weak = $2;
   type = $3;
   size = $5;
   sub(/^0*/, "", size);
-  size = "0x" size;
+  size = " 0x" size;
   version = $6;
   symbol = $7;
   gsub(/[()]/, "", version);
@@ -25,24 +23,36 @@ $2 == "g" || $2 == "w" && NF == 7 {
   if (version == "GLIBC_PRIVATE") next;
 
   if (type == "D" && $4 == ".tbss") {
-    print symbol, version, weak, "TLS", size | outpipe;
+    type = "T";
   }
   else if (type == "D" && $4 == ".opd") {
-    print symbol, version, weak, "FDESC" | outpipe;
+    type = "O";
+    size = "";
   }
   else if (type == "DO" && $4 == "*ABS*") {
-    print symbol, version, weak, "ABS" | outpipe;
+    type = "A";
+    size = "";
   }
   else if (type == "DO") {
-    print symbol, version, weak, "DATA", size | outpipe;
+    type = "D";
   }
   else if (type == "DF") {
-    print symbol, version, weak, "FUNC" | outpipe;
+    type = "F";
+    size = "";
   }
   else {
-    print symbol, version, weak, "UNEXPECTED", type, $4, $5;
+    print symbol, version, weak, "?", type, $4, $5;
+    next;
   }
 
+  desc = " " symbol " " (weak == "w" ? tolower(type) : type) size;
+
+  if (version in versions) {
+    versions[version] = versions[version] "\n" desc;
+  }
+  else {
+    versions[version] = desc;
+  }
   next;
 }
 
@@ -52,3 +62,43 @@ NF == 0 || /DYNAMIC SYMBOL TABLE/ || /file format/ { next }
 {
   print "Don't grok this line:", $0
 }
+
+END {
+  nverlist = 0;
+  for (version in versions) {
+    if (nverslist == 0) {
+      verslist = version;
+      nverslist = 1;
+      continue;
+    }
+    split(verslist, s, "\n");
+    if (version < s[1]) {
+      verslist = version;
+      for (i = 1; i <= nverslist; ++i) {
+	verslist = verslist "\n" s[i];
+      }
+    }
+    else {
+      verslist = s[1];
+      for (i = 2; i <= nverslist; ++i) {
+	if (version < s[i]) break;
+	verslist = verslist "\n" s[i];
+      }
+      verslist = verslist "\n" version;
+      for (; i <= nverslist; ++i) {
+	verslist = verslist "\n" s[i];
+      }
+    }
+    ++nverslist;
+  }
+
+  split(verslist, order, "\n");
+  for (i = 1; i <= nverslist; ++i) {
+    version = order[i];
+
+    print version;
+    outpipe = "sort";
+    print versions[version] | outpipe;
+    close(outpipe);
+  }
+}
diff --git a/scripts/extract-abilist.awk b/scripts/extract-abilist.awk
new file mode 100644
index 0000000000..c5b76e1309
--- /dev/null
+++ b/scripts/extract-abilist.awk
@@ -0,0 +1,44 @@
+# awk script to extract a config-specific .symlist file from a merged file.
+# This must be passed run with awk -v config=TUPLE to specify the configuration
+# tuple we will match.  The merged file contains stanzas in the form:
+#	GLIBC_x.y regexp...
+#	 function F
+#	 variable D 0x4
+# Each regexp is matched against TUPLE, and only matching stanzas go
+# into the output, with the regexp list removed.  The result matches the
+# original .symlist file from abilist.awk that was fed into merge-abilist.awk.
+
+BEGIN {
+  outpipe = "";
+}
+
+/^ / { if (!ignore) print | outpipe; next; }
+
+{
+  for (i = 2; i <= NF; ++i) {
+    regex = "^" $i "$";
+    if (match(config, regex) != 0) {
+      if ($1 != version) {
+	if (outpipe != "") {
+	  close(outpipe);
+	}
+	version = $1;
+	print version;
+	outpipe = "sort";
+      }
+      ignore = 0;
+      next;
+    }
+  }
+  ignore = 1;
+  next;
+}
+
+END {
+  if (outpipe == "") {
+    print "No stanza matched", config > "/dev/stderr";
+    exit 2;
+  }
+  else
+    close(outpipe);
+}
diff --git a/scripts/merge-abilist.awk b/scripts/merge-abilist.awk
new file mode 100644
index 0000000000..016debc628
--- /dev/null
+++ b/scripts/merge-abilist.awk
@@ -0,0 +1,129 @@
+# awk script to merge a config-specific .symlist file with others.
+# The input files should be an existing .abilist file, and a .symlist file.
+# This must be passed run with awk -v config=REGEXP to specify a regexp
+# matching configuration tuples for which the .symlist input defines an ABI.
+# The result merges all duplicate occurrences of any symbol in a version set
+# into a stanza listing the regexps matching configurations that contain it.
+
+/^[^ ]/ {
+  if (NF < 2 && config == "") {
+    print "BAD LINE:", $0 > "/dev/stderr";
+    exit 2;
+  }
+
+  if (NF < 2) {
+    current = $1 ":" config;
+  }
+  else {
+    current = $1 ":" $2;
+    for (i = 3; i <= NF; ++i) {
+      current = current "," $1 ":" $i;
+    }
+  }
+
+  next;
+}
+
+{
+  if ($0 in seen) {
+    seen[$0] = seen[$0] "\n" current;
+  }
+  else {
+    seen[$0] = current;
+  }
+
+  next;
+}
+
+END {
+  for (line in seen) {
+    split(seen[line], setlist, "\n");
+    for (i in setlist) {
+      split(setlist[i], configs, ",");
+      for (j in configs) {
+	split(configs[j], temp, ":");
+	version = temp[1];
+	conf = temp[2];
+
+	if ((version,conf) in have) continue;
+	have[version,conf] = 1;
+
+	if (version in confs) {
+	  split(confs[version], c, " ");
+	  if (conf < c[1]) {
+	    confs[version] = conf;
+	    for (k = 1; k <= nconfs[version]; ++k) {
+	      confs[version] = confs[version] " " c[k];
+	    }
+	  }
+	  else {
+	    confs[version] = c[1];
+	    for (k = 2; k <= nconfs[version]; ++k) {
+	      if (conf < c[k]) break;
+	      confs[version] = confs[version] " " c[k];
+	    }
+	    confs[version] = confs[version] " " conf;
+	    for (; k <= nconfs[version]; ++k) {
+	      confs[version] = confs[version] " " c[k];
+	    }
+	  }
+	  ++nconfs[version];
+	}
+	else {
+	  confs[version] = conf;
+	  nconfs[version] = 1;
+	}
+      }
+    }
+    for (idx in have) delete have[idx];
+
+    for (version in confs) {
+      idx = version " " confs[version];
+      if (idx in final) {
+	final[idx] = final[idx] "\n" line;
+      }
+      else {
+	final[idx] = line;
+      }
+      delete confs[version];
+      delete nconfs[version];
+    }
+  }
+
+  nstanzas = 0;
+  for (stanza in final) {
+    if (nstanzas == 0) {
+      stanzas = stanza;
+      nstanzas = 1;
+      continue;
+    }
+    split(stanzas, s, "\n");
+    if (stanza < s[1]) {
+      stanzas = stanza;
+      for (i = 1; i <= nstanzas; ++i) {
+	stanzas = stanzas "\n" s[i];
+      }
+    }
+    else {
+      stanzas = s[1];
+      for (i = 2; i <= nstanzas; ++i) {
+	if (stanza < s[i]) break;
+	stanzas = stanzas "\n" s[i];
+      }
+      stanzas = stanzas "\n" stanza;
+      for (; i <= nstanzas; ++i) {
+	stanzas = stanzas "\n" s[i];
+      }
+    }
+    ++nstanzas;
+  }
+
+  split(stanzas, order, "\n");
+  for (i = 1; i <= nstanzas; ++i) {
+    stanza = order[i];
+    print stanza;
+    outpipe = "sort";
+    print final[stanza] | outpipe;
+    close(outpipe);
+  }
+}