svn commit: r284735 - in projects/clang-trunk: lib/clang lib/clang/include lib/clang/include/clang/Basic lib/clang/include/llvm/Config lib/clang/libclangbasic lib/clang/libclangfrontend lib/clang/l...

Dimitry Andric dim at FreeBSD.org
Tue Jun 23 18:46:35 UTC 2015 

Author: dim
Date: Tue Jun 23 18:46:29 2015
New Revision: 284735
URL: https://svnweb.freebsd.org/changeset/base/284735

Log:
  Update llvm/clang build glue.

Added:
  projects/clang-trunk/lib/clang/libllvmlibdriver/
  projects/clang-trunk/lib/clang/libllvmlibdriver/Makefile   (contents, props changed)
  projects/clang-trunk/lib/clang/libllvmlibdriver/Options.inc   (contents, props changed)
Modified:
  projects/clang-trunk/lib/clang/Makefile
  projects/clang-trunk/lib/clang/clang.build.mk
  projects/clang-trunk/lib/clang/include/Makefile
  projects/clang-trunk/lib/clang/include/clang/Basic/Version.inc
  projects/clang-trunk/lib/clang/include/llvm/Config/config.h
  projects/clang-trunk/lib/clang/include/llvm/Config/llvm-config.h
  projects/clang-trunk/lib/clang/libclangbasic/Makefile
  projects/clang-trunk/lib/clang/libclangfrontend/Makefile
  projects/clang-trunk/lib/clang/libllvmcodegen/Makefile
  projects/clang-trunk/lib/clang/libllvminstrumentation/Makefile
  projects/clang-trunk/lib/clang/libllvmsupport/Makefile
  projects/clang-trunk/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang-trunk/usr.bin/clang/clang.prog.mk
  projects/clang-trunk/usr.bin/clang/llc/Makefile
  projects/clang-trunk/usr.bin/clang/llvm-ar/Makefile
  projects/clang-trunk/usr.bin/clang/llvm-lto/Makefile

Modified: projects/clang-trunk/lib/clang/Makefile
==============================================================================
--- projects/clang-trunk/lib/clang/Makefile	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/lib/clang/Makefile	Tue Jun 23 18:46:29 2015	(r284735)
@@ -41,6 +41,7 @@ SUBDIR=	libclanganalysis \
 	libllvmipa \
 	libllvmipo \
 	libllvmirreader \
+	libllvmlibdriver \
 	libllvmlinker \
 	libllvmmc \
 	libllvmmcdisassembler \

Modified: projects/clang-trunk/lib/clang/clang.build.mk
==============================================================================
--- projects/clang-trunk/lib/clang/clang.build.mk	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/lib/clang/clang.build.mk	Tue Jun 23 18:46:29 2015	(r284735)
@@ -227,11 +227,20 @@ Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRC
 	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
 .endfor
 
+# XXX: Atrocious hack, need to clean this up later
+.if defined(LIB) && ${LIB} == "llvmlibdriver"
+Options.inc.h: ${LLVM_SRCS}/lib/LibDriver/Options.td
+	${TBLGEN} -gen-opt-parser-defs \
+	    -I ${LLVM_SRCS}/include \
+	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
+	    ${LLVM_SRCS}/lib/LibDriver/Options.td
+.else
 Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/Options.td
 	${TBLGEN} -gen-opt-parser-defs \
 	    -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \
 	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/include/clang/Driver/Options.td
+.endif
 
 Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
 	${CLANG_TBLGEN} -gen-clang-sa-checkers \

Modified: projects/clang-trunk/lib/clang/include/Makefile
==============================================================================
--- projects/clang-trunk/lib/clang/include/Makefile	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/lib/clang/include/Makefile	Tue Jun 23 18:46:29 2015	(r284735)
@@ -60,6 +60,7 @@ INCS=	Intrin.h \
 	x86intrin.h \
 	xmmintrin.h \
 	xopintrin.h \
+	xtestintrin.h \
 	${GENINCS}
 GENINCS= arm_neon.h
 CLEANFILES= ${GENINCS}

Modified: projects/clang-trunk/lib/clang/include/clang/Basic/Version.inc
==============================================================================
--- projects/clang-trunk/lib/clang/include/clang/Basic/Version.inc	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/lib/clang/include/clang/Basic/Version.inc	Tue Jun 23 18:46:29 2015	(r284735)
@@ -6,6 +6,6 @@
 #define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
-#define	CLANG_VENDOR_SUFFIX		" 20150609"
+#define	CLANG_VENDOR_SUFFIX		" 20150621"
 
-#define	SVN_REVISION			"239412"
+#define	SVN_REVISION			"240225"

Modified: projects/clang-trunk/lib/clang/include/llvm/Config/config.h
==============================================================================
--- projects/clang-trunk/lib/clang/include/llvm/Config/config.h	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/lib/clang/include/llvm/Config/config.h	Tue Jun 23 18:46:29 2015	(r284735)
@@ -8,6 +8,9 @@
 /* Get __FreeBSD_version. */
 #include <osreldate.h>
 
+/* Exported configuration */
+#include "llvm/Config/llvm-config.h"
+
 /* Bug report URL. */
 #define BUG_REPORT_URL "https://bugs.freebsd.org/submit/"
 
@@ -18,7 +21,7 @@
 /* #undef CLANG_HAVE_LIBXML */
 
 /* Multilib suffix for libdir. */
-/* #undef CLANG_LIBDIR_SUFFIX */
+#define CLANG_LIBDIR_SUFFIX ""
 
 /* Relative directory for resource files */
 #define CLANG_RESOURCE_DIR ""
@@ -149,11 +152,14 @@
 /* Define to 1 if you have the `m' library (-lm). */
 #define HAVE_LIBM 1
 
+/* Define to 1 if you have the `ole32' library (-lole32). */
+/* #undef HAVE_LIBOLE32 */
+
 /* Define to 1 if you have the `psapi' library (-lpsapi). */
 /* #undef HAVE_LIBPSAPI */
 
 /* Define to 1 if you have the `pthread' library (-lpthread). */
-/* #undef HAVE_LIBPTHREAD */
+#define HAVE_LIBPTHREAD 1
 
 /* Define to 1 if you have the `shell32' library (-lshell32). */
 /* #undef HAVE_LIBSHELL32 */
@@ -224,16 +230,16 @@
 #define HAVE_PRINTF_A 1
 
 /* Have pthread_getspecific */
-/* #undef HAVE_PTHREAD_GETSPECIFIC */
+#define HAVE_PTHREAD_GETSPECIFIC 1
 
 /* Define to 1 if you have the <pthread.h> header file. */
-/* #undef HAVE_PTHREAD_H */
+#define HAVE_PTHREAD_H 1
 
 /* Have pthread_mutex_lock */
-/* #undef HAVE_PTHREAD_MUTEX_LOCK */
+#define HAVE_PTHREAD_MUTEX_LOCK 1
 
 /* Have pthread_rwlock_init */
-/* #undef HAVE_PTHREAD_RWLOCK_INIT */
+#define HAVE_PTHREAD_RWLOCK_INIT 1
 
 /* Define to 1 if srand48/lrand48/drand48 exist in <stdlib.h> */
 #define HAVE_RAND48 1
@@ -433,7 +439,7 @@
 #define LLVM_ENABLE_ABI_BREAKING_CHECKS 1
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 0
+#define LLVM_ENABLE_THREADS 1
 
 /* Define if zlib is enabled */
 #define LLVM_ENABLE_ZLIB 1
@@ -442,7 +448,7 @@
 /* #undef LLVM_ETCDIR */
 
 /* Has gcc/MSVC atomic intrinsics */
-#define LLVM_HAS_ATOMICS 0
+#define LLVM_HAS_ATOMICS 1
 
 /* Host triple LLVM will be executed on */
 /* #undef LLVM_HOST_TRIPLE */

Modified: projects/clang-trunk/lib/clang/include/llvm/Config/llvm-config.h
==============================================================================
--- projects/clang-trunk/lib/clang/include/llvm/Config/llvm-config.h	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/lib/clang/include/llvm/Config/llvm-config.h	Tue Jun 23 18:46:29 2015	(r284735)
@@ -31,14 +31,17 @@
 /* Installation directory for documentation */
 /* #undef LLVM_DOCSDIR */
 
+/* Define to enable checks that alter the LLVM C++ ABI */
+#define LLVM_ENABLE_ABI_BREAKING_CHECKS 1
+
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 0
+#define LLVM_ENABLE_THREADS 1
 
 /* Installation directory for config files */
 /* #undef LLVM_ETCDIR */
 
 /* Has gcc/MSVC atomic intrinsics */
-#define LLVM_HAS_ATOMICS 0
+#define LLVM_HAS_ATOMICS 1
 
 /* Host triple LLVM will be executed on */
 /* #undef LLVM_HOST_TRIPLE */
@@ -100,7 +103,4 @@
 /* LLVM version string */
 #define LLVM_VERSION_STRING "3.7.0svn"
 
-/* Define to enable checks that alter the LLVM C++ ABI */
-#define LLVM_ENABLE_ABI_BREAKING_CHECKS 1
-
 #endif

Modified: projects/clang-trunk/lib/clang/libclangbasic/Makefile
==============================================================================
--- projects/clang-trunk/lib/clang/libclangbasic/Makefile	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/lib/clang/libclangbasic/Makefile	Tue Jun 23 18:46:29 2015	(r284735)
@@ -10,6 +10,7 @@ SRCS=	Attributes.cpp \
 	CharInfo.cpp \
 	Diagnostic.cpp \
 	DiagnosticIDs.cpp \
+	DiagnosticOptions.cpp \
 	FileManager.cpp \
 	FileSystemStatCache.cpp \
 	IdentifierTable.cpp \

Modified: projects/clang-trunk/lib/clang/libclangfrontend/Makefile
==============================================================================
--- projects/clang-trunk/lib/clang/libclangfrontend/Makefile	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/lib/clang/libclangfrontend/Makefile	Tue Jun 23 18:46:29 2015	(r284735)
@@ -29,6 +29,7 @@ SRCS=	ASTConsumers.cpp \
 	LogDiagnosticPrinter.cpp \
 	ModuleDependencyCollector.cpp \
 	MultiplexConsumer.cpp \
+	PCHContainerOperations.cpp \
 	PrintPreprocessedOutput.cpp \
 	SerializedDiagnosticPrinter.cpp \
 	SerializedDiagnosticReader.cpp \

Modified: projects/clang-trunk/lib/clang/libllvmcodegen/Makefile
==============================================================================
--- projects/clang-trunk/lib/clang/libllvmcodegen/Makefile	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/lib/clang/libllvmcodegen/Makefile	Tue Jun 23 18:46:29 2015	(r284735)
@@ -26,12 +26,14 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	ExecutionDepsFix.cpp \
 	ExpandISelPseudos.cpp \
 	ExpandPostRAPseudos.cpp \
+	FaultMaps.cpp \
 	GCMetadata.cpp \
 	GCMetadataPrinter.cpp \
 	GCRootLowering.cpp \
 	GCStrategy.cpp \
 	GlobalMerge.cpp \
 	IfConversion.cpp \
+	ImplicitNullChecks.cpp \
 	InlineSpiller.cpp \
 	InterferenceCache.cpp \
 	IntrinsicLowering.cpp \
@@ -49,6 +51,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	LiveStackAnalysis.cpp \
 	LiveVariables.cpp \
 	LocalStackSlotAllocation.cpp \
+	MIRPrinter.cpp \
 	MIRPrintingPass.cpp \
 	MachineBasicBlock.cpp \
 	MachineBlockFrequencyInfo.cpp \

Modified: projects/clang-trunk/lib/clang/libllvminstrumentation/Makefile
==============================================================================
--- projects/clang-trunk/lib/clang/libllvminstrumentation/Makefile	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/lib/clang/libllvminstrumentation/Makefile	Tue Jun 23 18:46:29 2015	(r284735)
@@ -12,6 +12,7 @@ SRCS=	AddressSanitizer.cpp \
 	MemorySanitizer.cpp \
 	Instrumentation.cpp \
 	InstrProfiling.cpp \
+	SafeStack.cpp \
 	SanitizerCoverage.cpp \
 	ThreadSanitizer.cpp
 

Added: projects/clang-trunk/lib/clang/libllvmlibdriver/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang-trunk/lib/clang/libllvmlibdriver/Makefile	Tue Jun 23 18:46:29 2015	(r284735)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	llvmlibdriver
+
+SRCDIR=	lib/LibDriver
+SRCS=	LibDriver.cpp
+CFLAGS+= -I${.CURDIR}
+
+TGHDRS=	Options
+
+.include "../clang.lib.mk"

Added: projects/clang-trunk/lib/clang/libllvmlibdriver/Options.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang-trunk/lib/clang/libllvmlibdriver/Options.inc	Tue Jun 23 18:46:29 2015	(r284735)
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+#include "Options.inc.h"

Modified: projects/clang-trunk/lib/clang/libllvmsupport/Makefile
==============================================================================
--- projects/clang-trunk/lib/clang/libllvmsupport/Makefile	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/lib/clang/libllvmsupport/Makefile	Tue Jun 23 18:46:29 2015	(r284735)
@@ -70,6 +70,7 @@ SRCS=	APFloat.cpp \
 	StringMap.cpp \
 	StringPool.cpp \
 	StringRef.cpp \
+	StringSaver.cpp \
 	TargetParser.cpp \
 	TargetRegistry.cpp \
 	ThreadLocal.cpp \

Modified: projects/clang-trunk/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/clang-trunk/tools/build/mk/OptionalObsoleteFiles.inc	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/tools/build/mk/OptionalObsoleteFiles.inc	Tue Jun 23 18:46:29 2015	(r284735)
@@ -907,6 +907,7 @@ OLD_FILES+=usr/lib/clang/3.7.0/include/w
 OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.7.0/include
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a

Modified: projects/clang-trunk/usr.bin/clang/clang.prog.mk
==============================================================================
--- projects/clang-trunk/usr.bin/clang/clang.prog.mk	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/usr.bin/clang/clang.prog.mk	Tue Jun 23 18:46:29 2015	(r284735)
@@ -12,6 +12,9 @@ LDADD+=	${.OBJDIR}/../../../lib/clang/li
 DPADD+=	${LIBNCURSESW}
 LDADD+=	-lncursesw
 
+DPADD+=	${LIBPTHREAD}
+LDADD+=	-lpthread
+
 BINDIR?= /usr/bin
 
 

Modified: projects/clang-trunk/usr.bin/clang/llc/Makefile
==============================================================================
--- projects/clang-trunk/usr.bin/clang/llc/Makefile	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/usr.bin/clang/llc/Makefile	Tue Jun 23 18:46:29 2015	(r284735)
@@ -47,13 +47,14 @@ LIBDEPS=llvmmirparser \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
+	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \

Modified: projects/clang-trunk/usr.bin/clang/llvm-ar/Makefile
==============================================================================
--- projects/clang-trunk/usr.bin/clang/llvm-ar/Makefile	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/usr.bin/clang/llvm-ar/Makefile	Tue Jun 23 18:46:29 2015	(r284735)
@@ -7,7 +7,9 @@ PROG_CXX=llvm-ar
 SRCDIR=	tools/llvm-ar
 SRCS=	llvm-ar.cpp
 
-LIBDEPS=llvmaarch64disassembler \
+LIBDEPS=llvmlibdriver \
+	llvmoption \
+	llvmaarch64disassembler \
 	llvmaarch64codegen \
 	llvmaarch64asmparser \
 	llvmaarch64desc \
@@ -48,6 +50,7 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
+	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \

Modified: projects/clang-trunk/usr.bin/clang/llvm-lto/Makefile
==============================================================================
--- projects/clang-trunk/usr.bin/clang/llvm-lto/Makefile	Tue Jun 23 18:44:19 2015	(r284734)
+++ projects/clang-trunk/usr.bin/clang/llvm-lto/Makefile	Tue Jun 23 18:46:29 2015	(r284735)
@@ -61,6 +61,7 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmobject \
 	llvmmcparser \
 	llvminstcombine \
+	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
 	llvmmc \

More information about the svn-src-projects mailing list