aboutsummaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-03-27 09:48:09 +0000
committerRoland McGrath <roland@gnu.org>2003-03-27 09:48:09 +0000
commitfd54683c976e506e6311d0fc5d59a7a2d1387d42 (patch)
tree8391a61b59a13f937749f079461eabed7540bcc3 /Makerules
parent130ed2359f57a27949c65d90661ba72306e6c9b7 (diff)
downloadglibc-fd54683c976e506e6311d0fc5d59a7a2d1387d42.zip
glibc-fd54683c976e506e6311d0fc5d59a7a2d1387d42.tar.gz
glibc-fd54683c976e506e6311d0fc5d59a7a2d1387d42.tar.bz2
* Makerules (check-abi) [$(enable-check-abi) = warn]:
Ignore exit status from diff. * configure.in (enable_check_abi): Document possible value "warn". Change default to no for now. * configure: Regenerated. * sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Emit stub_warning macro calls and a #include <stub-tag.h> at the end. * Makerules ($(objpfx)stubs): Tweak sed commands. * sysdeps/unix/sysv/linux/syscalls.list: Use - rather than EXTRA in caller column for *xattr syscalls, since they are in sysdeps/generic. * sysdeps/unix/sysv/linux/i386/setfsuid.c: setfsgid -> setfsuid * sysdeps/unix/sysv/linux/i386/setfsgid.c: setfsuid -> setfsgid 2003-03-26 Roland McGrath <roland@redhat.com> * Makerules (check-abi-config): Use /thread instead of /tls when use-thread and not just use-tls is set. * Makerules (update-abi): Put quotes around $(update-abi-config). * elf/Makefile (check-abi): Depend on check-abi-ld. (update-abi): Depend on update-abi-ld.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules32
1 files changed, 22 insertions, 10 deletions
diff --git a/Makerules b/Makerules
index 070bff1..d8eae55 100644
--- a/Makerules
+++ b/Makerules
@@ -1190,15 +1190,23 @@ define check-abi
LC_ALL=C \
$(AWK) -f $< -v 'config=$(check-abi-config)' \
$(filter %.abilist,$^) \
- | diff -pu0 - $(filter %.symlist,$^)
+ | { diff -pu0 - $(filter %.symlist,$^) $(check-abi-warn) ; }
endef
+ifeq ($(enable-check-abi),warn)
+check-abi-warn = || echo '*** WARNING: $*.so failed ABI check'
+endif
ifeq ($(firstword $(sysd-sorted-done) f)$(firstword $(generating) f),tf)
-include $(common-objpfx)tls.make
-config-tls-yes := tls
-config-tls-no := notls
+config-tls := notls
+ifeq ($(use-tls),yes)
+config-tls := tls
+endif
+ifeq ($(use-thread),yes)
+config-tls := thread
+endif
check-abi-config := \
- $(config-machine)-$(config-vendor)-$(config-os)/$(config-tls-$(use-thread))
+ $(config-machine)-$(config-vendor)-$(config-os)/$(config-tls)
endif
update-abi-%: $(..)scripts/merge-abilist.awk $(..)abilist/%.abilist \
@@ -1213,7 +1221,7 @@ define update-abi
endef
else
define update-abi
-LC_ALL=C $(AWK) -v config=$(update-abi-config) -f $^ \
+LC_ALL=C $(AWK) -v config='$(update-abi-config)' -f $^ \
> $(..)abilist/$*.abilist.new
@if cmp -s $(..)abilist/$*.abilist.new $(..)abilist/$*.abilist 2> /dev/null; \
then rm -f $(..)abilist/$*.abilist.new; \
@@ -1241,11 +1249,13 @@ update-abi: update-abi-libc
common-generated += libc.symlist
endif
-ifeq ($(build-shared)$(enable-check-abi),yesyes)
+ifeq ($(build-shared),yes)
+ifneq ($(enable-check-abi),no)
ifdef subdir
tests: check-abi
endif
endif
+endif
endif
@@ -1375,14 +1385,16 @@ ifdef objpfx
.PHONY: stubs # The parent Makefile calls this target.
stubs: $(objpfx)stubs
endif
-s = $(sysdep_dir)/generic
$(objpfx)stubs: $(+depfiles)
# Use /dev/null since `...` might expand to empty.
- (s=`cd $s && $(PWD_P)`; \
+ (s=`cd $(sysdep_dir) && $(PWD_P)`; \
$(patsubst %/,cd % &&,$(objpfx)) \
sed -n 's/^stub_warning *(\([^)]*\).*$$/#define __stub_\1/p' \
- `sed -n -e '\@ $s/[^ ]*\.c@{; s@^.* $s/\([^ ]*\.c\).*$$@'"$$s"'/\1@; h; }' \
- -e '/stub-tag\.h/{; g; p; }' \
+ `sed -n -e 's@$(sysdep_dir)/@'"$$s"'/@g' \
+ -e 's@\$$(common-objpfx)@$(..)@g' -e 's@\$$(objpfx)@@g' \
+ -e '/: *[^ ]/{s@^.*: *\([^ ]*\) .*$$@\1@; h; }' \
+ -e '/:$$/d' \
+ -e '/stub-tag\.h/{; g; p; }' \
$(patsubst $(objpfx)%,%,$^) /dev/null` \
/dev/null) > $@T
mv -f $@T $@