From nobody Mon May 5 09:38:32 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 4Zrc0S4LpMz5vDM6; Mon, 05 May 2025 09:38:32 +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 4Zrc0S3cX9z4LTv; Mon, 05 May 2025 09:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746437912; 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=Ui3dmUFhZEhrgTGzzyYUM6cF3LpSH6O8X78IQEGudQc=; b=lyp22tP7Ikl6SvTF5qudq7jUKUdDskIryHhzx1Hw0fikPHrNNP/U7+lBSqZslKl8o6eN+t HroRCMeHZHF52REzeEnYv3qVnPbdtqVYQXyANgZmcIMro8QyN0PlFDTPZgt9F0x5ppeeOx GsA8IJhYVcADBvo06t85RvGJKo0+u7mnAEuxMCohICC72pokwMhWQqOof0knXurmnoamOk E28Kc2vryupKEkluPwAlOIz340VfqWlZrAeaCxHt7YhZFe8FoKoIxJTkFDu8rRINpzPUWz C4R1efBIQBo6vf7Si5mgPtlWW9ZiXI0CUfU6pPVj1HLoYKZG6ihqFrcnoZqpng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746437912; 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=Ui3dmUFhZEhrgTGzzyYUM6cF3LpSH6O8X78IQEGudQc=; b=jY5aOjCmbRq+SmNDHNmKe5bU3vfF1LTfMGjvpYJTTwK7A+vF8F2wWcDkpMCuk2WXe//V5H 6im79SkC5tNINZPLJ1F4mgPod9M3kNe9178+HvX/9gaMa2HQgWkJK8yO279PqD9+PzhpgG vAN1VHHynsWwJv5Xqw5/+J+V0BsMFm7WZosvkrDkYFRs9vWkpAPYwPbYeN95xKiBQokQ+R i3WO9HhkVQ/LtGaeXvFVxcXaf0h6dOHzYdGD0E4bnerQL1E/NPPUnYszh5+ardnahfx3/o 53KQkqEyAvD+jd6ldGzW2rTUp4vHJvUKi8NLurMyqljyqHhGLwi4o1QSP71T6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746437912; a=rsa-sha256; cv=none; b=pGnb9WG4sakpENiv/HDlWZHjbRgIULvEip11K/Pxv0O1MkVEqY169dP4eryhPD1ITnheU7 G1FYumIsxDTHCgtNazNZ9QZT9OSGMh/XaZBCPNkitamuMSQlNc7HZbyjA/GLYhk/jaJ9ks NXzw2RXwXXSlVRUzl5xwwkIrvpzyRAfd670RZICpy7S8qAPNR98+tgkabhNMJLNnbTPfRo cC45Z9wA0EtYbIlhkZ/grSWvMgu9MyrwYq7malm2LI3vCLSNWFxbwqTy++KWfVD4vsQ9CB T++iPtGpsEYd9C5sqK8oMw/q/+usRSHL1eYHU+NNx9coL/LB12e0MP0ERNk2rA== 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 4Zrc0S3Crbz17Y0; Mon, 05 May 2025 09:38:32 +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 5459cWms020447; Mon, 5 May 2025 09:38:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5459cWDO020444; Mon, 5 May 2025 09:38:32 GMT (envelope-from git) Date: Mon, 5 May 2025 09:38:32 GMT Message-Id: <202505050938.5459cWDO020444@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: 4939a4a9cd14 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 4939a4a9cd14a2a746a689f7b26fc9fff615326d Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4939a4a9cd14a2a746a689f7b26fc9fff615326d commit 4939a4a9cd14a2a746a689f7b26fc9fff615326d Author: Dimitry Andric AuthorDate: 2025-04-21 19:52:29 +0000 Commit: Dimitry Andric CommitDate: 2025-05-05 08:57:54 +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 8c3ba69af73d..3895ff67a787 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} @@ -153,7 +154,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} @@ -189,10 +190,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 2c8baa02b9e6..378767eef4e2 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 00e2e208989e..cff8a0a483ad 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 @@ -89,9 +90,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