From nobody Thu Apr 24 14:36:49 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 4Zjz7k1J4Xz5tNNS; Thu, 24 Apr 2025 14:36: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zjz7k03tmz3WGW; Thu, 24 Apr 2025 14:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745505410; 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=M8fRmkeNRnHfhfBMEhawZpFktMSbvMf9ls0ANW/kPIs=; b=XHTCxGswsQdFhRJ1Ft2o98jn509Uv+wd4beubTiapD8QR/fQ/C8BG/ggobvexq206HBAnH qGPK9TWLt3JBRwVpAwTKbPVgUe3ByQ8RZRIEJ1EKrW72Z36Y/SSrjzxrI1jKYBb7J4KeCV WEZNoBd/lb1XDp6K3JtB74ysCjV28/8WUjJLH7TxeZC4m/9rvuP9ej3zMx4wlaYXOHXpsw 9ZtSkJ+gy78ty9bItHEVVWIlTNsStPcnoMKMIHm8xJGmvNk01N62YP67uxz89scikEVwbe J1eR8Uwc/j0Vh8Le5HgqwVkbTvdvbmPeAr7rjIUYZ/uHyjUnGRjrrcBjQF5u5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745505410; a=rsa-sha256; cv=none; b=tOLN4MWLKkyK8YhJX90/3yfoVrVuRb/w0+cENYSK7lbX0xFeZ3ib0MynGk97XcmI/BnbLL Ly58VAWqdAmh1Aohb5ZWoUqNxPplnamrL2xVf7uBPGxH5dTrQXPEMD5qlzV+gMscUOsAYw cOG9QgPTQeGbINTaGqBqfpljW/D773MS7uT+gLinWWmrw5p3D7HJrj/8b88v4KHJPu24U8 K6txGerktZOGWpdX3uKX1Y1WPvmjc/qUaaonAzWYzGWPM6GY0dtJzw3hGSl47bylJBWBwd uRPzYTmhjVLXWEPSrEOg1lSKLkczcw6SLnk9S9EqI68X8BRQN4Rd4pTQJWjS3Q== 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=1745505410; 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=M8fRmkeNRnHfhfBMEhawZpFktMSbvMf9ls0ANW/kPIs=; b=WFAkPZiT0ejWc9HIhRrntukYbXZwukyDpYAq2xhtFz8M9v7DauUXO9k087Eak9DwY8oLVk aIEql5HC3RCmvg34cUQ3Nsw0Pr3G8bm/m/b+cjzrNo9KvFXxMM1j3Q6bRh5jOqodyTYosO kgJY9DEKuPJDiuzDzcqIyHzRLz+DdpV2WBNtVj5ZexGb4GMfZJw/akY6QrH9cmZ5hOPqj5 0xumaVFe3EOG8fHiYBl23RjIpY6p6Kt+FPKX8UkP+PTWQfF9BDz+++UbmG1r5LGqaWw3z/ BpjCTQNZBh1qdnYth/7wb8E+ANrf5vGfiSyen1auCTjJfuvDgvK2ivPGFQS/eA== 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 4Zjz7j6VNgztDh; Thu, 24 Apr 2025 14:36:49 +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 53OEangq076891; Thu, 24 Apr 2025 14:36:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53OEanKM076888; Thu, 24 Apr 2025 14:36:49 GMT (envelope-from git) Date: Thu, 24 Apr 2025 14:36:49 GMT Message-Id: <202504241436.53OEanKM076888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: a34d2231fa38 - main - Partially revert 6527682ab705 for llvm-based projects 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/main X-Git-Reftype: branch X-Git-Commit: a34d2231fa38a5e440ecdc94dbca3b3deb5a7f50 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a34d2231fa38a5e440ecdc94dbca3b3deb5a7f50 commit a34d2231fa38a5e440ecdc94dbca3b3deb5a7f50 Author: Dimitry Andric AuthorDate: 2025-04-24 12:03:38 +0000 Commit: Dimitry Andric CommitDate: 2025-04-24 14:36:40 +0000 Partially revert 6527682ab705 for llvm-based projects Upstream llvm compiles most of their subprojects with -std=c++17 explicitly, not -std=gnu++17. In gnu++17 mode, both clang and gcc define the macro 'i386' on i386, which clashes with a namespace identifier in contrib/llvm-project/llvm/include/llvm/ExecutionEngine/JITLink/i386.h. Since the default after 6527682ab705 is now CXXSTD=gnu++17, explicitly set CXXSTD=c++17 for lib/clang, lib/libclang_rt and lib/libomp. --- lib/clang/llvm.build.mk | 1 + lib/libclang_rt/Makefile.inc | 1 + lib/libomp/Makefile | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index c731deba8976..e88b2ff1033e 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -119,6 +119,7 @@ LDFLAGS+= -Wl,-m,elf64lriscv_fbsd .endif .endif +CXXSTD= c++17 CXXFLAGS+= -fno-exceptions CXXFLAGS+= -fno-rtti .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING) diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index e7db5a469661..c472e8b741be 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -33,3 +33,4 @@ CXXFLAGS+= -fvisibility-inlines-hidden CXXFLAGS+= -fvisibility=hidden CFLAGS+= -I${CRTSRC}/include CFLAGS+= -I${CRTSRC}/lib +CXXSTD= c++17 diff --git a/lib/libomp/Makefile b/lib/libomp/Makefile index f1513e70f3f6..6c14c7d21077 100644 --- a/lib/libomp/Makefile +++ b/lib/libomp/Makefile @@ -57,6 +57,7 @@ CFLAGS+= -fdata-sections CXXFLAGS+= -fvisibility-inlines-hidden CXXFLAGS+= -fno-exceptions CXXFLAGS+= -fno-rtti +CXXSTD= c++17 .if ${COMPILER_TYPE} == "clang" .if ${MACHINE_CPUARCH} == "i386"