Module Name: src
Committed By: joerg
Date: Sun Jun 17 16:51:32 UTC 2012
Modified Files:
src/external/bsd/llvm: Makefile Makefile.inc
Added Files:
src/external/bsd/llvm/librt: Makefile Makefile.inc
src/external/bsd/llvm/librt/libcompiler_rt: Makefile shlib_version
Log Message:
Update to LLVM/Clang snapshot r158648 to the fix a false warning in LVM.
Add build glue for compiler_rt.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/Makefile
cvs rdiff -u -r1.37 -r1.38 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/librt/Makefile \
src/external/bsd/llvm/librt/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/librt/libcompiler_rt/Makefile \
src/external/bsd/llvm/librt/libcompiler_rt/shlib_version
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 src/external/bsd/llvm/Makefile:1.2
--- src/external/bsd/llvm/Makefile:1.1 Sun Feb 6 01:13:43 2011
+++ src/external/bsd/llvm/Makefile Sun Jun 17 16:51:31 2012
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2011/02/06 01:13:43 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2012/06/17 16:51:31 joerg Exp $
+
+.include <bsd.init.mk>
SUBDIR= include \
.WAIT \
@@ -6,10 +8,16 @@ SUBDIR= include \
.WAIT \
bin
+.if ${MKCLANGRT:Uno} == "yes"
+SUBDIR+= librt
+.endif
+
.include "Makefile.inc"
checkout:
- svn co -r ${LLVM_REVISION} http://llvm.org/svn/llvm-project/llvm/trunk ${LLVM_SRCDIR}
- svn co -r ${CLANG_REVISION} http://llvm.org/svn/llvm-project/cfe/trunk ${CLANG_SRCDIR}
+ 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}
.include <bsd.subdir.mk>
Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.37 src/external/bsd/llvm/Makefile.inc:1.38
--- src/external/bsd/llvm/Makefile.inc:1.37 Sun Jun 17 07:40:25 2012
+++ src/external/bsd/llvm/Makefile.inc Sun Jun 17 16:51:31 2012
@@ -1,19 +1,23 @@
-# $NetBSD: Makefile.inc,v 1.37 2012/06/17 07:40:25 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.38 2012/06/17 16:51:31 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include <bsd.own.mk>
-COMMON_REVISION= 158533
+SVN_ROOT= http://llvm.org/svn/llvm-project
+
+COMMON_REVISION= 158648
LLVM_REVISION= ${COMMON_REVISION}
CLANG_REVISION= ${COMMON_REVISION}
+COMPILER_RT_REVISION= ${COMMON_REVISION}
LLVM_VERSION= 3.2
CLANG_VERSION= 3.2
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
+COMPILER_RT_SRCDIR:= ${.PARSEDIR}/dist/compiler-rt
LLVM_TOPLEVEL:= ${.PARSEDIR}
CPPFLAGS+= -I. -I${LLVM_SRCDIR}/include -I${CLANG_SRCDIR}/include \
Added files:
Index: src/external/bsd/llvm/librt/Makefile
diff -u /dev/null src/external/bsd/llvm/librt/Makefile:1.1
--- /dev/null Sun Jun 17 16:51:32 2012
+++ src/external/bsd/llvm/librt/Makefile Sun Jun 17 16:51:31 2012
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2012/06/17 16:51:31 joerg Exp $
+
+.include <bsd.own.mk>
+
+SUBDIR= \
+ libcompiler_rt
+
+.include <bsd.subdir.mk>
Index: src/external/bsd/llvm/librt/Makefile.inc
diff -u /dev/null src/external/bsd/llvm/librt/Makefile.inc:1.1
--- /dev/null Sun Jun 17 16:51:32 2012
+++ src/external/bsd/llvm/librt/Makefile.inc Sun Jun 17 16:51:31 2012
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2012/06/17 16:51:31 joerg Exp $
+
+.include "${.PARSEDIR}/../Makefile.inc"
Index: src/external/bsd/llvm/librt/libcompiler_rt/Makefile
diff -u /dev/null src/external/bsd/llvm/librt/libcompiler_rt/Makefile:1.1
--- /dev/null Sun Jun 17 16:51:32 2012
+++ src/external/bsd/llvm/librt/libcompiler_rt/Makefile Sun Jun 17 16:51:32 2012
@@ -0,0 +1,163 @@
+# $NetBSD: Makefile,v 1.1 2012/06/17 16:51:32 joerg Exp $
+
+LIB= compiler_rt
+USE_SHLIBDIR= yes
+CWARNFLAGS+= -Wno-missing-prototypes
+WARNS= 4
+NOLINT=
+
+.include <bsd.init.mk>
+
+LDFLAGS+= -nodefaultlibs
+
+# Excluded:
+# apple_versioning.c
+# clear_cache.c
+# enable_execute_stack.c
+# eprintf.c
+# trampoline_setup.c
+#
+# Must be optimised:
+# atomic.c
+
+GENERIC_SRCS+= \
+ absvdi2.c \
+ absvsi2.c \
+ absvti2.c \
+ adddf3.c \
+ addsf3.c \
+ addvdi3.c \
+ addvsi3.c \
+ addvti3.c \
+ ashldi3.c \
+ ashlti3.c \
+ ashrdi3.c \
+ ashrti3.c \
+ atomic.c \
+ clzdi2.c \
+ clzsi2.c \
+ clzti2.c \
+ cmpdi2.c \
+ cmpti2.c \
+ comparedf2.c \
+ comparesf2.c \
+ ctzdi2.c \
+ ctzsi2.c \
+ ctzti2.c \
+ divdc3.c \
+ divdf3.c \
+ divdi3.c \
+ divmoddi4.c \
+ divmodsi4.c \
+ divsc3.c \
+ divsf3.c \
+ divsi3.c \
+ divti3.c \
+ divxc3.c \
+ extendsfdf2.c \
+ ffsdi2.c \
+ ffsti2.c \
+ fixdfdi.c \
+ fixdfsi.c \
+ fixdfti.c \
+ fixsfdi.c \
+ fixsfsi.c \
+ fixsfti.c \
+ fixunsdfdi.c \
+ fixunsdfsi.c \
+ fixunsdfti.c \
+ fixunssfdi.c \
+ fixunssfsi.c \
+ fixunssfti.c \
+ fixunsxfdi.c \
+ fixunsxfsi.c \
+ fixunsxfti.c \
+ fixxfdi.c \
+ fixxfti.c \
+ floatdidf.c \
+ floatdisf.c \
+ floatdixf.c \
+ floatsidf.c \
+ floatsisf.c \
+ floattidf.c \
+ floattisf.c \
+ floattixf.c \
+ floatundidf.c \
+ floatundisf.c \
+ floatundixf.c \
+ floatunsidf.c \
+ floatunsisf.c \
+ floatuntidf.c \
+ floatuntisf.c \
+ floatuntixf.c \
+ gcc_personality_v0.c \
+ int_util.c \
+ lshrdi3.c \
+ lshrti3.c \
+ moddi3.c \
+ modsi3.c \
+ modti3.c \
+ muldc3.c \
+ muldf3.c \
+ muldi3.c \
+ mulodi4.c \
+ mulosi4.c \
+ muloti4.c \
+ mulsc3.c \
+ mulsf3.c \
+ multi3.c \
+ mulvdi3.c \
+ mulvsi3.c \
+ mulvti3.c \
+ mulxc3.c \
+ negdf2.c \
+ negdi2.c \
+ negsf2.c \
+ negti2.c \
+ negvdi2.c \
+ negvsi2.c \
+ negvti2.c \
+ paritydi2.c \
+ paritysi2.c \
+ parityti2.c \
+ popcountdi2.c \
+ popcountsi2.c \
+ popcountti2.c \
+ powidf2.c \
+ powisf2.c \
+ powitf2.c \
+ powixf2.c \
+ subdf3.c \
+ subsf3.c \
+ subvdi3.c \
+ subvsi3.c \
+ subvti3.c \
+ truncdfsf2.c \
+ ucmpdi2.c \
+ ucmpti2.c \
+ udivdi3.c \
+ udivmoddi4.c \
+ udivmodsi4.c \
+ udivmodti4.c \
+ udivsi3.c \
+ udivti3.c \
+ umoddi3.c \
+ umodsi3.c \
+ umodti3.c
+
+CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_CPU}
+ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_ARCH}
+
+.PATH: ${CPU_DIR}
+.PATH: ${ARCH_DIR}
+.PATH: ${COMPILER_RT_SRCDIR}/lib
+
+.for src in ${GENERIC_SRCS}
+. if exists(${CPU_DIR}/${src:R}.S) || exists(${ARCH_DIR}/${src:R}.S)
+SRCS+= ${src:R}.S
+. else
+SRCS+= ${src}
+. endif
+.endfor
+
+.include <bsd.lib.mk>
Index: src/external/bsd/llvm/librt/libcompiler_rt/shlib_version
diff -u /dev/null src/external/bsd/llvm/librt/libcompiler_rt/shlib_version:1.1
--- /dev/null Sun Jun 17 16:51:32 2012
+++ src/external/bsd/llvm/librt/libcompiler_rt/shlib_version Sun Jun 17 16:51:32 2012
@@ -0,0 +1,3 @@
+# $NetBSD: shlib_version,v 1.1 2012/06/17 16:51:32 joerg Exp $
+major=1
+minor=0
