diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-02-27 17:41:26 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-02-27 17:41:26 +0000 |
| commit | 0cbbd5186f89c037845af6b2db98d0d4615262d6 (patch) | |
| tree | 873d2850bf34898f49fd3c3f45c443bdd7a30af9 | |
| parent | a6c9c748791861576571a04e9f15d8a861d85a57 (diff) | |
move to amd64 MACHINE_ARCH
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/include/exec.h | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/include/param.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index b516a715843..1fce061fbb2 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.12 2004/02/25 00:16:04 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.13 2004/02/27 17:41:25 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -142,7 +142,7 @@ /* the following is used externally (sysctl_hw) */ char machine[] = "amd64"; /* cpu "architecture" */ -char machine_arch[] = "x86_64"; /* machine == machine_arch */ +char machine_arch[] = "amd64"; /* machine == machine_arch */ int x86_64_ndisks = 0; diff --git a/sys/arch/amd64/include/exec.h b/sys/arch/amd64/include/exec.h index 45290aafa7d..4acd4243c80 100644 --- a/sys/arch/amd64/include/exec.h +++ b/sys/arch/amd64/include/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.1 2004/01/28 01:39:39 mickey Exp $ */ +/* $OpenBSD: exec.h,v 1.2 2004/02/27 17:41:25 deraadt Exp $ */ /* * Written by Artur Grabowski <art@openbsd.org> Public Domain */ @@ -14,7 +14,7 @@ #define ELF_TARG_CLASS ELFCLASS64 #define ELF_TARG_DATA ELFDATA2LSB -#define ELF_TARG_MACH EM_X86_64 +#define ELF_TARG_MACH EM_AMD64 #define _NLIST_DO_ELF #define _KERN_DO_ELF64 diff --git a/sys/arch/amd64/include/param.h b/sys/arch/amd64/include/param.h index 7e3f512977f..aedd9111f8a 100644 --- a/sys/arch/amd64/include/param.h +++ b/sys/arch/amd64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.1 2004/01/28 01:39:39 mickey Exp $ */ +/* $OpenBSD: param.h,v 1.2 2004/02/27 17:41:25 deraadt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -48,9 +48,9 @@ #define _MACHINE amd64 #define MACHINE "amd64" -#define _MACHINE_ARCH x86_64 -#define MACHINE_ARCH "x86_64" -#define MID_MACHINE MID_X86_64 +#define _MACHINE_ARCH amd64 +#define MACHINE_ARCH "amd64" +#define MID_MACHINE MID_AMD64 /* * Round p (pointer or byte index) up to a correctly-aligned value |