svn commit: r473980 - in branches/2018Q3/devel: llvm-devel llvm-devel/files/openmp llvm38 llvm38/files llvm40 llvm40/files llvm50 llvm50/files llvm60 llvm60/files/openmp
Jan Beich
jbeich at FreeBSD.org
Thu Jul 5 18:52:22 UTC 2018
Author: jbeich
Date: Thu Jul 5 18:52:19 2018
New Revision: 473980
URL: https://svnweb.freebsd.org/changeset/ports/473980
Log:
MFH: r473956
devel/llvm*: apply r447281 and enable OPENMP on i386
PR: 229521
Approved by: brooks (maintainer)
Approved by: ports-secteam (miwi)
Added:
branches/2018Q3/devel/llvm-devel/files/openmp/patch-i386
- copied unchanged from r473956, head/devel/llvm-devel/files/openmp/patch-i386
branches/2018Q3/devel/llvm38/files/openmp-patch-i386
- copied unchanged from r473956, head/devel/llvm38/files/openmp-patch-i386
branches/2018Q3/devel/llvm40/files/openmp-patch-i386
- copied unchanged from r473956, head/devel/llvm40/files/openmp-patch-i386
branches/2018Q3/devel/llvm50/files/openmp-patch-i386
- copied unchanged from r473956, head/devel/llvm50/files/openmp-patch-i386
branches/2018Q3/devel/llvm60/files/openmp/patch-i386
- copied unchanged from r473956, head/devel/llvm60/files/openmp/patch-i386
Modified:
branches/2018Q3/devel/llvm-devel/Makefile
branches/2018Q3/devel/llvm38/Makefile
branches/2018Q3/devel/llvm40/Makefile
branches/2018Q3/devel/llvm50/Makefile
branches/2018Q3/devel/llvm60/Makefile
Directory Properties:
branches/2018Q3/ (props changed)
Modified: branches/2018Q3/devel/llvm-devel/Makefile
==============================================================================
--- branches/2018Q3/devel/llvm-devel/Makefile Thu Jul 5 18:23:22 2018 (r473979)
+++ branches/2018Q3/devel/llvm-devel/Makefile Thu Jul 5 18:52:19 2018 (r473980)
@@ -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
Copied: branches/2018Q3/devel/llvm-devel/files/openmp/patch-i386 (from r473956, head/devel/llvm-devel/files/openmp/patch-i386)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q3/devel/llvm-devel/files/openmp/patch-i386 Thu Jul 5 18:52:19 2018 (r473980, copy of r473956, head/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
+
Modified: branches/2018Q3/devel/llvm38/Makefile
==============================================================================
--- branches/2018Q3/devel/llvm38/Makefile Thu Jul 5 18:23:22 2018 (r473979)
+++ branches/2018Q3/devel/llvm38/Makefile Thu Jul 5 18:52:19 2018 (r473980)
@@ -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
Copied: branches/2018Q3/devel/llvm38/files/openmp-patch-i386 (from r473956, head/devel/llvm38/files/openmp-patch-i386)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q3/devel/llvm38/files/openmp-patch-i386 Thu Jul 5 18:52:19 2018 (r473980, copy of r473956, head/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
+
Modified: branches/2018Q3/devel/llvm40/Makefile
==============================================================================
--- branches/2018Q3/devel/llvm40/Makefile Thu Jul 5 18:23:22 2018 (r473979)
+++ branches/2018Q3/devel/llvm40/Makefile Thu Jul 5 18:52:19 2018 (r473980)
@@ -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
Copied: branches/2018Q3/devel/llvm40/files/openmp-patch-i386 (from r473956, head/devel/llvm40/files/openmp-patch-i386)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q3/devel/llvm40/files/openmp-patch-i386 Thu Jul 5 18:52:19 2018 (r473980, copy of r473956, head/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
+
Modified: branches/2018Q3/devel/llvm50/Makefile
==============================================================================
--- branches/2018Q3/devel/llvm50/Makefile Thu Jul 5 18:23:22 2018 (r473979)
+++ branches/2018Q3/devel/llvm50/Makefile Thu Jul 5 18:52:19 2018 (r473980)
@@ -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
Copied: branches/2018Q3/devel/llvm50/files/openmp-patch-i386 (from r473956, head/devel/llvm50/files/openmp-patch-i386)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q3/devel/llvm50/files/openmp-patch-i386 Thu Jul 5 18:52:19 2018 (r473980, copy of r473956, head/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
+
Modified: branches/2018Q3/devel/llvm60/Makefile
==============================================================================
--- branches/2018Q3/devel/llvm60/Makefile Thu Jul 5 18:23:22 2018 (r473979)
+++ branches/2018Q3/devel/llvm60/Makefile Thu Jul 5 18:52:19 2018 (r473980)
@@ -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
Copied: branches/2018Q3/devel/llvm60/files/openmp/patch-i386 (from r473956, head/devel/llvm60/files/openmp/patch-i386)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q3/devel/llvm60/files/openmp/patch-i386 Thu Jul 5 18:52:19 2018 (r473980, copy of r473956, head/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
+
More information about the svn-ports-branches
mailing list