[src/trunk]: src Update to LLVM/Clang revision 131404. This includes the fix ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ac445dba83b0
branches:  trunk
changeset: 765037:ac445dba83b0
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon May 16 19:27:47 2011 +0000

description:
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.

diffstat:

 external/bsd/llvm/Makefile.inc                        |  6 +++---
 external/bsd/llvm/config/llvm/Config/config.h         |  2 +-
 external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile      |  3 +--
 external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile |  5 +++--
 tools/llvm/Makefile                                   |  4 +++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diffs (85 lines):

diff -r d687ac62801d -r ac445dba83b0 external/bsd/llvm/Makefile.inc
--- a/external/bsd/llvm/Makefile.inc    Mon May 16 18:08:04 2011 +0000
+++ b/external/bsd/llvm/Makefile.inc    Mon May 16 19:27:47 2011 +0000
@@ -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
diff -r d687ac62801d -r ac445dba83b0 external/bsd/llvm/config/llvm/Config/config.h
--- a/external/bsd/llvm/config/llvm/Config/config.h     Mon May 16 18:08:04 2011 +0000
+++ b/external/bsd/llvm/config/llvm/Config/config.h     Mon May 16 19:27:47 2011 +0000
@@ -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
diff -r d687ac62801d -r ac445dba83b0 external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile
--- a/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile  Mon May 16 18:08:04 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile  Mon May 16 19:27:47 2011 +0000
@@ -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)
diff -r d687ac62801d -r ac445dba83b0 external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile
--- a/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile     Mon May 16 18:08:04 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMExecutionEngine/Makefile     Mon May 16 19:27:47 2011 +0000
@@ -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>
diff -r d687ac62801d -r ac445dba83b0 tools/llvm/Makefile
--- a/tools/llvm/Makefile       Mon May 16 18:08:04 2011 +0000
+++ b/tools/llvm/Makefile       Mon May 16 19:27:47 2011 +0000
@@ -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 \