Sat Feb 27 18:56:33 2016 UTC ()
Sparc/Sparc64 also support libc++ and compiler-rt in libc with Clang.


(joerg)
diff -r1.902 -r1.903 src/share/mk/bsd.own.mk
cvs diff -r1.902 -r1.903 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2016/02/23 18:03:31 1.902
+++ src/share/mk/bsd.own.mk 2016/02/27 18:56:33 1.903
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.902 2016/02/23 18:03:31 macallan Exp $ 1# $NetBSD: bsd.own.mk,v 1.903 2016/02/27 18:56:33 joerg Exp $
2 2
3# This needs to be before bsd.init.mk 3# This needs to be before bsd.init.mk
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -87,26 +87,28 @@ EXTERNAL_GCC_SUBDIR= /does/not/exist @@ -87,26 +87,28 @@ EXTERNAL_GCC_SUBDIR= /does/not/exist
87.endif 87.endif
88.else 88.else
89MKGCCCMDS?= no 89MKGCCCMDS?= no
90.endif 90.endif
91 91
92.if !empty(MACHINE_ARCH:Mearm*) 92.if !empty(MACHINE_ARCH:Mearm*)
93_LIBC_COMPILER_RT.${MACHINE_ARCH}= yes 93_LIBC_COMPILER_RT.${MACHINE_ARCH}= yes
94.endif 94.endif
95 95
96_LIBC_COMPILER_RT.aarch64= yes 96_LIBC_COMPILER_RT.aarch64= yes
97_LIBC_COMPILER_RT.i386= yes 97_LIBC_COMPILER_RT.i386= yes
98_LIBC_COMPILER_RT.powerpc= yes 98_LIBC_COMPILER_RT.powerpc= yes
99_LIBC_COMPILER_RT.powerpc64= yes 99_LIBC_COMPILER_RT.powerpc64= yes
 100_LIBC_COMPILER_RT.sparc= yes
 101_LIBC_COMPILER_RT.sparc64= yes
100_LIBC_COMPILER_RT.x86_64= yes 102_LIBC_COMPILER_RT.x86_64= yes
101 103
102.if ${HAVE_LLVM:Uno} == "yes" && ${_LIBC_COMPILER_RT.${MACHINE_ARCH}:Uno} == "yes" 104.if ${HAVE_LLVM:Uno} == "yes" && ${_LIBC_COMPILER_RT.${MACHINE_ARCH}:Uno} == "yes"
103HAVE_LIBGCC?= no 105HAVE_LIBGCC?= no
104.else 106.else
105HAVE_LIBGCC?= yes 107HAVE_LIBGCC?= yes
106.endif 108.endif
107 109
108 110
109# ia64 is not support 111# ia64 is not support
110.if ${HAVE_LLVM:Uno} == "yes" || !empty(MACHINE_ARCH:Mearm*) 112.if ${HAVE_LLVM:Uno} == "yes" || !empty(MACHINE_ARCH:Mearm*)
111HAVE_LIBGCC_EH?= no 113HAVE_LIBGCC_EH?= no
112.else 114.else
@@ -1162,31 +1164,33 @@ MKOBJDIRS:= no @@ -1162,31 +1164,33 @@ MKOBJDIRS:= no
1162 1164
1163.if ${MKSHARE} == "no" 1165.if ${MKSHARE} == "no"
1164MKCATPAGES:= no 1166MKCATPAGES:= no
1165MKDOC:= no 1167MKDOC:= no
1166MKINFO:= no 1168MKINFO:= no
1167MKHTML:= no 1169MKHTML:= no
1168MKMAN:= no 1170MKMAN:= no
1169MKNLS:= no 1171MKNLS:= no
1170.endif 1172.endif
1171 1173
1172.if !empty(MACHINE_ARCH:Mearm*) 1174.if !empty(MACHINE_ARCH:Mearm*)
1173_NEEDS_LIBCXX.${MACHINE_ARCH}= yes 1175_NEEDS_LIBCXX.${MACHINE_ARCH}= yes
1174.endif 1176.endif
 1177_NEEDS_LIBCXX.aarch64= yes
1175_NEEDS_LIBCXX.i386= yes 1178_NEEDS_LIBCXX.i386= yes
1176_NEEDS_LIBCXX.powerpc= yes 1179_NEEDS_LIBCXX.powerpc= yes
1177_NEEDS_LIBCXX.powerpc64= yes 1180_NEEDS_LIBCXX.powerpc64= yes
 1181_NEEDS_LIBCXX.sparc= yes
 1182_NEEDS_LIBCXX.sparc64= yes
1178_NEEDS_LIBCXX.x86_64= yes 1183_NEEDS_LIBCXX.x86_64= yes
1179_NEEDS_LIBCXX.aarch64= yes 
1180 1184
1181.if ${MKLLVM} == "yes" && ${_NEEDS_LIBCXX.${MACHINE_ARCH}:Uno} == "yes" 1185.if ${MKLLVM} == "yes" && ${_NEEDS_LIBCXX.${MACHINE_ARCH}:Uno} == "yes"
1182MKLIBCXX:= yes 1186MKLIBCXX:= yes
1183.endif 1187.endif
1184 1188
1185# 1189#
1186# install(1) parameters. 1190# install(1) parameters.
1187# 1191#
1188COPY?= -c 1192COPY?= -c
1189.if ${MKUPDATE} == "no" 1193.if ${MKUPDATE} == "no"
1190PRESERVE?=  1194PRESERVE?=
1191.else 1195.else
1192PRESERVE?= -p 1196PRESERVE?= -p