From patchwork Sat Dec 16 04:01:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 179795 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp24146dyi; Fri, 15 Dec 2023 20:02:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFiTsGAsHn1e0HpZ7MnOCdMq8AQWEq3IoEsEeHcNMpGmjpaemH4lCNSe9M59jLmXKm9rM4M X-Received: by 2002:a05:6214:20c7:b0:67f:ef0:62ae with SMTP id 7-20020a05621420c700b0067f0ef062aemr5980633qve.55.1702699378243; Fri, 15 Dec 2023 20:02:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702699378; cv=pass; d=google.com; s=arc-20160816; b=s66oAJ6/g7THGRJLZgmLuXsx1sGcGZ7ng/9wVkEZHvuJIeZuWAhFMPVFr1WFc4Y0Z9 0u5h52sda/j+F0sWgsLpSvG5XBD9jd7fBkWqcFvlGWimZSVZp+i4duSzAIwoNDu6xuKu JyDI4brZlS+GkbACIhC+WJhvXeh/Y2wS/GBlQOoalUL6dSJufPdo/SLcRhBEQFCwMcBf GbtEb74pPduTU8BI4cGtsY0Q9mICStVNsvmp16WDN+c1ryzsGwskNx86jE+HxcPVT/CL yrOQtdAiC/tquh21pEX5BJLMH5NRW3aUwHbskQ/gb4MO+FInK7bRSbBtVLP70MOsBpep oWoQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=zKwc6K0/uNuDcBz+A3yuXJkamjTOvXisou2ZZPQqums=; fh=d+TQwzAhMuw8XrjvK0tKqhSe+zd/8lKafsfJRo0vBYo=; b=tdvmom9mo32vGNKzC3RJBf/iey6MgU7OzWkNyqjj5yNUZl3gahnppWLb/47YrTmGA1 xddSdRHzek1as8kLJQuRvnlcOUGnma5e/+J5Joasvde7T+Xn7zmSkp+b2QOj+DWwklj5 6uowOkwN+b2IJGcxA6dqUGXToLwql1xpdeqy223h4OTwzjqzrQz6Ss5yAERsRApZT87j gtT0l51GlKjNKjBNb8N/8Qy08mUoTHUapLMyi0qc9U367TvxtMrVSLI9T3xFn4mpofWI K4ZPh9sdWGMiOdV9pvA7/b1HKOgTcDryedAKpQOG7HE3PKNoXbHmOjYS3SR/npmzy3VC LfLQ== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id i6-20020a05620a248600b0077dce7488c4si9517428qkn.36.2023.12.15.20.02.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 20:02:58 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F1BCA3847711 for ; Sat, 16 Dec 2023 04:02:57 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id ACADF3858283 for ; Sat, 16 Dec 2023 04:02:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ACADF3858283 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org ACADF3858283 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699372; cv=none; b=bNYMg5dkPLvHCobUgJTdyBAI3YDvhPa3NnlZu2MT/Ql04TxBtt2egE6DC3qF8bFtCFGenq9qMtFyZVT/4uqWW6hxPT97KHg+UG/mfjYuwyfU2gyLS2TpSo6Anro1PlNIvm0x2nFO6s3JgF1mCTqwUUu1eLWA7vOxxN9nEa+0ktY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699372; c=relaxed/simple; bh=zL5Y6jU+L58qgsz1JDYH9umv6Py0zkk40OMeSCQFDjM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=oggN5YqpBouQM7evC/epgbRuKGWklg3xEajCCfLcBhtyYFemOGD8OEqlZ2bq7GgFsjRnPMT/gqoPS+RTmUQjumgaO5TQx4kCUEo6ojL5UzylEMUVJ4u5jxYI5ChjfFDfQqsfjF7t632OYiVlrGc8UUOlNhN7XORGYfw2ei+iz78= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: binutils@sourceware.org Cc: nickc@redhat.com, Vladimir Mezentsev Subject: [2.41 PATCH 01/10] gprofng: 30700 tmpdir/gp-collect-app_F test fails Date: Sat, 16 Dec 2023 04:01:24 +0000 Message-ID: <20231216040239.1981071-2-sam@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216040239.1981071-1-sam@gentoo.org> References: <20231216040239.1981071-1-sam@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785409703602921617 X-GMAIL-MSGID: 1785409703602921617 From: Vladimir Mezentsev gprofng/ChangeLog 2023-08-03 Vladimir Mezentsev PR gprofng/30700 * testsuite/gprofng.display/gp-collect-app_F.exp: Fix -name argument for sub-experiment filtering. (cherry picked from commit e0282cf1284b4d358892427a6b4f60d6f4c0580b) --- gprofng/testsuite/gprofng.display/gp-collect-app_F.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gprofng/testsuite/gprofng.display/gp-collect-app_F.exp b/gprofng/testsuite/gprofng.display/gp-collect-app_F.exp index f791b0f7a95..02bcc8e5b49 100644 --- a/gprofng/testsuite/gprofng.display/gp-collect-app_F.exp +++ b/gprofng/testsuite/gprofng.display/gp-collect-app_F.exp @@ -46,11 +46,11 @@ proc run_gp_collect_app { subExpCnt F_opt } { return -code break } - set output [run_native_host_cmd "find $tdir -name '*x1.er' | wc -l"] + set output [run_native_host_cmd "find $tdir -name '*_x?.er' | wc -l"] set subExp [lindex $output 1] if { $subExp != $subExpCnt } then { set out [lindex $output 1] - send_log "Test failed for -F $F_opt. subExp=$subExp. Shold be $subExpCnt\n" + send_log "Test failed for -F $F_opt. subExp=$subExp. Should be $subExpCnt\n" fail $tdir return -code break } From patchwork Sat Dec 16 04:01:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 179797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp24452dyi; Fri, 15 Dec 2023 20:03:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IFxhbrBmvXGyHFz8lu7rEec+yysNgGxxPGI7/pATN0tCr+Nuzg4ltsuYCN2HsFVGZI+b7q9 X-Received: by 2002:a05:620a:4953:b0:77e:fdcb:780f with SMTP id vz19-20020a05620a495300b0077efdcb780fmr13895489qkn.68.1702699434183; Fri, 15 Dec 2023 20:03:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702699434; cv=pass; d=google.com; s=arc-20160816; b=uF0GX1md5JADhgYERt5gWQXgTHDaEMZE+CQsbZjmoTt7x95Ri3iW3m4272ucO5h0mj UORDfzQpwkJL7+HaMJl0xW4nnT94a+Vg4ZJVdfbOOmmWWTIlnEJw1thTgjGbzOhQPnzt FENXoMuSI83vkSkpj06lXfsN6NpmXQOGHlsmApm74mZ5D3v/bHcDA9HRl9e0REwBcvfl x/3a3ZFPhzwJOdRPb2zr69CXK+E9WpW2d4aHDL80ygT8x0Q3auGf53mpntgxKgWrmq0z X+378EfwtPqtPiV+x0xxe4FwkEBiIW9LzqKhiBysWqqP5rKY6b6oN5fYcJyyt18Wb3jO BDMQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=jxv732UoXD4CxnRhV88S2bIsN/3+Vl6d5rWIhVNO1dI=; fh=K6PyHuw3ZXsdAJsiwR1V00MJz/XCQlRStXtMmfw3mzI=; b=iRzhJDrlSF2KnxbsYQ2GYqvNvznC0iL8KSWttkIJ9EkC/HFQTUBT8/VRwacZgtPvnB 5SjdduAvDA6eLL9pjoMPq2HMg2x+52NPQe3KMITMUHpcrEbpVStPMpZiDLyffsifL1Sg IuJ6MvW/SAYXkxR0pXmbMgJrsGRLyq/H0xVBmw4r103NWXCqnEsF4WbQmtvp1kaMIfS3 TMB9/GFQEPRnEnWIslx5Fii6nl8zKzffN4Cczf+0iMVLil7a9PRSoXkuxbzVlQ5TWk7X TgGcv04CR3cNpJCscQoEyWNhI44wULHBGAtGCnb7fR2Bl4j009gdqS09PvZ+LOxkGRmf 8mYA== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id bp8-20020a05620a458800b007770c0ebe08si20953759qkb.14.2023.12.15.20.03.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 20:03:54 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ACAA63830B42 for ; Sat, 16 Dec 2023 04:03:32 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id B06323857C5B for ; Sat, 16 Dec 2023 04:02:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B06323857C5B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B06323857C5B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699375; cv=none; b=WgZDWzSO9ZP2PaedO5gcNZywI/ebJldaFZNYYPDqc2EmX0g7LwmQ3IRIbO+ue2YWfdtOqmOP8OI6EiefPz8Yf78kwaYw7aqfxuxzXzQLiYIAoW9V+IOZNin7wqbd95D3QI4f6Dns0AZxW51vt2EVvZDT5pqvQKQewP9ndgdCVM0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699375; c=relaxed/simple; bh=mzPS82dSUB/AGKyvJ5OL95RdxS87it+SsClrrTyxG7E=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=bBD/jCKo9jXIBOraj/tnZtl8qFeqn8jrHN/B9/AMqMkedDWRuxmqZg5Y/MZXvQ1cJPwHPOObzBlWIOE4CItlbfguLNw7i1jfljGqxjgETJubosqzo6whBMROiqxO9tIe56VDHrPHIfDDGfrbQkeJwuEJmVEVd10qc4y9oO780pg= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: binutils@sourceware.org Cc: nickc@redhat.com, "H.J. Lu" Subject: [2.41 PATCH 03/10] ld: Build libpr23169a.so with -z lazy Date: Sat, 16 Dec 2023 04:01:26 +0000 Message-ID: <20231216040239.1981071-4-sam@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216040239.1981071-1-sam@gentoo.org> References: <20231216040239.1981071-1-sam@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785409762062669958 X-GMAIL-MSGID: 1785409762062669958 From: "H.J. Lu" pr23169b test only works with lazy binding. To work with linker which disables lazy binding by default, build pr23169b binaries with -z lazy. PR ld/30698 * ld-ifunc/ifunc.exp: Build pr23169b binaries with -z lazy. (cherry picked from commit 51dd9e7c4cab13748f31f6575aed0672f03d6710) --- ld/testsuite/ld-ifunc/ifunc.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp index edabcc3f744..2bf656e73b2 100644 --- a/ld/testsuite/ld-ifunc/ifunc.exp +++ b/ld/testsuite/ld-ifunc/ifunc.exp @@ -604,7 +604,7 @@ run_cc_link_tests [list \ ] \ [list \ "Build libpr23169a.so" \ - "-shared" \ + "-shared -Wl,-z,lazy" \ "-fPIC -O2 -g" \ { pr23169a.c } \ {} \ @@ -751,7 +751,7 @@ run_ld_link_exec_tests [list \ ] \ [list \ "Run pr23169b" \ - "-pie -Wl,--no-as-needed tmpdir/libpr23169a.so" \ + "-pie -Wl,--no-as-needed,-z,lazy tmpdir/libpr23169a.so" \ "" \ { pr23169b.c pr23169c.c } \ "pr23169b" \ From patchwork Sat Dec 16 04:01:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 179799 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp24516dyi; Fri, 15 Dec 2023 20:04:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IH19eul59WUNbZbyI27O8blRIyfTzx2yK9zmuLBQYo6gBFvbbPBYgSmFT3KSVq9NFuPd+76 X-Received: by 2002:a05:622a:10e:b0:425:4054:bc48 with SMTP id u14-20020a05622a010e00b004254054bc48mr19259380qtw.36.1702699444123; Fri, 15 Dec 2023 20:04:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702699444; cv=pass; d=google.com; s=arc-20160816; b=V7lCGfLwSpnHyvv2/IPHw2X5VQGpyhyKK00+8hIA+WnIWEPCawv13xM1sqRRcNvevj QMALSGugdKGaXL/MYOtl95vIH9GhDNN7HWeOUeVXTKOabarShUkqYFBOQoG1Yz+b5vFV g5wCK+YbylBYfH4QIlT+V6vtjVZC3gLYoQzJDpWk4+t2HoHBQY4fT4n5MjND6O/FCAqR rCBk4hUq1IeEWCapZe81AdSkDkmDM1txluyFv6yqwSkqcIdH9tyxeGkY5J0qgYJzuJAb 7/H54nj5fDc4mnLXC4wBwj1bOB+ET8VWm47eflGi9EpmnDI2sJYox9+qyrSwGsMpgPNE bHYw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=izicJi7ZspiGmRv07W3w/T1W2NbdwlEiJnLfPpTduQg=; fh=8q0FNsHanCJPI6EPxbmjnCgcUOgjtP8i5rHqen9ihv0=; b=KWtiS7afYU/IqNsF211YadekqDSgJibpC2FM4FhHLTM9y663MpMkUfyclFho2VVwvw TWqgJ3x7bTuLmtnzPQgGIyM1piP7FVhMjztMCxe+fnS2rmq3pwltTr//tLPJG9rJKxXC FGDPTbiZv9gYBhMNCbVZtFnvogcMyTGXc+mBnbrN0W7Pd1CriWgUG9DSolLYI/zHfy/s iyUv+sLqGlJ08akDXXFndzcuNQQats2Df2Hci3oiXLjgo6i8bgVqB1SnP7T4sf+Sy3s0 lyF4M9X0Yag+JNsiyv+kRhJZ+xNNu3S5g6RBLCWNdoDDciALed+uNWd++dy9KcFCqgPN nEiQ== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id fk13-20020a05622a558d00b0042543c28f0esi20596066qtb.418.2023.12.15.20.04.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 20:04:04 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 805333881D2F for ; Sat, 16 Dec 2023 04:03:39 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 0FD803857720 for ; Sat, 16 Dec 2023 04:02:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0FD803857720 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0FD803857720 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699377; cv=none; b=HvReynBd6IqOPcgzD6I3vwWYsw79vIcLu1yf73G2occkM9WDl7eB2aXqDQWjcS9Q813yB2mavDPGHSWw/DyD/QqDikHWn09E+LixOzrEdP/FXdd9BxXq5fUMcJ0UTtSrX7WdLv5t9k4aziJF+Kjgyb/4RY31mknzfKsOeJm7/yE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699377; c=relaxed/simple; bh=rdIdjupruHs5ipXn5Wu+XfRsUmshn68gQyGQrDszvPY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=qqUYyOz4uJGv6OaSpf7bl0Kgqrvulf+5RTILESkLBFXmH9Tps5e8L7HPRd7JowIEktVpp2d2mx2KpX41Mbw2rcYD6BSmx6iU+i+qGTbQ/5iN/XSpvxC31LjqdJjUZ9ERjn251xbcZ1IJGaAktbds7Knn2T5z+s2mK6OyVytBUvU= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: binutils@sourceware.org Cc: nickc@redhat.com, Sam James Subject: [2.41 PATCH 05/10] ld: Fix retain7a.d XFAIL/notarget entry for hppa Date: Sat, 16 Dec 2023 04:01:28 +0000 Message-ID: <20231216040239.1981071-6-sam@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216040239.1981071-1-sam@gentoo.org> References: <20231216040239.1981071-1-sam@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785409771896305393 X-GMAIL-MSGID: 1785409771896305393 PR 30733 * ld/testsuite/ld-elf/retain7a.d: Fix XFAIL entry for hppa to match hppa{1.1,2.0}*, like hppa2.0-unknown-linux-gnu which Gentoo uses. Signed-off-by: Sam James (cherry picked from commit e3b66187192ce6840df283c00f6395bb0ff15cf5) --- ld/testsuite/ld-elf/retain7a.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ld/testsuite/ld-elf/retain7a.d b/ld/testsuite/ld-elf/retain7a.d index 314fe0f5733..38d9a9ba255 100644 --- a/ld/testsuite/ld-elf/retain7a.d +++ b/ld/testsuite/ld-elf/retain7a.d @@ -2,7 +2,7 @@ #source: retain7.s #ld: -e _start --gc-sections # hppa-linux chooses ELFOSABI_GNU regardless of GNU feature use -#notarget: ![supports_gnu_osabi] ![check_gc_sections_available] hppa-*-linux* +#notarget: ![supports_gnu_osabi] ![check_gc_sections_available] hppa*-*-linux* #readelf: -h #failif From patchwork Sat Dec 16 04:01:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 179802 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp24821dyi; Fri, 15 Dec 2023 20:04:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IFHTDbPi1smwaUe7AGs8oyUeJRQi7/U8hjZz06HUpskr2g+WbPFzkanwC+2sVZOyBMe2D97 X-Received: by 2002:a05:622a:1102:b0:418:2268:992b with SMTP id e2-20020a05622a110200b004182268992bmr18020082qty.14.1702699497518; Fri, 15 Dec 2023 20:04:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702699497; cv=pass; d=google.com; s=arc-20160816; b=s4b+YdK6Tt5XqD7geAota5YXz5G+DVsczKWvJa+xKlN1kOt15O1mCSCozdoC6LjGr6 btUBZLBu036P9zxPBNGCKkfev+6SkbPxkVp7+uRbXAIGRyMKPqRvmftmnAwLyrTsoiut xbgc27Ssr084Ulh9RI2M3S63Gmnljf+ydB4hiT2CV5AsDADQU2fvdmlXOLXXjySTjEIU ToWvjtXub6NrBuh8/BzjkGkHJwV9AnqrbG59ef3iM16s+2JHVZBxCMlnlXz4JyetG83p cBr9X+985WQXjzyAYw9cjtrxhw6Hl/LM5ivDKe9TVUOGfVNkNdLJWgmwZwOOnosAB07s kIFA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=3Ycj+tZ2wRzRbQnpVYVHNIK/4SxNyZHTasQwmKtogfY=; fh=8q0FNsHanCJPI6EPxbmjnCgcUOgjtP8i5rHqen9ihv0=; b=x/qw+f3ChUPnF3Wk72UVC1sUuwx9sJirIaS/rCdBtWPGQF49dzFtkhKmgfcw0y0QPQ y5zJHPXXifvHn2qAbURZQPz6tJLQyUGJG2Rw/ryifXdm0WCzbrvPfK1mBAkCPFoXorHx +sDVXw/XZttB3ssIMrfOSLmErzgE6w1uLGlubqRuVy61qV3e30ENAp//kMvr560jRAeb hqXTcDu1j0DYdyJg0LlkAaEWa3luobd/AiA5pY3gPzflX5mH1kupNZR2/BH+QYaic5/c 9zrDkTHgnp+XE1UAOLxFK4n8+aDMzucyg6GbL4sFkoteHOAr/XCAHGjdFaONyuKG1OMY BwEg== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id w13-20020ac857cd000000b00425dd10da3fsi9568611qta.25.2023.12.15.20.04.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 20:04:57 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 201DA383A612 for ; Sat, 16 Dec 2023 04:04:11 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id E64963857833 for ; Sat, 16 Dec 2023 04:02:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E64963857833 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E64963857833 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699378; cv=none; b=RQcn2QRhPyzDZHkho374hbBKF3AODED4xPIYAfZnlIb2y+7K5B81GtH7HFgLq1A7Iem/lrPmOA6RQMyF20ISNF3gfbZNuNEX5ctAIfFsNQ7tW+2+29vVc/d5VgmPffVmUB4NbaKgikc5s4vL2InZbOkGdGMiFCPs8r7XmjhAEic= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699378; c=relaxed/simple; bh=dOFjhHpd0L665PNzlHtE8Sv0LrUSO0oJgxV/TiwKQTU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=tsiqAH3B9pAuIR1D47jNbfMfhYwCA25UJoh5E+1Helk61HkimoK0c+hKyUrOl0ovxVh98YpgzBxr78s8iRWO/wq+t/tISP/b2thKpCJLGWuPKc/DhaKljG8QNPFUUe037vzz4srmNo4VXv4jPOxyx5fBYOjzUZA6Al7ehC6vAJA= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: binutils@sourceware.org Cc: nickc@redhat.com, Sam James Subject: [2.41 PATCH 06/10] ld: fix relocatable, retain7a target pattens for HPPA Date: Sat, 16 Dec 2023 04:01:29 +0000 Message-ID: <20231216040239.1981071-7-sam@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216040239.1981071-1-sam@gentoo.org> References: <20231216040239.1981071-1-sam@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785409828415853287 X-GMAIL-MSGID: 1785409828415853287 Fix issue reported by Dave and Alan. Put back the old pattern for hppa-*-linux* and add hppa[12]*-*-linux* to cover Gentoo's hppa1.1 and hppa2.0 without including hppa64 inadvertently like I did before. ld/ PR 30733 PR 30734 * ld/testsuite/ld-elf/relocatable.d: Use better pattern to exclude hppa64 but include hppa1.1, hppa2.0. * ld/testsuite/ld-elf/retain7a.d: Ditto. Fixes: 0e339f6b4f2df25ed351cb94dc7fe16868626f49 Fixes: e3b66187192ce6840df283c00f6395bb0ff15cf5 Signed-off-by: Sam James (cherry picked from commit 3b23a5ea693deee60648c9a9e9d666d83549298e) --- ld/testsuite/ld-elf/relocatable.d | 2 +- ld/testsuite/ld-elf/retain7a.d | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/testsuite/ld-elf/relocatable.d b/ld/testsuite/ld-elf/relocatable.d index cb39baa52bc..33a04912fd0 100644 --- a/ld/testsuite/ld-elf/relocatable.d +++ b/ld/testsuite/ld-elf/relocatable.d @@ -2,7 +2,7 @@ #source: simple.s #ld: -r -T relocatable.t #readelf: -S --wide -#xfail: hppa*-*-* +#xfail: hppa-*-* hppa[12]*-*-* #... \[[ 0-9]+\] \.text.*[ \t]+PROGBITS[ \t]+0+800000[ \t0-9a-f]+AX.* diff --git a/ld/testsuite/ld-elf/retain7a.d b/ld/testsuite/ld-elf/retain7a.d index 38d9a9ba255..406aaa40ad5 100644 --- a/ld/testsuite/ld-elf/retain7a.d +++ b/ld/testsuite/ld-elf/retain7a.d @@ -2,7 +2,7 @@ #source: retain7.s #ld: -e _start --gc-sections # hppa-linux chooses ELFOSABI_GNU regardless of GNU feature use -#notarget: ![supports_gnu_osabi] ![check_gc_sections_available] hppa*-*-linux* +#notarget: ![supports_gnu_osabi] ![check_gc_sections_available] hppa-*-linux* hppa[12]*-*-linux* #readelf: -h #failif From patchwork Sat Dec 16 04:01:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 179798 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp24461dyi; Fri, 15 Dec 2023 20:03:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IFi4URpps9fqA1pJ1rK4W3YPE3iDo/GHKAJUxJQwNPFXrrdNbEQsy5WqXyz8HjKh2uEious X-Received: by 2002:a05:622a:54c:b0:425:9561:4308 with SMTP id m12-20020a05622a054c00b0042595614308mr20138222qtx.122.1702699435738; Fri, 15 Dec 2023 20:03:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702699435; cv=pass; d=google.com; s=arc-20160816; b=qfeHCZMDuRcn+7xCPRYBxvwUln3rlAeYJGKRh0ZDHBfVune4INIZk5lHxGVbm8jINl kL10Hb7LX46RX3Dxq1hv1SGkSVUQHqzIVEiRZL8tXRGephFTRXxF6Kp9mbztCmeU/aRF H/j6/JKvZ7IWHZuvmdX1vJfj4Ulndhj5ziOOgvz1S4YesXHOAGmVWvr24Qar6yBSr28a Sf1D6RVAd/RaZa7eUjcAZHcdx4wmNILiMGXaFStp/9UL2vjF+jJo/z0raGReIyDKRnr8 8m0q+5pWCTmhqLDd5d5ezpcFNmqC2O8tojHNSaykxbAVtYgzbpYXcqRyZVkm3yiFiX2w dvBg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=IXgjzmyt9kGE1FbsvHcsF1uSYy160EhffkP9Lt/+gfc=; fh=8q0FNsHanCJPI6EPxbmjnCgcUOgjtP8i5rHqen9ihv0=; b=ENJZsrNpti292XarFE+EVrHFRJHiVzTcaRRd074+sMWU+9BP8iYrFbmaL0XLsXb0mi vrIOV3wljQMagCuPAUJvARRNEnRHQUurIoZ+5KA655AVDqpmDtRf1eIQXFL3Ib0U/1jL deZnshRNEDlLdb3bysrC4/HDZReE6qEtUN50IwoKFrL0jA3EWiRSvsr4yKSwm1RLAGLA X4qzImeOB8lRoTbG4O8DWj43f6touxzX/+OAXu3/JibcMPINhNR7ehLwwoPRp5039Vl6 oTtw9GEOGDXRbNrqznms0gFhe/8CBT/O5J8KK3cWruYKniJgXbvZTDlxTp+Kj6rfaxRF nDaw== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id bn3-20020a05622a1dc300b00423d64d4491si19973862qtb.71.2023.12.15.20.03.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 20:03:55 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1CBB83875DF5 for ; Sat, 16 Dec 2023 04:03:34 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 1E9AC3847738 for ; Sat, 16 Dec 2023 04:02:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1E9AC3847738 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1E9AC3847738 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699379; cv=none; b=dEF8DHPMlhJP9uQX6KPBSAaI1F7zLTQ4yNjuGdJ1edyfom0XlXYiuC54L0scB6C6uZROcRRHhfFcC/zOaz9vTi9pCHf5p411Y+jsAvPsULSXhZo/wbWAas1Dl0qrFvGjhzsysUhBCk9xTnoWP6nndPWRIMMP/vkyD0sJB2NH2Nk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699379; c=relaxed/simple; bh=oQ+NxnJqUXqvalnWeGmfe/2ZNP6nBB+MxigoOdis0Xo=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=SbLx7efhHb2CPqdTYnxpTwSqVB/lwdOZ8BNOXpih0zJOsxcear1q9HvS0+JrfSe3dfbyEA1OAZgh8QOfJNeY7j86Vk/1gvbZa8Yer7h+YQt+UB2f6to3r+gY+OgeCR+wvsrEaKOp3k+R+2Z/bMHAjwURxGr4S33xcIirxqrOLvI= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: binutils@sourceware.org Cc: nickc@redhat.com, Sam James Subject: [2.41 PATCH 07/10] ld: ld-lib.exp: log failed dump.out contents for debugging Date: Sat, 16 Dec 2023 04:01:30 +0000 Message-ID: <20231216040239.1981071-8-sam@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216040239.1981071-1-sam@gentoo.org> References: <20231216040239.1981071-1-sam@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785409763435910560 X-GMAIL-MSGID: 1785409763435910560 If we're using dump_prog in a test which fails, log the dump.out contents to ld.log to aid debugging. This avoids needing to ask reporters to manually run e.g. `objdump` commands when making bug reports. PR30722 * ld/testsuite/lib/ld-lib.exp: Log failed dump.out contents to aid debugging. Approved-by: Nick Clifton Signed-off-by: Sam James (cherry picked from commit 646657284f6b62a71a6869826e951b3def4d73a6) --- ld/testsuite/lib/ld-lib.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 918464069a9..aca303e0728 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -640,7 +640,7 @@ proc run_ld_link_tests { ldtests args } { remote_upload host "dump.out" if { [regexp_diff "dump.out" "$srcdir/$subdir/$dumpfile"] } then { - verbose "output is [file_contents "dump.out"]" 2 + verbose -log "output is [file_contents "dump.out"]" 2 set failed 1 remote_file build delete "dump.out" remote_file host delete "dump.out" @@ -1067,7 +1067,7 @@ proc run_cc_link_tests { ldtests } { } if { [regexp_diff "dump.out" "$srcdir/$subdir/$dumpfile"] } then { - verbose "output is [file_contents "dump.out"]" 2 + verbose -log "output is [file_contents "dump.out"]" 2 set failed 1 break } From patchwork Sat Dec 16 04:01:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 179796 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp24346dyi; Fri, 15 Dec 2023 20:03:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEceF1rXfM2e5l2Lh7cjakdkyVnZNmw8wAoDND8s9tXfG0SAPsR8oOK3UNRgLgWwiDcuLEu X-Received: by 2002:a05:622a:148c:b0:423:a4f0:382 with SMTP id t12-20020a05622a148c00b00423a4f00382mr20375096qtx.21.1702699416360; Fri, 15 Dec 2023 20:03:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702699416; cv=pass; d=google.com; s=arc-20160816; b=Crlcn5Yuz0xVXGnRrjNed8wPM+w3fgmc1LNRs5WWSaff2R92OfiGBmHARzBvVmmKJV lKpdyLqPWkzGfI+m3gKbooEWY4o7N5vAWZAL9fDMSFGM0zd61VJzVi8YSXxzN98qcEZ1 AWcOZsfcnclk3fvLZCj3QzKMLs+neUoXMbJi3XXkQqVemtEr/N448rZ8YzTUaiMrFIcu lupqHtnwrERNTbafRP9bklxSaSTH4xvzCvxVqjg77UYNU7pslfW+TftZrj0bNDdkrr2v HhrUXkgWzg1BJwmvJI1eEj49yJMyBaD0L6927SOgFP/8KO4rTjpM7AURL8vzbUq97jZw RUAA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=EbKBiFvdmUiz71wrEkpb6t9w2pjFr1aIaYz522d0HBg=; fh=xsOM88MzmEemLwX/Wnuw/FLLO3oL1Qpa4z+O9VYr3To=; b=PWAgkyJcIq8InpkeCpFMEWzzGub1TPDUfDgdahu0t58xWF0dKOJTurUuCEqlcY1iGu 63YIHPFysrmbyr2OvUGYwx9JrOjEHFc8lWnVK21p4w+pbHwBbbEdUxZly1fgYaNyJP/b hHifPtxVfkCXMV+ffO5H8/MYaiD+4nkuV9Hhhne+cnWptaPa5NbkA1sOkbjLP0L0C1J1 oDEqA2D9PODNhzi+XPP3xi7Rf8MUiPXak0KfCbIhhHQS1oFKkEF2b6vl1RkJ2QM7m2Gq mQ8WvNv+wteHBlL1vJ0JFXYWpbdxlW7iqxa1f9KQZdphZv7Jje6ITnLLjbK8Lbcfz+cz pUcw== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id fw7-20020a05622a4a8700b00407dd1bbbf5si19843693qtb.368.2023.12.15.20.03.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 20:03:36 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E4D0B385803F for ; Sat, 16 Dec 2023 04:03:23 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 26D193857C77 for ; Sat, 16 Dec 2023 04:03:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 26D193857C77 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 26D193857C77 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699382; cv=none; b=dCneW+S2lAB9AEYgiUQTQh9xeWlSxQACXBQPMOmrCzNfshuferZHRpkJEoNoU+Rz6yKSz+cf9vx2JsfsSmgL51HKG54nY/yYZnBxKNWUq/pHid3ymX8yZBMUBBCygymv2nAhln5CGRwTMmy3qcHZK+yVS4YvexTHgcRmLvtRBXo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699382; c=relaxed/simple; bh=mw8C8sp7bUFQvOEdtTaMeOCHxr+uK5MCVP5NHMq0cWI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=cpHv92R3PgszOVcYao87EhElAxdN1F+gKdDhJI7cBFE1b+QuYIUQcpa6BGkjzuhWwm9ETYHjl51yRsFet1NwtiAH9VF30Y/k1tqmTWdFLZ0uqeWqXlEI5i3Wk8zjevOnai5POCNUoETqK2XuHT4K16JQ1oATpK2AOJatYV4RtTo= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: binutils@sourceware.org Cc: nickc@redhat.com, Jan Beulich Subject: [2.41 PATCH 08/10] ld/x86: reduce testsuite dependency on system object files Date: Sat, 16 Dec 2023 04:01:31 +0000 Message-ID: <20231216040239.1981071-9-sam@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216040239.1981071-1-sam@gentoo.org> References: <20231216040239.1981071-1-sam@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785409743219768394 X-GMAIL-MSGID: 1785409743219768394 From: Jan Beulich PR ld/30722 Tests looking for certain .note-section recorded properties may not involve object files from the underlying platform (e.g. via using the C compiler for linking): Such object files may themselves have similar note sections, and hence they may influence the overall outcome. For now convert just the tests known to be affected by crt*.o coming with "ISA v3 needed" notes. Eventually other tests ought to be converted, too. (cherry picked from commit eab996435fe65a421541f59557c5f1fd427573a3) --- ld/testsuite/ld-x86-64/property-stk.s | 25 +++ .../{property-x86-1.S => property-x86-1.s} | 15 +- .../{property-x86-2.S => property-x86-2.s} | 15 +- ld/testsuite/ld-x86-64/x86-64.exp | 170 +++++++++--------- 4 files changed, 131 insertions(+), 94 deletions(-) create mode 100644 ld/testsuite/ld-x86-64/property-stk.s rename ld/testsuite/ld-x86-64/{property-x86-1.S => property-x86-1.s} (75%) rename ld/testsuite/ld-x86-64/{property-x86-2.S => property-x86-2.s} (70%) diff --git a/ld/testsuite/ld-x86-64/property-stk.s b/ld/testsuite/ld-x86-64/property-stk.s new file mode 100644 index 00000000000..b3c7c4ee7af --- /dev/null +++ b/ld/testsuite/ld-x86-64/property-stk.s @@ -0,0 +1,25 @@ + .ifdef __64_bit__ + .equ ALIGN, 3 + .else + .equ ALIGN, 2 + .endif + + .section ".note.gnu.property", "a" + .p2align ALIGN + .long 1f - 0f /* name length. */ + .long 3f - 1f /* data length. */ + /* NT_GNU_PROPERTY_TYPE_0 */ + .long 5 /* note type. */ +0: + .asciz "GNU" /* vendor name. */ +1: + .p2align ALIGN + /* GNU_PROPERTY_STACK_SIZE */ + .long 1 /* pr_type. */ + .long 5f - 4f /* pr_datasz. */ +4: + .dc.a 0x800000 /* Stack size. */ +5: + .p2align ALIGN +3: + .section .note.GNU-stack diff --git a/ld/testsuite/ld-x86-64/property-x86-1.S b/ld/testsuite/ld-x86-64/property-x86-1.s similarity index 75% rename from ld/testsuite/ld-x86-64/property-x86-1.S rename to ld/testsuite/ld-x86-64/property-x86-1.s index 6d1d8fbaef5..3e3f707bacc 100644 --- a/ld/testsuite/ld-x86-64/property-x86-1.S +++ b/ld/testsuite/ld-x86-64/property-x86-1.s @@ -1,8 +1,9 @@ -#ifdef __LP64__ -# define ALIGN 3 -#else -# define ALIGN 2 -#endif + .ifdef __64_bit__ + .equ ALIGN, 3 + .else + .equ ALIGN, 2 + .endif + .section ".note.gnu.property", "a" .p2align ALIGN .long 1f - 0f /* name length. */ @@ -24,14 +25,14 @@ .long 0xc0010002 /* pr_type. */ .long 5f - 4f /* pr_datasz. */ 4: - .long 0xa + .long 0xa /* GNU_PROPERTY_X86_ISA_1_V2 | GNU_PROPERTY_X86_ISA_1_V4 */ 5: .p2align ALIGN /* GNU_PROPERTY_X86_ISA_1_NEEDED */ .long 0xc0008002 /* pr_type. */ .long 5f - 4f /* pr_datasz. */ 4: - .long 0x3 + .long 0x3 /* GNU_PROPERTY_X86_ISA_1_BASELINE | GNU_PROPERTY_X86_ISA_1_V2 */ 5: .p2align ALIGN 3: diff --git a/ld/testsuite/ld-x86-64/property-x86-2.S b/ld/testsuite/ld-x86-64/property-x86-2.s similarity index 70% rename from ld/testsuite/ld-x86-64/property-x86-2.S rename to ld/testsuite/ld-x86-64/property-x86-2.s index 613d5b21ce7..2c3b303f7ee 100644 --- a/ld/testsuite/ld-x86-64/property-x86-2.S +++ b/ld/testsuite/ld-x86-64/property-x86-2.s @@ -1,8 +1,9 @@ -#ifdef __LP64__ -# define ALIGN 3 -#else -# define ALIGN 2 -#endif + .ifdef __64_bit__ + .equ ALIGN, 3 + .else + .equ ALIGN, 2 + .endif + .section ".note.gnu.property", "a" .p2align ALIGN .long 1f - 0f /* name length. */ @@ -17,14 +18,14 @@ .long 0xc0010002 /* pr_type. */ .long 5f - 4f /* pr_datasz. */ 4: - .long 0x3 + .long 0x3 /* GNU_PROPERTY_X86_ISA_1_BASELINE | GNU_PROPERTY_X86_ISA_1_V2 */ 5: .p2align ALIGN /* GNU_PROPERTY_X86_ISA_1_NEEDED */ .long 0xc0008002 /* pr_type. */ .long 5f - 4f /* pr_datasz. */ 4: - .long 0xa + .long 0xa /* GNU_PROPERTY_X86_ISA_1_V2 | GNU_PROPERTY_X86_ISA_1_V4 */ 5: .p2align ALIGN 3: diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 1a10c395b5c..123152df5b0 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -1091,86 +1091,6 @@ if { [isnative] && [check_compiler_available] } { {{readelf {-n} property-2.r}} \ "property-2.so" \ ] \ - [list \ - "Build property 3" \ - "" \ - "-Wa,-mx86-used-note=yes" \ - {pass.c property-stack.S property-x86-1.S} \ - {{readelf {-n} property-3.r}} \ - "property-3" \ - ] \ - [list \ - "Build property 3 (.o)" \ - "-r -nostdlib" \ - "-Wa,-mx86-used-note=yes" \ - {pass.c property-x86-1.S property-stack.S} \ - {{readelf {-n} property-3a.r}} \ - "property-3.o" \ - ] \ - [list \ - "Build property 3 (.so)" \ - "-shared" \ - "-fPIC -Wa,-mx86-used-note=yes" \ - {property-x86-1.S pass.c property-stack.S} \ - {{readelf {-n} property-3.r}} \ - "property-3.so" \ - ] \ - [list \ - "Build property 4" \ - "" \ - "-Wa,-mx86-used-note=yes" \ - {pass.c property-stack.S property-x86-1.S property-x86-2.S} \ - {{readelf {-n} property-4.r}} \ - "property-4" \ - ] \ - [list \ - "Build property 4 (.o)" \ - "-r -nostdlib" \ - "-Wa,-mx86-used-note=yes" \ - {pass.c property-x86-2.S property-x86-1.S property-stack.S} \ - {{readelf {-n} property-4a.r}} \ - "property-4.o" \ - ] \ - [list \ - "Build property 4 (.so)" \ - "-shared" \ - "-fPIC -Wa,-mx86-used-note=yes" \ - {property-x86-2.S property-x86-1.S pass.c property-stack.S} \ - {{readelf {-n} property-4.r}} \ - "property-4.so" \ - ] \ - [list \ - "Build property 4 (-Wl,-z,stack-size=0)" \ - "-Wl,-z,stack-size=0" \ - "-Wa,-mx86-used-note=yes" \ - {pass.c property-stack.S property-x86-1.S property-x86-2.S} \ - {{readelf {-n} property-4.r}} \ - "property-4" \ - ] \ - [list \ - "Build property 5" \ - "-Wl,-z,stack-size=0x900000" \ - "-Wa,-mx86-used-note=yes" \ - {pass.c property-stack.S property-x86-1.S property-x86-2.S} \ - {{readelf {-n} property-5.r}} \ - "property-5" \ - ] \ - [list \ - "Build property 5 (.o)" \ - "-r -nostdlib -Wl,-z,stack-size=0x900000" \ - "-Wa,-mx86-used-note=yes" \ - {pass.c property-x86-2.S property-x86-1.S property-stack.S} \ - {{readelf {-n} property-5a.r}} \ - "property-5.o" \ - ] \ - [list \ - "Build property 5 (.so)" \ - "-shared -Wl,-z,stack-size=0x900000" \ - "-fPIC -Wa,-mx86-used-note=yes" \ - {property-x86-2.S property-x86-1.S pass.c property-stack.S} \ - {{readelf {-n} property-5.r}} \ - "property-5.so" \ - ] \ [list \ "Build property-6.so" \ "-shared" \ @@ -2178,6 +2098,96 @@ run_ld_link_tests [list \ {{readelf -SW plt2.rd} {objdump -dwr plt2.dd}} \ "plt2" \ ] \ + [list \ + "Build property 3" \ + "" \ + "" \ + "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ + {property-stk.s property-x86-1.s} \ + {{readelf -n property-3.r}} \ + "property-3" \ + ] \ + [list \ + "Build property 3 (.o)" \ + "-r -nostdlib" \ + "" \ + "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ + {property-x86-1.s property-stk.s} \ + {{readelf -n property-3a.r}} \ + "property-3.o" \ + ] \ + [list \ + "Build property 3 (.so)" \ + "-shared" \ + "" \ + "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ + {property-x86-1.s property-stk.s} \ + {{readelf -n property-3.r}} \ + "property-3.so" \ + ] \ + [list \ + "Build property 4" \ + "" \ + "" \ + "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ + {property-stk.s property-x86-1.s property-x86-2.s} \ + {{readelf -n property-4.r}} \ + "property-4" \ + ] \ + [list \ + "Build property 4 (.o)" \ + "-r -nostdlib" \ + "" \ + "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ + {property-x86-2.s property-x86-1.s property-stk.s} \ + {{readelf {-n} property-4a.r}} \ + "property-4.o" \ + ] \ + [list \ + "Build property 4 (.so)" \ + "-shared" \ + "" \ + "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ + {property-x86-2.s property-x86-1.s property-stk.s} \ + {{readelf -n property-4.r}} \ + "property-4.so" \ + ] \ + [list \ + "Build property 4 (-z stack-size=0)" \ + "-z stack-size=0" \ + "" \ + "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ + {property-stk.s property-x86-1.s property-x86-2.s} \ + {{readelf -n property-4.r}} \ + "property-4" \ + ] \ + [list \ + "Build property 5" \ + "-z stack-size=0x900000" \ + "" \ + "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ + {property-stk.s property-x86-1.s property-x86-2.s} \ + {{readelf -n property-5.r}} \ + "property-5" \ + ] \ + [list \ + "Build property 5 (.o)" \ + "-r -nostdlib -z stack-size=0x900000" \ + "" \ + "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ + {property-x86-2.s property-x86-1.s property-stk.s} \ + {{readelf {-n} property-5a.r}} \ + "property-5.o" \ + ] \ + [list \ + "Build property 5 (.so)" \ + "-shared -z stack-size=0x900000" \ + "" \ + "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ + {property-x86-2.s property-x86-1.s property-stk.s} \ + {{readelf -n property-5.r}} \ + "property-5.so" \ + ] \ [list \ "Build pr21626.so" \ "-shared -melf_x86_64" \ From patchwork Sat Dec 16 04:01:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 179800 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp24624dyi; Fri, 15 Dec 2023 20:04:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPywIV0wzcyTe9MYtkQGlKsOOngx2us+EkzOoLPsCp7NUCJIC4uzOdUPAp8NtrsxJ6ZwwJ X-Received: by 2002:ac8:5fce:0:b0:425:a82a:3016 with SMTP id k14-20020ac85fce000000b00425a82a3016mr18405146qta.77.1702699458970; Fri, 15 Dec 2023 20:04:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702699458; cv=pass; d=google.com; s=arc-20160816; b=qzhLYaLAbuDrPxoTXohN3BbMCQRWZmnjDEhrny767bN0X8svk5aUyrneuNATOb6vhY hV+U2QNhu5Rlubwps5CcXdj8XNbF/tpsYOlEvgPtlk22nrvRxmq4koFx60PWgTczu9nG 73Qz0ETSlW8UxKqswPseU2K0UKKzK/qME6Yv81b0ojgSWA3Xu+UfinCgNoFeJT/bjwCU dyDXUipq700JJTJd7idtU9UA4QOed8EDRQj/bSqYIyY8+GbnY/zLcmRPKXj0rHKdnHpN ua+AL3IQFJmy2qV0+68iRHPa5CsE2P+ipbwG/agF3pzvy1sgsYqZhMlELJ5uPqbLYcML OIXQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=Moz5hjWPdzA8rihLTnNsr6JTcbEOO9WPVIzJ6SKed/E=; fh=K6PyHuw3ZXsdAJsiwR1V00MJz/XCQlRStXtMmfw3mzI=; b=OIF8XvAFEeXq4RyfCNq9M8YHuOYmzzdYlTaekWg+FPPRFoz4Bi8yK+qrYpUvVjmha8 Hl7aO0FpKSpyIeGRU8sSkXiO3PqACtm3Gc41WMPAgq9rksJkE4nCPWoBZuFN0WYq+ixD qaidcCFRxCxzTgwO2BPnoWJ5Hp8gYJZGQ4FBSzQo+8kM6CW12dOv2ShYKPLuk48hmFy3 AEuGPze6e56JLWV85lbNa2wMtD2A3YgGJudd0jTBrUoRMxWy+0qEWJ7h6A86zD54qw/B n4TmDTvKK6Z+/e3aeyZ+NIgRNZknw3YHMOoLCKWbVJWewmczkAS6uMOcUCECuCEHS/MX ZOOQ== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id bt14-20020ac8690e000000b0042586375f66si20832015qtb.124.2023.12.15.20.04.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 20:04:18 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 799AC383CA8F for ; Sat, 16 Dec 2023 04:03:47 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 5E523385773F for ; Sat, 16 Dec 2023 04:03:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5E523385773F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5E523385773F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699383; cv=none; b=qq/OEa+kprwD5QUg8jbyJ7u8IQ3D4Vzysy9zTwjxw2C4JMDvvAylZmAiTUNWWh/+eWcFzT2Kto8gzXGQ2cGmV3MiPbzx3DUUsbqWcj+E1foBurCaJkgzmWp1nTuJ49BK3es+eziBBUxqumqEGUOR8fA5N2hXdoJbwkMBCc/eaZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699383; c=relaxed/simple; bh=7vhFHzkXcN2k8dTaJcWEOz2yD4ceEpz9lbFf1sU6I/k=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=R+x3+f8zIcIxHCX8u3TLhZCZS8j0mjY2YucGReZDI5l9Mr7YzEEMuTNHm0UPghgYu5d6c/bF8SoAxgVpcgTEZwr46+MwD5jojwVoAo3EqiIgDhImPXbZYofCY0XTfv1r5v/ogHjt868sKE5mh7KPPFjH9CUUMW53+ZV7vajiYxA= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: binutils@sourceware.org Cc: nickc@redhat.com, "H.J. Lu" Subject: [2.41 PATCH 09/10] Fix ld/x86: reduce testsuite dependency on system object files Date: Sat, 16 Dec 2023 04:01:32 +0000 Message-ID: <20231216040239.1981071-10-sam@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216040239.1981071-1-sam@gentoo.org> References: <20231216040239.1981071-1-sam@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785409787977960642 X-GMAIL-MSGID: 1785409787977960642 From: "H.J. Lu" commit eab996435fe65a421541f59557c5f1fd427573a3 Author: Jan Beulich Date: Tue Nov 7 13:58:32 2023 +0100 ld/x86: reduce testsuite dependency on system object files changed some C compiler tests to assembler/linker tests which introduced 2 problems: 1. It broke x32 binutils tests since --64 was passed to assembler, but -m elf_x86_64 wasn't passed to linker. 2. -nostdlib was passed to C compiler driver to exclude standard run-time files which should be avoided with -r option for linker tests. Fix them by passing -m elf_x86_64 to linker and removing -nostdlib for linker tests with -r. PR ld/30722 * testsuite/ld-x86-64/x86-64.exp: Pass -m elf_x86_64 to linker for tests with --64. Remove -nostdlib for tests with -r. (cherry picked from commit 260aa570edcf120332daefb4a102a08c90e4d9b4) --- ld/testsuite/ld-x86-64/x86-64.exp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 123152df5b0..bc736696cd0 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -2100,7 +2100,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 3" \ - "" \ + "-m elf_x86_64" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-stk.s property-x86-1.s} \ @@ -2109,7 +2109,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 3 (.o)" \ - "-r -nostdlib" \ + "-m elf_x86_64 -r" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-1.s property-stk.s} \ @@ -2118,7 +2118,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 3 (.so)" \ - "-shared" \ + "-m elf_x86_64 -shared" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-1.s property-stk.s} \ @@ -2127,7 +2127,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 4" \ - "" \ + "-m elf_x86_64" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-stk.s property-x86-1.s property-x86-2.s} \ @@ -2136,7 +2136,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 4 (.o)" \ - "-r -nostdlib" \ + "-m elf_x86_64 -r" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-2.s property-x86-1.s property-stk.s} \ @@ -2145,7 +2145,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 4 (.so)" \ - "-shared" \ + "-m elf_x86_64 -shared" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-2.s property-x86-1.s property-stk.s} \ @@ -2154,7 +2154,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 4 (-z stack-size=0)" \ - "-z stack-size=0" \ + "-m elf_x86_64 -z stack-size=0" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-stk.s property-x86-1.s property-x86-2.s} \ @@ -2163,7 +2163,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 5" \ - "-z stack-size=0x900000" \ + "-m elf_x86_64 -z stack-size=0x900000" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-stk.s property-x86-1.s property-x86-2.s} \ @@ -2172,7 +2172,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 5 (.o)" \ - "-r -nostdlib -z stack-size=0x900000" \ + "-m elf_x86_64 -r -z stack-size=0x900000" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-2.s property-x86-1.s property-stk.s} \ @@ -2181,7 +2181,7 @@ run_ld_link_tests [list \ ] \ [list \ "Build property 5 (.so)" \ - "-shared -z stack-size=0x900000" \ + "-m elf_x86_64 -shared -z stack-size=0x900000" \ "" \ "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-2.s property-x86-1.s property-stk.s} \ From patchwork Sat Dec 16 04:01:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 179801 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp24776dyi; Fri, 15 Dec 2023 20:04:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IFXhLWwFRSABEWUSLxoVTlVWVSLgTrQaIEQfP7fQXQVr1xAZPzoRTXtdWWpq+ta+y4acqL+ X-Received: by 2002:a05:622a:30e:b0:425:9e14:3f1f with SMTP id q14-20020a05622a030e00b004259e143f1fmr16179355qtw.120.1702699490615; Fri, 15 Dec 2023 20:04:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702699490; cv=pass; d=google.com; s=arc-20160816; b=Ge3UECTCmjlfNAJgC39umDpL/Se2SsIhkAF7xSuo3T1PvhlNZkfpC1V97O93HaQI2f AptRU8XCvRUku1tfKV4Rw869C3LXY+9XpnqTuQCI7nFxbU6N/N1+Y60kRJw4b2kOvA8w eGutNy8diblsLf5+Cqbnm7xjIZPxqYlL+oTr749+0u5FHZnKVtweWgxTyhwKfYHRZ14x 99sPqfGN1nYljQE02uSVOTjGkVnS+sf2DlTlzz/Z2V/lAfk4K7QiroYAbwIKG+R3se6Q ue+ag5XVA8DzapgbrPx5ci7SYDNQi5khY/yzzRtlfaGVeCioobtsnGLkHxrcfc6NdK/c yD/g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=kq0H9BmAeNEnDoEZA8zr4PZDsc/o1UGgMdj/vc1Z9ZQ=; fh=d+TQwzAhMuw8XrjvK0tKqhSe+zd/8lKafsfJRo0vBYo=; b=MAj3u5MXmxQE8kprE5INs/oDMKdLqyTdAuoFuYxT5tt2dAEQWjxUgbyxufzcCpOeVM MDhxHK5QzzUVbIFXTPISr76iVRhIQG/7TshUgaSPiQL9f91SG7p+EqZic4j4jZ0mcV+E tQ9XD+b672kDSPHsHIfF8ToJ6QsE1EF0A8GeDJeda9n0cIsPUUUW+Dd+Qejypk08tsTy A/D+MpCz7muiV0cGV+MG83qCmDbRKyUODQGIldTzFjnysEZvF2bEmOpAgpEWQEt930sc 4O5G2Rqebyd8y5Ylhtu3ZdMigGrs2ixsfwT/WwWZs31vJyO/ohIBOLxwAaL8KWyxSRgg 2YFQ== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id f36-20020a05622a1a2400b004069466b1c0si19945840qtb.562.2023.12.15.20.04.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 20:04:50 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EE6C3387544C for ; Sat, 16 Dec 2023 04:04:05 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 8A2FF38449EB for ; Sat, 16 Dec 2023 04:03:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A2FF38449EB Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8A2FF38449EB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699384; cv=none; b=v8heFILcTe+HprtUQxs2i3hQAwKZdL+3lIbD90kCJFPYXPYsklfMGli5fffgu64um7xULmAtH15FaZ4qC/77AjfT+L+L9R7pwDKq7U4ffAogbtE/PFSR0nlZEf3Ad4WAdskTRARjdS5meOtd+SddpriB0tV94HOwiNjoKg9/pqU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702699384; c=relaxed/simple; bh=rv0lBZYkBMSCxy6iQBB8eRZeOUvP9GhPMOnNyhMexX0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=juRO1RkD/R/W90lejPMrg5aQRNihEkhNQvY4FaVfPkLzIIAqWaxdDctI3QCV8O4R2XfyCISfb/2zzuLifiE9ANELTlWqAT9uBNS20Dai/wGwmurvBWV2idcPhwDjtBXV5z1t3CVfF9WJSEu0v8maISN3i4xu5J/5KEqwWkI3DCg= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: binutils@sourceware.org Cc: nickc@redhat.com, Vladimir Mezentsev Subject: [2.41 PATCH 10/10] Fix 30808 gprofng tests failed Date: Sat, 16 Dec 2023 04:01:33 +0000 Message-ID: <20231216040239.1981071-11-sam@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216040239.1981071-1-sam@gentoo.org> References: <20231216040239.1981071-1-sam@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785409821148676788 X-GMAIL-MSGID: 1785409821148676788 From: Vladimir Mezentsev In gprofng testing, we need a tempory gprofng installation to resolve run-time dependencies on libraries (libgprofng, libopcodes, libbfd, etc). We set LD_LIBRARY_PATH and GPROFNG_SYSCONFDIR to find our libraries and configuration file. These variables must be set for all gprofng tests. Tested on aarch64 and x86_64 with and without --enable-shared and --target=<>. gprofng/ChangeLog 2023-08-31 Vladimir Mezentsev PR gprofng/30808 * testsuite/config/default.exp: Make a temporary install dir. Set LD_LIBRARY_PATH, GPROFNG_SYSCONFDIR. * testsuite/lib/Makefile.skel: Move LD_LIBRARY_PATH and GPROFNG_SYSCONFDIR setting in testsuite/config/default.exp. (cherry picked from commit a13e4c5c10d1a13d9128d033c9525810e876ac14) --- gprofng/testsuite/config/default.exp | 20 ++++++++++++++------ gprofng/testsuite/lib/Makefile.skel | 5 ----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gprofng/testsuite/config/default.exp b/gprofng/testsuite/config/default.exp index 1c862d54592..c4a6588bb64 100644 --- a/gprofng/testsuite/config/default.exp +++ b/gprofng/testsuite/config/default.exp @@ -32,17 +32,25 @@ if {![info exists CFLAGS]} { set CFLAGS "-g -O2" } +remote_exec host "sh -c \"rm -rf tmpdir; mkdir -p tmpdir\"" if { "$CHECK_TARGET" == "check-install" } { set ::env(GPROFNG) "$PREFIX/bin/gprofng" } else { - set ::env(GPROFNG) "$BUILDDIR/src/gprofng" + # Make a temporary install dir to run gprofng from, and point at it + remote_exec host "sh -c \"$MAKE -C .. install-gprofng MAKEFLAGS=program_transform_name= DESTDIR=$BUILDDIR/tmpdir/root\"" + set ::env(GPROFNG) [exec find $BUILDDIR/tmpdir -type f -name gprofng -perm -u+x | head -1] + + set x [exec find $BUILDDIR/tmpdir -type d -name gprofng | head -1] + set ::env(LD_LIBRARY_PATH) "$x:$x/.." + + set x [exec find $BUILDDIR/tmpdir -type f -name gprofng.rc | head -1] + set ::env(GPROFNG_SYSCONFDIR) [exec dirname $x] + + puts "### LD_LIBRARY_PATH: $env(LD_LIBRARY_PATH)" + puts "### GPROFNG_SYSCONFDIR: $env(GPROFNG_SYSCONFDIR)" } +puts "### GPROFNG: $env(GPROFNG)" set TEST_TIMEOUT 300 -# Create directories where gprofng can find libraries and binaries: -remote_exec host "sh -c \"rm -rf tmpdir; mkdir -p tmpdir\"" -remote_exec host "sh -c \"mkdir -p lib; rm -f lib/gprofng; ln -s ../libcollector/.libs lib/gprofng\"" -remote_exec host "sh -c \"rm -f bin; ln -s src bin\"" - load_lib display-lib.exp diff --git a/gprofng/testsuite/lib/Makefile.skel b/gprofng/testsuite/lib/Makefile.skel index 5a30966c1cd..9ccc0340c10 100644 --- a/gprofng/testsuite/lib/Makefile.skel +++ b/gprofng/testsuite/lib/Makefile.skel @@ -39,11 +39,6 @@ DISPLAY = $(GPROFNG) display text EXPERIMENT = test.er DISPLAY_LOG = display.log -export LD_LIBRARY_PATH := $(BUILDDIR)/src - -# Set GPROFNG_SYSCONFDIR to find out gprofng.rc: -export GPROFNG_SYSCONFDIR := $(srcdir)/../../../src - .PHONY: all collect compare clobber clean all: compare