summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/csu/Makefile6
-rw-r--r--lib/libarch/mips64/Makefile6
-rw-r--r--lib/libc/Makefile8
-rw-r--r--lib/libc/Makefile.inc14
-rw-r--r--lib/libc/compat-43/Makefile.inc4
-rw-r--r--lib/libc/crypt/Makefile.inc4
-rw-r--r--lib/libc/gdtoa/Makefile.inc8
-rw-r--r--lib/libc/gen/Makefile.inc6
-rw-r--r--lib/libc/locale/Makefile.inc4
-rw-r--r--lib/libc/net/Makefile.inc6
-rw-r--r--lib/libc/quad/Makefile.inc4
-rw-r--r--lib/libc/stdlib/Makefile.inc18
-rw-r--r--lib/libc/string/Makefile.inc6
-rw-r--r--lib/libc/sys/Makefile.inc40
-rw-r--r--lib/libc/yp/Makefile.inc4
-rw-r--r--lib/libkvm/Makefile9
-rw-r--r--lib/libm/Makefile4
-rw-r--r--lib/libpthread/sys/Makefile.inc10
-rw-r--r--lib/libpthread/uthread/Makefile.inc4
-rw-r--r--lib/librthread/Makefile4
-rw-r--r--lib/libssl/crypto/Makefile14
21 files changed, 95 insertions, 88 deletions
diff --git a/lib/csu/Makefile b/lib/csu/Makefile
index 0b02853648d..ee9ab816d27 100644
--- a/lib/csu/Makefile
+++ b/lib/csu/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2006/11/09 15:19:18 drahn Exp $
+# $OpenBSD: Makefile,v 1.15 2010/02/03 20:49:00 miod Exp $
.if make(obj)
-SUBDIR= alpha arm hppa i386 m68k m88k powerpc sh sparc sparc64 vax amd64 mips64
+SUBDIR= alpha amd64 arm hppa i386 m68k m88k mips64 powerpc sh sparc sparc64 vax
.else
-SUBDIR= ${MACHINE_ARCH}
+SUBDIR= ${MACHINE_CPU}
.endif
.include <bsd.subdir.mk>
diff --git a/lib/libarch/mips64/Makefile b/lib/libarch/mips64/Makefile
index 8a33d4ce0d7..b9667366d73 100644
--- a/lib/libarch/mips64/Makefile
+++ b/lib/libarch/mips64/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2009/09/27 18:20:13 miod Exp $
+# $OpenBSD: Makefile,v 1.2 2010/02/03 20:49:00 miod Exp $
MAN= cacheflush.3
-MANSUBDIR= sgi
+MANSUBDIR= loongson sgi
-#.if ${MACHINE_ARCH} == "mips64"
+#.if ${MACHINE_CPU} == "mips64"
#NOPIC=
#SRCS=
#.include <bsd.lib.mk>
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 2e3229433fa..85feed2a1cb 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2009/11/24 20:11:08 mk Exp $
+# $OpenBSD: Makefile,v 1.29 2010/02/03 20:49:00 miod Exp $
#
# The NLS (message catalog) functions are always in libc. To choose that
# strerror(), perror(), strsignal(), psignal(), etc. actually call the NLS
@@ -31,16 +31,16 @@ copy-to-libkern-machind: ${KSRCS}
copy-to-libkern-machdep: ${KMSRCS}
.if defined(KMSRCS) && !empty(KMSRCS)
- cp -p ${.ALLSRC} ${LIBKERN}/arch/${MACHINE_ARCH}
+ cp -p ${.ALLSRC} ${LIBKERN}/arch/${MACHINE_CPU}
.endif
.if defined(KMINCLUDES) && !empty(KMINCLUDES)
- (cd ${.CURDIR} ; cp -p ${KMINCLUDES} ${LIBKERN}/arch/${MACHINE_ARCH})
+ (cd ${.CURDIR} ; cp -p ${KMINCLUDES} ${LIBKERN}/arch/${MACHINE_CPU})
.endif
rm-from-libkern:
for i in ${KSRCS}; do rm -f ${LIBKERN}/$$i; done
.if defined(KMSRCS) && !empty(KMSRCS)
- for i in ${KMSRCS}; do rm -f ${LIBKERN}/arch/${MACHINE_ARCH}/$$i; done
+ for i in ${KMSRCS}; do rm -f ${LIBKERN}/arch/${MACHINE_CPU}/$$i; done
.endif
.endif
diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc
index 1ff69227a46..28622a6da8e 100644
--- a/lib/libc/Makefile.inc
+++ b/lib/libc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.13 2009/10/27 23:59:59 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.14 2010/02/03 20:49:00 miod Exp $
#
# This file contains make rules used to build libc
#
@@ -18,14 +18,14 @@ CFLAGS+=-DYP -I${LIBCSRCDIR}/yp
.endif
LLIBS=
-AINC= -I${LIBCSRCDIR}/arch/${MACHINE_ARCH}
+AINC= -I${LIBCSRCDIR}/arch/${MACHINE_CPU}
.if defined(DESTDIR)
AINC+= -nostdinc -idirafter ${DESTDIR}/usr/include
.endif
-.if exists (${LIBCSRCDIR}/arch/${MACHINE_ARCH}/Makefile.inc)
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}
-.include "${LIBCSRCDIR}/arch/${MACHINE_ARCH}/Makefile.inc"
+.if exists (${LIBCSRCDIR}/arch/${MACHINE_CPU}/Makefile.inc)
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}
+.include "${LIBCSRCDIR}/arch/${MACHINE_CPU}/Makefile.inc"
.endif
.include "${LIBCSRCDIR}/db/Makefile.inc"
@@ -40,7 +40,7 @@ AINC+= -nostdinc -idirafter ${DESTDIR}/usr/include
.include "${LIBCSRCDIR}/net/Makefile.inc"
.include "${LIBCSRCDIR}/nls/Makefile.inc"
.include "${LIBCSRCDIR}/ohash/Makefile.inc"
-.if (${MACHINE_ARCH} != "alpha")
+.if (${MACHINE_CPU} != "alpha")
.include "${LIBCSRCDIR}/quad/Makefile.inc"
.endif
.include "${LIBCSRCDIR}/regex/Makefile.inc"
@@ -62,7 +62,7 @@ LIBKERN= ${LIBCSRCDIR}/../../sys/lib/libkern
KSRCS= bcmp.c bzero.c ffs.c strcat.c strcmp.c strcpy.c strlen.c strncmp.c \
strncpy.c htonl.c htons.c ntohl.c ntohs.c
-.if (${MACHINE_ARCH} != "alpha")
+.if (${MACHINE_CPU} != "alpha")
KSRCS+= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c
diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc
index e6a37906786..dc6901de44b 100644
--- a/lib/libc/compat-43/Makefile.inc
+++ b/lib/libc/compat-43/Makefile.inc
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.7 2003/05/08 23:30:01 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2010/02/03 20:49:00 miod Exp $
# compat-43 sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/compat-43 ${LIBCSRCDIR}/compat-43
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/compat-43 ${LIBCSRCDIR}/compat-43
SRCS+= creat.c getdtablesize.c gethostid.c getwd.c killpg.c sethostid.c \
setpgrp.c sigcompat.c
diff --git a/lib/libc/crypt/Makefile.inc b/lib/libc/crypt/Makefile.inc
index d961f36b520..df23499b3a3 100644
--- a/lib/libc/crypt/Makefile.inc
+++ b/lib/libc/crypt/Makefile.inc
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile.inc,v 1.16 2008/03/16 22:08:12 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.17 2010/02/03 20:49:00 miod Exp $
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/crypt ${LIBCSRCDIR}/crypt
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/crypt ${LIBCSRCDIR}/crypt
SRCS+= cast.c crypt.c crypt2.c md5crypt.c arc4random.c blowfish.c
SRCS+= bcrypt.c skipjack.c
diff --git a/lib/libc/gdtoa/Makefile.inc b/lib/libc/gdtoa/Makefile.inc
index 36d28aa47bb..84c95ccd2db 100644
--- a/lib/libc/gdtoa/Makefile.inc
+++ b/lib/libc/gdtoa/Makefile.inc
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.2 2008/10/21 17:52:03 martynas Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2010/02/03 20:49:00 miod Exp $
# gdtoa sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/gdtoa ${LIBCSRCDIR}/gdtoa
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/gdtoa ${LIBCSRCDIR}/gdtoa
CFLAGS+= -I${LIBCSRCDIR}/gdtoa
-CFLAGS+= -I${LIBCSRCDIR}/arch/${MACHINE_ARCH}/gdtoa
+CFLAGS+= -I${LIBCSRCDIR}/arch/${MACHINE_CPU}/gdtoa
CFLAGS+= -DINFNAN_CHECK
CFLAGS+= -DMULTIPLE_THREADS
@@ -15,4 +15,4 @@ SRCS+= dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c hd_init.c hdtoa.c \
hexnan.c ldtoa.c locks.c misc.c smisc.c strtod.c strtodg.c \
strtof.c strtold.c sum.c ulp.c
-.include "${LIBCSRCDIR}/arch/${MACHINE_ARCH}/gdtoa/Makefile.inc"
+.include "${LIBCSRCDIR}/arch/${MACHINE_CPU}/gdtoa/Makefile.inc"
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index 000e41d61c2..7f532f5fdae 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.49 2009/11/18 07:43:22 guenther Exp $
+# $OpenBSD: Makefile.inc,v 1.50 2010/02/03 20:49:00 miod Exp $
# gen sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/gen ${LIBCSRCDIR}/gen
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/gen ${LIBCSRCDIR}/gen
SRCS+= alarm.c assert.c auth_subr.c authenticate.c \
basename.c clock.c closedir.c confstr.c ctermid.c ctype_.c \
@@ -33,7 +33,7 @@ SRCS+= _sys_errlist.c _sys_nerr.c _sys_siglist.c
# _setjmp() fabs() frexp() infinity ldexp() modf() nan
# setjmp() sigsetjmp()
-.include "${LIBCSRCDIR}/arch/${MACHINE_ARCH}/gen/Makefile.inc"
+.include "${LIBCSRCDIR}/arch/${MACHINE_CPU}/gen/Makefile.inc"
.ifdef _NOTDEF_XXX_
diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index 0cb7b3b173b..8800b1433eb 100644
--- a/lib/libc/locale/Makefile.inc
+++ b/lib/libc/locale/Makefile.inc
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.14 2009/01/13 18:44:01 kettenis Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2010/02/03 20:49:00 miod Exp $
# locale sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/locale ${LIBCSRCDIR}/locale
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/locale ${LIBCSRCDIR}/locale
SRCS+= _def_messages.c _def_monetary.c _def_numeric.c _def_time.c \
localeconv.c nl_langinfo.c setlocale.c iswctype.c mbrtowc_sb.c \
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 50924ec1354..66f181d4736 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.46 2009/11/18 07:43:22 guenther Exp $
+# $OpenBSD: Makefile.inc,v 1.47 2010/02/03 20:49:00 miod Exp $
# net sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net ${LIBCSRCDIR}/net
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/net ${LIBCSRCDIR}/net
CFLAGS+=-DRESOLVSORT
@@ -25,7 +25,7 @@ SRCS+= ip6opt.c rthdr.c vars6.c
# m-d Makefile.inc must include sources for:
# htonl() htons() ntohl() ntohs()
-.include "${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net/Makefile.inc"
+.include "${LIBCSRCDIR}/arch/${MACHINE_CPU}/net/Makefile.inc"
MAN+= byteorder.3 ethers.3 gai_strerror.3 getaddrinfo.3 gethostbyname.3 \
getifaddrs.3 getnameinfo.3 getnetent.3 getprotoent.3 \
diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc
index 1f6969c87d9..21538c9b6b7 100644
--- a/lib/libc/quad/Makefile.inc
+++ b/lib/libc/quad/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2004/11/28 07:09:13 mickey Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2010/02/03 20:49:00 miod Exp $
# Quad support
SRCS+= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c fixdfdi.c \
@@ -10,4 +10,4 @@ KSRCS+= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/quad ${LIBCSRCDIR}/quad
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/quad ${LIBCSRCDIR}/quad
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index 3b9b36a1ed8..b003560291f 100644
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.42 2009/06/03 15:52:16 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.43 2010/02/03 20:49:00 miod Exp $
# stdlib sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/stdlib ${LIBCSRCDIR}/stdlib
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/stdlib ${LIBCSRCDIR}/stdlib
SRCS+= a64l.c abort.c atexit.c atoi.c atof.c atol.c atoll.c bsearch.c \
cfree.c exit.c ecvt.c gcvt.c getenv.c getopt_long.c \
@@ -12,28 +12,28 @@ SRCS+= a64l.c abort.c atexit.c atoi.c atof.c atol.c atoll.c bsearch.c \
tfind.c tsearch.c _rand48.c drand48.c erand48.c jrand48.c lcong48.c \
lrand48.c mrand48.c nrand48.c seed48.c srand48.c qabs.c qdiv.c _Exit.c
-.if (${MACHINE_ARCH} == "m68k")
+.if (${MACHINE_CPU} == "m68k")
SRCS+= abs.S div.c labs.c ldiv.c
LSRCS+= abs.c
-.elif (${MACHINE_ARCH} == "i386")
+.elif (${MACHINE_CPU} == "i386")
SRCS+= abs.S div.S labs.S ldiv.S
LSRCS+= abs.c div.c labs.c ldiv.c
-.elif (${MACHINE_ARCH} == "ns32k")
+.elif (${MACHINE_CPU} == "ns32k")
SRCS+= abs.S div.c labs.c ldiv.c
LSRCS+= abs.c
-.elif (${MACHINE_ARCH} == "tahoe")
+.elif (${MACHINE_CPU} == "tahoe")
SRCS+= abs.S div.c labs.c ldiv.c
LSRCS+= abs.c
-.elif (${MACHINE_ARCH} == "vax")
+.elif (${MACHINE_CPU} == "vax")
SRCS+= abs.c div.c labs.c ldiv.c
-.elif (${MACHINE_ARCH} == "alpha")
+.elif (${MACHINE_CPU} == "alpha")
# XXX should be .S's
SRCS+= abs.c div.c labs.c ldiv.c
.else
SRCS+= abs.c div.c labs.c ldiv.c
.endif
-.if (${MACHINE_ARCH} == "vax") || (${MACHINE_ARCH} == "m68k")
+.if (${MACHINE_CPU} == "vax") || (${MACHINE_CPU} == "m68k")
SRCS+= insque.S remque.S
.else
SRCS+= insque.c remque.c
diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc
index 124469cd3a8..8aa072a2893 100644
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.20 2007/10/25 22:41:02 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.21 2010/02/03 20:49:00 miod Exp $
# string sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/string ${LIBCSRCDIR}/string
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/string ${LIBCSRCDIR}/string
SRCS+= bm.c memccpy.c memrchr.c strcasecmp.c strcasestr.c strcoll.c strdup.c \
strerror.c strerror_r.c strlcat.c strmode.c strsignal.c strtok.c \
@@ -20,7 +20,7 @@ SRCS+= bm.c memccpy.c memrchr.c strcasecmp.c strcasestr.c strcoll.c strdup.c \
# m-d Makefile.inc may include sources for:
# memcpy() memmove() strchr() strrchr()
-.include "${LIBCSRCDIR}/arch/${MACHINE_ARCH}/string/Makefile.inc"
+.include "${LIBCSRCDIR}/arch/${MACHINE_CPU}/string/Makefile.inc"
# if no machine specific memmove(3), build one out of bcopy(3).
.if empty(SRCS:Mmemmove.S)
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 216fdd1f681..6e440ac40ce 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.88 2009/11/27 20:05:50 guenther Exp $
+# $OpenBSD: Makefile.inc,v 1.89 2010/02/03 20:49:00 miod Exp $
# $NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/17/93
# sys sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/sys ${LIBCSRCDIR}/sys
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/sys ${LIBCSRCDIR}/sys
# modules with non-default implementations on at least one architecture:
SRCS+= Ovfork.S brk.S cerror.S exect.S fork.S rfork.S \
@@ -82,102 +82,102 @@ SPSEUDO_NOERR=${PSEUDO_NOERR:.o=.so}
OBJS+= ${ASM} ${PSEUDO} ${PSEUDO_NOERR}
-${GASM}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${GASM}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
-${PASM}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${PASM}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
-.if (${MACHINE_ARCH} != "mips")
-${SASM}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+.if (${MACHINE_CPU} != "mips")
+${SASM}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | \
${AS} ${ASPICFLAG} -o ${.TARGET}
.else
-${SASM}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${SASM}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}
.endif
-${ASM}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${ASM}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' | \
${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
-${GPSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${GPSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
-${PPSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${PPSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
-.if (${MACHINE_ARCH} != "mips")
-${SPSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+.if (${MACHINE_CPU} != "mips")
+${SPSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | \
${AS} ${ASPICFLAG} -o ${.TARGET}
.else
-${SPSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${SPSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}
.endif
-${PSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${PSEUDO}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
-${GPSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${GPSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
-${PPSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${PPSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} -DPROF ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
@rm -f ${.TARGET}.o
-.if (${MACHINE_ARCH} != "mips")
-${SPSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+.if (${MACHINE_CPU} != "mips")
+${SPSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | \
${AS} ${ASPICFLAG} -o ${.TARGET}
.else
-${SPSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${SPSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} -DPIC ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}
.endif
-${PSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/SYS.h /usr/include/sys/syscall.h
+${PSEUDO_NOERR}: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/SYS.h /usr/include/sys/syscall.h
@echo creating ${.TARGET}
@printf '#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/_//})\n' | \
${CPP} ${CFLAGS:M-[ID]*} ${AINC} | ${AS} -o ${.TARGET}.o
diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc
index c650738caa7..ebbf96a59f4 100644
--- a/lib/libc/yp/Makefile.inc
+++ b/lib/libc/yp/Makefile.inc
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.6 2009/06/03 16:02:44 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.7 2010/02/03 20:49:00 miod Exp $
# yp sources
-.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/yp ${LIBCSRCDIR}/yp
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/yp ${LIBCSRCDIR}/yp
SRCS+= ypmatch_cache.c yp_bind.c yp_get_default_domain.c \
yp_first.c yp_all.c yp_order.c \
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 78f347cb9a0..1debf0ff158 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/01/10 03:37:50 guenther Exp $
+# $OpenBSD: Makefile,v 1.14 2010/02/03 20:49:00 miod Exp $
# $NetBSD: Makefile,v 1.11 1996/03/18 22:33:07 thorpej Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
@@ -10,8 +10,13 @@ WANTLINT=
SRCS= kvm_${MACHINE}.c
.else
# Less specific name (i.e. m68k)
-CFLAGS+=-D${MACHINE}
+.if exists(kvm_${MACHINE_ARCH}.c)
SRCS= kvm_${MACHINE_ARCH}.c
+.else
+# Even less specific name (i.e. mips64)
+CFLAGS+=-D${MACHINE_CPU}
+SRCS= kvm_${MACHINE_CPU}.c
+.endif
.endif
CFLAGS+= -D_LIBKVM
diff --git a/lib/libm/Makefile b/lib/libm/Makefile
index d59af2b54df..d91014889c7 100644
--- a/lib/libm/Makefile
+++ b/lib/libm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.74 2009/11/06 23:30:21 kettenis Exp $
+# $OpenBSD: Makefile,v 1.75 2010/02/03 20:49:00 miod Exp $
# $NetBSD: Makefile,v 1.28 1995/11/20 22:06:19 jtc Exp $
#
# @(#)Makefile 5.1beta 93/09/24
@@ -143,7 +143,7 @@ SRCS= ${COMMON_SRCS}
CPPFLAGS+= -I${.CURDIR}/src -I${.CURDIR}/src/ld80
SRCS+= ${LONG_SRCS}
.endif
-.if (${MACHINE_ARCH} == "hppa64") || (${MACHINE_ARCH} == "mips64") || \
+.if (${MACHINE_ARCH} == "hppa64") || (${MACHINE_CPU} == "mips64") || \
(${MACHINE_ARCH} == "sparc64")
.PATH: ${.CURDIR}/src/ld128
CPPFLAGS+= -I${.CURDIR}/src -I${.CURDIR}/src/ld128
diff --git a/lib/libpthread/sys/Makefile.inc b/lib/libpthread/sys/Makefile.inc
index 7056e455e67..10fcfe22961 100644
--- a/lib/libpthread/sys/Makefile.inc
+++ b/lib/libpthread/sys/Makefile.inc
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile.inc,v 1.17 2009/06/01 23:18:24 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.18 2010/02/03 20:49:00 miod Exp $
-.PATH: ${SRCDIR}/sys ${SRCDIR}/arch/${MACHINE_ARCH}
+.PATH: ${SRCDIR}/sys ${SRCDIR}/arch/${MACHINE_CPU}
SRCS+= uthread_error.c
-.if exists(${SRCDIR}/arch/${MACHINE_ARCH}/_atomic_lock.c)
+.if exists(${SRCDIR}/arch/${MACHINE_CPU}/_atomic_lock.c)
SRCS+= _atomic_lock.c
.endif
-.if exists(${SRCDIR}/arch/${MACHINE_ARCH}/uthread_machdep_asm.S)
+.if exists(${SRCDIR}/arch/${MACHINE_CPU}/uthread_machdep_asm.S)
SRCS+= uthread_machdep_asm.S
.endif
-.if exists(${SRCDIR}/arch/${MACHINE_ARCH}/uthread_machdep.c)
+.if exists(${SRCDIR}/arch/${MACHINE_CPU}/uthread_machdep.c)
SRCS+= uthread_machdep.c
.endif
diff --git a/lib/libpthread/uthread/Makefile.inc b/lib/libpthread/uthread/Makefile.inc
index 23d7f229128..66908ef5a21 100644
--- a/lib/libpthread/uthread/Makefile.inc
+++ b/lib/libpthread/uthread/Makefile.inc
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.21 2008/12/18 09:30:32 guenther Exp $
+# $OpenBSD: Makefile.inc,v 1.22 2010/02/03 20:49:00 miod Exp $
# $FreeBSD: Makefile.inc,v 1.19 1999/08/28 00:03:19 peter Exp $
# uthread sources
.PATH: ${SRCDIR}/uthread
-CFLAGS += -I${SRCDIR}/arch/${MACHINE_ARCH}
+CFLAGS += -I${SRCDIR}/arch/${MACHINE_CPU}
SRCS+= \
uthread_accept.c \
diff --git a/lib/librthread/Makefile b/lib/librthread/Makefile
index 5d2d31d4d20..7cea80a12a4 100644
--- a/lib/librthread/Makefile
+++ b/lib/librthread/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2009/11/27 19:42:24 guenther Exp $
+# $OpenBSD: Makefile,v 1.15 2010/02/03 20:49:00 miod Exp $
LIB=rthread
WANTLINT=
@@ -9,7 +9,7 @@ CFLAGS+=-Wall -g -Werror -Wshadow
CFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wsign-compare
CFLAGS+=-I${LIBCSRCDIR}/include
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/arch/${MACHINE_CPU}
SRCS= rthread.c rthread_attr.c rthread_sched.c rthread_sync.c rthread_tls.c \
rthread_sig.c rthread_np.c rthread_debug.c rthread_stack.c \
rthread_libc.c rthread_fork.c rthread_file.c
diff --git a/lib/libssl/crypto/Makefile b/lib/libssl/crypto/Makefile
index 364cdab83a8..a09d54d6901 100644
--- a/lib/libssl/crypto/Makefile
+++ b/lib/libssl/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2009/01/09 12:16:52 djm Exp $
+# $OpenBSD: Makefile,v 1.52 2010/02/03 20:49:00 miod Exp $
LIB= crypto
WANTLINT=
@@ -8,9 +8,11 @@ SSL_SRC= ${.CURDIR}/../${SSLEAYDIST}
LCRYPTO_SRC= ${SSL_SRC}/crypto
FIPS_SRC= ${SSL_SRC}/fips
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "arm" || \
- ${MACHINE_ARCH} == "vax" || ${MACHINE_ARCH} == "amd64" || \
- ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sh"
+# arm and sh default to little endian, mips defaults to big endian
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
+ ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \
+ ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "sh" || \
+ ${MACHINE_ARCH} == "vax"
CFLAGS+= -DL_ENDIAN
.else
CFLAGS+= -DB_ENDIAN
@@ -197,7 +199,7 @@ SRCS+= str_err.c str_lib.c str_mem.c str_meth.c
${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/ecdh ${LCRYPTO_SRC}/ecdsa \
${LCRYPTO_SRC}/pqueue ${LCRYPTO_SRC}/store \
${LCRYPTO_SRC} \
- ${LCRYPTO_SRC}/acss ${.CURDIR}/arch/${MACHINE_ARCH} \
+ ${LCRYPTO_SRC}/acss ${.CURDIR}/arch/${MACHINE_CPU} \
${LCRYPTO_SRC}/bn/asm \
${FIPS_SRC}/ ${FIPS_SRC}/aes ${FIPS_SRC}/des ${FIPS_SRC}/dh \
${FIPS_SRC}/dsa ${FIPS_SRC}/rand ${FIPS_SRC}/rsa ${FIPS_SRC}/sha1
@@ -272,7 +274,7 @@ HDRS=\
fips/rand/fips_rand.h
HDRS_GEN=\
- ${.CURDIR}/arch/${MACHINE_ARCH}/opensslconf.h \
+ ${.CURDIR}/arch/${MACHINE_CPU}/opensslconf.h \
${.OBJDIR}/obj_mac.h
includes: obj_mac.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 04:59:25 +0000