From 91adb529b07eca93e25a84d0054418335e2fc6cf Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 10 Feb 2005 09:18:34 +0000 Subject: [BZ #632] 2005-02-10 Roland McGrath [BZ #632] * scripts/soversions.awk: Expect cpu, vendor, os as separate variables from command line. Grok shlib-versions lines with WORDSIZE* in second column. Add new leading column to output, DEFAULT for existing output lines. Also emit lines with WORDSIZE* for alternate configurations. * Makeconfig ($(common-objpfx)soversions.i): Pass those variables. ($(common-objpfx)soversions.mk): Grok new column, use only DEFAULT. ($(common-objpfx)gnu/lib-names.stmp): Depend on soversions.i instead of soversions.mk; replace inline shell script with use of ... * scripts/lib-names.awk: New file. If input has non-DEFAULT lines, emit multiple sets of macros under #if. * shlib-versions (x86_64-.*-.*): Add WORDSIZE32 line mapping to i686. (s390x-.*-.*): Likewise for s390. (powerpc64-.*-.*): Likewise for powerpc. (sparc64-.*-.*): Likewise for sparc. --- shlib-versions | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'shlib-versions') diff --git a/shlib-versions b/shlib-versions index 72cbb4af0e..b6999c3439 100644 --- a/shlib-versions +++ b/shlib-versions @@ -17,6 +17,11 @@ # to apply on matching configurations when the matching entry for a particular # library has no third column. The defaults must precede the entries they # apply to. +# +# An entry with WORDSIZE* in the second column gives an alternate +# configuration tuple whose macros will be conditionally defined in +# gnu/lib-names.h; @CPU@, @VENDOR@, @OS@ can be used in the third +# column to compose the alternate tuple matched against the patterns here. # Configuration DEFAULT Earliest symbol set # ------------- --------------- ------------------------------ @@ -27,6 +32,13 @@ x86_64-.*-linux.* DEFAULT GLIBC_2.2.5 powerpc64-.*-linux.* DEFAULT GLIBC_2.3 .*-.*-gnu-gnu.* DEFAULT GLIBC_2.2.6 +# Configuration WORDSIZE32 Alternate configuration +# ------------- ---------- ----------------------- +x86_64-.*-.* WORDSIZE32 i686-@VENDOR@-@OS@ +s390x-.*-.* WORDSIZE32 s390-@VENDOR@-@OS@ +powerpc64-.*-.* WORDSIZE32 powerpc-@VENDOR@-@OS@ +sparc64-.*-.* WORDSIZE32 sparc-@VENDOR@-@OS@ + # Configuration Library=version Earliest symbol set (optional) # ------------- --------------- ------------------------------ -- cgit 1.4.1