Module Name: src
Committed By: joerg
Date: Wed Feb 26 22:37:56 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
src/lib/libm/compiler_rt: Makefile.inc
src/sys/external/bsd/compiler_rt: prepare-import.sh
src/sys/lib/libkern: Makefile.compiler-rt
Log Message:
Update compiler-rt glue for the new source layout.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/compiler_rt/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/compiler_rt/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/compiler_rt/prepare-import.sh
cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libkern/Makefile.compiler-rt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.14 src/lib/libc/compiler_rt/Makefile.inc:1.15
--- src/lib/libc/compiler_rt/Makefile.inc:1.14 Wed Jan 29 22:38:18 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Wed Feb 26 22:37:56 2014
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile.inc,v 1.14 2014/01/29 22:38:18 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.15 2014/02/26 22:37:56 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
.if ${MACHINE_ARCH} == "powerpc"
-COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
-COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
.else
-COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_CPU}
-COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_ARCH}
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_CPU}
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_ARCH}
.endif
.PATH: ${COMPILER_RT_CPU_DIR}
.PATH: ${COMPILER_RT_ARCH_DIR}
-.PATH: ${COMPILER_RT_SRCDIR}/lib
+.PATH: ${COMPILER_RT_SRCDIR}/lib/builtins
.PATH: ${COMPILER_RT_SRCDIR}/lib/profile
# Complex support needs parts of libm
Index: src/lib/libm/compiler_rt/Makefile.inc
diff -u src/lib/libm/compiler_rt/Makefile.inc:1.4 src/lib/libm/compiler_rt/Makefile.inc:1.5
--- src/lib/libm/compiler_rt/Makefile.inc:1.4 Mon Feb 3 13:30:10 2014
+++ src/lib/libm/compiler_rt/Makefile.inc Wed Feb 26 22:37:56 2014
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile.inc,v 1.4 2014/02/03 13:30:10 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2014/02/26 22:37:56 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
.if ${MACHINE_ARCH} == "powerpc"
-COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
-COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
.else
-COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_CPU}
-COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_ARCH}
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_CPU}
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_ARCH}
.endif
.PATH: ${COMPILER_RT_CPU_DIR}
.PATH: ${COMPILER_RT_ARCH_DIR}
-.PATH: ${COMPILER_RT_SRCDIR}/lib
+.PATH: ${COMPILER_RT_SRCDIR}/lib/builtins
# Needs scaling support
GENERIC_SRCS+= \
Index: src/sys/external/bsd/compiler_rt/prepare-import.sh
diff -u src/sys/external/bsd/compiler_rt/prepare-import.sh:1.2 src/sys/external/bsd/compiler_rt/prepare-import.sh:1.3
--- src/sys/external/bsd/compiler_rt/prepare-import.sh:1.2 Wed Jan 15 21:07:19 2014
+++ src/sys/external/bsd/compiler_rt/prepare-import.sh Wed Feb 26 22:37:56 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.2 2014/01/15 21:07:19 joerg Exp $
+# $NetBSD: prepare-import.sh,v 1.3 2014/02/26 22:37:56 joerg Exp $
#
# Checkout compiler_rt into dist.
# Run this script and check for additional files and directories to prune,
@@ -9,9 +9,11 @@ set -e
cd dist
rm -rf .svn
-rm -rf BlocksRuntime SDKs cmake include make www
+rm -rf SDKs cmake include make third_party unittests www
rm -f .arcconfig .gitignore CMakeLists.txt Makefile
-rm -rf lib/asan lib/dfsan lib/interception lib/lsan lib/msan lib/msandr
-rm -rf lib/sanitizer_common lib/tsan lib/ubsan
-rm -f lib/*/Makefile.mk lib/Makefile.mk lib/CMakeLists.txt
-rm -f lib/apple_versioning.c lib/lit.common.* lib/profile/CMakeLists.txt
+rm -rf lib/BlocksRuntime lib/asan lib/dfsan lib/interception lib/lsan
+rm -rf lib/msan lib/msandr lib/sanitizer_common lib/tsan lib/ubsan
+rm -rf test/BlocksRuntime test/asan test/dfsan test/lit.* test/lsan test/msan test/sanitizer_common test/tsan test/ubsan
+rm -f lib/*/*/Makefile.mk lib/*/Makefile.mk */Makefile.mk
+rm -f lib/*/CMakeLists.txt */CMakeLists.txt
+rm -f lib/builtins/apple_versioning.c lib/lit.common.*
Index: src/sys/lib/libkern/Makefile.compiler-rt
diff -u src/sys/lib/libkern/Makefile.compiler-rt:1.3 src/sys/lib/libkern/Makefile.compiler-rt:1.4
--- src/sys/lib/libkern/Makefile.compiler-rt:1.3 Wed Jan 29 22:30:24 2014
+++ src/sys/lib/libkern/Makefile.compiler-rt Wed Feb 26 22:37:55 2014
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile.compiler-rt,v 1.3 2014/01/29 22:30:24 joerg Exp $
+# $NetBSD: Makefile.compiler-rt,v 1.4 2014/02/26 22:37:55 joerg Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
.if ${MACHINE_ARCH} == "powerpc"
-COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
-COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/ppc
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
.else
-COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_CPU}
-COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/${MACHINE_ARCH}
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_CPU}
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_ARCH}
.endif
.PATH: ${COMPILER_RT_CPU_DIR}
.PATH: ${COMPILER_RT_ARCH_DIR}
-.PATH: ${COMPILER_RT_SRCDIR}/lib
+.PATH: ${COMPILER_RT_SRCDIR}/lib/builtins
GENERIC_SRCS+= \
absvdi2.c \
