From patchwork Fri Nov 6 14:22:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 540998 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 23063140E62 for ; Sat, 7 Nov 2015 01:22:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=gdDq17jd; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:subject:to:references:cc:from:message-id:date :mime-version:in-reply-to:content-type; q=dns; s=default; b=mvU/ U+QkIJDTK2qM5Ov7nXj36r867i7FY5fKXcy79ko7z9y/Xg/e9ZDD95jH/PnlqLNH 757YKh9zkwnN1pF98GtGEPu1fQqX7DY4NO+vGttqvWy6gCCI0rq7ZvxCAAe61pVD krIUbpYyUiRPtlBLrnq8Sl3xt+orNCipqxI6sPc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:subject:to:references:cc:from:message-id:date :mime-version:in-reply-to:content-type; s=default; bh=Ff08TvLGCA krRYbIH6FrlhMzEZM=; b=gdDq17jd0QpV0lf6NbOKtW7xDqjeq5DPLV7H72IVHN zdNx9pWH9pC64vtZ5cfIbWsVzUYuVfFbz+3KwnwXB8LawH51JOEIfK6LkNN5n147 u7l+MSLh4tp1bGsjkTtNQidWxfr8ZS3F0emqDqTxgEakYxXop6iAdCh9fbX8qvxk Y= Received: (qmail 53585 invoked by alias); 6 Nov 2015 14:22:32 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 53575 invoked by uid 89); 6 Nov 2015 14:22:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL, BAYES_50, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Subject: Re: [PATCH] Implement "make update-all-abi" To: Roland McGrath References: <56326011.4030506@redhat.com> <20151105213958.DE5F02C3B4D@topped-with-meat.com> Cc: GNU C Library From: Florian Weimer X-Enigmail-Draft-Status: N1110 Message-ID: <563CB7A2.6050403@redhat.com> Date: Fri, 6 Nov 2015 15:22:26 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20151105213958.DE5F02C3B4D@topped-with-meat.com> On 11/05/2015 10:39 PM, Roland McGrath wrote: >> +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. “set -o pipefail” and the “<( ... )” construct. I got rid of both. >> + $$(find $(..)sysdeps \ >> + -regextype posix-egrep -regex '.*/$*([^a-z0-9].*)?\.abilist$$' \ >> + \! -regex '.*/generic/.*') >> +endef > > Why isn't this find just rolled into the script? I added a comment explaining its peculiarities. It is related to abilist-pattern, so I think its place is in Makerules. >> +if test $# -lt 3 ; then > > Use [ ... ] rather than test. No space before a ; like that. Okay. >> + echo "usage: $0 OLD-FILE NEW-FILE FILES-TO-BE-PATCHED..." 1>&2 > > Two-space indent. Okay. >> + 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. No, I have to keep the original file to avoid a /tmp race. And I think the additional message has some value. Florian 2015-11-06 Florian Weimer * 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. diff --git a/Makefile b/Makefile index 1d800e3..9a01c93 100644 --- a/Makefile +++ b/Makefile @@ -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 \ diff --git a/Makerules b/Makerules index 1329f73..fa24030 100644 --- a/Makerules +++ b/Makerules @@ -1347,25 +1347,54 @@ define update-abi fi endef -.PHONY: update-abi check-abi +# Patch all .abilist files for one DSO. The find command locates +# abilist files for all architectures. The regular expression in the +# find invocation is needed to separate libc.abilist and +# libcrypt.abilist, for example. It assumes that abilist-pattern, if +# set, is of the form "%-SUFFIX", and not "%SUFFIX", that is, there is +# a non-alphanumeric seperator between the pattern and the suffix +# added. The abilist files in /generic/ are filtered out because +# these are expected to remain empty. +define update-all-abi +$(SHELL) $(..)scripts/update-abilist.sh $^ \ + $$(find $(..)sysdeps \ + -regextype posix-egrep -regex '.*/$*([^a-z0-9].*)?\.abilist$$' \ + \! -regex '.*/generic/.*') +endef +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) + +.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 diff --git a/elf/Makefile b/elf/Makefile index 546c8eb..8341397 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -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 diff --git a/scripts/update-abilist.sh b/scripts/update-abilist.sh new file mode 100644 index 0000000..0c2d0ff --- /dev/null +++ b/scripts/update-abilist.sh @@ -0,0 +1,66 @@ +#!/bin/sh +# 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 +# . + +set -e +export LC_ALL=C + +if [ $# -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_old_sorted="$(mktemp)" +tmp_new_sorted="$(mktemp)" +tmp_new_symbols="$(mktemp)" +tmp_patched="$(mktemp)" + +cleanup () { + rm -f -- "$tmp_old_sorted" "$tmp_new_sorted" \ + "$tmp_new_symbols" "$tmp_patched" +} + +trap cleanup 0 + +sort -u -o "$tmp_old_sorted" -- "$old_file" +sort -u -o "$tmp_new_sorted" -- "$new_file" + +# -1 skips symbols only in $old_file (deleted symbols). +# -3 skips symbols in both files (unchanged symbols). +comm -1 -3 "$tmp_old_sorted" "$tmp_new_sorted" > "$tmp_new_symbols" + +new_symbol_count="$(wc -l < "$tmp_new_symbols")" +if [ "$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