diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-02-03 20:49:02 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-02-03 20:49:02 +0000 |
| commit | a0067f51183d8b472112a095c7c0d32145ff98b3 (patch) | |
| tree | 96321fd1bd5ffaea0d4f16723ebb5a9cc4a139e9 /lib/libc/stdlib | |
| parent | 7dfb23e53684ac495a4cf9a6a5188a1f91d5885a (diff) | |
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@
Diffstat (limited to 'lib/libc/stdlib')
| -rw-r--r-- | lib/libc/stdlib/Makefile.inc | 18 |
1 files changed, 9 insertions, 9 deletions
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 |