Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Sep 2019 17:20:27 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r512799 - in head/devel/llvm90: . files/clang files/openmp
Message-ID:  <201909251720.x8PHKRcN053222@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Wed Sep 25 17:20:26 2019
New Revision: 512799
URL: https://svnweb.freebsd.org/changeset/ports/512799

Log:
  Update to 9.0.0 release.
  
  Attempt to fix linkin of openmp when the linker isn't LLD.
  
  Enable LLD_LINK by default.  It is increasingly the case that lld is a
  safe choice so just go with it.
  
  Enable SecurePLT on PowerPC for FreeBSD 13 and up.
  
  PR:		240730, 240737

Added:
  head/devel/llvm90/files/clang/patch-tools_clang_lib_Driver_ToolChains_Arch_PPC.cpp   (contents, props changed)
  head/devel/llvm90/files/openmp/patch-projects_openmp_runtime_cmake_LibompHandleFlags.cmake   (contents, props changed)
Modified:
  head/devel/llvm90/Makefile
  head/devel/llvm90/distinfo

Modified: head/devel/llvm90/Makefile
==============================================================================
--- head/devel/llvm90/Makefile	Wed Sep 25 17:17:10 2019	(r512798)
+++ head/devel/llvm90/Makefile	Wed Sep 25 17:20:26 2019	(r512799)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	9.0.0rc4
-PORTREVISION=	1
+DISTVERSION=	9.0.0
+PORTREVISION=	0
 CATEGORIES=	devel lang
 .if ${DISTVERSION:M*rc*}
 MASTER_SITES=  http://prereleases.llvm.org/${LLVM_RELEASE}/${RCDIR}
 .else
-MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/
+MASTER_SITES=	http://releases.llvm.org/${LLVM_RELEASE}/
 .endif
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
@@ -70,8 +70,8 @@ OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LL
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFINE_powerpc64=	OPENMP
-OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB PYCLANG
-OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD LLD_LINK OPENMP
+OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG
+OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFAULT_powerpc64=	OPENMP
 OPTIONS_SINGLE=		BACKENDS
@@ -272,7 +272,7 @@ COMMANDS+=	${LLDB_COMMANDS}
 .endif
 
 .if ${PORT_OPTIONS:MPYCLANG}
-PYCLANG_PATTERN=	(clang\/(__init__|cindex|enumerations).py$)
+PYCLANG_PATTERN=	(clang\/(__init__|cindex|enumerations).py)$$
 .endif
 
 .include <bsd.port.pre.mk>

Modified: head/devel/llvm90/distinfo
==============================================================================
--- head/devel/llvm90/distinfo	Wed Sep 25 17:17:10 2019	(r512798)
+++ head/devel/llvm90/distinfo	Wed Sep 25 17:20:26 2019	(r512799)
@@ -1,15 +1,15 @@
-TIMESTAMP = 1568188104
-SHA256 (llvm-9.0.0rc4.src.tar.xz) = b7a4cca6dc7b7c9bf0766be389afcba1ee1a229cc77cf39741e78e67dfadb0d0
-SIZE (llvm-9.0.0rc4.src.tar.xz) = 32998872
-SHA256 (cfe-9.0.0rc4.src.tar.xz) = a134a6fe858a29c7ccf6113504aa423277c5f10fa2b51e8e5202643b754a760d
-SIZE (cfe-9.0.0rc4.src.tar.xz) = 13532608
-SHA256 (compiler-rt-9.0.0rc4.src.tar.xz) = 409c60d812e5e5445ccf6af59edfb1ef412ba8aa7728399fed980a37ed2c67f3
-SIZE (compiler-rt-9.0.0rc4.src.tar.xz) = 1993372
-SHA256 (clang-tools-extra-9.0.0rc4.src.tar.xz) = b1fef1828ac0a09911a32452fdd7cac82260474ee7b1f11801db22fe2136d7c2
-SIZE (clang-tools-extra-9.0.0rc4.src.tar.xz) = 2183936
-SHA256 (lld-9.0.0rc4.src.tar.xz) = 9b3e87edf2a162fc6fdc2c2b3e5506044c00da125f934efc6ec228185910b7bc
-SIZE (lld-9.0.0rc4.src.tar.xz) = 1100616
-SHA256 (lldb-9.0.0rc4.src.tar.xz) = 90b425a26ae0e3c73f0811938ea59307e92c548137647365ce6106b26cff7e1e
-SIZE (lldb-9.0.0rc4.src.tar.xz) = 9848692
-SHA256 (openmp-9.0.0rc4.src.tar.xz) = d6eb006d98336f7a7dfa908ce73431ef734bf9c0be5cec6c0ae5cb45996a0ac3
-SIZE (openmp-9.0.0rc4.src.tar.xz) = 938944
+TIMESTAMP = 1569071576
+SHA256 (llvm-9.0.0.src.tar.xz) = d6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84
+SIZE (llvm-9.0.0.src.tar.xz) = 32994768
+SHA256 (cfe-9.0.0.src.tar.xz) = 7ba81eef7c22ca5da688fdf9d88c20934d2d6b40bfe150ffd338900890aa4610
+SIZE (cfe-9.0.0.src.tar.xz) = 13533024
+SHA256 (compiler-rt-9.0.0.src.tar.xz) = 56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e
+SIZE (compiler-rt-9.0.0.src.tar.xz) = 1993084
+SHA256 (clang-tools-extra-9.0.0.src.tar.xz) = ea1c86ce352992d7b6f6649bc622f6a2707b9f8b7153e9f9181a35c76aa3ac10
+SIZE (clang-tools-extra-9.0.0.src.tar.xz) = 2183436
+SHA256 (lld-9.0.0.src.tar.xz) = 31c6748b235d09723fb73fea0c816ed5a3fab0f96b66f8fbc546a0fcc8688f91
+SIZE (lld-9.0.0.src.tar.xz) = 1100608
+SHA256 (lldb-9.0.0.src.tar.xz) = 1e4c2f6a1f153f4b8afa2470d2e99dab493034c1ba8b7ffbbd7600de016d0794
+SIZE (lldb-9.0.0.src.tar.xz) = 9846624
+SHA256 (openmp-9.0.0.src.tar.xz) = 9979eb1133066376cc0be29d1682bc0b0e7fb541075b391061679111ae4d3b5b
+SIZE (openmp-9.0.0.src.tar.xz) = 939036

Added: head/devel/llvm90/files/clang/patch-tools_clang_lib_Driver_ToolChains_Arch_PPC.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm90/files/clang/patch-tools_clang_lib_Driver_ToolChains_Arch_PPC.cpp	Wed Sep 25 17:20:26 2019	(r512799)
@@ -0,0 +1,12 @@
+--- tools/clang/lib/Driver/ToolChains/Arch/PPC.cpp.orig
++++ tools/clang/lib/Driver/ToolChains/Arch/PPC.cpp
+@@ -115,7 +115,8 @@
+                                               const ArgList &Args) {
+   if (Args.getLastArg(options::OPT_msecure_plt))
+     return ppc::ReadGOTPtrMode::SecurePlt;
+-  if (Triple.isOSNetBSD() || Triple.isOSOpenBSD() || Triple.isMusl())
++  if ((Triple.isOSFreeBSD() && Triple.getOSMajorVersion() >= 13) ||
++      Triple.isOSNetBSD() || Triple.isOSOpenBSD() || Triple.isMusl())
+     return ppc::ReadGOTPtrMode::SecurePlt;
+   else
+     return ppc::ReadGOTPtrMode::Bss;

Added: head/devel/llvm90/files/openmp/patch-projects_openmp_runtime_cmake_LibompHandleFlags.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm90/files/openmp/patch-projects_openmp_runtime_cmake_LibompHandleFlags.cmake	Wed Sep 25 17:20:26 2019	(r512799)
@@ -0,0 +1,16 @@
+--- projects/openmp/runtime/cmake/LibompHandleFlags.cmake.orig
++++ projects/openmp/runtime/cmake/LibompHandleFlags.cmake
+@@ -158,11 +158,11 @@
+   if(${IA32})
+     libomp_append(libflags_local -lirc_pic LIBOMP_HAVE_IRC_PIC_LIBRARY)
+   endif()
+-  if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly")
++  if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly|FreeBSD")
+     libomp_append(libflags_local "-Wl,--no-as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG)
+     libomp_append(libflags_local "-lm")
+     libomp_append(libflags_local "-Wl,--as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG)
+-  elseif(${CMAKE_SYSTEM_NAME} MATCHES "(Free|Net)BSD")
++  elseif(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+     libomp_append(libflags_local -lm)
+   endif()
+   set(libflags_local ${libflags_local} ${LIBOMP_LIBFLAGS})



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909251720.x8PHKRcN053222>