From nobody Tue Sep 10 16:50:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X38pw2bnJz5WB9q for ; Tue, 10 Sep 2024 16:51:04 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X38pv1W2bz43Rw for ; Tue, 10 Sep 2024 16:51:03 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-42cb1e623d1so10294635e9.0 for ; Tue, 10 Sep 2024 09:51:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725987061; x=1726591861; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R7NUICIfZIODn6GVRur7Cy/zpsHHYfOq5Ad790CZ9cw=; b=sxd3RbQ9jfrf7NPq7CWnq9nSrDnzRN7ABrVhit6ZF5P/E5alXe1OSkRCtXLd3sMVf5 1TbqR9sQqqbCq4c8e60ZuNV/eZpk9bDNMirzKRj+LNorp5kRPTV0wC69XXFwxFLq2Tvd U5bm3S/nHXXcCzBLUV+5b6G29euKgoU3QRoI/1DxllTIRsuVBUnqmT8TYEEIPN5L8FBD jz7wqarG6smvtATXzMX5NCrjDQPfwRz8bDIUDpMroWJB6qSFoqZmV2u23CPv0zNDSR/Y yCs1jxwo8LFGgbm5zs+mZiRvP6M96q+RoZ78oLV9ILEtaX4bAnSzW5IE0MLfqvig9+UK HhRw== X-Forwarded-Encrypted: i=1; AJvYcCWK8q8r9KaQvSJmXej7a1DUnGwV12LUyaWo6BzJdXmuc2tJzUr8yRXkDB2s1pVOXNZRRy8rTPReEHqVLWOyEtQC5/MXCA==@freebsd.org X-Gm-Message-State: AOJu0YwCUWxpCdI7AWodH9ZlGTfyu3zq7x7il26cxBe/810j05wsHMMD HGnOOA0K92wHnPX+lroqOLBp7eHZlb2Q9/H8/t6b8rsezb1PkGILdjHTrNG4OzEaH0icOf5Ly8M P X-Google-Smtp-Source: AGHT+IFAKNYwi+snD4lHACXSgsOCzWYHUahOC56uhx+0fAWcuvHZ0sm0j0VoIo/haXHqgN8tuk+KiQ== X-Received: by 2002:a05:600c:5108:b0:426:5416:67e0 with SMTP id 5b1f17b1804b1-42ccd360aa5mr2511795e9.31.1725987060333; Tue, 10 Sep 2024 09:51:00 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42caeb4444asm117905935e9.22.2024.09.10.09.50.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Sep 2024 09:50:59 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3776.700.51\)) Subject: Re: git: 3a4b04e82df6 - main - depend-cleanup.sh: Simplify handling for stale syscall.S From: Jessica Clarke In-Reply-To: <202408051949.475JnRAM055960@gitrepo.freebsd.org> Date: Tue, 10 Sep 2024 17:50:49 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <4DA51278-CCE1-4790-BAE3-73DAC2494574@freebsd.org> References: <202408051949.475JnRAM055960@gitrepo.freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.3776.700.51) X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.79 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.89)[-0.890]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.42:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.42:from] X-Rspamd-Queue-Id: 4X38pv1W2bz43Rw On 5 Aug 2024, at 20:49, John Baldwin wrote: >=20 > The branch main has been updated by jhb: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D3a4b04e82df6bb9b28aa0c3c670c1906= 3843d644 >=20 > commit 3a4b04e82df6bb9b28aa0c3c670c19063843d644 > Author: John Baldwin > AuthorDate: 2024-08-05 19:49:06 +0000 > Commit: John Baldwin > CommitDate: 2024-08-05 19:49:06 +0000 >=20 > depend-cleanup.sh: Simplify handling for stale syscall.S >=20 > Remove the outer grep and depend on the greps in clean_dep instead. >=20 > Reviewed by: brooks, imp > Obtained from: CheriBSD > Sponsored by: AFRL, DARPA > Differential Revision: https://reviews.freebsd.org/D46103 > --- > tools/build/depend-cleanup.sh | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) >=20 > diff --git a/tools/build/depend-cleanup.sh = b/tools/build/depend-cleanup.sh > index b93d50a57ff4..b7231422c5ed 100755 > --- a/tools/build/depend-cleanup.sh > +++ b/tools/build/depend-cleanup.sh > @@ -171,9 +171,7 @@ clean_dep lib/libc statfs c > # 20240308 e6ffc7669a56 Remove pointless MD syscall(2) > # 20240308 0ee0ae237324 Remove pointless MD syscall(2) > # 20240308 7b3836c28188 Remove pointless MD syscall(2) > -if [ ${MACHINE} !=3D i386 -a -f = "$OBJTOP"/lib/libsys/.depend.syscall.o ] && \ > - grep -q -e 'libsys/[^ /]*/syscall.S' = "$OBJTOP"/lib/libsys/.depend.syscall.*; then > - echo "Removing stale /syscall.S depends" > +if [ ${MACHINE} !=3D i386 ]; then > clean_dep lib/libsys syscall S > clean_dep lib/libc syscall S > fi Aside from causing the files to be removed for amd64 lib32 as documented in the revision (but not, sadly, in the commit or file here), this causes them to also be removed for any non-i386 architecture. This is because "syscall.S" still features in the .depend file, just as: syscall.o: syscall.S given the source exists in the .OBJDIR, rather than: syscall.o \ /path/to/src/lib/libc/MACHINE/sys/syscall.S or syscall.o \ /path/to/src/lib/libsys/MACHINE/syscall.S You can test this for yourself with: MACHINE=3D... MACHINE_ARCH=3D... ALL_libcompats=3D"32" \ tools/build/depend-cleanup.sh -n /path/to/objtop (which I added last year for precisely this purpose) Jess