Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Update build system for LLVM/Clang snapshot r209886. This br...



details:   https://anonhg.NetBSD.org/src/rev/d988cd52ab99
branches:  trunk
changeset: 329613:d988cd52ab99
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri May 30 18:28:13 2014 +0000

description:
Update build system for LLVM/Clang snapshot r209886. This brings in the
merged AArch64 backend and the move of eARM to DWARF exception handling
for NetBSD. C++11 is required for building.

diffstat:

 distrib/sets/lists/comp/md.amd64                             |    3 +-
 distrib/sets/lists/comp/md.i386                              |    3 +-
 external/bsd/llvm/Makefile.inc                               |    8 +-
 external/bsd/llvm/bin/clang/Makefile                         |   10 +-
 external/bsd/llvm/bin/lld/Makefile                           |    5 +-
 external/bsd/llvm/bin/lldb/Makefile                          |   24 +-
 external/bsd/llvm/bin/llvm-readobj/Makefile                  |    5 +-
 external/bsd/llvm/config/clang/Config/config.h               |    2 +-
 external/bsd/llvm/config/llvm/Config/config.h.in             |   79 +------
 external/bsd/llvm/config/llvm/Support/DataTypes.h            |  117 ++--------
 external/bsd/llvm/include/Makefile                           |    5 +-
 external/bsd/llvm/lib/Makefile                               |   12 +-
 external/bsd/llvm/lib/libLLVMAArch64CodeGen/Makefile         |   24 +-
 external/bsd/llvm/lib/libLLVMAArch64Disassembler/Makefile    |    5 +-
 external/bsd/llvm/lib/libLLVMAArch64MCTargetDesc/Makefile    |    5 +-
 external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile             |    3 +-
 external/bsd/llvm/lib/libLLVMARMMCTargetDesc/Makefile        |    6 +-
 external/bsd/llvm/lib/libLLVMAnalysis/Makefile               |    4 +-
 external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile             |    6 +-
 external/bsd/llvm/lib/libLLVMCodeGen/Makefile                |    3 +-
 external/bsd/llvm/lib/libLLVMIR/Makefile                     |    4 +-
 external/bsd/llvm/lib/libLLVMMC/Makefile                     |    4 +-
 external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile            |    3 +-
 external/bsd/llvm/lib/libLLVMMipsMCTargetDesc/Makefile       |    3 +-
 external/bsd/llvm/lib/libLLVMObject/Makefile                 |    3 +-
 external/bsd/llvm/lib/libLLVMProfileData/Makefile            |   17 +
 external/bsd/llvm/lib/libLLVMScalarOpts/Makefile             |    4 +-
 external/bsd/llvm/lib/libLLVMSupport/Makefile                |    3 +-
 external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile        |    4 +-
 external/bsd/llvm/lib/libLLVMX86AsmParser/Makefile           |    5 +-
 external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile             |    3 +-
 external/bsd/llvm/lib/libLLVMX86Disassembler/Makefile        |    4 +-
 external/bsd/llvm/lib/libLLVMX86MCTargetDesc/Makefile        |    5 +-
 external/bsd/llvm/lib/libclangAnalysis/Makefile              |    5 +-
 external/bsd/llvm/lib/libclangBasic/Makefile                 |    8 +-
 external/bsd/llvm/lib/libclangCodeGen/Makefile               |    6 +-
 external/bsd/llvm/lib/libclangFrontend/Makefile              |    5 +-
 external/bsd/llvm/lib/liblldDriver/Makefile                  |    5 +-
 external/bsd/llvm/lib/liblldReaderWriterELFMips/Makefile     |    3 +-
 external/bsd/llvm/lib/liblldReaderWriterMachO/Makefile       |    3 +-
 external/bsd/llvm/lib/liblldbAPI/Makefile                    |    3 +-
 external/bsd/llvm/lib/liblldbCommands/Makefile               |    5 +-
 external/bsd/llvm/lib/liblldbCore/Makefile                   |    8 +-
 external/bsd/llvm/lib/liblldbHostCommon/Makefile             |    3 +-
 external/bsd/llvm/lib/liblldbPluginABIMacOSX_arm64/Makefile  |   15 +
 external/bsd/llvm/lib/liblldbPluginInstructionARM64/Makefile |   15 +
 external/bsd/llvm/lib/liblldbPluginJITLoaderGDB/Makefile     |   15 +
 external/bsd/llvm/lib/liblldbPluginObjectFileJIT/Makefile    |   15 +
 external/bsd/llvm/lib/liblldbPluginProcessElfCore/Makefile   |    6 +-
 external/bsd/llvm/lib/liblldbPluginProcessNetBSD/Makefile    |    5 +-
 external/bsd/llvm/lib/liblldbPluginProcessPOSIX/Makefile     |   20 +-
 external/bsd/llvm/lib/liblldbPluginProcessUtility/Makefile   |   11 +-
 external/bsd/llvm/lib/liblldbTarget/Makefile                 |    8 +-
 external/bsd/llvm/lib/liblldbUtility/Makefile                |    3 +-
 tools/llvm-lib/libLLVMDebugInfo/Makefile                     |    3 +
 tools/llvm-lib/libLLVMProfileData/Makefile                   |    3 +
 56 files changed, 297 insertions(+), 267 deletions(-)

diffs (truncated from 1650 to 300 lines):

diff -r 52dac99e92c1 -r d988cd52ab99 distrib/sets/lists/comp/md.amd64
--- a/distrib/sets/lists/comp/md.amd64  Fri May 30 18:13:37 2014 +0000
+++ b/distrib/sets/lists/comp/md.amd64  Fri May 30 18:28:13 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.219 2014/05/15 16:32:28 apb Exp $
+# $NetBSD: md.amd64,v 1.220 2014/05/30 18:28:13 joerg Exp $
 
 ./usr/include/amd64                            comp-c-include
 ./usr/include/amd64/ansi.h                     comp-c-include
@@ -183,6 +183,7 @@
 ./usr/include/clang-3.5/f16cintrin.h           comp-c-include          llvm
 ./usr/include/clang-3.5/fma4intrin.h           comp-c-include          llvm
 ./usr/include/clang-3.5/fmaintrin.h            comp-c-include          llvm
+./usr/include/clang-3.5/ia32intrin.h           comp-c-include          llvm
 ./usr/include/clang-3.5/immintrin.h            comp-c-include          llvm
 ./usr/include/clang-3.5/lzcntintrin.h          comp-c-include          llvm
 ./usr/include/clang-3.5/mm3dnow.h              comp-c-include          llvm
diff -r 52dac99e92c1 -r d988cd52ab99 distrib/sets/lists/comp/md.i386
--- a/distrib/sets/lists/comp/md.i386   Fri May 30 18:13:37 2014 +0000
+++ b/distrib/sets/lists/comp/md.i386   Fri May 30 18:28:13 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.145 2014/02/12 23:24:09 dsl Exp $
+# $NetBSD: md.i386,v 1.146 2014/05/30 18:28:13 joerg Exp $
 ./usr/include/clang-3.0/avx2intrin.h           comp-obsolete           obsolete
 ./usr/include/clang-3.0/avxintrin.h            comp-obsolete           obsolete
 ./usr/include/clang-3.0/bmi2intrin.h           comp-obsolete           obsolete
@@ -113,6 +113,7 @@
 ./usr/include/clang-3.5/f16cintrin.h           comp-c-include          llvm
 ./usr/include/clang-3.5/fma4intrin.h           comp-c-include          llvm
 ./usr/include/clang-3.5/fmaintrin.h            comp-c-include          llvm
+./usr/include/clang-3.5/ia32intrin.h           comp-c-include          llvm
 ./usr/include/clang-3.5/immintrin.h            comp-c-include          llvm
 ./usr/include/clang-3.5/lzcntintrin.h          comp-c-include          llvm
 ./usr/include/clang-3.5/mm3dnow.h              comp-c-include          llvm
diff -r 52dac99e92c1 -r d988cd52ab99 external/bsd/llvm/Makefile.inc
--- a/external/bsd/llvm/Makefile.inc    Fri May 30 18:13:37 2014 +0000
+++ b/external/bsd/llvm/Makefile.inc    Fri May 30 18:28:13 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.72 2014/03/04 21:05:05 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.73 2014/05/30 18:28:13 joerg Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
@@ -8,7 +8,7 @@
 SVN_ROOT=              http://llvm.org/svn/llvm-project
 SVN_BRANCH=            trunk
 
-COMMON_REVISION=       202566
+COMMON_REVISION=       209886
 CLANG_REVISION=                ${COMMON_REVISION}
 LLD_REVISION=          ${COMMON_REVISION}
 LLDB_REVISION=         ${COMMON_REVISION}
@@ -41,18 +41,14 @@
 LLVM_TOOLCONF_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm && ${PRINTOBJDIR}
 HOST_CPPFLAGS+=        ${CPPFLAGS}
 HOST_CXXFLAGS+=        -O2 -fno-rtti -fno-exceptions
-.if ${MKLLD:Uno} == "yes"
 HOST_CPPFLAGS+=        -std=c++11
-.endif
 .else
 LLVM_INCLUDE_CONFIG=   ${LLVM_TOPLEVEL}/config
 CLANG_INCLUDE_CONFIG=  ${LLVM_TOPLEVEL}/config
 MCLINKER_INCLUDE_CONFIG= ${LLVM_TOPLEVEL}/config/mclinker
 LLVM_INCLUDE_OBJDIR!=  cd ${LLVM_TOPLEVEL}/include && ${PRINTOBJDIR}
 
-.if ${MKLLD:Uno} == "yes" || ${MKLLDB:Uno} == "yes"
 CPPFLAGS+=     -std=c++11
-.endif
 .if ${MKLLDB:Uno} == "yes"
 CPPFLAGS+=     -DLLDB_DISABLE_PYTHON
 .endif
diff -r 52dac99e92c1 -r d988cd52ab99 external/bsd/llvm/bin/clang/Makefile
--- a/external/bsd/llvm/bin/clang/Makefile      Fri May 30 18:13:37 2014 +0000
+++ b/external/bsd/llvm/bin/clang/Makefile      Fri May 30 18:28:13 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.30 2014/02/14 20:23:56 joerg Exp $
+#      $NetBSD: Makefile,v 1.31 2014/05/30 18:28:13 joerg Exp $
 
 PROG_CXX=      clang
 NOMAN=         yes
@@ -75,10 +75,10 @@
        X86Utils \
        X86AsmParser \
        X86AsmPrinter \
-       Object \
        SelectionDAG \
        AsmPrinter \
        CodeGen \
+       ProfileData \
        Vectorize \
        Target \
        InstCombine \
@@ -88,6 +88,7 @@
        MCDisassembler \
        MCParser \
        MC \
+       Object \
        Linker \
        TransformsUtils \
        ipa \
@@ -97,4 +98,9 @@
 
 .include "${.PARSEDIR}/../../link.mk"
 
+LDADD+=        -lz
+.if !defined(HOSTPROG)
+DPADD+=        ${LIBZ}
+.endif
+
 .include <bsd.prog.mk>
diff -r 52dac99e92c1 -r d988cd52ab99 external/bsd/llvm/bin/lld/Makefile
--- a/external/bsd/llvm/bin/lld/Makefile        Fri May 30 18:13:37 2014 +0000
+++ b/external/bsd/llvm/bin/lld/Makefile        Fri May 30 18:28:13 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2014/01/05 16:38:06 joerg Exp $
+#      $NetBSD: Makefile,v 1.4 2014/05/30 18:28:13 joerg Exp $
 
 PROG_CXX=      lld
 NOMAN=         yes
@@ -27,6 +27,9 @@
 
 LLVM_LIBS+= \
        Object \
+       BitReader \
+       IR \
+       DebugInfo \
        Option \
        Support
 
diff -r 52dac99e92c1 -r d988cd52ab99 external/bsd/llvm/bin/lldb/Makefile
--- a/external/bsd/llvm/bin/lldb/Makefile       Fri May 30 18:13:37 2014 +0000
+++ b/external/bsd/llvm/bin/lldb/Makefile       Fri May 30 18:28:13 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2013/10/20 14:53:22 joerg Exp $
+#      $NetBSD: Makefile,v 1.3 2014/05/30 18:28:13 joerg Exp $
 
 PROG_CXX=      lldb
 NOMAN=         yes
@@ -8,9 +8,6 @@
 .PATH: ${LLDB_SRCDIR}/tools/driver
 
 SRCS=  Driver.cpp \
-       ELWrapper.cpp \
-       GetOptWrapper.cpp \
-       IOChannel.cpp \
        Platform.cpp
 
 CPPFLAGS.Driver.cpp+=  -Dgetopt_long_only=getopt_long
@@ -19,6 +16,7 @@
        API \
        Log \
        PluginInstructionARM \
+       PluginInstructionARM64 \
        PluginProcessGDBRemote \
        PluginProcessMachCore \
        PluginProcessPOSIX \
@@ -40,6 +38,7 @@
        Core \
        DataFormatters \
        PluginABIMacOSX_arm \
+       PluginABIMacOSX_arm64 \
        PluginABIMacOSX_i386 \
        PluginABISysV_x86_64 \
        PluginAppleObjCRuntime \
@@ -48,9 +47,11 @@
        PluginDynamicLoaderMacOSXDYLD \
        PluginDynamicLoaderPosixDYLD \
        PluginDynamicLoaderStatic \
+       PluginJITLoaderGDB \
        PluginObjectContainerBSDArchive \
        PluginObjectContainerMachOArchive \
        PluginObjectFileELF \
+       PluginObjectFileJIT \
        PluginObjectFileMachO \
        PluginObjectFilePECOFF \
        PluginPlatformNetBSD \
@@ -89,8 +90,6 @@
        ipo \
        IRReader \
        AsmParser \
-       BitReader \
-       BitWriter \
        MCDisassembler \
        AArch64CodeGen \
        AArch64TargetInfo \
@@ -114,11 +113,15 @@
        PowerPCCodeGen \
        PowerPCAsmParser \
        PowerPCTargetInfo \
+       PowerPCDisassembler \
        PowerPCMCTargetDesc \
        PowerPCAsmPrinter \
        SparcCodeGen \
        SparcTargetInfo \
+       SparcDisassembler \
        SparcMCTargetDesc \
+       SparcAsmParser \
+       SparcAsmPrinter \
        X86CodeGen \
        X86TargetInfo \
        X86MCTargetDesc \
@@ -126,7 +129,6 @@
        X86Disassembler \
        X86AsmPrinter \
        X86Utils \
-       Object \
        SelectionDAG \
        AsmPrinter \
        CodeGen \
@@ -138,16 +140,20 @@
        MCDisassembler \
        MCParser \
        MC \
+       Object \
+       BitReader \
+       BitWriter \
        Linker \
        TransformsUtils \
        Analysis \
        ipa \
        IR \
+       ProfileData \
        Option \
        Support
 
-LDADD+=        -ledit -lterminfo -lexecinfo
-DPADD+=        ${LIBEDIT} ${LIBTERMINFO} ${LIBEXECINFO}
+LDADD+=        -ledit -lterminfo -lexecinfo -lz
+DPADD+=        ${LIBEDIT} ${LIBTERMINFO} ${LIBEXECINFO} ${LIBZ}
 DBG=-g
 
 .include "${.PARSEDIR}/../../link.mk"
diff -r 52dac99e92c1 -r d988cd52ab99 external/bsd/llvm/bin/llvm-readobj/Makefile
--- a/external/bsd/llvm/bin/llvm-readobj/Makefile       Fri May 30 18:13:37 2014 +0000
+++ b/external/bsd/llvm/bin/llvm-readobj/Makefile       Fri May 30 18:28:13 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2014/02/14 20:23:56 joerg Exp $
+#      $NetBSD: Makefile,v 1.7 2014/05/30 18:28:13 joerg Exp $
 
 PROG_CXX=      llvm-readobj
 NOMAN=         yes
@@ -14,7 +14,8 @@
        Error.cpp \
        MachODumper.cpp \
        ObjDumper.cpp \
-       StreamWriter.cpp
+       StreamWriter.cpp \
+       Win64EHDumper.cpp
 
 LLVM_LIBS+= \
        AArch64TargetInfo \
diff -r 52dac99e92c1 -r d988cd52ab99 external/bsd/llvm/config/clang/Config/config.h
--- a/external/bsd/llvm/config/clang/Config/config.h    Fri May 30 18:13:37 2014 +0000
+++ b/external/bsd/llvm/config/clang/Config/config.h    Fri May 30 18:28:13 2014 +0000
@@ -14,7 +14,7 @@
 #define C_INCLUDE_DIRS "/usr/include/clang-3.5:/usr/include"
 
 /* Linker version detected at compile time. */
-#define HOST_LINK_VERSION "2.23.52.20130913"
+#define HOST_LINK_VERSION "1"
 
 /* Default <path> to all compiler invocations for --sysroot=<path>. */
 #define DEFAULT_SYSROOT ""
diff -r 52dac99e92c1 -r d988cd52ab99 external/bsd/llvm/config/llvm/Config/config.h.in
--- a/external/bsd/llvm/config/llvm/Config/config.h.in  Fri May 30 18:13:37 2014 +0000
+++ b/external/bsd/llvm/config/llvm/Config/config.h.in  Fri May 30 18:28:13 2014 +0000
@@ -34,24 +34,6 @@
 /* Directory where gcc is installed. */
 #define GCC_INSTALL_PREFIX ""
 
-/* Define to 1 if you have the `argz_append' function. */
-/* #undef HAVE_ARGZ_APPEND */
-
-/* Define to 1 if you have the `argz_create_sep' function. */
-/* #undef HAVE_ARGZ_CREATE_SEP */
-
-/* Define to 1 if you have the <argz.h> header file. */
-/* #undef HAVE_ARGZ_H */
-
-/* Define to 1 if you have the `argz_insert' function. */
-/* #undef HAVE_ARGZ_INSERT */
-
-/* Define to 1 if you have the `argz_next' function. */
-/* #undef HAVE_ARGZ_NEXT */
-
-/* Define to 1 if you have the `argz_stringify' function. */
-/* #undef HAVE_ARGZ_STRINGIFY */
-
 /* Define to 1 if you have the `backtrace' function. */
 /* #undef HAVE_BACKTRACE */
 
@@ -61,9 +43,6 @@
 /* Define if the neat program is available */
 /* #undef HAVE_CIRCO */
 
-/* Define to 1 if you have the `closedir' function. */
-#define HAVE_CLOSEDIR 1
-
 /* Define to 1 if you have the <CrashReporterClient.h> header file. */
 /* #undef HAVE_CRASHREPORTERCLIENT_H */



Home | Main Index | Thread Index | Old Index