From patchwork Tue May 21 15:44:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 90618 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EC4D8384AB40 for ; Tue, 21 May 2024 15:45:30 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id E21B0385841C for ; Tue, 21 May 2024 15:43:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E21B0385841C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E21B0385841C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716306190; cv=none; b=wY3yHVfIgK+usELKexS8TNrD8qNKt0Sz8ZANwxofUBYfw7kS2fe+miaqI91W45zEL6ftkuAzAxSZjXrWrLslu/3ZGf65JZGTaeR7HRqzYgWWlmH97Mp5iQjC+khPuafoO6wIPGg5PUW3bUHCb3JweZ+WvnCPHniYAOioxY8D1Z4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716306190; c=relaxed/simple; bh=PxU+6JTVcVwSHhoL9PNGr+Gg3OCs6TD7YnGcDDb/cMs=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=OYmu/51WKbc/CSudK7A0O8RAGpOChK6I7F24k4CyJc2swhSBAqqYNWEfLs9bAlENi1bts1rinRFeODe4HPRA4N351feRSoWedvbBEaGq7vJiLeUVD5HDxfGzs7QBaWAGa79E8ug+ODS7zLXcYGbVEShTgFjWk6er0+hMy5Dyx58= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 33D0421B4A for ; Tue, 21 May 2024 15:43:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716306185; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gFIIQKTGuyAgFKKwdIn9Vlv8YzFz5J+VpBGu4iuHW9g=; b=EAQ9k0gpUuoXLb5U8IWk8sac7cUqpx/n0MK2UsGyb75PlCRUE5KTxGKkAgdV7r1v/VP4+9 vuF7736uN6q70Aoum8Lvr3+bhka93l5y4OjaYG6ovMZa00Osk+HDQMNe5zxG2hMTA/+J9l GdSwoAsB0waOsnfnW5qEs6c1i7Q/LzU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716306185; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gFIIQKTGuyAgFKKwdIn9Vlv8YzFz5J+VpBGu4iuHW9g=; b=baE3Ka0BLkj8hJfWHXy6Pq4rmclAdhbDj7OEaNe+1Uwixqw+PtPluGJ7k6hgX1SxypVbP+ Gd7Jo/QTM5M8emCw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716306184; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gFIIQKTGuyAgFKKwdIn9Vlv8YzFz5J+VpBGu4iuHW9g=; b=idodbGG6R6mTvfGpg2lWEElBpnW/W/908ZjEAk6WXGE68u4Nxo/AWKAIi/cGtbMD1dYVPx o6uZvwCQ2gNNmqKeI2kJY1P79LpO/tuv1ggfqI+ctjGVT4rkfL7gKmdcbN3PCfZ8+uDTLH IsoHfbj5imPG5ILmRqi0N/MiGfVWHj0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716306184; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gFIIQKTGuyAgFKKwdIn9Vlv8YzFz5J+VpBGu4iuHW9g=; b=3HJy2ZbTJl4+r+oAqyNaB7uNsTW8AjFfMHezjgzRJxegX6y+q8oEjtUVxv6GDHy0eVnzgQ NYT3gOzs1ncw2CAg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 1ED1E13A79 for ; Tue, 21 May 2024 15:43:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id IH88BgjBTGbJGwAAD6G6ig (envelope-from ) for ; Tue, 21 May 2024 15:43:04 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 11/11] [gdb/testsuite] Don't use readelf in gdb/contrib/cc-with-tweaks.sh Date: Tue, 21 May 2024 17:44:15 +0200 Message-Id: <20240521154415.9543-11-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240521154415.9543-1-tdevries@suse.de> References: <20240521154415.9543-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-0.57 / 50.00]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; BAYES_HAM(-0.77)[84.35%]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -0.57 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Readelf is used in gdb/contrib/cc-with-tweaks.sh to find the .dwo files to put into a .dwp package. Usage a more basic method for this: assume a .dwo file for each .o file in the link line. Verified using shellcheck. PR/testsuite 31754 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31754 --- gdb/contrib/cc-with-tweaks.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gdb/contrib/cc-with-tweaks.sh b/gdb/contrib/cc-with-tweaks.sh index f760bd7c0a1..036f3e9d394 100755 --- a/gdb/contrib/cc-with-tweaks.sh +++ b/gdb/contrib/cc-with-tweaks.sh @@ -70,7 +70,6 @@ then fi OBJCOPY=${OBJCOPY:-objcopy} -READELF=${READELF:-readelf} DWZ=${DWZ:-dwz} DWP=${DWP:-dwp} @@ -280,14 +279,18 @@ elif [ "$want_multi" = true ]; then fi if [ "$want_dwp" = true ]; then - dwo_files=$($READELF -wi "${output_file}" | grep _dwo_name | \ - sed -e 's/^.*: //' | sort | uniq) + dwo_files=() + for arg in "$@"; do + if echo "$arg" | grep -Eq "\.o$"; then + dwo_files=("${dwo_files[@]}" "${arg/.o/.dwo}") + fi + done rc=0 - if [ -n "$dwo_files" ]; then - $DWP -o "${output_file}.dwp" ${dwo_files} > /dev/null + if [ ${#dwo_files[@]} -ne 0 ]; then + $DWP -o "${output_file}.dwp" "${dwo_files[@]}" > /dev/null rc=$? [ $rc != 0 ] && exit $rc - rm -f ${dwo_files} + rm -f "${dwo_files[@]}" fi fi