diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | elf/Makefile | 12 | ||||
| -rw-r--r-- | shlib-versions | 5 |
4 files changed, 34 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index cdc238d16b..887875739b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,19 @@ +2008-05-21 Roland McGrath <roland@redhat.com> + + * shlib-versions (sparc.*-.*-.*, sparc64.*-.*-.*): Add ABI lines. + + * Makefile (check-data): Use $(abi-name) before other guesses. + Look in $(add-ons) dirs before scripts/data/. + * elf/Makefile (check-data): Likewise. + + * scripts/soversions.awk: Grok ABI line. + * Makeconfig ($(common-objpfx)soversions.mk): Likewise. + Emit definition for abi-name variable. + 2008-05-21 Ulrich Drepper <drepper@redhat.com> * string/endian.h: Define new fixed-size hto* and *toh macros only - is __USE_BSD. + if [__USE_BSD]. * iconvdata/Depend: Add localedata. diff --git a/Makefile b/Makefile index 43c4f4d4b5..437854ed33 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ -# Copyright (C) 1991-2002,2003,2004,2005,2006 Free Software Foundation, Inc. +# Copyright (C) 1991-2002,2003,2004,2005,2006,2008 +# 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 @@ -246,8 +247,12 @@ tests-clean: tests: $(objpfx)c++-types-check.out $(objpfx)check-local-headers.out ifneq ($(CXX),no) check-data := $(firstword $(wildcard \ - $(foreach M,$(config-machine) $(base-machine),\ - scripts/data/c++-types-$M-$(config-os).data))) + $(foreach D,$(add-ons) scripts/data,\ + $(patsubst %,$D/c++-types-%.data,\ + $(abi-name) \ + $(addsuffix -$(config-os),\ + $(config-machine) \ + $(base-machine)))))) ifneq (,$(check-data)) $(objpfx)c++-types-check.out: $(check-data) scripts/check-c++-types.sh scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@ diff --git a/elf/Makefile b/elf/Makefile index 861485dcd1..e509153547 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -841,10 +841,14 @@ $(objpfx)tst-dlmodcount: $(libdl) $(objpfx)tst-dlmodcount.out: $(test-modules) check-data := $(firstword $(wildcard \ - $(patsubst %,../scripts/data/localplt-%.data,\ - $(addsuffix -$(config-os),\ - $(config-machine) $(base-machine))\ - generic))) + $(foreach D,$(add-ons) scripts/data,\ + $(patsubst %,$(..)$D/localplt-%.data,\ + $(abi-name) \ + $(addsuffix -$(config-os),\ + $(config-machine) \ + $(base-machine)) \ + generic)))) + tests: $(objpfx)check-localplt.out ifeq ($(have-thread-library),yes) diff --git a/shlib-versions b/shlib-versions index 9a10fc0566..65e772bbb5 100644 --- a/shlib-versions +++ b/shlib-versions @@ -43,6 +43,11 @@ powerpc.*-.*-.* WORDSIZE64 powerpc64-@VENDOR@-@OS@ sparc64.*-.*-.* WORDSIZE32 sparc-@VENDOR@-@OS@ sparc.*-.*-.* WORDSIZE64 sparc64-@VENDOR@-@OS@ +# Configuration ABI Identifier for ABI data files +# ------------- ---------- ----------------------------- +sparc64.*-.*-.* ABI sparc64-@OS@ +sparc.*-.*-.* ABI sparc-@OS@ + # Configuration Library=version Earliest symbol set (optional) # ------------- --------------- ------------------------------ |