Module Name: src
Committed By: yamt
Date: Thu May 22 16:30:18 UTC 2014
Modified Files:
src/external/bsd/llvm [yamt-pagecache]: Makefile Makefile.inc link.mk
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.1.6.1 -r1.1.6.2 src/external/bsd/llvm/Makefile \
src/external/bsd/llvm/link.mk
cvs rdiff -u -r1.23.2.5 -r1.23.2.6 src/external/bsd/llvm/Makefile.inc
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
diff -u src/external/bsd/llvm/Makefile:1.1.6.1 src/external/bsd/llvm/Makefile:1.1.6.2
--- src/external/bsd/llvm/Makefile:1.1.6.1 Tue Oct 30 18:55:47 2012
+++ src/external/bsd/llvm/Makefile Thu May 22 16:30:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.6.1 2012/10/30 18:55:47 yamt Exp $
+# $NetBSD: Makefile,v 1.1.6.2 2014/05/22 16:30:18 yamt Exp $
.include <bsd.init.mk>
@@ -15,9 +15,19 @@ SUBDIR+= librt
.include "Makefile.inc"
checkout:
- svn co -r ${LLVM_REVISION} ${SVN_ROOT}/llvm/trunk ${LLVM_SRCDIR}
- svn co -r ${CLANG_REVISION} ${SVN_ROOT}/cfe/trunk ${CLANG_SRCDIR}
- svn co -r ${COMPILER_RT_REVISION} ${SVN_ROOT}/compiler-rt/trunk \
- ${COMPILER_RT_SRCDIR}
+ svn co -r ${LLD_REVISION} ${SVN_ROOT}/lld/${SVN_BRANCH} ${LLD_SRCDIR}
+ svn co -r ${LLDB_REVISION} ${SVN_ROOT}/lldb/${SVN_BRANCH} ${LLDB_SRCDIR}
+
+checkout-imported:
+ svn co -r ${CLANG_REVISION} ${SVN_ROOT}/cfe/${SVN_BRANCH} ${CLANG_SRCDIR}
+ svn co -r ${LLVM_REVISION} ${SVN_ROOT}/llvm/${SVN_BRANCH} ${LLVM_SRCDIR}
+
+checkout-mclinker:
+ if [ -d ${MCLINKER_SRCDIR}/.git ]; then \
+ cd ${MCLINKER_SRCDIR}; git pull ${MCLINKER_ROOT} ; \
+ else \
+ git clone ${MCLINKER_ROOT} ${MCLINKER_SRCDIR}; \
+ fi
+ cd ${MCLINKER_SRCDIR} && git checkout ${MCLINKER_REVISION}
.include <bsd.subdir.mk>
Index: src/external/bsd/llvm/link.mk
diff -u src/external/bsd/llvm/link.mk:1.1.6.1 src/external/bsd/llvm/link.mk:1.1.6.2
--- src/external/bsd/llvm/link.mk:1.1.6.1 Tue Oct 30 18:55:47 2012
+++ src/external/bsd/llvm/link.mk Thu May 22 16:30:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: link.mk,v 1.1.6.1 2012/10/30 18:55:47 yamt Exp $
+# $NetBSD: link.mk,v 1.1.6.2 2014/05/22 16:30:18 yamt Exp $
.include <bsd.own.mk>
@@ -8,12 +8,30 @@ LIB_BASE= ${NETBSDSRCDIR}/tools/llvm-lib
LIB_BASE= ${LLVM_TOPLEVEL}/lib
.endif
+.for l in ${MCLINKER_LIBS}
+MCLINKER_OBJDIR.${l}!= cd ${LIB_BASE}/libMCLinker${l} && ${PRINTOBJDIR}
+LDADD+= -L${MCLINKER_OBJDIR.${l}} -lMCLinker${l}
+DPADD+= ${MCLINKER_OBJDIR.${l}}/libMCLinker${l}.a
+.endfor
+
+.for l in ${LLDB_LIBS}
+LLDB_OBJDIR.${l}!= cd ${LIB_BASE}/liblldb${l} && ${PRINTOBJDIR}
+LDADD+= -L${LLDB_OBJDIR.${l}} -llldb${l}
+DPADD+= ${LLDB_OBJDIR.${l}}/liblldb${l}.a
+.endfor
+
.for l in ${CLANG_LIBS}
CLANG_OBJDIR.${l}!= cd ${LIB_BASE}/lib${l} && ${PRINTOBJDIR}
LDADD+= -L${CLANG_OBJDIR.${l}} -l${l}
DPADD+= ${CLANG_OBJDIR.${l}}/lib${l}.a
.endfor
+.for l in ${LLD_LIBS}
+LLD_OBJDIR.${l}!= cd ${LIB_BASE}/lib${l} && ${PRINTOBJDIR}
+LDADD+= -L${LLD_OBJDIR.${l}} -l${l}
+DPADD+= ${LLD_OBJDIR.${l}}/lib${l}.a
+.endfor
+
.for l in ${LLVM_LIBS}
LLVM_OBJDIR.${l}!= cd ${LIB_BASE}/libLLVM${l} && ${PRINTOBJDIR}
LDADD+= -L${LLVM_OBJDIR.${l}} -lLLVM${l}
@@ -21,8 +39,12 @@ DPADD+= ${LLVM_OBJDIR.${l}}/libLLVM${l}.
.endfor
.if defined(HOSTPROG)
-LDADD_NEED_DL= cat ${LLVM_TOOLCONF_OBJDIR}/need-dl 2> /dev/null
-LDADD+= ${LDADD_NEED_DL:sh}
+LDADD_NEED_DL= cat ${LLVM_TOOLCONF_OBJDIR}/need-dl 2> /dev/null
+LDADD_NEED_TERMINFO= cat ${LLVM_TOOLCONF_OBJDIR}/need-terminfo 2> /dev/null
+LDADD+= ${LDADD_NEED_DL:sh} ${LDADD_NEED_TERMINFO:sh}
+.else
+LDADD+= -lterminfo
+DPADD+= ${LIBTERMINFO}
.endif
LDADD+= -lpthread
Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.23.2.5 src/external/bsd/llvm/Makefile.inc:1.23.2.6
--- src/external/bsd/llvm/Makefile.inc:1.23.2.5 Wed Jan 16 05:27:58 2013
+++ src/external/bsd/llvm/Makefile.inc Thu May 22 16:30:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.23.2.5 2013/01/16 05:27:58 yamt Exp $
+# $NetBSD: Makefile.inc,v 1.23.2.6 2014/05/22 16:30:18 yamt Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
@@ -6,47 +6,75 @@ LLVM_TOPLEVEL_MK=
.include <bsd.own.mk>
SVN_ROOT= http://llvm.org/svn/llvm-project
+SVN_BRANCH= trunk
-COMMON_REVISION= 168187
-LLVM_REVISION= ${COMMON_REVISION}
+COMMON_REVISION= 202566
CLANG_REVISION= ${COMMON_REVISION}
-COMPILER_RT_REVISION= ${COMMON_REVISION}
+LLD_REVISION= ${COMMON_REVISION}
+LLDB_REVISION= ${COMMON_REVISION}
+LLVM_REVISION= ${COMMON_REVISION}
-LLVM_VERSION= 3.2
-CLANG_VERSION= 3.2
+MCLINKER_REVISION= deeb2a77b4165827316f88e0a7ba4ba6b743a080
+MCLINKER_ROOT= https://code.google.com/p/mclinker/
+
+LLVM_VERSION= 3.5
+CLANG_VERSION= 3.5
-LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
-COMPILER_RT_SRCDIR:= ${.PARSEDIR}/dist/compiler-rt
+LLD_SRCDIR:= ${.PARSEDIR}/dist/lld
+LLDB_SRCDIR:= ${.PARSEDIR}/dist/lldb
+LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
+MCLINKER_SRCDIR:= ${.PARSEDIR}/dist/mclinker
LLVM_TOPLEVEL:= ${.PARSEDIR}
-CPPFLAGS+= -I. -I${LLVM_SRCDIR}/include -I${CLANG_SRCDIR}/include \
+CPPFLAGS+= -I. -I${CLANG_SRCDIR}/include -I${LLD_SRCDIR}/include \
+ -I${LLVM_SRCDIR}/include -I${MCLINKER_SRCDIR}/include \
+ -I${LLDB_SRCDIR}/include \
-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS \
- -D__STDC_FORMAT_MACROS
+ -D__STDC_FORMAT_MACROS -DCLANG_ENABLE_STATIC_ANALYZER
.if defined(HOSTLIB) || defined(HOSTPROG)
LLVM_INCLUDE_CONFIG= ${LLVM_TOOLCONF_OBJDIR}/config/include
CLANG_INCLUDE_CONFIG= ${LLVM_TOOLCONF_OBJDIR}/config/tools/clang/include
+MCLINKER_INCLUDE_CONFIG= ${LLVM_TOPLEVEL}/config/mclinker
LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm-include && ${PRINTOBJDIR}
LLVM_TOOLCONF_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm && ${PRINTOBJDIR}
HOST_CPPFLAGS+= ${CPPFLAGS}
-HOST_CXXFLAGS+= -O2 -g -fno-rtti -fno-exceptions
+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
CXXFLAGS+= -fno-rtti -fno-exceptions
+CXXFLAGS+= -ffunction-sections -fdata-sections
+LDFLAGS+= -Wl,--gc-sections
.endif
CPPFLAGS+= -I${LLVM_INCLUDE_OBJDIR} -I${LLVM_INCLUDE_CONFIG} \
- -I${CLANG_INCLUDE_CONFIG}
+ -I${CLANG_INCLUDE_CONFIG} -I${MCLINKER_INCLUDE_CONFIG}
+
+LLVM_PLATFORM=${MACHINE_GNU_ARCH}--netbsd
LLVM_CONFIGURE_ARGS= \
- --enable-targets=x86,powerpc,sparc,arm,mips \
+ --enable-targets=x86,powerpc,sparc,aarch64,arm,mips \
--with-c-include-dirs=/usr/include/clang-${CLANG_VERSION}:/usr/include \
--disable-timestamps --prefix=/usr --sysconfdir=/etc/llvm \
--with-clang-srcdir=${CLANG_SRCDIR} \
- --host=${MACHINE_GNU_PLATFORM} \
+ --host=${LLVM_PLATFORM} --disable-compiler-version-checks \
llvm_cv_gnu_make_command=${MAKE}
+.for tool in circo dot dotty fdp neato twopi xdot
+LLVM_CONFIGURE_ARGS+= ac_cv_path_${tool:tu}="echo ${tool}"
+.endfor
+
.endif
