Module Name: src
Committed By: joerg
Date: Mon May 16 19:27:48 UTC 2011
Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/config/llvm/Config: config.h
src/external/bsd/llvm/lib/libLLVMAsmPrinter: Makefile
src/external/bsd/llvm/lib/libLLVMExecutionEngine: Makefile
src/tools/llvm: Makefile
Log Message:
Update to LLVM/Clang revision 131404. This includes the fix for asm labels
on builtins (broke longjmp usage) and a better cross-compiling support
in combination with -m32/-m64.
Update configuration to include /usr/include/clang-3.0 in the search
path.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/config/llvm/Config/config.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/llvm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.6 src/external/bsd/llvm/Makefile.inc:1.7
--- src/external/bsd/llvm/Makefile.inc:1.6 Thu May 12 14:56:22 2011
+++ src/external/bsd/llvm/Makefile.inc Mon May 16 19:27:48 2011
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.6 2011/05/12 14:56:22 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2011/05/16 19:27:48 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include <bsd.own.mk>
-LLVM_REVISION= 130695
-CLANG_REVISION= 130695
+LLVM_REVISION= 131404
+CLANG_REVISION= 131404
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
Index: src/external/bsd/llvm/config/llvm/Config/config.h
diff -u src/external/bsd/llvm/config/llvm/Config/config.h:1.1 src/external/bsd/llvm/config/llvm/Config/config.h:1.2
--- src/external/bsd/llvm/config/llvm/Config/config.h:1.1 Sun Feb 6 01:13:51 2011
+++ src/external/bsd/llvm/config/llvm/Config/config.h Mon May 16 19:27:48 2011
@@ -20,7 +20,7 @@
#define CXX_INCLUDE_ROOT ""
/* Directories clang will search for headers */
-#define C_INCLUDE_DIRS ""
+#define C_INCLUDE_DIRS "/usr/include/clang-3.0:/usr/include"
/* Define if CBE is enabled for printf %a output */
#define ENABLE_CBE_PRINTF_A 1
Index: src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile:1.3 src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile:1.4
--- src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile:1.3 Thu May 12 14:56:23 2011
+++ src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile Mon May 16 19:27:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/12 14:56:23 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2011/05/16 19:27:48 joerg Exp $
LIB= LLVMAsmPrinter
@@ -15,7 +15,6 @@
DwarfCompileUnit.cpp \
DwarfDebug.cpp \
DwarfException.cpp \
- DwarfTableException.cpp \
OcamlGCPrinter.cpp
.if defined(HOSTLIB)
Index: src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile:1.1 src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile:1.2
--- src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile:1.1 Sun Feb 6 01:13:57 2011
+++ src/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile Mon May 16 19:27:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/02/06 01:13:57 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/16 19:27:48 joerg Exp $
LIB= LLVMExecutionEngine
@@ -7,6 +7,7 @@
.PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine
SRCS+= ExecutionEngine.cpp \
- ExecutionEngineBindings.cpp
+ ExecutionEngineBindings.cpp \
+ TargetSelect.cpp
.include <bsd.lib.mk>
Index: src/tools/llvm/Makefile
diff -u src/tools/llvm/Makefile:1.3 src/tools/llvm/Makefile:1.4
--- src/tools/llvm/Makefile:1.3 Mon Mar 21 02:10:10 2011
+++ src/tools/llvm/Makefile Mon May 16 19:27:47 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/03/21 02:10:10 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2011/05/16 19:27:47 joerg Exp $
.include <bsd.init.mk>
@@ -21,7 +21,9 @@
mkdir -p config
cd config && ${LLVM_SRCDIR}/configure --prefix=/usr \
--enable-targets=x86 --host=x86_64--netbsd \
+ --with-c-include-dirs=/usr/include/clang-3.0:/usr/include \
--enable-optimized --disable--assertions
+
need-dl:
printf '#include <dlfcn.h>\nint main(void){void *p; return dladdr(p, p);}' > need-dl.c
if ${HOST_CC} -o need-dl.out -D_GNU_SOURCE need-dl.c > /dev/null 2>&1; then \
