From patchwork Sat Dec 21 22:21:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 852743 Delivered-To: patch@linaro.org Received: by 2002:a5d:4888:0:b0:385:e875:8a9e with SMTP id g8csp2743678wrq; Sat, 21 Dec 2024 14:21:43 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXo4paeTtt9HK2mP90lOx0D90cD7Z5f2MkPRIPi5khKnycTyyzvo4lmuz29Puoex8JuP3uSyw==@linaro.org X-Google-Smtp-Source: AGHT+IGkK16bjoGk4RIH/JS9hGSSfZZ/Ty6q0GbFoZ6IFfO0ssMKTgzAnLADzalkElF1iv9h5RRM X-Received: by 2002:a05:6214:268f:b0:6d8:a5da:3aba with SMTP id 6a1803df08f44-6dd2334646amr118949926d6.20.1734819703091; Sat, 21 Dec 2024 14:21:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1734819703; cv=pass; d=google.com; s=arc-20240605; b=ZMmqeMMAIzTch9BT1d1erf5VvVb0cWknjM3ePuW49j9mCXT/zJ9I2As5M+niJz/e3P J+ewvJPbF60ar0IOpwKIZdEZPX8be4f1r45fCWZSQeKXWt3/Kxwn0gim1sueSCpgU6f1 tSaA22lLnjn3CTof67FPcrOR9UV8Jr0njVmj7DEQ2nOb5MyubXCjpR8T2XyUpyx6TteY blKRXyFibH0lohxDO/v07vCX1U3TFo/upIzpJ43eCEH/6wH1Eut4iPsGWT9bz7bFq0Ba yt7QZVa0PDPg/tr2OHM9qLKg1PXnbfjhwe7eiXWlG0OTc7dTaPWrCgBHlp1fZXIuQdwk CWDA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :dkim-filter:arc-filter:dmarc-filter:delivered-to:dkim-filter; bh=MWAZwz5kOz38b83iEzfAOUSnRi9+DecNfFKtExNqKuU=; fh=rJtIiWzkCr5V2GvQGQWdJX+wkLY3kEXmUtQZbZqt0f0=; b=eeh0U5moShIIajvsmFkN7f5Q9dceiAR3MYbL+9EyxosOUiSWkHzC2I9cMUxE2aALOl SK5NDTi3ti+Uk2ioJPmTIpy787t3v+NmQ+VYiJUW7iCG/Vq+1cdYgh/NExP1yaewcbJx 97n71pUtu0eMHAZJ1T+xZvBB8MUHNtQ6/wE/a3mBNiWRU2KRYg9RLcK/+/3NvWOzxT83 ggbBdWPUMRqi0XBJqnTnDbkBP0EWlTPVtrwUb068o+UBbFe1/0PvZS2WxkpY/RoXESYN zBqWAFPPLXbUHdiO/UMvwuOkutChLzW5KPpuFmTr/kmFo8rq91debubTvEFi0OsLS9no 2uZQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=QPNFYTgA; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id d75a77b69052e-46a3e6825eesi79982291cf.68.2024.12.21.14.21.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Dec 2024 14:21:43 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=QPNFYTgA; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A721A385841E for ; Sat, 21 Dec 2024 22:21:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A721A385841E Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=QPNFYTgA X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by sourceware.org (Postfix) with ESMTPS id 181F93858D3C for ; Sat, 21 Dec 2024 22:21:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 181F93858D3C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 181F93858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1032 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734819688; cv=none; b=Pn+lUvVMUMBdrxuPlEv0ZLC05C72daPpbMELGhqT1zwBxpB3MB/58mHUlS8dzimNFZ89QbfgSWZQuamxWRvGiSfI4ZdMW8Lg8DY6xlyS4A65VZN8RGMgna+LAzvx1aRbG89YkTCwSuCwdyAXQvjUuQKpjsh+VT2Vo8gVrBU9ZRU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734819688; c=relaxed/simple; bh=ikZz5hJRCHjXUxmueFOXcJw6SVEjH/tnmBlIM7F70nA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=OcTeaNJsb+G5L77UoTmS9R4ESeHzTb9Q9Tb6EXTFAuTSO9gCeO95URc9V329yofBDhogrG9Xgt77r7JLbxx5fNqM4jXLDjZBZvTrbYR7wn8HQGhceYPiRwk/xacih6lBiRNolhmPj0Y+dlEBXBwvi5t022x0unjbp8fPIsFHh3Q= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 181F93858D3C Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-2efb17478adso2647701a91.1 for ; Sat, 21 Dec 2024 14:21:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734819687; x=1735424487; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MWAZwz5kOz38b83iEzfAOUSnRi9+DecNfFKtExNqKuU=; b=QPNFYTgAUvHWu5JG6tF4RTqXknB28ZmuS3U0SRFHMaRd7zS9kigMJUU7DDtyAh83P8 FtvTPqK0RcUmldeNnfYHAGjTF3v4feQ6fgjmEqLx+N9Nm1PwtLNY8BWXJum2XajzEZK+ gQ5jQMYYL2K6iRIsnmcZvV+8LDqOh/jJuwSdGgnolsk4vTSivT1rzaRy9Fvt9Uso+y5I HofRYRMrEOsK2ZUaST9R2KVgCocBUGZWhy14AcLeAilvMQniWfrQsLc8FTgRsWqZTsku utF/k77Dc5P+zvisPjSau2TJCOXjqkdaw5FM5BOMFTlUSdLi6yMjiemxWvdsdmv25CYQ gWHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734819687; x=1735424487; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MWAZwz5kOz38b83iEzfAOUSnRi9+DecNfFKtExNqKuU=; b=Bc7ILsjdlD70D9SbuaVwiVauqFSXP6cae8gUiuV1dZyKuA9MdJDPgw1IME1g/u4jX2 D4Px8D+RneeHBoEBZRcLKF4+Okyd6wJG7tGX/PzrV7LfwK/75p7oLQr/9UE3t5n7gu5b 4A2UCWzxOAtv0iCm29vyaIh570hfncmc+i1qDYR1GpiPHcoOWNbuCEpIuqgTkSFybnkI dysxINNwsAN8qwO1DnoE9IIgVGt8saeSuKmQWtk8tFPpNHQ0sZ5ReWiNC/bOnRtBWwLZ cRvVk5S7dWrs6wBt3LbTRrAd9FBzK5CNDSWG+ey4zxWzQV743EWK2KAb9KvJ4Zw1VMpI 2vMg== X-Gm-Message-State: AOJu0YydAOwCbPR5BoeB470FIANmkRBXEd+ENamSl/Ycbp67K3W3Dwk3 GojuCADaT/t3efM6nY9wf9J2FRFd2hvN7tYOzaAzDybvkU+nJxo3pFBb2rCv1xHRLw== X-Gm-Gg: ASbGncuY8d58m4sMSN/qwgZbMM8cA30FiKNaGY1uP1BAfINnr9vBzLv0G7TVxxW0yUG acrpSP8C2LXGm8UvYV4oAdBXOBFFxw+iO5/KBaDqL5NoZziUJB+EkP7Vp/LBZcFotuCv8PyYlwF A4escJX7DjGS8X3l3yOgsVP+c0VhQKUXeqA9inzghcpeqh3dogMaq3EkUWpYzWi+vHYeLN3/t92 yjaPIMLhwKR6cVV2KKg86ND26k9cBEFf5vH/jeAkPpw7UGjUUZyL411C5XVW5QFC3QupvM= X-Received: by 2002:a17:90b:2d4c:b0:2ee:b26c:10a0 with SMTP id 98e67ed59e1d1-2f452ec6fbbmr12276199a91.24.1734819686866; Sat, 21 Dec 2024 14:21:26 -0800 (PST) Received: from gnu-tgl-3.localdomain ([120.204.185.181]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f2ed52cf9esm8172377a91.8.2024.12.21.14.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Dec 2024 14:21:26 -0800 (PST) Received: from gnu-tgl-3.lan (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id 2C776C028A; Sun, 22 Dec 2024 06:21:21 +0800 (CST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: Adhemerval Zanella Subject: [PATCH] conform: Use -dD instead of -dN on compiler invocation Date: Sun, 22 Dec 2024 06:21:18 +0800 Message-ID: <20241221222118.753302-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patch=linaro.org@sourceware.org From: Adhemerval Zanella clang does not support -dN. --- conform/conformtest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conform/conformtest.py b/conform/conformtest.py index 8337afcdad..d38afb06a8 100644 --- a/conform/conformtest.py +++ b/conform/conformtest.py @@ -620,7 +620,7 @@ class HeaderTests(object): out_file = os.path.join(self.temp_dir, 'namespace-out') with open(c_file, 'w') as c_file_out: c_file_out.write('#include <%s>\n' % self.header) - cmd = ('%s %s -E %s -P -Wp,-dN > %s' + cmd = ('%s %s -E %s -P -Wp,-dD > %s' % (self.cc, self.cflags_namespace, c_file, out_file)) subprocess.check_call(cmd, shell=True) bad_tokens = set() @@ -639,11 +639,11 @@ class HeaderTests(object): # macros defined by user code including the # header.) continue - match = re.match(r'#define (.*)', line) + match = re.match(r'#define (.*?[^\(\s]+)', line) if match: self.check_token(bad_tokens, match.group(1)) continue - match = re.match(r'#undef (.*)', line) + match = re.match(r'#undef (.*?[^\(\s]+)', line) if match: bad_tokens.discard(match.group(1)) continue