Module Name: src
Committed By: matt
Date: Sun Aug 10 23:39:08 UTC 2014
Modified Files:
src/lib/libc: Makefile libcincludes.mk
src/lib/libc/compiler_rt: Makefile.inc
src/lib/libc/softfloat: Makefile.inc
src/lib/libkvm: Makefile
Log Message:
MKCOMPAT fixes for when compat MACHINE_CPU != normal MACHINE_CPU
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/lib/libc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/libcincludes.mk
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/compiler_rt/Makefile.inc
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/softfloat/Makefile.inc
cvs rdiff -u -r1.49 -r1.50 src/lib/libkvm/Makefile
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/Makefile
diff -u src/lib/libc/Makefile:1.165 src/lib/libc/Makefile:1.166
--- src/lib/libc/Makefile:1.165 Tue Mar 4 14:58:14 2014
+++ src/lib/libc/Makefile Sun Aug 10 23:39:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2014/03/04 14:58:14 joerg Exp $
+# $NetBSD: Makefile,v 1.166 2014/08/10 23:39:08 matt Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -19,8 +19,6 @@
.include "Makefile.inc"
-LIBC_MACHINE_ARCH?= ${MACHINE_ARCH} # for MKCOMPAT
-
LIB= c
CPPFLAGS+= -I${.CURDIR}/include -I${.CURDIR}
Index: src/lib/libc/libcincludes.mk
diff -u src/lib/libc/libcincludes.mk:1.1 src/lib/libc/libcincludes.mk:1.2
--- src/lib/libc/libcincludes.mk:1.1 Sun Oct 26 07:28:06 2008
+++ src/lib/libc/libcincludes.mk Sun Aug 10 23:39:08 2014
@@ -1,18 +1,19 @@
-# $NetBSD: libcincludes.mk,v 1.1 2008/10/26 07:28:06 mrg Exp $
+# $NetBSD: libcincludes.mk,v 1.2 2014/08/10 23:39:08 matt Exp $
# Makefile fragment shared across several parts that want to look
# inside libc's include tree.
+LIBC_MACHINE_ARCH?= ${MACHINE_ARCH}
+LIBC_MACHINE_CPU?= ${MACHINE_CPU}
+
.if defined(LIBC_MACHINE_ARCH) && \
exists(${NETBSDSRCDIR}/lib/libc/arch/${LIBC_MACHINE_ARCH}/SYS.h)
ARCHSUBDIR= ${LIBC_MACHINE_ARCH}
-.elif exists(${NETBSDSRCDIR}/lib/libc/arch/${MACHINE_ARCH}/SYS.h)
-ARCHSUBDIR= ${MACHINE_ARCH}
-.elif exists(${NETBSDSRCDIR}/lib/libc/arch/${MACHINE_CPU}/SYS.h)
-ARCHSUBDIR= ${MACHINE_CPU}
+.elif exists(${NETBSDSRCDIR}/lib/libc/arch/${LIBC_MACHINE_CPU}/SYS.h)
+ARCHSUBDIR= ${LIBC_MACHINE_CPU}
.else
.BEGIN:
- @echo no ARCHDIR for ${MACHINE_ARCH} nor ${MACHINE_CPU}
+ @echo no ARCHDIR for ${LIBC_MACHINE_ARCH} nor ${LIBC_MACHINE_CPU}
@false
.endif
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.23 src/lib/libc/compiler_rt/Makefile.inc:1.24
--- src/lib/libc/compiler_rt/Makefile.inc:1.23 Sun Aug 10 10:15:39 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Sun Aug 10 23:39:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.23 2014/08/10 10:15:39 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.24 2014/08/10 23:39:08 matt Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -6,7 +6,7 @@ COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/
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/builtins/${MACHINE_CPU}
+COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${LIBC_MACHINE_CPU}
COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${LIBC_MACHINE_ARCH}
.endif
@@ -135,8 +135,8 @@ GENERIC_SRCS+= \
.endif
# These have h/w instructions which are always used.
-.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_CPU} != "powerpc" \
- && ${MACHINE_CPU} != "aarch64" && ${MACHINE_ARCH} != "vax"
+.if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_CPU} != "powerpc" \
+ && ${LIBC_MACHINE_CPU} != "aarch64" && ${LIBC_MACHINE_ARCH} != "vax"
GENERIC_SRCS+= \
clzsi2.c \
ctzsi2.c \
@@ -146,7 +146,7 @@ GENERIC_SRCS+= \
udivmodsi4.c \
umodsi3.c
-. if ${MACHINE_CPU} != "sh3"
+. if ${LIBC_MACHINE_CPU} != "sh3"
# On sh3 __udivsi3 is gcc "millicode" with special calling convention
# (less registers clobbered than usual). Each DSO that needs it gets
# its own hidden copy from libgcc.a.
@@ -167,8 +167,8 @@ GENERIC_SRCS+= \
subvdi3.c
# These have h/w instructions which are always used.
-.if ${MACHINE_ARCH} != "alpha" && ${MACHINE_CPU} != "powerpc64" \
- && ${MACHINE_ARCH} != "aarch64"
+.if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_CPU} != "powerpc64" \
+ && ${LIBC_MACHINE_ARCH} != "aarch64"
GENERIC_SRCS+= \
clzdi2.c \
ctzdi2.c \
@@ -212,12 +212,12 @@ GENERIC_SRCS+= \
gcc_qsub.c
.endif
-.if ${MACHINE_CPU} == "aarch64"
+.if ${LIBC_MACHINE_CPU} == "aarch64"
GENERIC_SRCS+= \
clear_cache.c
.endif
-.if ${MACHINE_CPU} == "arm"
+.if ${LIBC_MACHINE_CPU} == "arm"
.if !empty(LIBC_MACHINE_ARCH:Mearm*)
GENERIC_SRCS+= \
aeabi_idivmod.S \
Index: src/lib/libc/softfloat/Makefile.inc
diff -u src/lib/libc/softfloat/Makefile.inc:1.18 src/lib/libc/softfloat/Makefile.inc:1.19
--- src/lib/libc/softfloat/Makefile.inc:1.18 Sat Jun 14 20:49:37 2014
+++ src/lib/libc/softfloat/Makefile.inc Sun Aug 10 23:39:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2014/06/14 20:49:37 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.19 2014/08/10 23:39:08 matt Exp $
SOFTFLOAT_BITS?=64
.PATH: ${ARCHDIR}/softfloat \
@@ -31,12 +31,12 @@ SRCS+= ${SRCS.softfloat}
# XXX
.if defined(HAVE_GCC)
-. if (${MACHINE_CPU} == "arm")
+. if (${LIBC_MACHINE_CPU} == "arm")
# See doc/HACKS for more information.
COPTS.softfloat.c+= -Wno-enum-compare
COPTS.softfloat.c+= ${${ACTIVE_CXX} == "gcc":? -fno-tree-vrp :}
-.elif (${MACHINE_CPU} == "mips" || \
- ${MACHINE_CPU} == "sh3")
+.elif (${LIBC_MACHINE_CPU} == "mips" || \
+ ${LIBC_MACHINE_CPU} == "sh3")
COPTS.softfloat.c+= -Wno-enum-compare
. endif
.endif
Index: src/lib/libkvm/Makefile
diff -u src/lib/libkvm/Makefile:1.49 src/lib/libkvm/Makefile:1.50
--- src/lib/libkvm/Makefile:1.49 Wed Mar 21 10:08:30 2012
+++ src/lib/libkvm/Makefile Sun Aug 10 23:39:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/03/21 10:08:30 matt Exp $
+# $NetBSD: Makefile,v 1.50 2014/08/10 23:39:08 matt Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
WARNS= 3
@@ -20,6 +20,8 @@ SRCS= kvm.c kvm_file.c kvm_getloadavg.c
.include <bsd.own.mk>
.if exists(kvm_${KVM_MACHINE_ARCH}.c)
SRCS+= kvm_${KVM_MACHINE_ARCH}.c
+.elif exists(kvm_${KVM_MACHINE_CPU}.c)
+SRCS+= kvm_${KVM_MACHINE_CPU}.c
.elif exists(kvm_${MACHINE_ARCH}.c)
SRCS+= kvm_${MACHINE_ARCH}.c
.elif exists(kvm_${MACHINE_CPU}.c)
