d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update llvm/clang build glue.

Browse Source
This commit is contained in:
dim 2015-06-23 18:46:29 +00:00
parent 353ba56951
commit 3aff6c77e3
18 changed files with 65 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/clang/Makefile
View File

@ -41,6 +41,7 @@ SUBDIR= libclanganalysis \
libllvmipa \
libllvmipo \
libllvmirreader \
libllvmlibdriver \
libllvmlinker \
libllvmmc \
libllvmmcdisassembler \

9
lib/clang/clang.build.mk
View File

@ -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 \

1
lib/clang/include/Makefile
View File

@ -60,6 +60,7 @@ INCS= Intrin.h \
x86intrin.h \
xmmintrin.h \
xopintrin.h \
xtestintrin.h \
${GENINCS}
GENINCS= arm_neon.h
CLEANFILES= ${GENINCS}

4
lib/clang/include/clang/Basic/Version.inc
View File

@ -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"

22
lib/clang/include/llvm/Config/config.h
View File

@ -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 */

10
lib/clang/include/llvm/Config/llvm-config.h
View File

@ -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

1
lib/clang/libclangbasic/Makefile
View File

@ -10,6 +10,7 @@ SRCS= Attributes.cpp \
CharInfo.cpp \
Diagnostic.cpp \
DiagnosticIDs.cpp \
DiagnosticOptions.cpp \
FileManager.cpp \
FileSystemStatCache.cpp \
IdentifierTable.cpp \

1
lib/clang/libclangfrontend/Makefile
View File

@ -29,6 +29,7 @@ SRCS= ASTConsumers.cpp \
LogDiagnosticPrinter.cpp \
ModuleDependencyCollector.cpp \
MultiplexConsumer.cpp \
PCHContainerOperations.cpp \
PrintPreprocessedOutput.cpp \
SerializedDiagnosticPrinter.cpp \
SerializedDiagnosticReader.cpp \

3
lib/clang/libllvmcodegen/Makefile
View File

@ -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 \

1
lib/clang/libllvminstrumentation/Makefile
View File

@ -12,6 +12,7 @@ SRCS= AddressSanitizer.cpp \
MemorySanitizer.cpp \
Instrumentation.cpp \
InstrProfiling.cpp \
SafeStack.cpp \
SanitizerCoverage.cpp \
ThreadSanitizer.cpp

13
lib/clang/libllvmlibdriver/Makefile Normal file
View File

@ -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"

2
lib/clang/libllvmlibdriver/Options.inc Normal file
View File

@ -0,0 +1,2 @@
/* $FreeBSD$ */
#include "Options.inc.h"

1
lib/clang/libllvmsupport/Makefile
View File

@ -70,6 +70,7 @@ SRCS= APFloat.cpp \
StringMap.cpp \
StringPool.cpp \
StringRef.cpp \
StringSaver.cpp \
TargetParser.cpp \
TargetRegistry.cpp \
ThreadLocal.cpp \

1
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -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

3
usr.bin/clang/clang.prog.mk
View File

@ -12,6 +12,9 @@ LDADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
DPADD+= ${LIBNCURSESW}
LDADD+= -lncursesw
DPADD+= ${LIBPTHREAD}
LDADD+= -lpthread
BINDIR?= /usr/bin

3
usr.bin/clang/llc/Makefile
View File

@ -47,13 +47,14 @@ LIBDEPS=llvmmirparser \
llvmselectiondag \
llvmasmprinter \
llvmcodegen \
llvmtarget \
llvmscalaropts \
llvmprofiledata \
llvminstcombine \
llvminstrumentation \
llvmtransformutils \
llvmipa \
llvmanalysis \
llvmtarget \
llvmx86desc \
llvmobject \
llvmmcparser \

5
usr.bin/clang/llvm-ar/Makefile
View File

@ -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 \

1
usr.bin/clang/llvm-lto/Makefile
View File

@ -61,6 +61,7 @@ LIBDEPS=llvmaarch64disassembler \
llvmobject \
llvmmcparser \
llvminstcombine \
llvminstrumentation \
llvmtransformutils \
llvmipa \
llvmmc \