[src/trunk]: src Update compiler-rt glue for the new source layout.

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

details:   https://anonhg.NetBSD.org/src/rev/bd5d232ef9e6
branches:  trunk
changeset: 327080:bd5d232ef9e6
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Feb 26 22:37:55 2014 +0000

description:
Update compiler-rt glue for the new source layout.

diffstat:

 lib/libc/compiler_rt/Makefile.inc              |  12 ++++++------
 lib/libm/compiler_rt/Makefile.inc              |  12 ++++++------
 sys/external/bsd/compiler_rt/prepare-import.sh |  14 ++++++++------
 sys/lib/libkern/Makefile.compiler-rt           |  12 ++++++------
 4 files changed, 26 insertions(+), 24 deletions(-)

diffs (111 lines):

diff -r c29226cb8569 -r bd5d232ef9e6 lib/libc/compiler_rt/Makefile.inc
--- a/lib/libc/compiler_rt/Makefile.inc Wed Feb 26 22:31:29 2014 +0000
+++ b/lib/libc/compiler_rt/Makefile.inc Wed Feb 26 22:37:55 2014 +0000
@@ -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
diff -r c29226cb8569 -r bd5d232ef9e6 lib/libm/compiler_rt/Makefile.inc
--- a/lib/libm/compiler_rt/Makefile.inc Wed Feb 26 22:31:29 2014 +0000
+++ b/lib/libm/compiler_rt/Makefile.inc Wed Feb 26 22:37:55 2014 +0000
@@ -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+= \
diff -r c29226cb8569 -r bd5d232ef9e6 sys/external/bsd/compiler_rt/prepare-import.sh
--- a/sys/external/bsd/compiler_rt/prepare-import.sh    Wed Feb 26 22:31:29 2014 +0000
+++ b/sys/external/bsd/compiler_rt/prepare-import.sh    Wed Feb 26 22:37:55 2014 +0000
@@ -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 @@
 
 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.*
diff -r c29226cb8569 -r bd5d232ef9e6 sys/lib/libkern/Makefile.compiler-rt
--- a/sys/lib/libkern/Makefile.compiler-rt      Wed Feb 26 22:31:29 2014 +0000
+++ b/sys/lib/libkern/Makefile.compiler-rt      Wed Feb 26 22:37:55 2014 +0000
@@ -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 \