From nobody Mon Dec 12 17:38:20 2022 X-Original-To: dev-commits-ports-branches@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 4NW83w6gV7z4krpc; Mon, 12 Dec 2022 17:38:20 +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 4NW83w5tySz3kbh; Mon, 12 Dec 2022 17:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670866700; 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=NHRLO87IHpSxj9aq3VEIhbBpv6e3jlwhldizJKHAET0=; b=nvnF8H9UgwsL7x4ID1fT25pJdWAqpSKljZz4CyHcRqj2blHpa3NS+AFsYN74SO+3+m1Bsd YHAWOWw246YLH8bZ92Kj1Vhvv1FSqm6gwaeTNzDABjhbyevxTAZWND7+ykOGQzuuAZP8kO 0oYfMGRj5+PMp55owsU7l6czUwwJ6Dax28XotOIc5wFvmNMhknd+tK8eUfXKzZx2k1t6hU XeOkd2oYhr4a904qc6buIeUz+0uPbXXEqzsg/C7PwZqrL0r6CrCyD96R0meXt3AnEblCqV 0U37Yae3uW4H+p1QQ7HlBuTmg0zRFqkU5dMGjUY42lrA8KnXg0mixxHdctB1vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670866700; 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=NHRLO87IHpSxj9aq3VEIhbBpv6e3jlwhldizJKHAET0=; b=g+uLeFrxgWh+wYvlFRPSgoFk0vFJxuQbmNhvIdcCiUIzAhh1GuWvS703bCIUOWELG7M2jD sN+inR95+6fMy9E7JR8atbiZnC8f7dnLJ0nwEfBKjL+9vLlOUjnK0iKqo279EQK/Riic6U I03X8O+XCMY/BKTjX73x6XfvinW0Y2nqZ50Ufa3XvrvOOkfZEGPyPIWz8Idn90534p66se bPOlZUJpbNb5KrVqvKP9fNAqCaL+OVSN2LnADXIAk5BlaJtiYM+x5xIsz6GyB3wvBaym2O /1I0IUbMZOJq105sx3NEsUDci7qzvla7qVplJljOkyP3viLMcOnfxxJpySkJtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670866700; a=rsa-sha256; cv=none; b=jKDXdtCsUVheLUXGA05GRYGg22BGK0bsP0155cr6Jg502rt0lNt3IpgXOb3V0mJO9czLAv kuKuEFcG6t9+p5BBJ7tht1sWMhqK4r+N7SxhNHe0XKIgyp0vMRM0tvLL/iP5UrQjQpm6GZ roxGpzZ42yRRA6pd8a2rah1udngQmCiyOU4Vucb3Z4O0y8VilplRozjzdsgbamFR1JGdd7 nmrRNFze8Yyu85W9AsotKiml4t4evw1JZs+Pqz04acVs08u3+1aMcPz0ZpNvM/CMsAqAGn ZC1G2sSko1ELnfyJo3VbQSsMZAbMKCpCW9CQn/thLw8ooljLPdkkUagZ7Whc4Q== 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 4NW83w4zTfzjZG; Mon, 12 Dec 2022 17:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BCHcKkc030633; Mon, 12 Dec 2022 17:38:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BCHcKOu030632; Mon, 12 Dec 2022 17:38:20 GMT (envelope-from git) Date: Mon, 12 Dec 2022 17:38:20 GMT Message-Id: <202212121738.2BCHcKOu030632@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: f4497535fe59 - 2022Q4 - devel/llvm1[2345]: fix build with clang 15 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: f4497535fe59b5e0fee717a4c91032fc8bb223cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4497535fe59b5e0fee717a4c91032fc8bb223cc commit f4497535fe59b5e0fee717a4c91032fc8bb223cc Author: Brooks Davis AuthorDate: 2022-12-12 17:37:59 +0000 Commit: Brooks Davis CommitDate: 2022-12-12 17:37:59 +0000 devel/llvm1[2345]: fix build with clang 15 When building llvm12 through llvm15 with clang 15 as host compiler, and when compiler-rt is enabled, there will be errors due to float16 support, similar to: In file included from /wrkdirs/usr/ports/devel/llvm15/work/llvm-project-15.0.6.src/compiler-rt/lib/builtins/extendhfsf2.c:11: In file included from /wrkdirs/usr/ports/devel/llvm15/work/llvm-project-15.0.6.src/compiler-rt/lib/builtins/fp_extend_impl.inc:38: /wrkdirs/usr/ports/devel/llvm15/work/llvm-project-15.0.6.src/compiler-rt/lib/builtins/fp_extend.h:44:9: error: _Float16 is not supported on this target typedef _Float16 src_t; ^ This is because compiler-rt's CMake infrastructure detects float16 support at configure time, while targeting 'pure' x86_64, but then builds parts of its tree also targeting i386. To work around this, modify compiler-rt's top-level CMakeLists.txt to move setting the -DCOMPILER_RT_HAS_FLOAT16 compilation flag to the arch-specific for loop, so it only gets enabled for x86_64, and not for i386. For llvm15, also add another modification that removes the bfloat16 source files from the i386_SOURCES list, so these are not built for i386. PR: 268196 Submitted by: dim (cherry picked from commit 830bbdd84a53aa33b48c01ee16048d1400094e26) --- .../patch-compiler-rt_lib_builtins_CMakeLists.txt | 22 ++++++++++ .../patch-compiler-rt_lib_builtins_CMakeLists.txt | 22 ++++++++++ .../patch-compiler-rt_lib_builtins_CMakeLists.txt | 22 ++++++++++ .../patch-compiler-rt_lib_builtins_CMakeLists.txt | 50 ++++++++++++++++++++++ 4 files changed, 116 insertions(+) diff --git a/devel/llvm12/files/patch-compiler-rt_lib_builtins_CMakeLists.txt b/devel/llvm12/files/patch-compiler-rt_lib_builtins_CMakeLists.txt new file mode 100644 index 000000000000..af02e8aa7dae --- /dev/null +++ b/devel/llvm12/files/patch-compiler-rt_lib_builtins_CMakeLists.txt @@ -0,0 +1,22 @@ +--- compiler-rt/lib/builtins/CMakeLists.txt.orig 2021-06-28 16:23:38 UTC ++++ compiler-rt/lib/builtins/CMakeLists.txt +@@ -664,8 +664,6 @@ else () + else () + set(BUILTIN_CFLAGS "") + +- append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS) +- + append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 BUILTIN_CFLAGS) + + # These flags would normally be added to CMAKE_C_FLAGS by the llvm +@@ -724,6 +722,10 @@ else () + # double routines. + if("${arch}" STREQUAL "riscv32") + list(APPEND BUILTIN_CFLAGS -fforce-enable-int128) ++ endif() ++ ++ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" AND ${arch} STREQUAL "i386")) ++ append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS_${arch}) + endif() + + add_compiler_rt_runtime(clang_rt.builtins diff --git a/devel/llvm13/files/patch-compiler-rt_lib_builtins_CMakeLists.txt b/devel/llvm13/files/patch-compiler-rt_lib_builtins_CMakeLists.txt new file mode 100644 index 000000000000..874ad38b689a --- /dev/null +++ b/devel/llvm13/files/patch-compiler-rt_lib_builtins_CMakeLists.txt @@ -0,0 +1,22 @@ +--- compiler-rt/lib/builtins/CMakeLists.txt.orig 2022-01-20 21:31:59 UTC ++++ compiler-rt/lib/builtins/CMakeLists.txt +@@ -675,8 +675,6 @@ else () + else () + set(BUILTIN_CFLAGS "") + +- append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS) +- + append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 BUILTIN_CFLAGS) + + # These flags would normally be added to CMAKE_C_FLAGS by the llvm +@@ -747,6 +745,10 @@ else () + ) + + set(deps_aarch64 lse_builtin_symlinks) ++ endif() ++ ++ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" AND ${arch} STREQUAL "i386")) ++ append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS_${arch}) + endif() + + add_compiler_rt_runtime(clang_rt.builtins diff --git a/devel/llvm14/files/patch-compiler-rt_lib_builtins_CMakeLists.txt b/devel/llvm14/files/patch-compiler-rt_lib_builtins_CMakeLists.txt new file mode 100644 index 000000000000..a1a022c059fc --- /dev/null +++ b/devel/llvm14/files/patch-compiler-rt_lib_builtins_CMakeLists.txt @@ -0,0 +1,22 @@ +--- compiler-rt/lib/builtins/CMakeLists.txt.orig 2022-06-22 16:46:24 UTC ++++ compiler-rt/lib/builtins/CMakeLists.txt +@@ -682,8 +682,6 @@ else () + append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) + endif() + +- append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS) +- + append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 BUILTIN_CFLAGS) + + # These flags would normally be added to CMAKE_C_FLAGS by the llvm +@@ -754,6 +752,10 @@ else () + ) + + set(deps_aarch64 lse_builtin_symlinks) ++ endif() ++ ++ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" AND ${arch} STREQUAL "i386")) ++ append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS_${arch}) + endif() + + add_compiler_rt_runtime(clang_rt.builtins diff --git a/devel/llvm15/files/patch-compiler-rt_lib_builtins_CMakeLists.txt b/devel/llvm15/files/patch-compiler-rt_lib_builtins_CMakeLists.txt new file mode 100644 index 000000000000..e26ae7cf0634 --- /dev/null +++ b/devel/llvm15/files/patch-compiler-rt_lib_builtins_CMakeLists.txt @@ -0,0 +1,50 @@ +--- compiler-rt/lib/builtins/CMakeLists.txt.orig 2022-11-29 10:05:58 UTC ++++ compiler-rt/lib/builtins/CMakeLists.txt +@@ -183,11 +183,14 @@ if(COMPILER_RT_HAS_BFLOAT16 AND NOT APPLE) + + # Build BF16 files only when "__bf16" is available. + if(COMPILER_RT_HAS_BFLOAT16 AND NOT APPLE) +- set(GENERIC_SOURCES +- ${GENERIC_SOURCES} ++ set(GENERIC_BF_SOURCES + truncdfbf2.c + truncsfbf2.c + ) ++ set(GENERIC_SOURCES ++ ${GENERIC_SOURCES} ++ ${GENERIC_BF_SOURCES} ++ ) + endif() + + # TODO: Several "tf" files (and divtc3.c, but not multc3.c) are in +@@ -360,6 +363,10 @@ if (NOT MSVC) + i386/chkstk2.S + ) + endif() ++ ++ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") ++ list(REMOVE_ITEM i386_SOURCES ${GENERIC_BF_SOURCES}) ++ endif() + else () # MSVC + # Use C versions of functions when building on MSVC + # MSVC's assembler takes Intel syntax, not AT&T syntax. +@@ -703,8 +710,6 @@ else () + append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) + endif() + +- append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS) +- + append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 BUILTIN_CFLAGS) + + # These flags would normally be added to CMAKE_C_FLAGS by the llvm +@@ -775,6 +780,10 @@ else () + ) + + set(deps_aarch64 lse_builtin_symlinks) ++ endif() ++ ++ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" AND ${arch} STREQUAL "i386")) ++ append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS) + endif() + + add_compiler_rt_runtime(clang_rt.builtins