From nobody Mon May 05 09:38:47 2025 X-Original-To: dev-commits-src-all@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 4Zrc0l5d4xz5vDM8; Mon, 05 May 2025 09:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zrc0l53nyz4LbY; Mon, 05 May 2025 09:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746437927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rPlflGdh+QWIBmmZfSL5lAo3LzVR3XQkit8QthkEZvs=; b=UDVSZluE9n3VX22HMjMxQ0hwqhyS6roTGuEqVfG1v/ZqT2ncMZO0gWAZdCr+J+Tw2Yphcr ZNSyA0Iskb9aAtkbMkoIuKhNmEaFgt+xLS1YVyTcDYpwjMMqJJ58acG++VtgbFpRHfhuOk hkk6txf6NzTIrUEX2qa3Sj6W6R1UZzwSL78ZllWJXM5xV2bDraroMbv+QwWXG46+zB9eVA kCOrvfgIP8k1+oiPdI/ZSI0Cu72uq08ei9rSEJgUw/rVg5sgYDlhedy/FXbUrh1Y1p/CM2 qzcSWLCf+SA9fWsnTD/QjivFFcKCKDELmyP0unGz/tF/7VakEahCnTy77DIm8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746437927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rPlflGdh+QWIBmmZfSL5lAo3LzVR3XQkit8QthkEZvs=; b=Wy8rl5dOC+6aU9l2+3zRhRvhxKUyw94x+4dTilSjZ6seSzm/aCV795XWMeWnM6iUG/r4OF 893KSRRNECs5Oupjmd8RbVA7uA+4iLrLUteOwOY9sHqgW14A7q0fUp1E9k5f/wnBcMy4jl aoNTN8ggI1tDt1RVDo34ZLIDa9rlFttjQnP/8T20TQoBPmY+E/c+LkwjLUHcdtiS3ADQT7 XmfDSb9C3iM0lgu+FKeDEdvs1+48zG1ntUT3lYmWcJPlWY8JVXX8cMbUAiHwCRLbUUUU6O TgLbk4NBa7fWl/0Af1UJYBRl61AQAbOmAiutyPHbueBk9ULr/PWVufXZITLQBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746437927; a=rsa-sha256; cv=none; b=PhLwlbtMcwPmnvE+yny7SzOyiQiruAnxI/Qee1uCR6H/7xrkHKa2NallMh1gqqoW/vO96x OVEAZ2+Pyh70uR0De0MpXMuDEr1S8qe6UZ16oYAD6hwSbNh5iRC2aq2Ow0Oty7lMKyZgmk hPS8saBcm+ZC8Bp40XIIGgK7g4KW+VXbsB/ga4W07qEroo14ylQ9LBmPOBskkspOgzHii4 CFL3nJBHu1yWZiYbCowbjWB2NKeP3uHH65hLw8d2lLlZLHA6MQSTj/CgJGkbB5zBGHtNB4 M+PAeFEFtTEXVanoKkLelQTwRoJc4q3IqIUKyaB7OhJHPIpRcvzm4H+8vZJLSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zrc0l4g03z17Y1; Mon, 05 May 2025 09:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5459clRR020642; Mon, 5 May 2025 09:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5459cl3a020639; Mon, 5 May 2025 09:38:47 GMT (envelope-from git) Date: Mon, 5 May 2025 09:38:47 GMT Message-Id: <202505050938.5459cl3a020639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 979864eef41b - stable/13 - Use .pieo extension for WITH_PIE bsd.prog.mk output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 979864eef41b5f8e4d201c2b37e0733c33cf41b2 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=979864eef41b5f8e4d201c2b37e0733c33cf41b2 commit 979864eef41b5f8e4d201c2b37e0733c33cf41b2 Author: Dimitry Andric AuthorDate: 2025-04-21 19:52:29 +0000 Commit: Dimitry Andric CommitDate: 2025-05-05 08:59:30 +0000 Use .pieo extension for WITH_PIE bsd.prog.mk output When object files for programs are built using bsd.prog.mk, and WITH_PIE is enabled, the extension used is still plain ".o". To be consistent with bsd.lib.mk, and to allow changes in WITH_PIE settings to propagate correctly, the extension should be ".pieo" instead. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49966 (cherry picked from commit 245bb0110639fe963086fb2903143dbd4e6ac48c) --- share/mk/bsd.prog.mk | 15 ++++++++------- share/mk/bsd.progs.mk | 2 +- tests/sys/fs/fusefs/Makefile | 8 +++++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 8c7de9be4093..ee6282de4f8a 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -4,7 +4,7 @@ .include .include -.SUFFIXES: .out .o .bc .c .cc .cpp .cxx .C .m .y .l .ll .ln .s .S .asm +.include # XXX The use of COPTS in modern makefiles is discouraged. .if defined(COPTS) @@ -47,13 +47,14 @@ LDFLAGS+= -Wl,-znorelro LDFLAGS+= -Wl,-zrelro .endif .endif -.if ${MK_PIE} != "no" # Static PIE is not yet supported/tested. -.if !defined(NO_SHARED) || ${NO_SHARED:tl} == "no" +.if ${MK_PIE} != "no" && (!defined(NO_SHARED) || ${NO_SHARED:tl} == "no") CFLAGS+= -fPIE CXXFLAGS+= -fPIE LDFLAGS+= -pie -.endif +OBJ_EXT=pieo +.else +OBJ_EXT=o .endif .if ${MK_RETPOLINE} != "no" .if ${COMPILER_FEATURES:Mretpoline} && ${LINKER_FEATURES:Mretpoline} @@ -149,7 +150,7 @@ PROGNAME?= ${PROG} .if defined(SRCS) -OBJS+= ${SRCS:N*.h:${OBJS_SRCS_FILTER:ts:}:S/$/.o/g} +OBJS+= ${SRCS:N*.h:${OBJS_SRCS_FILTER:ts:}:S/$/.${OBJ_EXT}/g} # LLVM bitcode / textual IR representations of the program BCOBJS+=${SRCS:N*.[hsS]:N*.asm:${OBJS_SRCS_FILTER:ts:}:S/$/.bco/g} @@ -185,10 +186,10 @@ SRCS= ${PROG}.c # - the name of the object gets put into the executable symbol table instead of # the name of a variable temporary object. # - it's useful to keep objects around for crunching. -OBJS+= ${PROG}.o +OBJS+= ${PROG}.${OBJ_EXT} BCOBJS+= ${PROG}.bc LLOBJS+= ${PROG}.ll -CLEANFILES+= ${PROG}.o ${PROG}.bc ${PROG}.ll +CLEANFILES+= ${PROG}.${OBJ_EXT} ${PROG}.bc ${PROG}.ll .if target(beforelinking) beforelinking: ${OBJS} diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index f86e95bed749..15e359ac72c0 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -109,7 +109,7 @@ _PROGS_ALL_SRCS+= ${s} .if !empty(_PROGS_COMMON_SRCS) _PROGS_COMMON_OBJS= ${_PROGS_COMMON_SRCS:M*.[dhly]} .if !empty(_PROGS_COMMON_SRCS:N*.[dhly]) -_PROGS_COMMON_OBJS+= ${_PROGS_COMMON_SRCS:N*.[dhly]:${OBJS_SRCS_FILTER:ts:}:S/$/.o/g} +_PROGS_COMMON_OBJS+= ${_PROGS_COMMON_SRCS:N*.[dhly]:${OBJS_SRCS_FILTER:ts:}:S/$/.${OBJ_EXT}/g} .endif .endif diff --git a/tests/sys/fs/fusefs/Makefile b/tests/sys/fs/fusefs/Makefile index 8e6fdd10c377..c5101be6026f 100644 --- a/tests/sys/fs/fusefs/Makefile +++ b/tests/sys/fs/fusefs/Makefile @@ -57,6 +57,7 @@ GTESTS+= xattr .for p in ${GTESTS} SRCS.$p+= ${p}.cc SRCS.$p+= getmntopts.c +SRCS.$p+= mntopts.h SRCS.$p+= mockfs.cc SRCS.$p+= utils.cc .endfor @@ -88,9 +89,14 @@ CXXWARNFLAGS+= -Wno-vla-cxx-extension CXXFLAGS+= -I${SRCTOP}/tests CXXFLAGS+= -I${FUSEFS} CXXFLAGS+= -I${MOUNT} -.PATH: ${MOUNT} CXXSTD= c++14 +.for f in getmntopts.c mntopts.h +CLEANFILES+= ${f} +${f}: ${MOUNT}/${f} .NOMETA + ln -sf ${.ALLSRC} ${.TARGET} +.endfor + LIBADD+= pthread LIBADD+= gmock gtest LIBADD+= util