diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-02-27 17:36:19 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-02-27 17:36:19 +0000 |
| commit | bf0a65b8ba35f3b89700a10c7eb23f2c8dc212cb (patch) | |
| tree | c14e90f29f6ed57b9358529c8ef66d4b69c29a0f /usr.sbin | |
| parent | cadcabe0265db6753eccec3bcc53bdc5b837cc3d (diff) | |
change amd64's MACHINE_ARCH from x86_64 to amd64. There are many many
reasons for this, quite a few of them technical, and not all of them
in response to Intel's broken ia32e crud. The gcc toolchain stays at
x86_64 for now.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/afs/lib/libarla/Makefile.lwp.inc | 2 | ||||
| -rw-r--r-- | usr.sbin/httpd/Makefile.bsd-wrapper | 4 | ||||
| -rw-r--r-- | usr.sbin/openssl/Makefile | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/afs/lib/libarla/Makefile.lwp.inc b/usr.sbin/afs/lib/libarla/Makefile.lwp.inc index 3c83e8b30a8..46f3beb5858 100644 --- a/usr.sbin/afs/lib/libarla/Makefile.lwp.inc +++ b/usr.sbin/afs/lib/libarla/Makefile.lwp.inc @@ -20,7 +20,7 @@ process.S: HOST_CPU=${MACHINE_ARCH}; \ case "$$HOST_CPU" in \ arm) PROCESS_S="process.arm.S" ;; \ - x86_64) PROCESS_S="process.x86_64.S" ;; \ + amd64) PROCESS_S="process.x86_64.S" ;; \ sparc64) PROCESS_S="process.sparc.S" ;; \ sparc) PROCESS_S="process.sparc.S" ;; \ i*86*) PROCESS_S="process.i386.S" ;; \ diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper index c9c41f6e69d..8da42cb6dd0 100644 --- a/usr.sbin/httpd/Makefile.bsd-wrapper +++ b/usr.sbin/httpd/Makefile.bsd-wrapper @@ -1,5 +1,5 @@ # Build wrapper for Apache -# $OpenBSD: Makefile.bsd-wrapper,v 1.45 2004/02/11 23:15:50 deraadt Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.46 2004/02/27 17:36:18 deraadt Exp $ # Our lndir is hacked; specify a full path to avoid potential conflicts # with the one installed with X11. @@ -100,7 +100,7 @@ INSTALL_MODULES= .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "arm" || \ ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "m68k" || \ ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc" || \ - ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64" + ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" CONFIG_ARGS+= ${DSO_MODULE_ARGS} INSTALL_MODULES= \ src/modules/experimental/mod_mmap_static.so \ diff --git a/usr.sbin/openssl/Makefile b/usr.sbin/openssl/Makefile index 0acdf585948..0413ca31177 100644 --- a/usr.sbin/openssl/Makefile +++ b/usr.sbin/openssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2004/01/28 17:46:05 deraadt Exp $ +# $OpenBSD: Makefile,v 1.16 2004/02/27 17:36:18 deraadt Exp $ PROG= openssl LDADD= -lssl -lcrypto @@ -9,8 +9,8 @@ SSLEAYDIST= lib/libssl/src SSLEAY_SRC= ${.CURDIR}/../../${SSLEAYDIST}/apps SSLEAY_SRC_TOP= ${.CURDIR}/../../${SSLEAYDIST} -.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") || \ - (${MACHINE_ARCH} == "vax") +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "vax" || \ + ${MACHINE_ARCH} == "amd64" CFLAGS+= -DL_ENDIAN .else |