diff options
author | dim <dim@FreeBSD.org> | 2015-06-23 18:46:29 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-06-23 18:46:29 +0000 |
commit | 3aff6c77e3df32357458b1e73642a6c7c11f56c2 (patch) | |
tree | b91118c5c818d84405113f4db1997af7c1b6d181 | |
parent | 353ba56951ab7e2773c37d54f1cd5ee5134796c6 (diff) | |
download | FreeBSD-src-3aff6c77e3df32357458b1e73642a6c7c11f56c2.zip FreeBSD-src-3aff6c77e3df32357458b1e73642a6c7c11f56c2.tar.gz |
Update llvm/clang build glue.
-rw-r--r-- | lib/clang/Makefile | 1 | ||||
-rw-r--r-- | lib/clang/clang.build.mk | 9 | ||||
-rw-r--r-- | lib/clang/include/Makefile | 1 | ||||
-rw-r--r-- | lib/clang/include/clang/Basic/Version.inc | 4 | ||||
-rw-r--r-- | lib/clang/include/llvm/Config/config.h | 22 | ||||
-rw-r--r-- | lib/clang/include/llvm/Config/llvm-config.h | 10 | ||||
-rw-r--r-- | lib/clang/libclangbasic/Makefile | 1 | ||||
-rw-r--r-- | lib/clang/libclangfrontend/Makefile | 1 | ||||
-rw-r--r-- | lib/clang/libllvmcodegen/Makefile | 3 | ||||
-rw-r--r-- | lib/clang/libllvminstrumentation/Makefile | 1 | ||||
-rw-r--r-- | lib/clang/libllvmlibdriver/Makefile | 13 | ||||
-rw-r--r-- | lib/clang/libllvmlibdriver/Options.inc | 2 | ||||
-rw-r--r-- | lib/clang/libllvmsupport/Makefile | 1 | ||||
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 1 | ||||
-rw-r--r-- | usr.bin/clang/clang.prog.mk | 3 | ||||
-rw-r--r-- | usr.bin/clang/llc/Makefile | 3 | ||||
-rw-r--r-- | usr.bin/clang/llvm-ar/Makefile | 5 | ||||
-rw-r--r-- | usr.bin/clang/llvm-lto/Makefile | 1 |
18 files changed, 65 insertions, 17 deletions
diff --git a/lib/clang/Makefile b/lib/clang/Makefile index 1575c9c..9bcde20 100644 --- a/lib/clang/Makefile +++ b/lib/clang/Makefile @@ -41,6 +41,7 @@ SUBDIR= libclanganalysis \ libllvmipa \ libllvmipo \ libllvmirreader \ + libllvmlibdriver \ libllvmlinker \ libllvmmc \ libllvmmcdisassembler \ diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk index 5cb0dd0..1610a90 100644 --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -227,11 +227,20 @@ Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td -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 \ diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile index e1697f7..055f051 100644 --- a/lib/clang/include/Makefile +++ b/lib/clang/include/Makefile @@ -60,6 +60,7 @@ INCS= Intrin.h \ x86intrin.h \ xmmintrin.h \ xopintrin.h \ + xtestintrin.h \ ${GENINCS} GENINCS= arm_neon.h CLEANFILES= ${GENINCS} diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 2575dc2..db50948 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -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" diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index ec32e0d..92d51c1 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -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 */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 692bd4a..b6df38d 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -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 diff --git a/lib/clang/libclangbasic/Makefile b/lib/clang/libclangbasic/Makefile index 6a5791c..68c2a77 100644 --- a/lib/clang/libclangbasic/Makefile +++ b/lib/clang/libclangbasic/Makefile @@ -10,6 +10,7 @@ SRCS= Attributes.cpp \ CharInfo.cpp \ Diagnostic.cpp \ DiagnosticIDs.cpp \ + DiagnosticOptions.cpp \ FileManager.cpp \ FileSystemStatCache.cpp \ IdentifierTable.cpp \ diff --git a/lib/clang/libclangfrontend/Makefile b/lib/clang/libclangfrontend/Makefile index 95b8fc8..8e63fb0 100644 --- a/lib/clang/libclangfrontend/Makefile +++ b/lib/clang/libclangfrontend/Makefile @@ -29,6 +29,7 @@ SRCS= ASTConsumers.cpp \ LogDiagnosticPrinter.cpp \ ModuleDependencyCollector.cpp \ MultiplexConsumer.cpp \ + PCHContainerOperations.cpp \ PrintPreprocessedOutput.cpp \ SerializedDiagnosticPrinter.cpp \ SerializedDiagnosticReader.cpp \ diff --git a/lib/clang/libllvmcodegen/Makefile b/lib/clang/libllvmcodegen/Makefile index f28798d..eedba37 100644 --- a/lib/clang/libllvmcodegen/Makefile +++ b/lib/clang/libllvmcodegen/Makefile @@ -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 \ diff --git a/lib/clang/libllvminstrumentation/Makefile b/lib/clang/libllvminstrumentation/Makefile index 963b638..b01b91a 100644 --- a/lib/clang/libllvminstrumentation/Makefile +++ b/lib/clang/libllvminstrumentation/Makefile @@ -12,6 +12,7 @@ SRCS= AddressSanitizer.cpp \ MemorySanitizer.cpp \ Instrumentation.cpp \ InstrProfiling.cpp \ + SafeStack.cpp \ SanitizerCoverage.cpp \ ThreadSanitizer.cpp diff --git a/lib/clang/libllvmlibdriver/Makefile b/lib/clang/libllvmlibdriver/Makefile new file mode 100644 index 0000000..863ef48 --- /dev/null +++ b/lib/clang/libllvmlibdriver/Makefile @@ -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" diff --git a/lib/clang/libllvmlibdriver/Options.inc b/lib/clang/libllvmlibdriver/Options.inc new file mode 100644 index 0000000..37422c1 --- /dev/null +++ b/lib/clang/libllvmlibdriver/Options.inc @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "Options.inc.h" diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile index e21103d..db11396 100644 --- a/lib/clang/libllvmsupport/Makefile +++ b/lib/clang/libllvmsupport/Makefile @@ -70,6 +70,7 @@ SRCS= APFloat.cpp \ StringMap.cpp \ StringPool.cpp \ StringRef.cpp \ + StringSaver.cpp \ TargetParser.cpp \ TargetRegistry.cpp \ ThreadLocal.cpp \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 357c429..c15e807 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -907,6 +907,7 @@ OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h 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 diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk index 14f7609..9e929c4 100644 --- a/usr.bin/clang/clang.prog.mk +++ b/usr.bin/clang/clang.prog.mk @@ -12,6 +12,9 @@ LDADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a DPADD+= ${LIBNCURSESW} LDADD+= -lncursesw +DPADD+= ${LIBPTHREAD} +LDADD+= -lpthread + BINDIR?= /usr/bin diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile index bf0dbb3..5f292dd 100644 --- a/usr.bin/clang/llc/Makefile +++ b/usr.bin/clang/llc/Makefile @@ -47,13 +47,14 @@ LIBDEPS=llvmmirparser \ llvmselectiondag \ llvmasmprinter \ llvmcodegen \ + llvmtarget \ llvmscalaropts \ llvmprofiledata \ llvminstcombine \ + llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmanalysis \ - llvmtarget \ llvmx86desc \ llvmobject \ llvmmcparser \ diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index a73b1ce..9165773 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -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 \ diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile index d42472f..1428a3f 100644 --- a/usr.bin/clang/llvm-lto/Makefile +++ b/usr.bin/clang/llvm-lto/Makefile @@ -61,6 +61,7 @@ LIBDEPS=llvmaarch64disassembler \ llvmobject \ llvmmcparser \ llvminstcombine \ + llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmmc \ |