From 44a740d46dbdb3792d875e44b2e570f98dbd5d75 Mon Sep 17 00:00:00 2001 From: miod <> Date: Wed, 3 Feb 2010 20:49:00 +0000 Subject: Use MACHINE_CPU instead of MACHINE_ARCH to pick the correct machine dependent files or directories when applicable. The inspiration and name of MACHINE_CPU come from NetBSD, although the way to provide it to Makefiles is completely different. ok kettenis@ --- src/lib/libc/crypt/Makefile.inc | 4 ++-- src/lib/libc/net/Makefile.inc | 6 +++--- src/lib/libc/stdlib/Makefile.inc | 18 +++++++++--------- src/lib/libc/string/Makefile.inc | 6 +++--- src/lib/libssl/crypto/Makefile | 14 ++++++++------ 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/lib/libc/crypt/Makefile.inc b/src/lib/libc/crypt/Makefile.inc index d961f36b52..df23499b3a 100644 --- a/src/lib/libc/crypt/Makefile.inc +++ b/src/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/src/lib/libc/net/Makefile.inc b/src/lib/libc/net/Makefile.inc index 50924ec135..66f181d473 100644 --- a/src/lib/libc/net/Makefile.inc +++ b/src/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/src/lib/libc/stdlib/Makefile.inc b/src/lib/libc/stdlib/Makefile.inc index 3b9b36a1ed..b003560291 100644 --- a/src/lib/libc/stdlib/Makefile.inc +++ b/src/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/src/lib/libc/string/Makefile.inc b/src/lib/libc/string/Makefile.inc index 124469cd3a..8aa072a289 100644 --- a/src/lib/libc/string/Makefile.inc +++ b/src/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/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile index 364cdab83a..a09d54d690 100644 --- a/src/lib/libssl/crypto/Makefile +++ b/src/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 -- cgit v1.2.3-55-g6feb