Attachment 194882 Details for Bug 229521 – v1

[patch] v1

llvm.openmp.diff (text/plain), 9.36 KB, created by Jan Beich on 2018-07-05 00:09:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2018-07-05 00:09:34 UTC

Size: 9.36 KB

patch

obsolete

>From d6d3ece6b2d409afdd9794e6d05e22048b7f5ee4 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Wed, 4 Jul 2018 23:17:39 +0000
>Subject: [PATCH] devel/llvm*: apply r447281 and enable OPENMP on i386
>
>PR:		229521
>Approved by:	!!! brooks (maintainer) OR maintainer timeout (2 weeks) !!!
>---
> devel/llvm-devel/Makefile                |  6 +++---
> devel/llvm-devel/files/openmp/patch-i386 | 11 +++++++++++
> devel/llvm38/Makefile                    |  7 ++++---
> devel/llvm38/files/openmp-patch-i386     | 11 +++++++++++
> devel/llvm40/Makefile                    |  7 ++++---
> devel/llvm40/files/openmp-patch-i386     | 11 +++++++++++
> devel/llvm50/Makefile                    |  7 ++++---
> devel/llvm50/files/openmp-patch-i386     | 11 +++++++++++
> devel/llvm60/Makefile                    |  6 +++---
> devel/llvm60/files/openmp/patch-i386     | 11 +++++++++++
> 10 files changed, 73 insertions(+), 15 deletions(-)
> create mode 100644 devel/llvm-devel/files/openmp/patch-i386
> create mode 100644 devel/llvm38/files/openmp-patch-i386
> create mode 100644 devel/llvm40/files/openmp-patch-i386
> create mode 100644 devel/llvm50/files/openmp-patch-i386
> create mode 100644 devel/llvm60/files/openmp/patch-i386
>
>diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
>index b4db9c9ac011..f8c53f7bcfdd 100644
>--- a/devel/llvm-devel/Makefile
>+++ b/devel/llvm-devel/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	llvm
> PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	devel lang
> PKGNAMESUFFIX=	-devel
> 
>@@ -49,10 +49,10 @@ GH_TAGNAME=	${LLVM_COMMIT}
> 
> OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD LLDB
> OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
>-OPTIONS_DEFINE_i386=	COMPILER_RT
>+OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
> OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD LLDB
> OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
>-OPTIONS_DEFAULT_i386=	COMPILER_RT
>+OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
> OPTIONS_EXCLUDE_FreeBSD_10=	LLDB OPENMP
> OPTIONS_SUB=	yes
> 
>diff --git a/devel/llvm-devel/files/openmp/patch-i386 b/devel/llvm-devel/files/openmp/patch-i386
>new file mode 100644
>index 000000000000..9300640f6845
>--- /dev/null
>+++ b/devel/llvm-devel/files/openmp/patch-i386
>@@ -0,0 +1,11 @@
>+--- projects/openmp/runtime/src/kmp_runtime.cpp.orig	2017-07-17 09:03:14 UTC
>++++ projects/openmp/runtime/src/kmp_runtime.cpp
>+@@ -7535,7 +7535,7 @@ __kmp_determine_reduction_method(
>+ 
>+ #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS
>+ 
>+-#if KMP_OS_LINUX || KMP_OS_WINDOWS
>++#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS
>+ 
>+     // basic tuning
>+ 
>diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile
>index 63cd8621a379..625eae5e9170 100644
>--- a/devel/llvm38/Makefile
>+++ b/devel/llvm38/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	llvm
> DISTVERSION=	3.8.1
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	devel lang
> MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
> DISTNAME=	${PORTNAME}-${DISTVERSION}.src
>@@ -44,10 +44,10 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
> 
> OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD LLDB
> OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
>-OPTIONS_DEFINE_i386=	COMPILER_RT
>+OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
> OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD LLDB
> OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
>-OPTIONS_DEFAULT_i386=	COMPILER_RT
>+OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
> OPTIONS_SUB=	yes
> 
> PLIST_FILES=
>@@ -85,6 +85,7 @@ LLDB_IMPLIES=		CLANG
> OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
> OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
> OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp-patch-bug32279
>+OPENMP_EXTRA_PATCHES+=	${PATCHDIR}/openmp-patch-i386
> GOLD_DESC=		Build the LLVM Gold plugin for LTO
> GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
> GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
>diff --git a/devel/llvm38/files/openmp-patch-i386 b/devel/llvm38/files/openmp-patch-i386
>new file mode 100644
>index 000000000000..8b4b6518214e
>--- /dev/null
>+++ b/devel/llvm38/files/openmp-patch-i386
>@@ -0,0 +1,11 @@
>+--- tools/openmp/runtime/src/kmp_runtime.c.orig	2016-06-02 20:32:40 UTC
>++++ tools/openmp/runtime/src/kmp_runtime.c
>+@@ -7574,7 +7574,7 @@ __kmp_determine_reduction_method( ident_t *loc, kmp_in
>+ 
>+         #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH
>+ 
>+-            #if KMP_OS_LINUX || KMP_OS_WINDOWS
>++            #if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS
>+ 
>+                 // basic tuning
>+ 
>diff --git a/devel/llvm40/Makefile b/devel/llvm40/Makefile
>index 947d60d92321..6ee6c5664d72 100644
>--- a/devel/llvm40/Makefile
>+++ b/devel/llvm40/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	llvm
> DISTVERSION=	4.0.1
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	devel lang
> MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
> PKGNAMESUFFIX=	${LLVM_SUFFIX}
>@@ -50,10 +50,10 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
> 
> OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD LLDB
> OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
>-OPTIONS_DEFINE_i386=	COMPILER_RT
>+OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
> OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD LLDB
> OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
>-OPTIONS_DEFAULT_i386=	COMPILER_RT
>+OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
> OPTIONS_SUB=	yes
> 
> CLANG_DESC=	Build clang
>@@ -98,6 +98,7 @@ LLDB_VARS=		_USES_PYTHON=python:2.7
> OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
> OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
> OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp-patch-bug32279
>+OPENMP_EXTRA_PATCHES+=	${PATCHDIR}/openmp-patch-i386
> 
> .if defined(WITH_DEBUG)
> CMAKE_BUILD_TYPE=	RelWithDebInfo
>diff --git a/devel/llvm40/files/openmp-patch-i386 b/devel/llvm40/files/openmp-patch-i386
>new file mode 100644
>index 000000000000..c4b3f9022971
>--- /dev/null
>+++ b/devel/llvm40/files/openmp-patch-i386
>@@ -0,0 +1,11 @@
>+--- tools/openmp/runtime/src/kmp_runtime.cpp.orig	2017-01-20 23:31:21 UTC
>++++ tools/openmp/runtime/src/kmp_runtime.cpp
>+@@ -7597,7 +7597,7 @@ __kmp_determine_reduction_method( ident_t *loc, kmp_in
>+ 
>+         #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS
>+ 
>+-            #if KMP_OS_LINUX || KMP_OS_WINDOWS
>++            #if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS
>+ 
>+                 // basic tuning
>+ 
>diff --git a/devel/llvm50/Makefile b/devel/llvm50/Makefile
>index c78e80282518..51059a646b39 100644
>--- a/devel/llvm50/Makefile
>+++ b/devel/llvm50/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	llvm
> DISTVERSION=	5.0.2
>-PORTREVISON=	0
>+PORTREVISON=	1
> CATEGORIES=	devel lang
> MASTER_SITES=	https://releases.llvm.org/${LLVM_RELEASE}/${RCDIR} LOCAL/brooks
> PKGNAMESUFFIX=	${LLVM_SUFFIX}
>@@ -50,10 +50,10 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
> 
> OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD LLDB
> OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
>-OPTIONS_DEFINE_i386=	COMPILER_RT
>+OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
> OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD LLDB
> OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
>-OPTIONS_DEFAULT_i386=	COMPILER_RT
>+OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
> OPTIONS_EXCLUDE_FreeBSD_10=	LLDB
> OPTIONS_SUB=	yes
> 
>@@ -99,6 +99,7 @@ LLDB_VARS=		_USES_PYTHON=python:2.7
> OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
> OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
> OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp-patch-bug32279
>+OPENMP_EXTRA_PATCHES+=	${PATCHDIR}/openmp-patch-i386
> 
> .if defined(WITH_DEBUG)
> CMAKE_BUILD_TYPE=	RelWithDebInfo
>diff --git a/devel/llvm50/files/openmp-patch-i386 b/devel/llvm50/files/openmp-patch-i386
>new file mode 100644
>index 000000000000..9300640f6845
>--- /dev/null
>+++ b/devel/llvm50/files/openmp-patch-i386
>@@ -0,0 +1,11 @@
>+--- projects/openmp/runtime/src/kmp_runtime.cpp.orig	2017-07-17 09:03:14 UTC
>++++ projects/openmp/runtime/src/kmp_runtime.cpp
>+@@ -7535,7 +7535,7 @@ __kmp_determine_reduction_method(
>+ 
>+ #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS
>+ 
>+-#if KMP_OS_LINUX || KMP_OS_WINDOWS
>++#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS
>+ 
>+     // basic tuning
>+ 
>diff --git a/devel/llvm60/Makefile b/devel/llvm60/Makefile
>index c7b1d9443b92..480a85a51f74 100644
>--- a/devel/llvm60/Makefile
>+++ b/devel/llvm60/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	llvm
> DISTVERSION=	6.0.1
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	devel lang
> MASTER_SITES=	http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
> PKGNAMESUFFIX=	${LLVM_SUFFIX}
>@@ -50,10 +50,10 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
> 
> OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD LLDB
> OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
>-OPTIONS_DEFINE_i386=	COMPILER_RT
>+OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
> OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD LLDB
> OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
>-OPTIONS_DEFAULT_i386=	COMPILER_RT
>+OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
> OPTIONS_EXCLUDE_FreeBSD_10=	LLDB OPENMP
> OPTIONS_SUB=	yes
> 
>diff --git a/devel/llvm60/files/openmp/patch-i386 b/devel/llvm60/files/openmp/patch-i386
>new file mode 100644
>index 000000000000..9300640f6845
>--- /dev/null
>+++ b/devel/llvm60/files/openmp/patch-i386
>@@ -0,0 +1,11 @@
>+--- projects/openmp/runtime/src/kmp_runtime.cpp.orig	2017-07-17 09:03:14 UTC
>++++ projects/openmp/runtime/src/kmp_runtime.cpp
>+@@ -7535,7 +7535,7 @@ __kmp_determine_reduction_method(
>+ 
>+ #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS
>+ 
>+-#if KMP_OS_LINUX || KMP_OS_WINDOWS
>++#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS
>+ 
>+     // basic tuning
>+

Flags:

brooks: maintainer-approval+

Actions: View | Diff

Attachments on bug 229521: 194882