svn commit: r414485 - in head/devel/llvm38: . files

[Brooks Davis]

Author: brooks
Date: Mon May  2 22:55:22 2016
New Revision: 414485
URL: https://svnweb.freebsd.org/changeset/ports/414485

Log:
  Remove builds of i386 sanitizers on amd64.
  
  The cmake build system would attempt to check if -m32 builds worked and
  then add those files.  There are an infinite number of reasons why -m32
  might not work on a given system so rip out the test to ensure a
  consistant build.
  
  PR:		209029

Added:
  head/devel/llvm38/files/compiler-rt-patch-no-m32   (contents, props changed)
Modified:
  head/devel/llvm38/Makefile

Modified: head/devel/llvm38/Makefile
==============================================================================
--- head/devel/llvm38/Makefile	Mon May  2 21:09:31 2016	(r414484)
+++ head/devel/llvm38/Makefile	Mon May  2 22:55:22 2016	(r414485)
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 DISTVERSION=	3.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
@@ -217,7 +217,7 @@ _COMPILER_RT_LIBS= \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
 .endif
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+.if ${ARCH} == "i386"
 _COMPILER_RT_LIBS+= \
 	libclang_rt.asan-i386.a \
 	libclang_rt.asan-i386.so \
@@ -288,6 +288,7 @@ post-patch:
 
 post-patch-COMPILER_RT-on:
 	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-svn-261229
+	cd ${WRKSRC_compiler_rt} && patch < ${PATCHDIR}/compiler-rt-patch-no-m32
 
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build

Added: head/devel/llvm38/files/compiler-rt-patch-no-m32
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/llvm38/files/compiler-rt-patch-no-m32	Mon May  2 22:55:22 2016	(r414485)
@@ -0,0 +1,14 @@
+--- cmake/config-ix.cmake.orig	2016-05-02 20:51:53.598525522 +0000
++++ cmake/config-ix.cmake	2016-05-02 20:53:24.573519349 +0000
+@@ -189,11 +189,6 @@
+   if("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "i[2-6]86|x86|amd64")
+     if(NOT MSVC)
+       test_target_arch(x86_64 "" "-m64")
+-      # FIXME: We build runtimes for both i686 and i386, as "clang -m32" may
+-      # target different variant than "$CMAKE_C_COMPILER -m32". This part should
+-      # be gone after we resolve PR14109.
+-      test_target_arch(i686 __i686__ "-m32")
+-      test_target_arch(i386 __i386__ "-m32")
+     else()
+       if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+         test_target_arch(i386 "" "")