diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-05-30 19:53:28 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-05-30 19:53:28 +0000 |
| commit | 978560d2d59061c18105088eefd568c7a5ac3b4b (patch) | |
| tree | fc3006d7a270e49ac3f09c9063f76f521bd52f47 /libc/Makefile | |
| parent | 47023889431f41fa4e408ba468096b7040caaa11 (diff) | |
Merge changes between r18761 and r18832 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@18833 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/Makefile')
| -rw-r--r-- | libc/Makefile | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/libc/Makefile b/libc/Makefile index 2ab6f54b9..04ea3d76a 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -189,14 +189,29 @@ $(inst_includedir)/gnu/stubs.h: include/stubs-bootstrap.h $(+force) installed-stubs = else -ifeq ($(biarch),no) +ifndef abi-variants installed-stubs = $(inst_includedir)/gnu/stubs.h else -installed-stubs = $(inst_includedir)/gnu/stubs-$(biarch).h +installed-stubs = $(inst_includedir)/gnu/stubs-$(default-abi).h -$(inst_includedir)/gnu/stubs.h: include/stubs-biarch.h $(+force) +$(inst_includedir)/gnu/stubs.h: $(common-objpfx)soversions.mk $(+force) $(make-target-directory) - $(INSTALL_DATA) $< $@ + { \ + echo '/* This file is automatically generated.';\ + echo " This file selects the right generated file of \`__stub_FUNCTION' macros";\ + echo ' based on the architecture being compiled for. */'; \ + echo ''; \ + $(foreach h,$(abi-includes), echo '#include <$(h)>';) \ + echo ''; \ + $(foreach v,$(abi-variants),\ + $(if $(abi-$(v)-condition),\ + echo '#if $(abi-$(v)-condition)'; \ + echo '# include <gnu/stubs-$(v).h>'); \ + $(if $(abi-$(v)-condition),echo '#endif';) \ + rm -f $(@:.d=.h).new$(v); \ + ) \ + } > $(@:.d=.h).new + mv -f $(@:.d=.h).new $(@:.d=.h) install-others-nosubdir: $(installed-stubs) endif |