Implement "make update-all-abi"
Commit Message
This picks up an old idea, from this thread:
<https://sourceware.org/ml/libc-alpha/2015-03/msg00302.html>
This patch depends on the abilist format change. The new implementation
just uses sort and one invocation of “comm”.
I tested ABI updates in string and resolv subdirectories, on x86_64 and
ppc64le (which defines abilist-pattern).
Florian
Comments
On 10/29/2015 07:06 PM, Florian Weimer wrote:
> This picks up an old idea, from this thread:
>
> <https://sourceware.org/ml/libc-alpha/2015-03/msg00302.html>
>
> This patch depends on the abilist format change. The new implementation
> just uses sort and one invocation of “comm”.
>
> I tested ABI updates in string and resolv subdirectories, on x86_64 and
> ppc64le (which defines abilist-pattern).
Ping? This will help me to sure to avoid breaking the build bots if I
added additional function symbols to the ABI.
Florian
> +define update-all-abi
> +bash $(..)scripts/update-abilist.sh $^ \
$(BASH)
But what in this script is actually using a bash extension? If it doesn't
take much effort to keep a script POSIX sh-compatible, we should do it.
> + $$(find $(..)sysdeps \
> + -regextype posix-egrep -regex '.*/$*([^a-z0-9].*)?\.abilist$$' \
> + \! -regex '.*/generic/.*')
> +endef
Why isn't this find just rolled into the script?
> +if test $# -lt 3 ; then
Use [ ... ] rather than test. No space before a ; like that.
> + echo "usage: $0 OLD-FILE NEW-FILE FILES-TO-BE-PATCHED..." 1>&2
Two-space indent.
> + if ! cmp -s -- "$to_be_patched" "$tmp_patched" ; then
> + echo "info: updating $to_be_patched" 1>&2
> + cp -- "$tmp_patched" "$to_be_patched"
> + fi
Just call out to move-if-change for this.
2015-10-29 Florian Weimer <fweimer@redhat.com>
* scripts/update-abilist.sh: New file.
* Makefile (+subdir_targets): Add subdir_update-all-abi.
* Makerules (update-all-abi-%, update-all-abi)
(subdir_update-all-abi): New targets.
* elf/Makefile (update-all-abi): New target.
@@ -53,6 +53,7 @@ endif # $(AUTOCONF) = no
subdir_clean subdir_distclean subdir_realclean \
tests xtests \
subdir_update-abi subdir_check-abi \
+ subdir_update-all-abi \
subdir_echo-headers \
subdir_install \
subdir_objs subdir_stubs subdir_testclean \
@@ -1347,25 +1347,48 @@ define update-abi
fi
endef
-.PHONY: update-abi check-abi
+# Patch all .abilist files for one DSO. Avoid updating the abilist
+# files in /generic/, because these are kept empty.
+ifdef abilist-pattern
+update-all-abi-%: $(abilist-pattern) $(objpfx)%.symlist
+ $(update-all-abi)
+update-all-abi-%: $(abilist-pattern) $(common-objpfx)%.symlist
+ $(update-all-abi)
+endif
+update-all-abi-%: %.abilist $(objpfx)%.symlist
+ $(update-all-abi)
+update-all-abi-%: %.abilist $(common-objpfx)%.symlist
+ $(update-all-abi)
+define update-all-abi
+bash $(..)scripts/update-abilist.sh $^ \
+ $$(find $(..)sysdeps \
+ -regextype posix-egrep -regex '.*/$*([^a-z0-9].*)?\.abilist$$' \
+ \! -regex '.*/generic/.*')
+endef
+
+.PHONY: update-abi update-all-abi check-abi
update-abi: $(patsubst %.so,update-abi-%,$(install-lib.so-versioned))
+update-all-abi: $(patsubst %.so,update-all-abi-%,$(install-lib.so-versioned))
check-abi-list = $(patsubst %.so,$(objpfx)check-abi-%.out, \
$(install-lib.so-versioned))
check-abi: $(check-abi-list)
ifdef subdir
subdir_check-abi: check-abi
subdir_update-abi: update-abi
+subdir_update-all-abi: update-all-abi
else
check-abi: subdir_check-abi
if grep -q '^FAIL:' $(objpfx)*/check-abi*.test-result; then \
cat $(objpfx)*/check-abi*.out && exit 1; fi
update-abi: subdir_update-abi
+update-all-abi: subdir_update-all-abi
endif
ifeq ($(subdir),elf)
check-abi: $(objpfx)check-abi-libc.out
tests-special += $(objpfx)check-abi-libc.out
update-abi: update-abi-libc
+update-all-abi: update-all-abi-libc
common-generated += libc.symlist
endif
@@ -299,6 +299,7 @@ endif
check-abi: $(objpfx)check-abi-ld.out
tests-special += $(objpfx)check-abi-ld.out
update-abi: update-abi-ld
+update-all-abi: update-all-abi-ld
include ../Rules
new file mode 100644
@@ -0,0 +1,62 @@
+#!/bin/bash
+# Update abilist files based on differences on one architecture.
+# Copyright (C) 2015 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
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <http://www.gnu.org/licenses/>.
+
+set -e
+set -o pipefail
+export LC_ALL=C
+
+if test $# -lt 3 ; then
+ echo "usage: $0 OLD-FILE NEW-FILE FILES-TO-BE-PATCHED..." 1>&2
+ exit 2
+fi
+
+old_file="$1"
+shift
+new_file="$1"
+shift
+
+tmp_new_symbols="$(mktemp)"
+tmp_patched="$(mktemp)"
+
+cleanup () {
+ rm -f -- "$tmp_new_symbols" "$tmp_patched"
+}
+
+trap cleanup 0
+
+# -1 skips symbols only in $old_file (deleted symbols).
+# -3 skips symbols in both files (unchanged symbols).
+comm -1 -3 <(sort -u -- "$old_file") <(sort -u -- "$new_file") \
+ > "$tmp_new_symbols"
+
+new_symbol_count="$(wc -l < "$tmp_new_symbols")"
+if test "$new_symbol_count" -eq 0 ; then
+ echo "info: no symbols added" 1>&2
+ exit 0
+fi
+
+echo "info: $new_symbol_count symbol(s) added" 1>&2
+
+for to_be_patched in "$@" ; do
+ sort -u -o "$tmp_patched" -- "$to_be_patched" "$tmp_new_symbols"
+ if ! cmp -s -- "$to_be_patched" "$tmp_patched" ; then
+ echo "info: updating $to_be_patched" 1>&2
+ cp -- "$tmp_patched" "$to_be_patched"
+ fi
+done