Attachment 247490 Details for Bug 276155 – devel/llvm14 devel/llvm15 devel/llvm16 devel/llvm17: fix build with clang 18

[patch] devel/llvm14 devel/llvm15 devel/llvm16 devel/llvm17: fix build with clang 18

devel__llvm14_15_16_17-fix-clang-18-build-1.diff (text/plain), 6.16 KB, created by Dimitry Andric on 2024-01-06 17:30:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2024-01-06 17:30:51 UTC

Size: 6.16 KB

patch

obsolete

>commit a6a8bb3a7349e3bbf674661caba124b2ef8ef4ff
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2024-01-06T18:11:27+01:00
>
>    devel/llvm14 devel/llvm15 devel/llvm16 devel/llvm17: fix build with clang 18
>    
>    Clang 18 is more strict in checking inline assembly constraints,
>    resulting in an error building devel/llvm14, devel/llvm15, devel/llvm16,
>    and devel/llvm17:
>    
>      /wrkdirs/usr/ports/devel/llvm14/work-default/llvm-project-14.0.6.src/compiler-rt/lib/asan/asan_rtl_x86_64.S:130:286: error: displacement 70368744177664 is not within [-2147483648, 2147483647]
>    
>    This is fixed by two upstream commits:
>    https://github.com/llvm/llvm-project/commit/b9935bb02a50
>    https://github.com/llvm/llvm-project/commit/966d564e43e6
>    
>    PR:             276155
>    MFH:            2024Q1
>
>diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile
>index 6995247f16bc..7eead94bb544 100644
>--- a/devel/llvm14/Makefile
>+++ b/devel/llvm14/Makefile
>@@ -8,6 +8,10 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
> DISTNAME=	llvm-project-${DISTVERSION}.src
> DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
> 
>+PATCH_SITES=	https://github.com/llvm/llvm-project/commit/
>+PATCHFILES+=	llvmorg-18-init-15199-gb9935bb02a50.patch:-p1 # https://github.com/llvm/llvm-project/pull/75748
>+PATCHFILES+=	llvmorg-18-init-15680-g966d564e43e6.patch:-p1 # https://github.com/llvm/llvm-project/pull/76185
>+
> MAINTAINER=	brooks@FreeBSD.org
> COMMENT=	LLVM and Clang
> WWW=		https://llvm.org/
>diff --git a/devel/llvm14/distinfo b/devel/llvm14/distinfo
>index dedc06cb90fe..987d3431ff51 100644
>--- a/devel/llvm14/distinfo
>+++ b/devel/llvm14/distinfo
>@@ -1,3 +1,7 @@
> TIMESTAMP = 1656378667
> SHA256 (llvm-project-14.0.6.src.tar.xz) = 8b3cfd7bc695bd6cea0f37f53f0981f34f87496e79e2529874fd03a2f9dd3a8a
> SIZE (llvm-project-14.0.6.src.tar.xz) = 105618228
>+SHA256 (llvmorg-18-init-15199-gb9935bb02a50.patch) = b0805cba765084c7bef426fa1235dd887c61ae0c1fd5e3fad5c8742cdd6ee8b0
>+SIZE (llvmorg-18-init-15199-gb9935bb02a50.patch) = 1893
>+SHA256 (llvmorg-18-init-15680-g966d564e43e6.patch) = 3abf92d4a788ff2f74fa9fc627a113f04d9fb72cd7e47344a8c4dce06140a163
>+SIZE (llvmorg-18-init-15680-g966d564e43e6.patch) = 1297
>diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile
>index 3651f6dda433..50323576f8ba 100644
>--- a/devel/llvm15/Makefile
>+++ b/devel/llvm15/Makefile
>@@ -8,6 +8,10 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
> DISTNAME=	llvm-project-${DISTVERSION}.src
> DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
> 
>+PATCH_SITES=	https://github.com/llvm/llvm-project/commit/
>+PATCHFILES+=	llvmorg-18-init-15199-gb9935bb02a50.patch:-p1 # https://github.com/llvm/llvm-project/pull/75748
>+PATCHFILES+=	llvmorg-18-init-15680-g966d564e43e6.patch:-p1 # https://github.com/llvm/llvm-project/pull/76185
>+
> MAINTAINER=	brooks@FreeBSD.org
> COMMENT=	LLVM and Clang
> WWW=		https://llvm.org/
>diff --git a/devel/llvm15/distinfo b/devel/llvm15/distinfo
>index f6a85a9bc945..7abec8c5f61f 100644
>--- a/devel/llvm15/distinfo
>+++ b/devel/llvm15/distinfo
>@@ -1,3 +1,7 @@
> TIMESTAMP = 1673554510
> SHA256 (llvm-project-15.0.7.src.tar.xz) = 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6
> SIZE (llvm-project-15.0.7.src.tar.xz) = 110936452
>+SHA256 (llvmorg-18-init-15199-gb9935bb02a50.patch) = b0805cba765084c7bef426fa1235dd887c61ae0c1fd5e3fad5c8742cdd6ee8b0
>+SIZE (llvmorg-18-init-15199-gb9935bb02a50.patch) = 1893
>+SHA256 (llvmorg-18-init-15680-g966d564e43e6.patch) = 3abf92d4a788ff2f74fa9fc627a113f04d9fb72cd7e47344a8c4dce06140a163
>+SIZE (llvmorg-18-init-15680-g966d564e43e6.patch) = 1297
>diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile
>index d5ec6b044d2a..4bdee92d2303 100644
>--- a/devel/llvm16/Makefile
>+++ b/devel/llvm16/Makefile
>@@ -8,6 +8,10 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
> DISTNAME=	llvm-project-${DISTVERSION}.src
> DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
> 
>+PATCH_SITES=	https://github.com/llvm/llvm-project/commit/
>+PATCHFILES+=	llvmorg-18-init-15199-gb9935bb02a50.patch:-p1 # https://github.com/llvm/llvm-project/pull/75748
>+PATCHFILES+=	llvmorg-18-init-15680-g966d564e43e6.patch:-p1 # https://github.com/llvm/llvm-project/pull/76185
>+
> MAINTAINER=	brooks@FreeBSD.org
> COMMENT=	LLVM and Clang
> WWW=		https://llvm.org/
>diff --git a/devel/llvm16/distinfo b/devel/llvm16/distinfo
>index 95efc23fe3c1..e7394a506f14 100644
>--- a/devel/llvm16/distinfo
>+++ b/devel/llvm16/distinfo
>@@ -1,3 +1,7 @@
> TIMESTAMP = 1686758340
> SHA256 (llvm-project-16.0.6.src.tar.xz) = ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e
> SIZE (llvm-project-16.0.6.src.tar.xz) = 118013488
>+SHA256 (llvmorg-18-init-15199-gb9935bb02a50.patch) = b0805cba765084c7bef426fa1235dd887c61ae0c1fd5e3fad5c8742cdd6ee8b0
>+SIZE (llvmorg-18-init-15199-gb9935bb02a50.patch) = 1893
>+SHA256 (llvmorg-18-init-15680-g966d564e43e6.patch) = 3abf92d4a788ff2f74fa9fc627a113f04d9fb72cd7e47344a8c4dce06140a163
>+SIZE (llvmorg-18-init-15680-g966d564e43e6.patch) = 1297
>diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile
>index 9bf6394c77d7..0f12e37a6387 100644
>--- a/devel/llvm17/Makefile
>+++ b/devel/llvm17/Makefile
>@@ -8,6 +8,10 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
> DISTNAME=	llvm-project-${DISTVERSION}.src
> DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
> 
>+PATCH_SITES=	https://github.com/llvm/llvm-project/commit/
>+PATCHFILES+=	llvmorg-18-init-15199-gb9935bb02a50.patch:-p1 # https://github.com/llvm/llvm-project/pull/75748
>+PATCHFILES+=	llvmorg-18-init-15680-g966d564e43e6.patch:-p1 # https://github.com/llvm/llvm-project/pull/76185
>+
> MAINTAINER=	brooks@FreeBSD.org
> COMMENT=	LLVM and Clang
> WWW=		https://llvm.org/
>diff --git a/devel/llvm17/distinfo b/devel/llvm17/distinfo
>index 81dcd0a422d4..9b27c6ea150d 100644
>--- a/devel/llvm17/distinfo
>+++ b/devel/llvm17/distinfo
>@@ -1,3 +1,7 @@
> TIMESTAMP = 1701190197
> SHA256 (llvm-project-17.0.6.src.tar.xz) = 58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813
> SIZE (llvm-project-17.0.6.src.tar.xz) = 127838860
>+SHA256 (llvmorg-18-init-15199-gb9935bb02a50.patch) = b0805cba765084c7bef426fa1235dd887c61ae0c1fd5e3fad5c8742cdd6ee8b0
>+SIZE (llvmorg-18-init-15199-gb9935bb02a50.patch) = 1893
>+SHA256 (llvmorg-18-init-15680-g966d564e43e6.patch) = 3abf92d4a788ff2f74fa9fc627a113f04d9fb72cd7e47344a8c4dce06140a163
>+SIZE (llvmorg-18-init-15680-g966d564e43e6.patch) = 1297

Actions: View | Diff

Attachments on bug 276155: 247490