* shlib-versions [USE_IN_LIBIO] (.*-.*-gnu-gnu*): Set earliest

	supported version for libc 0.2.90.libio to GLIBC_2.2.

	* Makeconfig (soversions.mk): Grok new third column in shlib-versions,
	and use it to emit new variable `map-firstversions'.
	* scripts/firstversions.awk: New file.
	* Makerules (Versions.all): Use scripts/firstversions.awk and
	the $(map-firstversions) value to generate a modified versions list
	that includes renames in "A = B" syntax for each version set earlier
	than the "earliest symbol version" named in shlib-versions.
	* scripts/versions.awk: Recognize "A = B" lines in the input to mean
	rename version set A to B in the output to the intermediate file.
	* scripts/abi-versions.awk: New file.
	* Makerules (abi-versions.h): New target, generated by that script.
	[$(versioning) = yes] (before-compile): Prepend abi-versions.h.
	* include/shlib-compat.h: New file, uses that generated header.

1 files changed, 24 insertions, 4 deletions

diff --git a/Makerules b/Makerules
index 4d6a48742c..fefbea0342 100644
--- a/Makerules
+++ b/Makerules
@@ -1,4 +1,5 @@
-# Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,97,98,99,2000
+#	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
@@ -128,6 +129,18 @@ before-compile := $(filter $(common-objpfx)mach% $(common-objpfx)hurd%,\
 		  $(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) -f $^ > $@T
+	mv -f $@T $@
+endif # avoid-generated
+endif # $(versioning) = yes
+
+
 # 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,
@@ -277,9 +290,15 @@ ifneq ($(sysd-versions-subdirs),$(all-subdirs) $(config-sysdirs))
 sysd-versions-force = FORCE
 FORCE:
 endif
-$(common-objpfx)Versions.all: $(..)Versions.def \
-			      $(wildcard $(add-ons:%=$(..)%/Versions.def))
-	cat $^ > $@T
+$(common-objpfx)Versions.all: $(..)scripts/firstversions.awk \
+	                      $(..)Versions.def \
+			      $(wildcard $(add-ons:%=$(..)%/Versions.def)) \
+			      $(common-objpfx)soversions.mk
+	{ for map in $(map-firstversions); do \
+	    echo $$map; \
+	  done | sed 's/:/ : /'; \
+	  cat $(filter-out $< $(common-objpfx)soversions.mk,$^); \
+	} | LC_ALL=C $(AWK) -f $< > $@T
 	mv -f $@T $@
 $(common-objpfx)sysd-versions: $(common-objpfx)Versions.all \
 			       $(..)scripts/versions.awk \
@@ -296,6 +315,7 @@ endif # avoid-generated
 endif # $(versioning) = yes
 endif # sysd-dirs-done
 
+
 ifndef compile-command.S
 compile-command.S = $(compile.S) $(OUTPUT_OPTION)
 endif