aboutsummaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-02-11 10:17:19 +0000
committerRoland McGrath <roland@gnu.org>2005-02-11 10:17:19 +0000
commit3e1e123d02fa495961898f390741bd743a92022d (patch)
treeed5b2fddac71558294faac14742a16f723643746 /Makeconfig
parent9b382805e29a41abca88de8cd0348958d90f724f (diff)
downloadglibc-3e1e123d02fa495961898f390741bd743a92022d.zip
glibc-3e1e123d02fa495961898f390741bd743a92022d.tar.gz
glibc-3e1e123d02fa495961898f390741bd743a92022d.tar.bz2
* Makefile (installed-stubs): New variable. Set to $(inst_includedir)/gnu/stubs.h if $(biarch) is no, or to $(inst_includedir)/gnu/stubs-$(biarch).h if otherwise. [$(biarch) != no] (install-others-nosubdir): Add $(installed-stubs). ($(inst_includedir)/gnu/stubs.h): Use $(installed-stubs) for this rule's target. ($(inst_includedir)/gnu/stubs.h): New target, install from ... * include/stubs-biarch.h: New file. * shlib-versions (i.86-.*-.*): Add WORDSIZE64 line mapping to x86_64. * Makeconfig ($(common-objpfx)soversions.mk): Depend on Makeconfig. Emit defn for variable `biarch'. * include/stub-tag.h: Update comment.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig12
1 files changed, 10 insertions, 2 deletions
diff --git a/Makeconfig b/Makeconfig
index 3060532..4c3a4e3 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -792,8 +792,10 @@ $(common-objpfx)soversions.i: $(..)scripts/soversions.awk \
-v os='$(config-os)' \
-f $^ > $@T
mv -f $@T $@
-$(common-objpfx)soversions.mk: $(common-objpfx)soversions.i
- (while read which lib number setname; do \
+$(common-objpfx)soversions.mk: $(common-objpfx)soversions.i $(..)Makeconfig
+ (seen_DEFAULT=0; seen_WORDSIZE32=0; seen_WORDSIZE64=0; \
+ while read which lib number setname; do \
+ eval seen_$$which=1; \
test x"$$which" = xDEFAULT || continue; \
case $$number in \
[0-9]*) echo "$$lib.so-version=.$$number"; \
@@ -802,6 +804,12 @@ $(common-objpfx)soversions.mk: $(common-objpfx)soversions.i
echo "all-sonames+=$$lib=\$$($$lib.so-version)";;\
esac; \
done; \
+ case "$$seen_DEFAULT$$seen_WORDSIZE32$$seen_WORDSIZE64" in \
+ 100) echo biarch = no;; \
+ 101) echo biarch = 32;; \
+ ?1?) echo biarch = 64;; \
+ *) echo >&2 BUG; exit 2;; \
+ esac; \
echo soversions.mk-done = t;) < $< > $@T; exit 0
mv -f $@T $@
endif