From nobody Tue Sep 5 22:08:50 2023 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 4RgKQp66xNz4sVFH; Tue, 5 Sep 2023 22:08:50 +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 4RgKQp5QrPz4KxR; Tue, 5 Sep 2023 22:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693951730; 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=gf8FR7UqG+6klAIjbPA8MTKPG5vBNt3vvd5Qf7IT3Y0=; b=hvCl/WADoFGbpG7fpqHS06cQRBftcIQxkppvxKxRoEQTY7735+CzCYWr0hRpbOg5YWCcqw wXdNzSRCJgusitHLa8jmjDZQ9ZJKGSNmjgf6Yy77Cnh0uPOS/raR6AkQK2dY5H1OZxRXYR AvbpI4gZEKNoXDEkhPT945PeMYbLGy4vEu33qtINhVzV5VX6y/nqUfYuh4hj2JlLRGsjBJ Ts3ZD4bH7MOeTBtAHMLtjR8UBqD2KVvK1BdF9yuYfKJe67sBs5DYnvvCli3Of10LBv6XWh ktwZyjeDDf8rrav+T77AJmgD0ua6hQEeaw6uuxEja0uHTHfb82CR6rx9PUSfEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693951730; a=rsa-sha256; cv=none; b=cljhRXI4dDTesTeqU47r9hNwDEf7mopL3h7YBZfAZ5W0BWhj2v18byQC9ahSRo0VzfU8kS re+RMyBiRskn6bGjmHOVWjyaS0E2CrYub4SIxiCobl+Av9S5zQYc0D1gZfd8Mm5mageSEu KqvCtqaBAw7u56JH/iql08MecPor1xVuDa0paUDOWjuN5jQ38FXNsX9fJnGrHu9+/avfd5 MzpX89EpdcdZNQQ4oqmTvSAUcc81g9BrSLzMwFGoEQAaUPcxBqpbhFAmkJWNQO5+cJAVvg UbGmao8zuJDgXzDFhGH+h7H5iKCr7JNOCgpTE3g1yjO0mfH8GOQd1koUVxRY2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693951730; 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=gf8FR7UqG+6klAIjbPA8MTKPG5vBNt3vvd5Qf7IT3Y0=; b=FmwufBoxpv3o/Px7AHgIa8FxeHow74yVojtaTv0ujHk5sjAQ09Oqx6Mft2gAsRbmCKVii6 a+M7oEkfQ1rrPJLqgjEIm8HggfVoP8o4s8N8ymVOEDEAtBLRJJXDvXN/kQAe62M1FDnBcx QK+5V/DhKjgnWgkI7pPmMdQ9MNcyHOXpvLKGcpod99im/ckC8VgerEplbB0OixaYxNetmN Mmv51j1hS2US5iKG6Rj1/Bx/QNhN6za/bohBvLCzHGc31ykswdM7sGeyL7qr80efthhepc P2XygDBL7wlpmPx8GFwOjmMwqGpe0CMVnc/UZoVE2mHMcALmihF/RYq0tm1KyQ== 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 4RgKQp4N2jzqd4; Tue, 5 Sep 2023 22:08:50 +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 385M8o0h042849; Tue, 5 Sep 2023 22:08:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385M8oAZ042846; Tue, 5 Sep 2023 22:08:50 GMT (envelope-from git) Date: Tue, 5 Sep 2023 22:08:50 GMT Message-Id: <202309052208.385M8oAZ042846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b19d8afe4dd2 - main - msun: LIBCSRCDIR is too fragile, use ${SRCTOP}/lib/libc instead 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b19d8afe4dd205f7d4bfa3282f58b73d504926db Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b19d8afe4dd205f7d4bfa3282f58b73d504926db commit b19d8afe4dd205f7d4bfa3282f58b73d504926db Author: Warner Losh AuthorDate: 2023-09-05 20:58:06 +0000 Commit: Warner Losh CommitDate: 2023-09-05 22:08:02 +0000 msun: LIBCSRCDIR is too fragile, use ${SRCTOP}/lib/libc instead LIBCSRCDIR is defined in bsd.libnames.mk, which is read in later in the Makefile than the line: .if exists(${LIBCSRCDIR}/${MACHINE_ARCH}) so we test to see if /${MARCHIN_ARCH} exists which it usually doesn't (but did for me since I mounted 13.2R SD image there). Move to defining our own LIBC_SRCTOP in terms of SRCTOP to treat these uniformily. Sponsored by: Netflix Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D41661 --- lib/libc/Makefile | 14 ++++++++------ lib/msun/Makefile | 20 +++++++++++++++----- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index a26215324332..7540eb8c21ad 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -7,12 +7,14 @@ SHLIBDIR?= /lib LIBC_SRCTOP?= ${.CURDIR} -# Pick the current architecture directory for libc. In general, this is -# named MACHINE_CPUARCH, but some ABIs are different enough to require -# their own libc, so allow a directory named MACHINE_ARCH to override this. - -.if exists(${LIBC_SRCTOP}/${MACHINE_ARCH:S/powerpc64le/powerpc64/}) -LIBC_ARCH=${MACHINE_ARCH:S/powerpc64le/powerpc64/} +# Pick the current architecture directory for libc. In general, this is named +# MACHINE_CPUARCH, but some ABIs are different enough to require their own libc, +# so allow a directory named MACHINE_ARCH to override this (though treat +# powerpc64le and powerpc64 the same). +# Note: This is copeid to msun/Makefile +M=${MACHINE_ARCH:S/powerpc64le/powerpc64/} +.if exists(${LIBC_SRCTOP}/${M}) +LIBC_ARCH=${M} .else LIBC_ARCH=${MACHINE_CPUARCH} .endif diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 8bc984c2c342..9917be01d863 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -97,17 +97,27 @@ COMMON_SRCS+= s_cospi.c s_cospif.c \ s_sinpi.c s_sinpif.c \ s_tanpi.c s_tanpif.c +# LIBCSRCDIR is defined lazily, so can't be used for exists() below +LIBC_SRCTOP=${SRCTOP}/lib/libc # Location of fpmath.h and _fpmath.h -.if exists(${LIBCSRCDIR}/${MACHINE_ARCH}) -LIBC_ARCH=${MACHINE_ARCH} + +# Pick the current architecture directory for libc. In general, this is named +# MACHINE_CPUARCH, but some ABIs are different enough to require their own libc, +# so allow a directory named MACHINE_ARCH to override this (though treat +# powerpc64le and powerpc64 the same). +# Note: This is copied from libc/Makefile +M=${MACHINE_ARCH:S/powerpc64le/powerpc64/} +.if exists(${LIBC_SRCTOP}/${M}) +LIBC_ARCH=${M} .else LIBC_ARCH=${MACHINE_CPUARCH} .endif -CFLAGS+= -I${.CURDIR}/src -I${LIBCSRCDIR}/include \ - -I${LIBCSRCDIR}/${LIBC_ARCH} + +CFLAGS+= -I${.CURDIR}/src -I${LIBC_SRCTOP}/include \ + -I${LIBC_SRCTOP}/${LIBC_ARCH} SYM_MAPS+= ${.CURDIR}/Symbol.map -VERSION_DEF= ${LIBCSRCDIR}/Versions.def +VERSION_DEF= ${LIBC_SRCTOP}/Versions.def SYMBOL_MAPS= ${SYM_MAPS} # C99 long double functions