From nobody Fri Nov 10 10:06:55 2023 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 4SRZHN1CT0z5015w; Fri, 10 Nov 2023 10:06:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRZHN0jGMz3JTm; Fri, 10 Nov 2023 10:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610816; 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=AJY04f4mRnC+umyzLjdGXI65geIFJLYa66j7msIX6GY=; b=I4QZ6pJdWRNS85SFcs9b/XZEegIxEbwalu495WGywauvNitefr41DccQkGN3j7BaanPhzl UV1octMhQRgJvVPT2PtTW2nW8PY5G/22nxXbxlAVTsY+UgEoohH5iWPr1vmZg6nd0a7aiH vYpdYqGD5yZVq0Wdm5Q6IEQP2VvNTAj0T/TXifIa0Eo3g/R4Dfy3JwRrVftnqobauf+zC9 kDRi1m/15YlgaytJPdR5oA7tnYre+nTaNaucZsXGe8CyD0qaBQk5a4Tmehw6OHxuubUnwP z0cdqd3s7bBrnIZHfKcgX+YJ/uM74QAKuzadUfQM8g4bVmdN11VxXMiz57I2Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610816; 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=AJY04f4mRnC+umyzLjdGXI65geIFJLYa66j7msIX6GY=; b=L9UY5msLJmWpOMpkq5eLfLs1Sn3naxseqiHyZQx9StdDWI5SPclnAqY8GKSbNnqe3yyq7u QeiMkBRp3vSF6+I3Jfbf53wcVlvX1XGxZsb958WB/5VLynHzQZepDkqr3FFPJqJXRJYcF6 9rxpEi6HEFbA8sY9QQnA3qg+PyjWoUbNI3OYOgF/MnHyDlviw9PslcH8iOBSgrgmLu1Lgq V7QOvprbb309lRa9hflljdji6p3WugUfUMR5B6MOyRpoU5cjubPNAIVarUv4VwMT23Y8ru keepMQBbLFo/WLgYp74HOL25OJW76Yd93TxQiVE2zEncDa+5YHxPvNT89knHXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699610816; a=rsa-sha256; cv=none; b=oVHtTyx0WN6DLKCJTPlzHoL7ih1P6E/9fMFe/F6n2IoufR80kvUVf2AdKnysJqvLXvtRre iF4R7y5qbIdIRyIlRO1qBw4nyVXfxuAOVY5clxGfCCrSer1an3AvrV4iq/vMFoMBP1oVQC 0SmyRpP/ZafjlLEWCboRQ+CV6O10yagq5mYIKLcL8nR4YCaVr4vo/8XV0zkCcq8qmCo+Og SPS870/MCrwNLBRnUi3TuYIpqg+g2jz+VbmIh7FDCJVJQSBGNNBCsmtz5VqarHuARBWf0C oGP5acp3zCKdSdJa3smjhVtw8DkJZXiYCwJoqxf23cNzu2aqoIjHUUGbf2KNGQ== 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 4SRZHM6kN2ztfS; Fri, 10 Nov 2023 10:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAA6tRE016630; Fri, 10 Nov 2023 10:06:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAA6tLH016627; Fri, 10 Nov 2023 10:06:55 GMT (envelope-from git) Date: Fri, 10 Nov 2023 10:06:55 GMT Message-Id: <202311101006.3AAA6tLH016627@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 960b4327f49c - main - bsd.compat.mk: Set MACHINE before including bsd.opts.mk 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 960b4327f49cb84f1555d147aa7e16a070e4e82b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=960b4327f49cb84f1555d147aa7e16a070e4e82b commit 960b4327f49cb84f1555d147aa7e16a070e4e82b Author: Andrew Turner AuthorDate: 2023-11-02 17:46:34 +0000 Commit: Andrew Turner CommitDate: 2023-11-10 09:57:45 +0000 bsd.compat.mk: Set MACHINE before including bsd.opts.mk In bsd.opts.mk we check MACHINE_ARCH and may want to check MACHINE to decide which options to enable. Unfortunately this is included too early via bsd.compiler.mk. Move including bsd.compiler.mk until after we can set MACHINE and MACHINE_ARCH. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42448 --- share/mk/bsd.compat.mk | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 0c387bcb020c..c41cfda5f01c 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -20,8 +20,6 @@ COMPAT_ARCH= ${MACHINE_ARCH} .for _LIBCOMPAT in ${_ALL_LIBCOMPATS} LIB${_LIBCOMPAT}CPUTYPE= ${CPUTYPE} .endfor -.include -COMPAT_COMPILER_TYPE=${COMPILER_TYPE} .endif # ------------------------------------------------------------------- @@ -33,10 +31,7 @@ LIB32CPUFLAGS= -march=i686 -mmmx -msse -msse2 .else LIB32CPUFLAGS= -march=${LIB32CPUTYPE} .endif -.if ${COMPAT_COMPILER_TYPE} == gcc -.else -LIB32CPUFLAGS+= -target x86_64-unknown-freebsd${OS_REVISION} -.endif +LIB32CPUFLAGS.clang+= -target x86_64-unknown-freebsd${OS_REVISION} LIB32CPUFLAGS+= -m32 LIB32_MACHINE= i386 LIB32_MACHINE_ARCH= i386 @@ -52,11 +47,8 @@ LIB32CPUFLAGS= -mcpu=powerpc LIB32CPUFLAGS= -mcpu=${LIB32CPUTYPE} .endif -.if ${COMPAT_COMPILER_TYPE} == "gcc" -LIB32CPUFLAGS+= -m32 -.else -LIB32CPUFLAGS+= -target powerpc-unknown-freebsd${OS_REVISION} -.endif +LIB32CPUFLAGS.gcc+= -m32 +LIB32CPUFLAGS.clang+= -target powerpc-unknown-freebsd${OS_REVISION} LIB32_MACHINE= powerpc LIB32_MACHINE_ARCH= powerpc @@ -72,10 +64,7 @@ LIB32CPUFLAGS= -mcpu=${LIB32CPUTYPE} .endif LIB32CPUFLAGS+= -m32 -.if ${COMPAT_COMPILER_TYPE} == "gcc" -.else -LIB32CPUFLAGS+= -target armv7-unknown-freebsd${OS_REVISION}-gnueabihf -.endif +LIB32CPUFLAGS.clang+= -target armv7-unknown-freebsd${OS_REVISION}-gnueabihf LIB32_MACHINE= arm LIB32_MACHINE_ARCH= armv7 @@ -121,6 +110,25 @@ _LIBCOMPATS= ${USE_COMPAT} libcompats= ${_LIBCOMPATS:tl} +# Update MACHINE and MACHINE_ARCH so they can be used in bsd.opts.mk via +# bsd.compiler.mk +.if defined(USE_COMPAT) +_LIBCOMPAT_MAKEVARS= _MACHINE _MACHINE_ARCH +.for _var in ${_LIBCOMPAT_MAKEVARS} +.if !empty(LIB${USE_COMPAT}${_var}) +LIBCOMPAT${_var}?= ${LIB${USE_COMPAT}${_var}} +.endif +.endfor + +MACHINE= ${LIBCOMPAT_MACHINE} +MACHINE_ARCH= ${LIBCOMPAT_MACHINE_ARCH} +.endif + +.if !defined(COMPAT_COMPILER_TYPE) +.include +COMPAT_COMPILER_TYPE=${COMPILER_TYPE} +.endif + # ------------------------------------------------------------------- # Generic code for each type. # Set defaults based on type. @@ -131,6 +139,7 @@ WORLDTMP?= ${SYSROOT} LIB${_LIBCOMPAT}_OBJTOP?= ${OBJTOP}/obj-lib${_libcompat} LIB${_LIBCOMPAT}CFLAGS+= ${LIB${_LIBCOMPAT}CPUFLAGS} \ + ${LIB${_LIBCOMPAT}CPUFLAGS.${COMPAT_COMPILER_TYPE}} \ -DCOMPAT_LIBCOMPAT=\"${_LIBCOMPAT}\" \ -DCOMPAT_libcompat=\"${_libcompat}\" \ -DCOMPAT_LIB${_LIBCOMPAT} \ @@ -150,10 +159,12 @@ LIB${_LIBCOMPAT}CFLAGS+= -B${WORLDTMP}/usr/lib${_libcompat} .endfor .if defined(USE_COMPAT) +LIB${USE_COMPAT}CPUFLAGS+= ${LIB${USE_COMPAT}CPUFLAGS.${COMPAT_COMPILER_TYPE}} + libcompat= ${USE_COMPAT:tl} _LIBCOMPAT_MAKEVARS= _OBJTOP TMP CPUFLAGS CFLAGS CXXFLAGS LDFLAGS \ - _MACHINE _MACHINE_ARCH _MACHINE_ABI \ + _MACHINE_ABI \ WMAKEENV WMAKEFLAGS WMAKE WORLDTMP .for _var in ${_LIBCOMPAT_MAKEVARS} .if !empty(LIB${USE_COMPAT}${_var}) @@ -166,8 +177,6 @@ LIBDATADIR:= /usr/lib${libcompat} _LIB_OBJTOP= ${LIBCOMPAT_OBJTOP} CFLAGS+= ${LIBCOMPATCFLAGS} LDFLAGS+= ${CFLAGS} ${LIBCOMPATLDFLAGS} -MACHINE= ${LIBCOMPAT_MACHINE} -MACHINE_ARCH= ${LIBCOMPAT_MACHINE_ARCH} .endif .endif