From: Simon Schubert Date: Wed, 4 Nov 2009 16:22:28 +0000 (-0800) Subject: rename amd64 architecture to x86_64 X-Git-Url: https://gitweb.dragonflybsd.org/~syl/dragonfly.git/commitdiff_plain/b2b3ffcd091c0c996de604acb6e17b6451dddb08 rename amd64 architecture to x86_64 The rest of the world seems to call amd64 x86_64. Bite the bullet and rename all of the architecture files and references. This will hopefully make pkgsrc builds less painful. Discussed-with: dillon@ --- diff --git a/Makefile b/Makefile index 6cbffba1a6..6a286bcd82 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ # # See src/UPDATING `COMMON ITEMS' for more complete information. # -# If TARGET_ARCH=arch (e.g. amd64) is specified you can +# If TARGET_ARCH=arch (e.g. x86_64) is specified you can # cross build world for other architectures using the buildworld target, # and once the world is built you can cross build a kernel using the # buildkernel target. diff --git a/Makefile.inc1 b/Makefile.inc1 index 34e225061b..dd0f6293b2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -123,6 +123,12 @@ DESTDIRBASE?= ${OBJTREE}${.CURDIR} WORLD_CCVER?= gcc41 WORLD_BINUTILSVER?= binutils217 +# temporary until everybody has converted to x86_64 +.if ${MACHINE_ARCH} == "amd64" +MACHINE_ARCH= x86_64 +.makeenv MACHINE_ARCH +.endif + TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -131,6 +137,12 @@ TARGET?= ${TARGET_ARCH} .endif .if make(buildworld) BUILD_ARCH!= sysctl -n hw.machine_arch + +# temporary until everybody has converted to x86_64 +.if ${BUILD_ARCH} == "amd64" +BUILD_ARCH= x86_64 +.endif + .if ${MACHINE_ARCH} != ${BUILD_ARCH} .error To cross-build, set TARGET_ARCH. .endif @@ -147,7 +159,7 @@ MACHINE_PLATFORM= pc32 .if !defined(TARGET_PLATFORM) .if ${TARGET_ARCH} == "i386" TARGET_PLATFORM= pc32 -.elif ${TARGET_ARCH} == "amd64" +.elif ${TARGET_ARCH} == "x86_64" TARGET_PLATFORM= pc64 .else .error Unknown target architecture. @@ -494,7 +506,7 @@ KERNWARN= yes .if ${TARGET_ARCH} == "i386" KERNCONF?= GENERIC .else -KERNCONF?= AMD64_GENERIC +KERNCONF?= X86_64_GENERIC .endif .endif INSTKERNNAME?= kernel diff --git a/crypto/openssl/README.DRAGONFLY b/crypto/openssl/README.DRAGONFLY index 36836eec23..96942a068e 100644 --- a/crypto/openssl/README.DRAGONFLY +++ b/crypto/openssl/README.DRAGONFLY @@ -5,7 +5,7 @@ Here's some hints to upgrading: ./Configure shared no-asm --prefix=/usr --openssldir=/etc/ssl BSD-x86-elf cp crypto/opensslconf.h ../../secure/lib/libcrypto/opensslconf-i386.h ./Configure shared no-asm --prefix=/usr --openssldir=/etc/ssl BSD-x86_64 -cp crypto/opensslconf.h ../../secure/lib/libcrypto/opensslconf-amd64.h +cp crypto/opensslconf.h ../../secure/lib/libcrypto/opensslconf-x86_64.h cd ../../secure/lib/libcrypto # Update the version in Makefile.inc # Add DragonFly keywords to opensslconf-*.h diff --git a/etc/etc.amd64/disktab b/etc/etc.x86_64/disktab similarity index 100% rename from etc/etc.amd64/disktab rename to etc/etc.x86_64/disktab diff --git a/etc/etc.amd64/ttys b/etc/etc.x86_64/ttys similarity index 100% rename from etc/etc.amd64/ttys rename to etc/etc.x86_64/ttys diff --git a/gnu/lib/gcc41/libstdc++/Makefile b/gnu/lib/gcc41/libstdc++/Makefile index bafe045724..24ece1d9b5 100644 --- a/gnu/lib/gcc41/libstdc++/Makefile +++ b/gnu/lib/gcc41/libstdc++/Makefile @@ -4,7 +4,7 @@ .if ${MACHINE_ARCH} == "i386" && !empty(MACHINE_CPU:Mi486) MARCHDIR= i486 -.elif ${MACHINE_ARCH} == "amd64" +.elif ${MACHINE_ARCH} == "x86_64" MARCHDIR= i486 .else MARCHDIR= ${MACHINE_ARCH} diff --git a/gnu/lib/gcc44/libstdc++/Makefile b/gnu/lib/gcc44/libstdc++/Makefile index 87d91a9871..fdf5403b51 100644 --- a/gnu/lib/gcc44/libstdc++/Makefile +++ b/gnu/lib/gcc44/libstdc++/Makefile @@ -2,7 +2,7 @@ .if ${MACHINE_ARCH} == "i386" && !empty(MACHINE_CPU:Mi486) MARCHDIR= i486 -.elif ${MACHINE_ARCH} == "amd64" +.elif ${MACHINE_ARCH} == "x86_64" MARCHDIR= i486 .else MARCHDIR= ${MACHINE_ARCH} diff --git a/gnu/lib/gcc44/libstdc++/config.h b/gnu/lib/gcc44/libstdc++/config.h index d43bdca64f..5c0cb0637e 100644 --- a/gnu/lib/gcc44/libstdc++/config.h +++ b/gnu/lib/gcc44/libstdc++/config.h @@ -182,7 +182,7 @@ /* Define if int64_t is a long long. */ #define HAVE_INT64_T_LONG_LONG 1 -#elif defined(__amd64__) +#elif defined(__x86_64__) /* Define if int64_t is a long. */ #define HAVE_INT64_T_LONG 1 diff --git a/gnu/usr.bin/binutils217/as/amd64-dragonfly/itbl-cpu.h b/gnu/usr.bin/binutils217/as/amd64-dragonfly/itbl-cpu.h deleted file mode 100644 index eb88bb101c..0000000000 --- a/gnu/usr.bin/binutils217/as/amd64-dragonfly/itbl-cpu.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * $DragonFly: src/gnu/usr.bin/binutils217/as/amd64-dragonfly/itbl-cpu.h,v 1.1 2007/04/13 12:24:32 corecode Exp $ - */ - -#include "itbl-i386.h" diff --git a/gnu/usr.bin/binutils217/as/amd64-dragonfly/obj-format.h b/gnu/usr.bin/binutils217/as/amd64-dragonfly/obj-format.h deleted file mode 100644 index d4ad9fa106..0000000000 --- a/gnu/usr.bin/binutils217/as/amd64-dragonfly/obj-format.h +++ /dev/null @@ -1,4 +0,0 @@ -/* - * $DragonFly: src/gnu/usr.bin/binutils217/as/amd64-dragonfly/obj-format.h,v 1.1 2007/04/13 12:24:32 corecode Exp $ - */ -#include "obj-elf.h" diff --git a/gnu/usr.bin/binutils217/as/amd64-dragonfly/targ-cpu.h b/gnu/usr.bin/binutils217/as/amd64-dragonfly/targ-cpu.h deleted file mode 100644 index c1ffb83abe..0000000000 --- a/gnu/usr.bin/binutils217/as/amd64-dragonfly/targ-cpu.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * $DragonFly: src/gnu/usr.bin/binutils217/as/amd64-dragonfly/targ-cpu.h,v 1.1 2007/04/13 12:24:32 corecode Exp $ - */ - -#include "tc-i386.h" diff --git a/gnu/usr.bin/binutils217/as/amd64-dragonfly/targ-env.h b/gnu/usr.bin/binutils217/as/amd64-dragonfly/targ-env.h deleted file mode 100644 index e4346ea1d2..0000000000 --- a/gnu/usr.bin/binutils217/as/amd64-dragonfly/targ-env.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Default target format spec for the assembler - * - * $DragonFly: src/gnu/usr.bin/binutils217/as/amd64-dragonfly/targ-env.h,v 1.1 2007/04/13 12:24:32 corecode Exp $ - */ - -#define LOCAL_LABELS_DOLLAR 1 -#define LOCAL_LABELS_FB 1 - -#include "obj-format.h" - diff --git a/gnu/usr.bin/binutils217/as/amd64-dragonfly/Makefile b/gnu/usr.bin/binutils217/as/x86_64-dragonfly/Makefile similarity index 68% rename from gnu/usr.bin/binutils217/as/amd64-dragonfly/Makefile rename to gnu/usr.bin/binutils217/as/x86_64-dragonfly/Makefile index 8ec27cc194..374daa3b3d 100644 --- a/gnu/usr.bin/binutils217/as/amd64-dragonfly/Makefile +++ b/gnu/usr.bin/binutils217/as/x86_64-dragonfly/Makefile @@ -1,5 +1,3 @@ -# $DragonFly: src/gnu/usr.bin/binutils217/as/amd64-dragonfly/Makefile,v 1.1 2007/04/13 12:24:32 corecode Exp $ - DEFAULT_ARCH= x86_64 EMULATIONS= &i386elf, DEFAULT_EMULATION= i386elf @@ -10,8 +8,8 @@ TARGET_CPU= x86_64 .include "${.CURDIR}/../Makefile.inc0" CFLAGS += -I${.OBJDIR}/../../libbfd -.if ${TARGET_ARCH} != "amd64" -BINDIR= /usr/libexec/cross/amd64-dragonfly +.if ${TARGET_ARCH} != "x86_64" +BINDIR= /usr/libexec/cross/x86_64-dragonfly .endif SRCS+= obj-elf.c tc-i386-local.c CLEANFILES= tc-i386-local.c diff --git a/gnu/usr.bin/binutils220/as/amd64-dragonfly/itbl-cpu.h b/gnu/usr.bin/binutils217/as/x86_64-dragonfly/itbl-cpu.h similarity index 100% copy from gnu/usr.bin/binutils220/as/amd64-dragonfly/itbl-cpu.h copy to gnu/usr.bin/binutils217/as/x86_64-dragonfly/itbl-cpu.h diff --git a/gnu/usr.bin/binutils220/as/amd64-dragonfly/obj-format.h b/gnu/usr.bin/binutils217/as/x86_64-dragonfly/obj-format.h similarity index 100% copy from gnu/usr.bin/binutils220/as/amd64-dragonfly/obj-format.h copy to gnu/usr.bin/binutils217/as/x86_64-dragonfly/obj-format.h diff --git a/gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-cpu.h b/gnu/usr.bin/binutils217/as/x86_64-dragonfly/targ-cpu.h similarity index 100% copy from gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-cpu.h copy to gnu/usr.bin/binutils217/as/x86_64-dragonfly/targ-cpu.h diff --git a/gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-env.h b/gnu/usr.bin/binutils217/as/x86_64-dragonfly/targ-env.h similarity index 100% copy from gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-env.h copy to gnu/usr.bin/binutils217/as/x86_64-dragonfly/targ-env.h diff --git a/gnu/usr.bin/binutils217/ld/Makefile.amd64 b/gnu/usr.bin/binutils217/ld/Makefile.x86_64 similarity index 90% rename from gnu/usr.bin/binutils217/ld/Makefile.amd64 rename to gnu/usr.bin/binutils217/ld/Makefile.x86_64 index eec3067224..4e652a0887 100644 --- a/gnu/usr.bin/binutils217/ld/Makefile.amd64 +++ b/gnu/usr.bin/binutils217/ld/Makefile.x86_64 @@ -1,12 +1,10 @@ -# $DragonFly: src/gnu/usr.bin/binutils217/ld/Makefile.amd64,v 1.1 2007/04/13 12:24:32 corecode Exp $ - TARGET_TUPLE?= x86_64-just-dragonfly NATIVE_EMULATION= elf_x86_64 HOST= ${TARGET_TUPLE} CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\" CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\" -_amd64_path= ${USRDATA_PREFIX}/usr/lib +_x86_64_path= ${USRDATA_PREFIX}/usr/lib EMS+= ${NATIVE_EMULATION} .for ext in ${ELF_SCR_EXT} LDSCRIPTS_${NATIVE_EMULATION}+= ${NATIVE_EMULATION}.${ext} @@ -20,7 +18,7 @@ e${NATIVE_EMULATION}.c ${LDSCRIPTS_${NATIVE_EMULATION}}: \ scripttempl/elf.sc genscripts.sh stringify.sed sort-sections.sh sh ${SRCDIR}/ld/genscripts.sh \ ${SRCDIR:Q}/ld \ - ${_amd64_path:Q} \ + ${_x86_64_path:Q} \ "" \ "" \ ${HOST} \ diff --git a/gnu/usr.bin/binutils217/libbfd/Makefile b/gnu/usr.bin/binutils217/libbfd/Makefile index b9e53762af..42bad0f324 100644 --- a/gnu/usr.bin/binutils217/libbfd/Makefile +++ b/gnu/usr.bin/binutils217/libbfd/Makefile @@ -31,7 +31,7 @@ CFLAGS+= -I${BINUTILSDISTDIR}/bfd -I${BINUTILSDISTDIR}/include -I. # XXX broken SELARCH= -.if ${BINUTIL_ARCH} == "amd64" +.if ${BINUTIL_ARCH} == "x86_64" SELARCH= &bfd_i386_arch .else .for _a in ${ARCHS} @@ -91,7 +91,7 @@ bfdver.h: ${SRCDIR}/bfd/version.h mv -f bfdver.h.new bfdver.h # match targets defined in the assembler's targ-env.h with an output vector. -# XXX i386-*-dragonfly and amd64-*-dragonfly are obsolete, but not quite +# XXX i386-*-dragonfly and x86_64-*-dragonfly are obsolete, but not quite # removed from the binutils build yet. targmatch.h: targmatch.sed config.bfd sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}.new diff --git a/gnu/usr.bin/binutils217/libbfd/Makefile.amd64 b/gnu/usr.bin/binutils217/libbfd/Makefile.x86_64 similarity index 61% rename from gnu/usr.bin/binutils217/libbfd/Makefile.amd64 rename to gnu/usr.bin/binutils217/libbfd/Makefile.x86_64 index 5526e31caf..78cc494997 100644 --- a/gnu/usr.bin/binutils217/libbfd/Makefile.amd64 +++ b/gnu/usr.bin/binutils217/libbfd/Makefile.x86_64 @@ -1,5 +1,3 @@ -# $DragonFly: src/gnu/usr.bin/binutils217/libbfd/Makefile.amd64,v 1.1 2007/04/13 12:24:32 corecode Exp $ - BFD_ARCH_SIZE?=64 BFD_DEFAULT_TARGET_SIZE?=64 @@ -8,8 +6,7 @@ VECS+= bfd_elf64_x86_64_vec DEFAULT_VECTOR?= bfd_elf64_x86_64_vec -TARGMATCH+= { "elf64-amd64-dragonfly*", &bfd_elf64_x86_64_vec }, -TARGMATCH+= { "amd64-*-dragonfly*", &bfd_elf64_x86_64_vec }, +TARGMATCH+= { "elf64-x86_64-dragonfly*", &bfd_elf64_x86_64_vec }, TARGMATCH+= { "x86_64-*-dragonfly*", &bfd_elf64_x86_64_vec }, CLEANFILES+= elf64-target.h diff --git a/gnu/usr.bin/binutils217/libopcodes/Makefile.amd64 b/gnu/usr.bin/binutils217/libopcodes/Makefile.amd64 deleted file mode 100644 index ffea0f0ade..0000000000 --- a/gnu/usr.bin/binutils217/libopcodes/Makefile.amd64 +++ /dev/null @@ -1,4 +0,0 @@ -# $DragonFly: src/gnu/usr.bin/binutils217/libopcodes/Makefile.amd64,v 1.1 2007/04/13 12:24:32 corecode Exp $ - -SRCS+= i386-dis.c -CFLAGS+= -DARCH_i386 diff --git a/gnu/usr.bin/binutils217/libopcodes/Makefile.x86_64 b/gnu/usr.bin/binutils217/libopcodes/Makefile.x86_64 new file mode 100644 index 0000000000..2909164f6b --- /dev/null +++ b/gnu/usr.bin/binutils217/libopcodes/Makefile.x86_64 @@ -0,0 +1,2 @@ +SRCS+= i386-dis.c +CFLAGS+= -DARCH_i386 diff --git a/gnu/usr.bin/binutils220/as/amd64-dragonfly/Makefile b/gnu/usr.bin/binutils220/as/x86_64-dragonfly/Makefile similarity index 82% rename from gnu/usr.bin/binutils220/as/amd64-dragonfly/Makefile rename to gnu/usr.bin/binutils220/as/x86_64-dragonfly/Makefile index 6008d83141..7664347a52 100644 --- a/gnu/usr.bin/binutils220/as/amd64-dragonfly/Makefile +++ b/gnu/usr.bin/binutils220/as/x86_64-dragonfly/Makefile @@ -8,8 +8,8 @@ TARGET_CPU= x86_64 .include "${.CURDIR}/../Makefile.inc0" CFLAGS += -I${.OBJDIR}/../../libbfd -.if ${TARGET_ARCH} != "amd64" -BINDIR= /usr/libexec/cross/amd64-dragonfly +.if ${TARGET_ARCH} != "x86_64" +BINDIR= /usr/libexec/cross/x86_64-dragonfly .endif SRCS+= obj-elf.c tc-i386.c diff --git a/gnu/usr.bin/binutils220/as/amd64-dragonfly/itbl-cpu.h b/gnu/usr.bin/binutils220/as/x86_64-dragonfly/itbl-cpu.h similarity index 100% rename from gnu/usr.bin/binutils220/as/amd64-dragonfly/itbl-cpu.h rename to gnu/usr.bin/binutils220/as/x86_64-dragonfly/itbl-cpu.h diff --git a/gnu/usr.bin/binutils220/as/amd64-dragonfly/obj-format.h b/gnu/usr.bin/binutils220/as/x86_64-dragonfly/obj-format.h similarity index 100% rename from gnu/usr.bin/binutils220/as/amd64-dragonfly/obj-format.h rename to gnu/usr.bin/binutils220/as/x86_64-dragonfly/obj-format.h diff --git a/gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-cpu.h b/gnu/usr.bin/binutils220/as/x86_64-dragonfly/targ-cpu.h similarity index 100% rename from gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-cpu.h rename to gnu/usr.bin/binutils220/as/x86_64-dragonfly/targ-cpu.h diff --git a/gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-env.h b/gnu/usr.bin/binutils220/as/x86_64-dragonfly/targ-env.h similarity index 100% rename from gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-env.h rename to gnu/usr.bin/binutils220/as/x86_64-dragonfly/targ-env.h diff --git a/gnu/usr.bin/binutils220/ld/Makefile.amd64 b/gnu/usr.bin/binutils220/ld/Makefile.x86_64 similarity index 95% rename from gnu/usr.bin/binutils220/ld/Makefile.amd64 rename to gnu/usr.bin/binutils220/ld/Makefile.x86_64 index a9155deaf5..8e1f794531 100644 --- a/gnu/usr.bin/binutils220/ld/Makefile.amd64 +++ b/gnu/usr.bin/binutils220/ld/Makefile.x86_64 @@ -4,7 +4,7 @@ NATIVE_EMULATION= elf_x86_64 HOST= ${TARGET_TUPLE} CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\" CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\" -_amd64_path= ${USRDATA_PREFIX}/usr/lib +_x86_64_path= ${USRDATA_PREFIX}/usr/lib EMS+= ${NATIVE_EMULATION} .for ext in ${ELF_SCR_EXT} LDSCRIPTS_${NATIVE_EMULATION}+= ${NATIVE_EMULATION}.${ext} @@ -18,7 +18,7 @@ e${NATIVE_EMULATION}.c ${LDSCRIPTS_${NATIVE_EMULATION}}: \ scripttempl/elf.sc genscripts.sh stringify.sed sh ${SRCDIR}/ld/genscripts.sh \ ${SRCDIR:Q}/ld \ - ${_amd64_path:Q} \ + ${_x86_64_path:Q} \ "" \ "" \ ${HOST} \ diff --git a/gnu/usr.bin/binutils220/libbfd/Makefile.host.amd64 b/gnu/usr.bin/binutils220/libbfd/Makefile.host.x86_64 similarity index 100% rename from gnu/usr.bin/binutils220/libbfd/Makefile.host.amd64 rename to gnu/usr.bin/binutils220/libbfd/Makefile.host.x86_64 diff --git a/gnu/usr.bin/binutils220/libbfd/Makefile.amd64 b/gnu/usr.bin/binutils220/libbfd/Makefile.x86_64 similarity index 100% rename from gnu/usr.bin/binutils220/libbfd/Makefile.amd64 rename to gnu/usr.bin/binutils220/libbfd/Makefile.x86_64 diff --git a/gnu/usr.bin/binutils220/libbinutils/Makefile.amd64 b/gnu/usr.bin/binutils220/libbinutils/Makefile.x86_64 similarity index 100% rename from gnu/usr.bin/binutils220/libbinutils/Makefile.amd64 rename to gnu/usr.bin/binutils220/libbinutils/Makefile.x86_64 diff --git a/gnu/usr.bin/binutils220/libopcodes/Makefile.amd64 b/gnu/usr.bin/binutils220/libopcodes/Makefile.x86_64 similarity index 100% rename from gnu/usr.bin/binutils220/libopcodes/Makefile.amd64 rename to gnu/usr.bin/binutils220/libopcodes/Makefile.x86_64 diff --git a/gnu/usr.bin/cc41/Makefile.tgt b/gnu/usr.bin/cc41/Makefile.tgt index 946223916a..8b7ce9214e 100644 --- a/gnu/usr.bin/cc41/Makefile.tgt +++ b/gnu/usr.bin/cc41/Makefile.tgt @@ -6,7 +6,7 @@ version= 4.1.2 target_machine= ${TARGET_ARCH}-pc-dragonflybsd GCC_CPU?= ${TARGET_ARCH} -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "x86_64" GCC_CPU= i386 .endif @@ -29,11 +29,11 @@ GTFILES_SRCDIR = $(srcdir) # This is ordered to avoid build warnings/errors TARGET_INC= options.h -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "x86_64" TARGET_INC+= i386/biarch64.h .endif TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h -.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64" TARGET_INC+= ${GCC_CPU}/unix.h TARGET_INC+= ${GCC_CPU}/att.h .endif @@ -41,11 +41,11 @@ TARGET_INC+= dbxelf.h TARGET_INC+= elfos.h TARGET_INC+= dragonfly-spec.h TARGET_INC+= dragonfly.h -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "x86_64" TARGET_INC+= ${GCC_CPU}/x86-64.h .endif TARGET_INC+= ${GCC_CPU}/dragonfly.h -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "x86_64" TARGET_INC+= ${GCC_CPU}/dragonfly64.h .endif TARGET_INC+= defaults.h diff --git a/gnu/usr.bin/cc41/cc_prep/dragonfly-native.h b/gnu/usr.bin/cc41/cc_prep/dragonfly-native.h index 05e795c0c8..6612d6f16e 100644 --- a/gnu/usr.bin/cc41/cc_prep/dragonfly-native.h +++ b/gnu/usr.bin/cc41/cc_prep/dragonfly-native.h @@ -1244,7 +1244,7 @@ #ifndef USED_FOR_TARGET #if defined(__i386__) #define SIZEOF_LONG SIZEOF_INT -#elif defined(__amd64__) +#elif defined(__x86_64__) #define SIZEOF_LONG SIZEOF_LONG_LONG #else #error "Unknown architecture" diff --git a/gnu/usr.bin/cc41/libiberty/config.h b/gnu/usr.bin/cc41/libiberty/config.h index 107c9cb483..66abeea5d2 100644 --- a/gnu/usr.bin/cc41/libiberty/config.h +++ b/gnu/usr.bin/cc41/libiberty/config.h @@ -408,7 +408,7 @@ /* The size of a `int', as computed by sizeof. */ #if defined(__i386__) #define SIZEOF_INT 4 -#elif defined(__amd64__) +#elif defined(__x86_64__) #define SIZEOF_INT 8 #else #error "Unknown target platform" diff --git a/gnu/usr.bin/cc44/Makefile.tgt b/gnu/usr.bin/cc44/Makefile.tgt index dac15ad3d1..84bfe32b56 100644 --- a/gnu/usr.bin/cc44/Makefile.tgt +++ b/gnu/usr.bin/cc44/Makefile.tgt @@ -4,7 +4,7 @@ version= ${GCCCOMPLETEVER} target_machine= ${TARGET_ARCH}-pc-dragonflybsd GCC_CPU?= ${TARGET_ARCH} -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "x86_64" GCC_CPU= i386 .endif @@ -31,11 +31,11 @@ GTFILES_SRCDIR = $(srcdir) # This is ordered to avoid build warnings/errors TARGET_INC= options.h -.if ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "x86_64" TARGET_INC+= i386/biarch64.h .endif TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h -.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" +.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64" TARGET_INC+= ${GCC_CPU}/unix.h TARGET_INC+= ${GCC_CPU}/att.h .endif @@ -44,7 +44,7 @@ TARGET_INC+= elfos.h TARGET_INC+= dragonfly.h .if ${TARGET_ARCH} == "i386" TARGET_INC+= ${GCC_CPU}/dragonfly.h -.elif ${TARGET_ARCH} == "amd64" +.elif ${TARGET_ARCH} == "x86_64" TARGET_INC+= ${GCC_CPU}/x86-64.h TARGET_INC+= ${GCC_CPU}/dragonfly64.h .endif diff --git a/gnu/usr.bin/cc44/cc_prep/auto-host.h b/gnu/usr.bin/cc44/cc_prep/auto-host.h index 704b2d1bbf..144f42a62f 100644 --- a/gnu/usr.bin/cc44/cc_prep/auto-host.h +++ b/gnu/usr.bin/cc44/cc_prep/auto-host.h @@ -1424,7 +1424,7 @@ #ifndef USED_FOR_TARGET #if defined(__i386__) #define SIZEOF_LONG SIZEOF_INT -#elif defined(__amd64__) +#elif defined(__x86_64__) #define SIZEOF_LONG SIZEOF_LONG_LONG #else #error "Unknown architecture" diff --git a/gnu/usr.bin/cc44/gmp/Makefile.amd64 b/gnu/usr.bin/cc44/gmp/Makefile.x86_64 similarity index 100% rename from gnu/usr.bin/cc44/gmp/Makefile.amd64 rename to gnu/usr.bin/cc44/gmp/Makefile.x86_64 diff --git a/gnu/usr.bin/cc44/gmp/gmp.h b/gnu/usr.bin/cc44/gmp/gmp.h index d5b4783523..f3038284ff 100644 --- a/gnu/usr.bin/cc44/gmp/gmp.h +++ b/gnu/usr.bin/cc44/gmp/gmp.h @@ -30,7 +30,7 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ #if ! defined (__GMP_WITHIN_CONFIGURE) #if defined(__i386__) #define __GMP_BITS_PER_MP_LIMB 32 -#elif defined(__amd64__) +#elif defined(__x86_64__) #define __GMP_BITS_PER_MP_LIMB 64 #else #error port me! diff --git a/gnu/usr.bin/cc44/libiberty/config.h b/gnu/usr.bin/cc44/libiberty/config.h index 0565b0c71f..fb4c0dd990 100644 --- a/gnu/usr.bin/cc44/libiberty/config.h +++ b/gnu/usr.bin/cc44/libiberty/config.h @@ -407,7 +407,7 @@ /* The size of a `int', as computed by sizeof. */ #if defined(__i386__) #define SIZEOF_INT 4 -#elif defined(__amd64__) +#elif defined(__x86_64__) #define SIZEOF_INT 8 #else #error "Unknown target platform" diff --git a/gnu/usr.bin/gdb/kgdb/trgt_amd64.c b/gnu/usr.bin/gdb/kgdb/trgt_x86_64.c similarity index 100% rename from gnu/usr.bin/gdb/kgdb/trgt_amd64.c rename to gnu/usr.bin/gdb/kgdb/trgt_x86_64.c diff --git a/gnu/usr.bin/gdb/libbfd/Makefile.host.amd64 b/gnu/usr.bin/gdb/libbfd/Makefile.host.x86_64 similarity index 100% rename from gnu/usr.bin/gdb/libbfd/Makefile.host.amd64 rename to gnu/usr.bin/gdb/libbfd/Makefile.host.x86_64 diff --git a/gnu/usr.bin/gdb/libbfd/Makefile.amd64 b/gnu/usr.bin/gdb/libbfd/Makefile.x86_64 similarity index 100% rename from gnu/usr.bin/gdb/libbfd/Makefile.amd64 rename to gnu/usr.bin/gdb/libbfd/Makefile.x86_64 diff --git a/gnu/usr.bin/gdb/libbfd/config.h b/gnu/usr.bin/gdb/libbfd/config.h index f6e896c874..40ef46a9b3 100644 --- a/gnu/usr.bin/gdb/libbfd/config.h +++ b/gnu/usr.bin/gdb/libbfd/config.h @@ -265,7 +265,7 @@ /* The size of `long', as computed by sizeof. */ #if defined(__i386__) #define SIZEOF_LONG 4 -#elif defined(__amd64__) +#elif defined(__x86_64__) #define SIZEOF_LONG 8 #else #error Unsupported platform @@ -283,7 +283,7 @@ /* The size of `void *', as computed by sizeof. */ #if defined(__i386__) #define SIZEOF_VOID_P 4 -#elif defined(__amd64__) +#elif defined(__x86_64__) #define SIZEOF_VOID_P 8 #else #error Unsupported platform diff --git a/gnu/usr.bin/gdb/libgdb/Makefile.amd64 b/gnu/usr.bin/gdb/libgdb/Makefile.x86_64 similarity index 100% rename from gnu/usr.bin/gdb/libgdb/Makefile.amd64 rename to gnu/usr.bin/gdb/libgdb/Makefile.x86_64 diff --git a/gnu/usr.bin/gdb/libgdb/freebsd-uthread.c b/gnu/usr.bin/gdb/libgdb/freebsd-uthread.c index 6b75a2291f..e22cf0e55a 100644 --- a/gnu/usr.bin/gdb/libgdb/freebsd-uthread.c +++ b/gnu/usr.bin/gdb/libgdb/freebsd-uthread.c @@ -474,7 +474,7 @@ static char jmpmap[I386_SSE_NUM_REGS] = /* map reg to jmp_buf */ #endif -#ifdef __amd64__ +#ifdef __x86_64__ #include "amd64-tdep.h" diff --git a/gnu/usr.bin/gdb/libopcodes/Makefile.amd64 b/gnu/usr.bin/gdb/libopcodes/Makefile.x86_64 similarity index 100% rename from gnu/usr.bin/gdb/libopcodes/Makefile.amd64 rename to gnu/usr.bin/gdb/libopcodes/Makefile.x86_64 diff --git a/lib/csu/amd64/Makefile.csu b/lib/csu/x86_64/Makefile.csu similarity index 79% rename from lib/csu/amd64/Makefile.csu rename to lib/csu/x86_64/Makefile.csu index 9efa4442a0..a49c8f39f3 100644 --- a/lib/csu/amd64/Makefile.csu +++ b/lib/csu/x86_64/Makefile.csu @@ -1,5 +1,4 @@ # $FreeBSD: src/lib/csu/amd64/Makefile,v 1.18 2003/06/30 12:53:39 ru Exp $ -# $DragonFly: src/lib/csu/amd64/Makefile.csu,v 1.2 2007/07/11 21:12:50 corecode Exp $ SRCS+= crt1.c crti.S crtn.S OBJS+= gcrt1.o diff --git a/lib/csu/amd64/crt1.c b/lib/csu/x86_64/crt1.c similarity index 94% rename from lib/csu/amd64/crt1.c rename to lib/csu/x86_64/crt1.c index 71ce7ca8e0..e2db276b86 100644 --- a/lib/csu/amd64/crt1.c +++ b/lib/csu/x86_64/crt1.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/lib/csu/amd64/crt1.c,v 1.13 2003/04/30 19:27:07 peter Exp $ - * $DragonFly: src/lib/csu/amd64/crt1.c,v 1.2 2008/08/25 23:38:35 dillon Exp $ */ #ifndef lint @@ -106,5 +105,3 @@ __asm__(".text"); __asm__("eprol:"); __asm__(".previous"); #endif - -__asm__(".ident\t\"$DragonFly: src/lib/csu/amd64/crt1.c,v 1.2 2008/08/25 23:38:35 dillon Exp $\""); diff --git a/lib/csu/amd64/crti.S b/lib/csu/x86_64/crti.S similarity index 90% rename from lib/csu/amd64/crti.S rename to lib/csu/x86_64/crti.S index e0b4328399..e2fee49b5c 100644 --- a/lib/csu/amd64/crti.S +++ b/lib/csu/x86_64/crti.S @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/lib/csu/amd64/crti.S,v 1.6 2002/05/15 04:19:49 obrien Exp $ - * $DragonFly: src/lib/csu/amd64/crti.S,v 1.1 2004/02/02 05:43:13 dillon Exp $ */ .section .init,"ax",@progbits @@ -39,4 +38,3 @@ _init: _fini: .section .rodata -.ascii "$DragonFly: src/lib/csu/amd64/crti.S,v 1.1 2004/02/02 05:43:13 dillon Exp $\0" diff --git a/lib/csu/amd64/crtn.S b/lib/csu/x86_64/crtn.S similarity index 90% rename from lib/csu/amd64/crtn.S rename to lib/csu/x86_64/crtn.S index 498f31067a..1dbbb44be5 100644 --- a/lib/csu/amd64/crtn.S +++ b/lib/csu/x86_64/crtn.S @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/lib/csu/amd64/crtn.S,v 1.5 2002/05/15 04:19:49 obrien Exp $ - * $DragonFly: src/lib/csu/amd64/crtn.S,v 1.1 2004/02/02 05:43:13 dillon Exp $ */ .section .init,"ax",@progbits @@ -33,4 +32,3 @@ ret .section .rodata -.ascii "$DragonFly: src/lib/csu/amd64/crtn.S,v 1.1 2004/02/02 05:43:13 dillon Exp $\0" diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc index 1a83c29ec3..772b85a2e7 100644 --- a/lib/libc/Makefile.inc +++ b/lib/libc/Makefile.inc @@ -25,7 +25,7 @@ NOASM= .include "${.CURDIR}/../libc/locale/Makefile.inc" .include "${.CURDIR}/../libc/net/Makefile.inc" .include "${.CURDIR}/../libc/nls/Makefile.inc" -.if ${MACHINE_ARCH} != "amd64" +.if ${MACHINE_ARCH} != "x86_64" .include "${.CURDIR}/../libc/quad/Makefile.inc" .endif .include "${.CURDIR}/../libc/regex/Makefile.inc" diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c index 08d71bbb1c..a5c327218d 100644 --- a/lib/libc/gen/nlist.c +++ b/lib/libc/gen/nlist.c @@ -256,7 +256,7 @@ __elf_fdnlist(int fd, struct nlist *list) /* calculate section header table size */ shdr_size = ehdr.e_shentsize * ehdr.e_shnum; -#ifndef __amd64__ +#ifndef __x86_64__ /* Make sure it's not too big to mmap */ if (shdr_size > SIZE_T_MAX) { errno = EFBIG; @@ -287,7 +287,7 @@ __elf_fdnlist(int fd, struct nlist *list) } } -#ifndef __amd64__ +#ifndef __x86_64__ /* Check for files too large to mmap. */ if (symstrsize > SIZE_T_MAX) { errno = EFBIG; diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c index 47bfa183cd..7051ed7b9f 100644 --- a/lib/libc/gmon/gmon.c +++ b/lib/libc/gmon/gmon.c @@ -47,7 +47,7 @@ #include "libc_private.h" -#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) || defined(__powerpc__) +#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__) || defined(__powerpc__) extern char *minbrk __asm (".minbrk"); #else extern char *minbrk __asm ("minbrk"); diff --git a/lib/libc/amd64/Makefile.inc b/lib/libc/x86_64/Makefile.inc similarity index 51% rename from lib/libc/amd64/Makefile.inc rename to lib/libc/x86_64/Makefile.inc index 1fb131032c..e067a24adf 100644 --- a/lib/libc/amd64/Makefile.inc +++ b/lib/libc/x86_64/Makefile.inc @@ -1,7 +1,6 @@ # $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.6 2007/12/03 07:17:32 das Exp $ -# $DragonFly: src/lib/libc/amd64/Makefile.inc,v 1.1 2004/02/02 05:43:14 dillon Exp $ # -# Machine dependent definitions for the amd64 architecture. +# Machine dependent definitions for the x86_64 architecture. # # Long double is 80 bits diff --git a/lib/libc/amd64/SYS.h b/lib/libc/x86_64/SYS.h similarity index 97% rename from lib/libc/amd64/SYS.h rename to lib/libc/x86_64/SYS.h index 85f2281ece..e2d38d0455 100644 --- a/lib/libc/amd64/SYS.h +++ b/lib/libc/x86_64/SYS.h @@ -31,7 +31,6 @@ * * @(#)SYS.h 5.5 (Berkeley) 5/7/91 * $FreeBSD: src/lib/libc/amd64/SYS.h,v 1.30 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/SYS.h,v 1.2 2006/07/27 00:43:42 corecode Exp $ */ #include diff --git a/lib/libc/amd64/_fpmath.h b/lib/libc/x86_64/_fpmath.h similarity index 96% rename from lib/libc/amd64/_fpmath.h rename to lib/libc/x86_64/_fpmath.h index 8a1396d651..41b01c3d39 100644 --- a/lib/libc/amd64/_fpmath.h +++ b/lib/libc/x86_64/_fpmath.h @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.7 2008/01/17 16:39:06 bde Exp $ - * $DragonFly: src/lib/libc/amd64/_fpmath.h,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ union IEEEl2bits { diff --git a/lib/libc/amd64/arith.h b/lib/libc/x86_64/arith.h similarity index 86% rename from lib/libc/amd64/arith.h rename to lib/libc/x86_64/arith.h index f4dafa98fc..8d3b5f6268 100644 --- a/lib/libc/amd64/arith.h +++ b/lib/libc/x86_64/arith.h @@ -2,7 +2,6 @@ * MD header for contrib/gdtoa * * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.3 2003/05/08 13:50:43 das Exp $ - * $DragonFly: src/lib/libc/amd64/arith.h,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ /* diff --git a/lib/libc/amd64/gd_qnan.h b/lib/libc/x86_64/gd_qnan.h similarity index 100% rename from lib/libc/amd64/gd_qnan.h rename to lib/libc/x86_64/gd_qnan.h diff --git a/lib/libc/amd64/gen/Makefile.inc b/lib/libc/x86_64/gen/Makefile.inc similarity index 81% rename from lib/libc/amd64/gen/Makefile.inc rename to lib/libc/x86_64/gen/Makefile.inc index 54be1f79ec..fb0a5a86f0 100644 --- a/lib/libc/amd64/gen/Makefile.inc +++ b/lib/libc/x86_64/gen/Makefile.inc @@ -1,6 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.24 2003/10/13 20:32:33 alc Exp $ -# $DragonFly: src/lib/libc/amd64/gen/Makefile.inc,v 1.4 2007/08/21 19:49:10 corecode Exp $ SRCS+= _setjmp.S rfork_thread.S setjmp.S sigsetjmp.S \ fabs.S modf.S mcontext.S\ diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/x86_64/gen/_setjmp.S similarity index 97% rename from lib/libc/amd64/gen/_setjmp.S rename to lib/libc/x86_64/gen/_setjmp.S index 3e82ac055c..5b6af71665 100644 --- a/lib/libc/amd64/gen/_setjmp.S +++ b/lib/libc/x86_64/gen/_setjmp.S @@ -31,7 +31,6 @@ * * @(#)_setjmp.s 5.1 (Berkeley) 4/23/90 * $FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.21 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/gen/_setjmp.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/gen/fabs.S b/lib/libc/x86_64/gen/fabs.S similarity index 95% rename from lib/libc/amd64/gen/fabs.S rename to lib/libc/x86_64/gen/fabs.S index 4be6b3efb1..171e3e0cb4 100644 --- a/lib/libc/amd64/gen/fabs.S +++ b/lib/libc/x86_64/gen/fabs.S @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/amd64/gen/fabs.S,v 1.4 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/gen/fabs.S,v 1.2 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/flt_rounds.c b/lib/libc/x86_64/gen/flt_rounds.c similarity index 82% rename from lib/libc/amd64/gen/flt_rounds.c rename to lib/libc/x86_64/gen/flt_rounds.c index 43717b9187..d0bba7d106 100644 --- a/lib/libc/amd64/gen/flt_rounds.c +++ b/lib/libc/x86_64/gen/flt_rounds.c @@ -1,8 +1,6 @@ /* * Written by J.T. Conklin, Apr 10, 1995 * Public domain. - * - * $DragonFly: src/lib/libc/amd64/gen/flt_rounds.c,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/fpclassifyl.c b/lib/libc/x86_64/gen/fpclassifyl.c similarity index 96% rename from lib/libc/amd64/gen/fpclassifyl.c rename to lib/libc/x86_64/gen/fpclassifyl.c index 0c93348b0e..25c2d3461f 100644 --- a/lib/libc/amd64/gen/fpclassifyl.c +++ b/lib/libc/x86_64/gen/fpclassifyl.c @@ -34,7 +34,6 @@ * POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: fpclassifyl.c,v 1.2 2004/01/18 19:33:01 matt Exp $ - * $DragonFly: src/lib/libc/amd64/gen/fpclassifyl.c,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/fpgetmask.S b/lib/libc/x86_64/gen/fpgetmask.S similarity index 84% rename from lib/libc/amd64/gen/fpgetmask.S rename to lib/libc/x86_64/gen/fpgetmask.S index 8c168760ce..589818ebbd 100644 --- a/lib/libc/amd64/gen/fpgetmask.S +++ b/lib/libc/x86_64/gen/fpgetmask.S @@ -3,7 +3,6 @@ * Public domain. * * $NetBSD: fpgetmask.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $ - * $DragonFly: src/lib/libc/amd64/gen/fpgetmask.S,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/fpgetround.S b/lib/libc/x86_64/gen/fpgetround.S similarity index 83% rename from lib/libc/amd64/gen/fpgetround.S rename to lib/libc/x86_64/gen/fpgetround.S index 3308fa5911..1a0885012e 100644 --- a/lib/libc/amd64/gen/fpgetround.S +++ b/lib/libc/x86_64/gen/fpgetround.S @@ -3,7 +3,6 @@ * Public domain. * * $NetBSD: fpgetround.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $ - * $DragonFly: src/lib/libc/amd64/gen/fpgetround.S,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/fpgetsticky.S b/lib/libc/x86_64/gen/fpgetsticky.S similarity index 84% rename from lib/libc/amd64/gen/fpgetsticky.S rename to lib/libc/x86_64/gen/fpgetsticky.S index a0f8fdd2eb..76ffeb36a5 100644 --- a/lib/libc/amd64/gen/fpgetsticky.S +++ b/lib/libc/x86_64/gen/fpgetsticky.S @@ -3,7 +3,6 @@ * Public domain. * * $NetBSD: fpgetsticky.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $ - * $DragonFly: src/lib/libc/amd64/gen/fpgetsticky.S,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/fpsetmask.S b/lib/libc/x86_64/gen/fpsetmask.S similarity index 89% rename from lib/libc/amd64/gen/fpsetmask.S rename to lib/libc/x86_64/gen/fpsetmask.S index 475206fd1a..42476f9197 100644 --- a/lib/libc/amd64/gen/fpsetmask.S +++ b/lib/libc/x86_64/gen/fpsetmask.S @@ -3,7 +3,6 @@ * Public domain. * * $NetBSD: fpsetmask.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $ - * $DragonFly: src/lib/libc/amd64/gen/fpsetmask.S,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/fpsetround.S b/lib/libc/x86_64/gen/fpsetround.S similarity index 89% rename from lib/libc/amd64/gen/fpsetround.S rename to lib/libc/x86_64/gen/fpsetround.S index f7106f4c33..43d7e5045d 100644 --- a/lib/libc/amd64/gen/fpsetround.S +++ b/lib/libc/x86_64/gen/fpsetround.S @@ -3,7 +3,6 @@ * Public domain. * * $NetBSD: fpsetround.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $ - * $DragonFly: src/lib/libc/amd64/gen/fpsetround.S,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/fpsetsticky.S b/lib/libc/x86_64/gen/fpsetsticky.S similarity index 89% rename from lib/libc/amd64/gen/fpsetsticky.S rename to lib/libc/x86_64/gen/fpsetsticky.S index ad763de782..1659045cf7 100644 --- a/lib/libc/amd64/gen/fpsetsticky.S +++ b/lib/libc/x86_64/gen/fpsetsticky.S @@ -3,7 +3,6 @@ * Public domain. * * $NetBSD: fpsetsticky.S,v 1.5 2004/03/09 17:16:13 drochner Exp $ - * $DragonFly: src/lib/libc/amd64/gen/fpsetsticky.S,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/infinityl.c b/lib/libc/x86_64/gen/infinityl.c similarity index 77% rename from lib/libc/amd64/gen/infinityl.c rename to lib/libc/x86_64/gen/infinityl.c index 3ed0e85b8f..fa62487e0d 100644 --- a/lib/libc/amd64/gen/infinityl.c +++ b/lib/libc/x86_64/gen/infinityl.c @@ -1,9 +1,8 @@ /* * IEEE-compatible infinityl.c for little-endian 80-bit format -- public domain. - * Note that the representation includes 48 bits of tail padding per amd64 ABI. + * Note that the representation includes 48 bits of tail padding per x86_64 ABI. * * $NetBSD: infinityl.c,v 1.2 2005/06/12 05:21:27 lukem Exp $ - * $DragonFly: src/lib/libc/amd64/gen/infinityl.c,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/isfinitel.c b/lib/libc/x86_64/gen/isfinitel.c similarity index 96% rename from lib/libc/amd64/gen/isfinitel.c rename to lib/libc/x86_64/gen/isfinitel.c index 7af01cfca0..5c9aef3b51 100644 --- a/lib/libc/amd64/gen/isfinitel.c +++ b/lib/libc/x86_64/gen/isfinitel.c @@ -34,7 +34,6 @@ * POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: isfinitel.c,v 1.1 2003/10/29 20:03:51 kleink Exp $ - * $DragonFly: src/lib/libc/amd64/gen/isfinitel.c,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/isinfl.c b/lib/libc/x86_64/gen/isinfl.c similarity index 96% rename from lib/libc/amd64/gen/isinfl.c rename to lib/libc/x86_64/gen/isinfl.c index 28b20d31c0..cad0ae1815 100644 --- a/lib/libc/amd64/gen/isinfl.c +++ b/lib/libc/x86_64/gen/isinfl.c @@ -32,7 +32,6 @@ * * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp * $NetBSD: isinfl.c,v 1.5 2004/03/04 23:42:39 kleink Exp $ - * $DragonFly: src/lib/libc/amd64/gen/isinfl.c,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/isnanl.c b/lib/libc/x86_64/gen/isnanl.c similarity index 96% rename from lib/libc/amd64/gen/isnanl.c rename to lib/libc/x86_64/gen/isnanl.c index 67ed4360a1..55f3bb4e12 100644 --- a/lib/libc/amd64/gen/isnanl.c +++ b/lib/libc/x86_64/gen/isnanl.c @@ -32,7 +32,6 @@ * * from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp * $NetBSD: isnanl.c,v 1.5 2004/03/04 23:42:39 kleink Exp $ - * $DragonFly: src/lib/libc/amd64/gen/isnanl.c,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/ldexp.c b/lib/libc/x86_64/gen/ldexp.c similarity index 96% rename from lib/libc/amd64/gen/ldexp.c rename to lib/libc/x86_64/gen/ldexp.c index 2783f40acf..c9915449fc 100644 --- a/lib/libc/amd64/gen/ldexp.c +++ b/lib/libc/x86_64/gen/ldexp.c @@ -31,7 +31,6 @@ * * @(#)ldexp.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libc/amd64/gen/ldexp.c,v 1.14 2007/01/09 00:38:24 imp Exp $ - * $DragonFly: src/lib/libc/amd64/gen/ldexp.c,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ /* diff --git a/lib/libc/amd64/gen/mcontext.S b/lib/libc/x86_64/gen/mcontext.S similarity index 97% rename from lib/libc/amd64/gen/mcontext.S rename to lib/libc/x86_64/gen/mcontext.S index 1dd5010e0f..ea31674adb 100644 --- a/lib/libc/amd64/gen/mcontext.S +++ b/lib/libc/x86_64/gen/mcontext.S @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/lib/libc/amd64/gen/mcontext.S,v 1.2 2008/08/28 23:36:31 dillon Exp $ */ #include diff --git a/lib/libc/amd64/gen/modf.S b/lib/libc/x86_64/gen/modf.S similarity index 96% rename from lib/libc/amd64/gen/modf.S rename to lib/libc/x86_64/gen/modf.S index 8b857de68c..42895d0dc5 100644 --- a/lib/libc/amd64/gen/modf.S +++ b/lib/libc/x86_64/gen/modf.S @@ -32,7 +32,6 @@ * from: @(#)modf.s 5.5 (Berkeley) 3/18/91 * $NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $ * $FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.4 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/gen/modf.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/gen/nanf.c b/lib/libc/x86_64/gen/nanf.c similarity index 66% rename from lib/libc/amd64/gen/nanf.c rename to lib/libc/x86_64/gen/nanf.c index 58257ccb16..7959f7876d 100644 --- a/lib/libc/amd64/gen/nanf.c +++ b/lib/libc/x86_64/gen/nanf.c @@ -1,7 +1,3 @@ -/* - * $DragonFly: src/lib/libc/amd64/gen/nanf.c,v 1.1 2006/07/27 00:46:57 corecode Exp $ - */ - #include #include diff --git a/lib/libc/amd64/gen/rfork_thread.S b/lib/libc/x86_64/gen/rfork_thread.S similarity index 96% rename from lib/libc/amd64/gen/rfork_thread.S rename to lib/libc/x86_64/gen/rfork_thread.S index eebef2a157..9f1fd06afe 100644 --- a/lib/libc/amd64/gen/rfork_thread.S +++ b/lib/libc/x86_64/gen/rfork_thread.S @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/amd64/gen/rfork_thread.S,v 1.2 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/gen/rfork_thread.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/x86_64/gen/setjmp.S similarity index 97% rename from lib/libc/amd64/gen/setjmp.S rename to lib/libc/x86_64/gen/setjmp.S index f85428141f..f22bd55787 100644 --- a/lib/libc/amd64/gen/setjmp.S +++ b/lib/libc/x86_64/gen/setjmp.S @@ -31,7 +31,6 @@ * * @(#)setjmp.s 5.1 (Berkeley) 4/23/90 * $FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.29 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/gen/setjmp.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/gen/signbitl.c b/lib/libc/x86_64/gen/signbitl.c similarity index 96% rename from lib/libc/amd64/gen/signbitl.c rename to lib/libc/x86_64/gen/signbitl.c index 541403e40b..c5003bb7d7 100644 --- a/lib/libc/amd64/gen/signbitl.c +++ b/lib/libc/x86_64/gen/signbitl.c @@ -34,7 +34,6 @@ * POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: signbitl.c,v 1.1 2004/01/15 19:43:45 kleink Exp $ - * $DragonFly: src/lib/libc/amd64/gen/signbitl.c,v 1.1 2006/07/27 00:46:57 corecode Exp $ */ #include diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/x86_64/gen/sigsetjmp.S similarity index 97% rename from lib/libc/amd64/gen/sigsetjmp.S rename to lib/libc/x86_64/gen/sigsetjmp.S index 519e8bbd51..6463634d2f 100644 --- a/lib/libc/amd64/gen/sigsetjmp.S +++ b/lib/libc/x86_64/gen/sigsetjmp.S @@ -32,7 +32,6 @@ * @(#)setjmp.s 5.1 (Berkeley) 4/23/90 * $Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $ * $FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.30 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/stdlib/Makefile.inc b/lib/libc/x86_64/stdlib/Makefile.inc similarity index 100% rename from lib/libc/amd64/stdlib/Makefile.inc rename to lib/libc/x86_64/stdlib/Makefile.inc diff --git a/lib/libc/amd64/stdlib/div.S b/lib/libc/x86_64/stdlib/div.S similarity index 100% rename from lib/libc/amd64/stdlib/div.S rename to lib/libc/x86_64/stdlib/div.S diff --git a/lib/libc/amd64/stdlib/ldiv.S b/lib/libc/x86_64/stdlib/ldiv.S similarity index 100% rename from lib/libc/amd64/stdlib/ldiv.S rename to lib/libc/x86_64/stdlib/ldiv.S diff --git a/lib/libc/amd64/stdlib/lldiv.S b/lib/libc/x86_64/stdlib/lldiv.S similarity index 100% rename from lib/libc/amd64/stdlib/lldiv.S rename to lib/libc/x86_64/stdlib/lldiv.S diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/x86_64/string/Makefile.inc similarity index 100% rename from lib/libc/amd64/string/Makefile.inc rename to lib/libc/x86_64/string/Makefile.inc diff --git a/lib/libc/amd64/string/bcmp.S b/lib/libc/x86_64/string/bcmp.S similarity index 100% rename from lib/libc/amd64/string/bcmp.S rename to lib/libc/x86_64/string/bcmp.S diff --git a/lib/libc/amd64/string/bcopy.S b/lib/libc/x86_64/string/bcopy.S similarity index 100% rename from lib/libc/amd64/string/bcopy.S rename to lib/libc/x86_64/string/bcopy.S diff --git a/lib/libc/amd64/string/bzero.S b/lib/libc/x86_64/string/bzero.S similarity index 100% rename from lib/libc/amd64/string/bzero.S rename to lib/libc/x86_64/string/bzero.S diff --git a/lib/libc/amd64/string/memcmp.S b/lib/libc/x86_64/string/memcmp.S similarity index 100% rename from lib/libc/amd64/string/memcmp.S rename to lib/libc/x86_64/string/memcmp.S diff --git a/lib/libc/amd64/string/memcpy.S b/lib/libc/x86_64/string/memcpy.S similarity index 100% rename from lib/libc/amd64/string/memcpy.S rename to lib/libc/x86_64/string/memcpy.S diff --git a/lib/libc/amd64/string/memmove.S b/lib/libc/x86_64/string/memmove.S similarity index 100% rename from lib/libc/amd64/string/memmove.S rename to lib/libc/x86_64/string/memmove.S diff --git a/lib/libc/amd64/string/memset.S b/lib/libc/x86_64/string/memset.S similarity index 100% rename from lib/libc/amd64/string/memset.S rename to lib/libc/x86_64/string/memset.S diff --git a/lib/libc/amd64/string/strcat.S b/lib/libc/x86_64/string/strcat.S similarity index 100% rename from lib/libc/amd64/string/strcat.S rename to lib/libc/x86_64/string/strcat.S diff --git a/lib/libc/amd64/string/strcmp.S b/lib/libc/x86_64/string/strcmp.S similarity index 100% rename from lib/libc/amd64/string/strcmp.S rename to lib/libc/x86_64/string/strcmp.S diff --git a/lib/libc/amd64/string/strcpy.S b/lib/libc/x86_64/string/strcpy.S similarity index 100% rename from lib/libc/amd64/string/strcpy.S rename to lib/libc/x86_64/string/strcpy.S diff --git a/lib/libc/amd64/sys/Makefile.inc b/lib/libc/x86_64/sys/Makefile.inc similarity index 90% rename from lib/libc/amd64/sys/Makefile.inc rename to lib/libc/x86_64/sys/Makefile.inc index 6a80ceb651..5145e76382 100644 --- a/lib/libc/amd64/sys/Makefile.inc +++ b/lib/libc/x86_64/sys/Makefile.inc @@ -1,6 +1,5 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp # $FreeBSD: src/lib/libc/amd64/sys/Makefile.inc,v 1.29 2003/10/23 06:07:09 peter Exp $ -# $DragonFly: src/lib/libc/amd64/sys/Makefile.inc,v 1.3 2007/08/21 19:49:10 corecode Exp $ SRCS+= amd64_get_fsbase.c amd64_get_gsbase.c amd64_set_fsbase.c amd64_set_gsbase.c diff --git a/lib/libc/amd64/sys/amd64_get_fsbase.c b/lib/libc/x86_64/sys/amd64_get_fsbase.c similarity index 94% rename from lib/libc/amd64/sys/amd64_get_fsbase.c rename to lib/libc/x86_64/sys/amd64_get_fsbase.c index 7de04bc4de..e024c71e8d 100644 --- a/lib/libc/amd64/sys/amd64_get_fsbase.c +++ b/lib/libc/x86_64/sys/amd64_get_fsbase.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/amd64/sys/amd64_get_fsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $ - * $DragonFly: src/lib/libc/amd64/sys/amd64_get_fsbase.c,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/amd64_get_gsbase.c b/lib/libc/x86_64/sys/amd64_get_gsbase.c similarity index 94% rename from lib/libc/amd64/sys/amd64_get_gsbase.c rename to lib/libc/x86_64/sys/amd64_get_gsbase.c index defd958cd2..2b2b6f7d6f 100644 --- a/lib/libc/amd64/sys/amd64_get_gsbase.c +++ b/lib/libc/x86_64/sys/amd64_get_gsbase.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/amd64/sys/amd64_get_gsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $ - * $DragonFly: src/lib/libc/amd64/sys/amd64_get_gsbase.c,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/amd64_set_fsbase.c b/lib/libc/x86_64/sys/amd64_set_fsbase.c similarity index 94% rename from lib/libc/amd64/sys/amd64_set_fsbase.c rename to lib/libc/x86_64/sys/amd64_set_fsbase.c index d803cedbb6..e077a78040 100644 --- a/lib/libc/amd64/sys/amd64_set_fsbase.c +++ b/lib/libc/x86_64/sys/amd64_set_fsbase.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/amd64/sys/amd64_set_fsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $ - * $DragonFly: src/lib/libc/amd64/sys/amd64_set_fsbase.c,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/amd64_set_gsbase.c b/lib/libc/x86_64/sys/amd64_set_gsbase.c similarity index 94% rename from lib/libc/amd64/sys/amd64_set_gsbase.c rename to lib/libc/x86_64/sys/amd64_set_gsbase.c index 7aefaef30a..d55b83cddf 100644 --- a/lib/libc/amd64/sys/amd64_set_gsbase.c +++ b/lib/libc/x86_64/sys/amd64_set_gsbase.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc/amd64/sys/amd64_set_gsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $ - * $DragonFly: src/lib/libc/amd64/sys/amd64_set_gsbase.c,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/asmcontext.c b/lib/libc/x86_64/sys/asmcontext.c similarity index 93% rename from lib/libc/amd64/sys/asmcontext.c rename to lib/libc/x86_64/sys/asmcontext.c index 4e54b30ccb..166bdb4428 100644 --- a/lib/libc/amd64/sys/asmcontext.c +++ b/lib/libc/x86_64/sys/asmcontext.c @@ -1,5 +1,3 @@ -/* $DragonFly: src/lib/libc/amd64/sys/asmcontext.c,v 1.2 2008/08/28 23:36:47 dillon Exp $ */ - #define _KERNEL_STRUCTURES #include #include @@ -10,7 +8,7 @@ ASSYM(UC_SIGMASK, offsetof(ucontext_t, uc_sigmask)); ASSYM(UC_MCONTEXT, offsetof(ucontext_t, uc_mcontext)); ASSYM(SIG_BLOCK, SIG_BLOCK); ASSYM(SIG_SETMASK, SIG_SETMASK); -#ifdef __amd64__ +#ifdef __x86_64__ ASSYM(MC_ONSTACK, offsetof(mcontext_t, mc_onstack)); ASSYM(MC_RDI, offsetof(mcontext_t, mc_rdi)); ASSYM(MC_RSI, offsetof(mcontext_t, mc_rsi)); diff --git a/lib/libc/amd64/sys/brk.S b/lib/libc/x86_64/sys/brk.S similarity index 96% rename from lib/libc/amd64/sys/brk.S rename to lib/libc/x86_64/sys/brk.S index 53eeea96f5..231454699b 100644 --- a/lib/libc/amd64/sys/brk.S +++ b/lib/libc/x86_64/sys/brk.S @@ -31,7 +31,6 @@ * * @(#)brk.s 5.2 (Berkeley) 12/17/90 * $FreeBSD: src/lib/libc/amd64/sys/brk.S,v 1.15 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/sys/brk.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/cerror.S b/lib/libc/x86_64/sys/cerror.S similarity index 96% rename from lib/libc/amd64/sys/cerror.S rename to lib/libc/x86_64/sys/cerror.S index 94c15bb0ac..b1835e4a37 100644 --- a/lib/libc/amd64/sys/cerror.S +++ b/lib/libc/x86_64/sys/cerror.S @@ -35,7 +35,6 @@ * * @(#)cerror.s 5.1 (Berkeley) 4/23/90 * $FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.13 2003/04/30 18:16:33 peter Exp $ - * $DragonFly: src/lib/libc/amd64/sys/cerror.S,v 1.3 2008/08/28 23:38:52 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/exect.S b/lib/libc/x86_64/sys/exect.S similarity index 96% rename from lib/libc/amd64/sys/exect.S rename to lib/libc/x86_64/sys/exect.S index 41d47d1467..1782990196 100644 --- a/lib/libc/amd64/sys/exect.S +++ b/lib/libc/x86_64/sys/exect.S @@ -31,7 +31,6 @@ * * @(#)exect.s 5.1 (Berkeley) 4/23/90 * $FreeBSD: src/lib/libc/amd64/sys/exect.S,v 1.13 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/sys/exect.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/pipe.S b/lib/libc/x86_64/sys/pipe.S similarity index 96% rename from lib/libc/amd64/sys/pipe.S rename to lib/libc/x86_64/sys/pipe.S index 3aa3fc0154..0357f203ff 100644 --- a/lib/libc/amd64/sys/pipe.S +++ b/lib/libc/x86_64/sys/pipe.S @@ -31,7 +31,6 @@ * * @(#)pipe.s 5.1 (Berkeley) 4/23/90 * $FreeBSD: src/lib/libc/amd64/sys/pipe.S,v 1.15 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/sys/pipe.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/ptrace.S b/lib/libc/x86_64/sys/ptrace.S similarity index 96% rename from lib/libc/amd64/sys/ptrace.S rename to lib/libc/x86_64/sys/ptrace.S index 74770dad26..5246112594 100644 --- a/lib/libc/amd64/sys/ptrace.S +++ b/lib/libc/x86_64/sys/ptrace.S @@ -35,7 +35,6 @@ * * @(#)ptrace.s 5.1 (Berkeley) 4/23/90 * $FreeBSD: src/lib/libc/amd64/sys/ptrace.S,v 1.11 2003/05/24 17:35:23 peter Exp $ - * $DragonFly: src/lib/libc/amd64/sys/ptrace.S,v 1.2 2006/07/27 00:44:27 corecode Exp $ */ #include diff --git a/lib/libc/amd64/sys/reboot.S b/lib/libc/x86_64/sys/reboot.S similarity index 96% rename from lib/libc/amd64/sys/reboot.S rename to lib/libc/x86_64/sys/reboot.S index 0d38b9a458..fdca804613 100644 --- a/lib/libc/amd64/sys/reboot.S +++ b/lib/libc/x86_64/sys/reboot.S @@ -31,7 +31,6 @@ * * @(#)reboot.s 5.1 (Berkeley) 4/23/90 * $FreeBSD: src/lib/libc/amd64/sys/reboot.S,v 1.11 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/sys/reboot.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/sbrk.S b/lib/libc/x86_64/sys/sbrk.S similarity index 96% rename from lib/libc/amd64/sys/sbrk.S rename to lib/libc/x86_64/sys/sbrk.S index f651197e4b..4f6e5a75d0 100644 --- a/lib/libc/amd64/sys/sbrk.S +++ b/lib/libc/x86_64/sys/sbrk.S @@ -31,7 +31,6 @@ * * @(#)sbrk.s 5.1 (Berkeley) 4/23/90 * $FreeBSD: src/lib/libc/amd64/sys/sbrk.S,v 1.15 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/sys/sbrk.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/setlogin.S b/lib/libc/x86_64/sys/setlogin.S similarity index 96% rename from lib/libc/amd64/sys/setlogin.S rename to lib/libc/x86_64/sys/setlogin.S index eb0d59ddfe..6dabe7ee7e 100644 --- a/lib/libc/amd64/sys/setlogin.S +++ b/lib/libc/x86_64/sys/setlogin.S @@ -31,7 +31,6 @@ * * @(#)setlogin.s 5.2 (Berkeley) 4/12/91 * $FreeBSD: src/lib/libc/amd64/sys/setlogin.S,v 1.14 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/sys/setlogin.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/sigreturn.S b/lib/libc/x86_64/sys/sigreturn.S similarity index 95% rename from lib/libc/amd64/sys/sigreturn.S rename to lib/libc/x86_64/sys/sigreturn.S index 95af738725..b51a82cc3b 100644 --- a/lib/libc/amd64/sys/sigreturn.S +++ b/lib/libc/x86_64/sys/sigreturn.S @@ -31,7 +31,6 @@ * * @(#)sigreturn.s 5.2 (Berkeley) 12/17/90 * $FreeBSD: src/lib/libc/amd64/sys/sigreturn.S,v 1.13 2007/01/09 00:27:49 imp Exp $ - * $DragonFly: src/lib/libc/amd64/sys/sigreturn.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libc/x86_64/sys/vfork.S similarity index 96% rename from lib/libc/amd64/sys/vfork.S rename to lib/libc/x86_64/sys/vfork.S index 744d9b58ed..6831835d71 100644 --- a/lib/libc/amd64/sys/vfork.S +++ b/lib/libc/x86_64/sys/vfork.S @@ -31,7 +31,6 @@ * * @(#)Ovfork.s 5.1 (Berkeley) 4/23/90 * $FreeBSD: src/lib/libc/amd64/sys/vfork.S,v 1.24 2008/11/02 01:10:54 peter Exp $ - * $DragonFly: src/lib/libc/amd64/sys/vfork.S,v 1.1 2004/02/02 05:43:14 dillon Exp $ */ #include diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c index 7c52dc4394..cb2f2f9d03 100644 --- a/lib/libc/xdr/xdr_float.c +++ b/lib/libc/xdr/xdr_float.c @@ -61,7 +61,7 @@ #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \ defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \ defined(__arm__) || defined(__ppc__) || defined(__ia64__) || \ - defined(__arm26__) || defined(__sparc64__) || defined(__amd64__) + defined(__arm26__) || defined(__sparc64__) || defined(__x86_64__) #include #define IEEEFP #endif diff --git a/lib/libc_r/arch/amd64/_atomic_lock.S b/lib/libc_r/arch/x86_64/_atomic_lock.S similarity index 93% rename from lib/libc_r/arch/amd64/_atomic_lock.S rename to lib/libc_r/arch/x86_64/_atomic_lock.S index fc956923dc..1045152d8e 100644 --- a/lib/libc_r/arch/amd64/_atomic_lock.S +++ b/lib/libc_r/arch/x86_64/_atomic_lock.S @@ -20,7 +20,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libc_r/arch/i386/_atomic_lock.S,v 1.3 1999/08/28 00:03:01 peter Exp $ - * $DragonFly: src/lib/libc_r/arch/amd64/_atomic_lock.S,v 1.1 2006/07/27 00:43:35 corecode Exp $ */ #include diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h index a0e1faef2a..8c1d1e616a 100644 --- a/lib/libc_r/uthread/pthread_private.h +++ b/lib/libc_r/uthread/pthread_private.h @@ -78,7 +78,7 @@ #define SET_STACK_SJB(sjb, stk) (sjb)[0]._sjb[2] = (int)(stk) #define SET_STACK_UC(ucp, stk) (ucp)->uc_mcontext.mc_esp = (int)(stk) #define SET_RETURN_ADDR_JB(jb, ra) (jb)[0]._jb[0] = (int)(ra) -#elif defined(__amd64__) +#elif defined(__x86_64__) #define GET_STACK_JB(jb) ((unsigned long)((jb)[0]._jb[2])) #define GET_STACK_SJB(sjb) ((unsigned long)((sjb)[0]._sjb[2])) #define GET_STACK_UC(ucp) ((unsigned long)((ucp)->uc_mcontext.mc_rsp)) diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_x86_64.c similarity index 96% rename from lib/libkvm/kvm_amd64.c rename to lib/libkvm/kvm_x86_64.c index be28db154f..300007e12b 100644 --- a/lib/libkvm/kvm_amd64.c +++ b/lib/libkvm/kvm_x86_64.c @@ -36,11 +36,10 @@ * * @(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.16 2003/04/30 21:05:33 peter Exp $ - * $DragonFly: src/lib/libkvm/kvm_amd64.c,v 1.2 2007/04/29 01:36:04 dillon Exp $ */ /* - * AMD64 machine dependent routines for kvm. Hopefully, the forthcoming + * x86_64 machine dependent routines for kvm. Hopefully, the forthcoming * vm code will one day obsolete this module. */ @@ -61,8 +60,8 @@ #include "kvm_private.h" #ifndef btop -#define btop(x) (amd64_btop(x)) -#define ptob(x) (amd64_ptob(x)) +#define btop(x) (x86_64_btop(x)) +#define ptob(x) (x86_64_ptob(x)) #endif struct vmstate { diff --git a/lib/libm/arch/i386/Makefile.inc b/lib/libm/arch/i386/Makefile.inc index b43d3643cd..6dece21a7c 100644 --- a/lib/libm/arch/i386/Makefile.inc +++ b/lib/libm/arch/i386/Makefile.inc @@ -11,7 +11,7 @@ SRCS+= e_acos.S e_asin.S e_atan2.S e_atan2f.S e_exp.S e_expf.S e_fmod.S \ s_scalbn.S s_scalbnf.S s_significand.S s_significandf.S s_sin.S \ s_sinf.S s_tan.S s_tanf.S -# This file is included by arch/amd64/Makefile.inc, so pull in the right +# This file is included by arch/x86_64/Makefile.inc, so pull in the right # fenv.[ch]. # .if ${MACHINE_ARCH} == "i386" diff --git a/lib/libm/arch/amd64/Makefile.inc b/lib/libm/arch/x86_64/Makefile.inc similarity index 71% rename from lib/libm/arch/amd64/Makefile.inc rename to lib/libm/arch/x86_64/Makefile.inc index a6fa209dc4..2b2164d1a6 100644 --- a/lib/libm/arch/amd64/Makefile.inc +++ b/lib/libm/arch/x86_64/Makefile.inc @@ -1,4 +1,4 @@ -.PATH: ${.CURDIR}/arch/amd64 +.PATH: ${.CURDIR}/arch/x86_64 SRCS+= fenv.c INCS= fenv.h diff --git a/lib/libm/arch/amd64/fenv.c b/lib/libm/arch/x86_64/fenv.c similarity index 100% rename from lib/libm/arch/amd64/fenv.c rename to lib/libm/arch/x86_64/fenv.c diff --git a/lib/libm/arch/amd64/fenv.h b/lib/libm/arch/x86_64/fenv.h similarity index 100% rename from lib/libm/arch/amd64/fenv.h rename to lib/libm/arch/x86_64/fenv.h diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index 0cfdf2e477..361252157b 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -18,7 +18,7 @@ WARNS?= 2 # Mostly OK, some of the libc imports are a bit noisy CFLAGS+= -ffreestanding -std=c99 -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_ARCH} == "x86_64" CFLAGS+= -m32 -mpreferred-stack-boundary=2 .endif .if ${MACHINE_ARCH} == "i386" @@ -36,7 +36,7 @@ SRCS+= strcasecmp.c # string functions from libc .PATH: ${.CURDIR}/../libc/string -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" SRCS+= bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ memcpy.c memmove.c memset.c qdivrem.c rindex.c strcat.c strchr.c \ strcmp.c strcpy.c strcspn.c strlen.c strncat.c strncmp.c strncpy.c \ @@ -48,7 +48,7 @@ SRCS+= ucmpdi2.c .endif # _setjmp/_longjmp -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" .PATH: ${.CURDIR}/i386 .else .endif @@ -92,7 +92,7 @@ SRCS+= hammerread.c .include -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_ARCH} == "x86_64" CFLAGS+= -I${.OBJDIR} beforedepend ${OBJS}: machine cpu diff --git a/lib/libthread_xu/arch/amd64/Makefile.inc b/lib/libthread_xu/arch/x86_64/Makefile.inc similarity index 50% rename from lib/libthread_xu/arch/amd64/Makefile.inc rename to lib/libthread_xu/arch/x86_64/Makefile.inc index 5dac39d5bf..6cc1f63158 100644 --- a/lib/libthread_xu/arch/amd64/Makefile.inc +++ b/lib/libthread_xu/arch/x86_64/Makefile.inc @@ -1,5 +1,3 @@ -# $DragonFly: src/lib/libthread_xu/arch/amd64/Makefile.inc,v 1.1 2005/02/01 12:38:27 davidxu Exp $ - .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} SRCS+= pthread_md.c _umtx_sleep_wakeup_err.S diff --git a/lib/libthread_xu/arch/amd64/include/pthread_md.h b/lib/libthread_xu/arch/x86_64/include/pthread_md.h similarity index 94% rename from lib/libthread_xu/arch/amd64/include/pthread_md.h rename to lib/libthread_xu/arch/x86_64/include/pthread_md.h index 22128afb2e..4b925d9aa9 100644 --- a/lib/libthread_xu/arch/amd64/include/pthread_md.h +++ b/lib/libthread_xu/arch/x86_64/include/pthread_md.h @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libpthread/arch/amd64/include/pthread_md.h,v 1.10 2004/08/25 23:42:40 davidxu Exp $ - * $DragonFly: src/lib/libthread_xu/arch/amd64/include/pthread_md.h,v 1.5 2008/07/23 16:39:30 dillon Exp $ */ /* diff --git a/lib/libthread_xu/arch/amd64/amd64/_umtx_sleep_wakeup_err.S b/lib/libthread_xu/arch/x86_64/x86_64/_umtx_sleep_wakeup_err.S similarity index 100% rename from lib/libthread_xu/arch/amd64/amd64/_umtx_sleep_wakeup_err.S rename to lib/libthread_xu/arch/x86_64/x86_64/_umtx_sleep_wakeup_err.S diff --git a/lib/libthread_xu/arch/amd64/amd64/pthread_md.c b/lib/libthread_xu/arch/x86_64/x86_64/pthread_md.c similarity index 94% rename from lib/libthread_xu/arch/amd64/amd64/pthread_md.c rename to lib/libthread_xu/arch/x86_64/x86_64/pthread_md.c index cb6aacc110..84461a55d5 100644 --- a/lib/libthread_xu/arch/amd64/amd64/pthread_md.c +++ b/lib/libthread_xu/arch/x86_64/x86_64/pthread_md.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/lib/libpthread/arch/amd64/amd64/pthread_md.c,v 1.4 2004/11/06 03:33:19 peter Exp $ - * $DragonFly: src/lib/libthread_xu/arch/amd64/amd64/pthread_md.c,v 1.8 2006/07/27 00:42:54 corecode Exp $ */ #include diff --git a/libexec/rtld-elf/amd64/Makefile.inc b/libexec/rtld-elf/x86_64/Makefile.inc similarity index 64% rename from libexec/rtld-elf/amd64/Makefile.inc rename to libexec/rtld-elf/x86_64/Makefile.inc index 53e34c8e6e..ba39193cf8 100644 --- a/libexec/rtld-elf/amd64/Makefile.inc +++ b/libexec/rtld-elf/x86_64/Makefile.inc @@ -1,4 +1,3 @@ -# $DragonFly: src/libexec/rtld-elf/amd64/Makefile.inc,v 1.1 2006/07/27 00:40:35 corecode Exp $ CFLAGS+= -elf LDFLAGS+= -elf # Uncomment this to build the dynamic linker as an executable instead diff --git a/libexec/rtld-elf/amd64/lockdflt.c b/libexec/rtld-elf/x86_64/lockdflt.c similarity index 98% rename from libexec/rtld-elf/amd64/lockdflt.c rename to libexec/rtld-elf/x86_64/lockdflt.c index 59d89ce75d..21bb8f4554 100644 --- a/libexec/rtld-elf/amd64/lockdflt.c +++ b/libexec/rtld-elf/x86_64/lockdflt.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/libexec/rtld-elf/i386/lockdflt.c,v 1.5.2.4 2002/07/11 23:52:32 jdp Exp $ - * $DragonFly: src/libexec/rtld-elf/amd64/lockdflt.c,v 1.1 2006/07/27 00:40:35 corecode Exp $ */ /* diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/x86_64/reloc.c similarity index 99% rename from libexec/rtld-elf/amd64/reloc.c rename to libexec/rtld-elf/x86_64/reloc.c index f0b78426f0..81ed53b9b4 100644 --- a/libexec/rtld-elf/amd64/reloc.c +++ b/libexec/rtld-elf/x86_64/reloc.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/libexec/rtld-elf/amd64/reloc.c,v 1.18 2006/03/28 06:09:24 davidxu Exp $ - * $DragonFly: src/libexec/rtld-elf/amd64/reloc.c,v 1.1 2006/07/27 00:40:35 corecode Exp $ */ /* diff --git a/libexec/rtld-elf/amd64/rtld_machdep.h b/libexec/rtld-elf/x86_64/rtld_machdep.h similarity index 96% rename from libexec/rtld-elf/amd64/rtld_machdep.h rename to libexec/rtld-elf/x86_64/rtld_machdep.h index e375bf735e..308178f527 100644 --- a/libexec/rtld-elf/amd64/rtld_machdep.h +++ b/libexec/rtld-elf/x86_64/rtld_machdep.h @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/libexec/rtld-elf/amd64/rtld_machdep.h,v 1.13 2006/03/29 12:29:01 des Exp $ - * $DragonFly: src/libexec/rtld-elf/amd64/rtld_machdep.h,v 1.1 2006/07/27 00:40:35 corecode Exp $ */ #ifndef RTLD_MACHDEP_H diff --git a/libexec/rtld-elf/amd64/rtld_start.S b/libexec/rtld-elf/x86_64/rtld_start.S similarity index 97% rename from libexec/rtld-elf/amd64/rtld_start.S rename to libexec/rtld-elf/x86_64/rtld_start.S index 09b99d3d49..5e7c33f9fe 100644 --- a/libexec/rtld-elf/amd64/rtld_start.S +++ b/libexec/rtld-elf/x86_64/rtld_start.S @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/libexec/rtld-elf/amd64/rtld_start.S,v 1.5 2004/03/21 01:43:39 peter Exp $ - * $DragonFly: src/libexec/rtld-elf/amd64/rtld_start.S,v 1.1 2006/07/27 00:40:35 corecode Exp $ */ /* diff --git a/nrelease/Makefile b/nrelease/Makefile index b043d23463..d4078695a2 100644 --- a/nrelease/Makefile +++ b/nrelease/Makefile @@ -21,6 +21,12 @@ OBJSYS= ${.OBJDIR}/../sys MAKE_JOBS?= $$(sysctl -n hw.ncpu) +# temporary until everybody has converted to x86_64 +.if ${MACHINE_ARCH} == "amd64" +MACHINE_ARCH= x86_64 +.makeenv MACHINE_ARCH +.endif + .if make(gui) KERNCONF ?= DFLYLIVE VKERNEL DFLYLIVE-SMP DFLYLIVE-SMP-NOAPIC .else @@ -29,7 +35,7 @@ KERNCONF ?= DFLYLIVE VKERNEL DFLYLIVE-SMP DFLYLIVE-SMP-NOAPIC .if ${MACHINE_ARCH} == "i386" KERNCONF ?= GENERIC VKERNEL .else -KERNCONF ?= AMD64_GENERIC +KERNCONF ?= X86_64_GENERIC .endif .endif diff --git a/sbin/Makefile b/sbin/Makefile index ba29172094..12b42f3843 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -100,7 +100,7 @@ SUBDIR+=ipf \ ipnat .endif -.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == amd64 +.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64 .if ${MACHINE_ARCH} == i386 SUBDIR+=kget .endif diff --git a/sbin/gpt/migrate.c b/sbin/gpt/migrate.c index 93ea6ac278..3c5a6c92b5 100644 --- a/sbin/gpt/migrate.c +++ b/sbin/gpt/migrate.c @@ -43,7 +43,7 @@ /* * Allow compilation on platforms that do not have a BSD label. - * The values are valid for amd64, i386 and ia64 disklabels. + * The values are valid for x86_64, i386 and ia64 disklabels. */ #ifndef LABELOFFSET #define LABELOFFSET 0 diff --git a/secure/lib/libcrypto/opensslconf-amd64.h b/secure/lib/libcrypto/opensslconf-x86_64.h similarity index 100% rename from secure/lib/libcrypto/opensslconf-amd64.h rename to secure/lib/libcrypto/opensslconf-x86_64.h diff --git a/share/man/man3/fpgetround.3 b/share/man/man3/fpgetround.3 index 66551da024..9a7fbeb5fa 100644 --- a/share/man/man3/fpgetround.3 +++ b/share/man/man3/fpgetround.3 @@ -173,7 +173,7 @@ The and .Fn fpsetprec functions provide functionality unavailable on many platforms. -At present, they are implemented only on the i386 and amd64 platforms. +At present, they are implemented only on the i386 and x86_64 platforms. .Sh SEE ALSO .Xr fenv 3 , .Xr isnan 3 diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4 index f7cee7bd79..88665edd3b 100644 --- a/share/man/man4/acpi.4 +++ b/share/man/man4/acpi.4 @@ -461,7 +461,7 @@ and .Xr iasl 8 utilities and some ACPI knowledge. .Sh COMPATIBILITY -ACPI is only found and supported on i386/ia32, ia64, and amd64. +ACPI is only found and supported on i386/ia32, ia64, and x86_64. .Sh SEE ALSO .Xr kenv 1 , .Xr acpi_thermal 4 , diff --git a/share/man/man5/kernconf.5 b/share/man/man5/kernconf.5 index fbda29d702..e0ac48af8d 100644 --- a/share/man/man5/kernconf.5 +++ b/share/man/man5/kernconf.5 @@ -89,7 +89,7 @@ and .Sy I686_CPU .Tn ( Pentium Pro ) ; for -.Sy amd64 : +.Sy x86_64 : .Sy HAMMER_CPU .Tn ( x86-64 ) . More than one CPU type specification can appear in a configuration file. @@ -152,7 +152,7 @@ The system is to run on the machine architecture The legal architectures are .Sy i386 , and -.Sy amd64 . +.Sy x86_64 . .Pp .It Sy makeoptions Xo .Ar name Ns Sy = Ns Ar value @@ -214,12 +214,12 @@ instances. .El .\".Sh OPTIONS .Sh FILES -.Bl -tag -width ".Pa /sys/config/AMD64_GENERIC" +.Bl -tag -width ".Pa /sys/config/X86_64_GENERIC" .It Pa /sys/config/LINT description of kernel configuration options -.It Pa /sys/config/AMD64_GENERIC +.It Pa /sys/config/X86_64_GENERIC default -.Sy amd64 +.Sy x86_64 kernel configuration file .It Pa /sys/config/GENERIC default diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index b46fe8ca58..416ece0401 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -154,7 +154,7 @@ For the 64 bit .Tn AMD architecture known as AMD64, x86-64 or Intel 64, use: .Bd -literal -offset indent -TARGET_ARCH=amd64 +TARGET_ARCH=x86_64 TARGET_PLATFORM=pc64 .Ed .It Ev DESTDIR diff --git a/share/mk/bsd.cpu.custom.mk b/share/mk/bsd.cpu.custom.mk index 65ca858589..39c68c615f 100644 --- a/share/mk/bsd.cpu.custom.mk +++ b/share/mk/bsd.cpu.custom.mk @@ -2,6 +2,6 @@ . if ${MACHINE_ARCH} == "i386" MACHINE_CPU = i486 -. elif ${MACHINE_ARCH} == "amd64" -MACHINE_CPU = amd64 sse2 sse +. elif ${MACHINE_ARCH} == "x86_64" +MACHINE_CPU = x86_64 sse2 sse . endif diff --git a/share/mk/bsd.cpu.gcc41.mk b/share/mk/bsd.cpu.gcc41.mk index a252871e2d..5dbd3e10e2 100644 --- a/share/mk/bsd.cpu.gcc41.mk +++ b/share/mk/bsd.cpu.gcc41.mk @@ -8,8 +8,8 @@ _CPUCFLAGS = . if ${MACHINE_ARCH} == "i386" MACHINE_CPU = i486 -. elif ${MACHINE_ARCH} == "amd64" -MACHINE_CPU = amd64 sse2 sse +. elif ${MACHINE_ARCH} == "x86_64" +MACHINE_CPU = x86_64 sse2 sse . endif .else @@ -45,7 +45,7 @@ CPUTYPE = athlon-mp . elif ${CPUTYPE} == "k7" CPUTYPE = athlon . endif -. elif ${MACHINE_ARCH} == "amd64" +. elif ${MACHINE_ARCH} == "x86_64" . if ${CPUTYPE} == "prescott" || ${CPUTYPE} == "core2" CPUTYPE = nocona . endif @@ -69,7 +69,7 @@ _CPUCFLAGS = -march=pentium . else _CPUCFLAGS = -march=${CPUTYPE} . endif # GCC on 'i386' -. elif ${MACHINE_ARCH} == "amd64" +. elif ${MACHINE_ARCH} == "x86_64" _CPUCFLAGS = -march=${CPUTYPE} . endif @@ -114,12 +114,12 @@ MACHINE_CPU = i486 i386 . elif ${CPUTYPE} == "i386" MACHINE_CPU = i386 . endif -. elif ${MACHINE_ARCH} == "amd64" +. elif ${MACHINE_ARCH} == "x86_64" . if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8" MACHINE_CPU = k8 3dnow . elif ${CPUTYPE} == "nocona" MACHINE_CPU = sse3 . endif -MACHINE_CPU += amd64 sse2 sse mmx +MACHINE_CPU += x86_64 sse2 sse mmx . endif .endif diff --git a/share/mk/bsd.cpu.gcc44.mk b/share/mk/bsd.cpu.gcc44.mk index 2098dfe880..5596e9968b 100644 --- a/share/mk/bsd.cpu.gcc44.mk +++ b/share/mk/bsd.cpu.gcc44.mk @@ -5,7 +5,7 @@ .if !defined(CPUTYPE) || empty(CPUTYPE) . if ${MACHINE_ARCH} == "i386" CPUTYPE = i686 -. elif ${MACHINE_ARCH} == "amd64" +. elif ${MACHINE_ARCH} == "x86_64" CPUTYPE = athlon64 . endif .endif @@ -57,7 +57,7 @@ _CPUCFLAGS = -march=pentium . else _CPUCFLAGS = -march=${CPUTYPE} . endif # GCC on 'i386' -.elif ${MACHINE_ARCH} == "amd64" +.elif ${MACHINE_ARCH} == "x86_64" _CPUCFLAGS = -march=${CPUTYPE} .endif @@ -105,7 +105,7 @@ MACHINE_CPU = i486 i386 . elif ${CPUTYPE} == "i386" MACHINE_CPU = i386 . endif -.elif ${MACHINE_ARCH} == "amd64" +.elif ${MACHINE_ARCH} == "x86_64" . if ${CPUTYPE} == "athlon64-sse3" MACHINE_CPU = k8 3dnow sse3 . elif ${CPUTYPE} == "athlon64" @@ -115,5 +115,5 @@ MACHINE_CPU = sse3 . elif ${CPUTYPE} == "core2" MACHINE_CPU = ssse3 sse3 . endif -MACHINE_CPU += amd64 sse2 sse mmx +MACHINE_CPU += x86_64 sse2 sse mmx .endif diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 5fa9766f05..3e41899470 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -120,7 +120,7 @@ YFLAGS ?= -d # # MACHINE_PLATFORM platform architecture (vkernel, pc32) # MACHINE machine architecture (i386, etc..) -# MACHINE_ARCH cpu architecture (i386, amd64, etc) +# MACHINE_ARCH cpu architecture (i386, x86_64, etc) # .if !defined(MACHINE) .error "MACHINE was not defined by make" diff --git a/sys/boot/Makefile b/sys/boot/Makefile index c6e2f3b373..9beebbee25 100644 --- a/sys/boot/Makefile +++ b/sys/boot/Makefile @@ -1,8 +1,8 @@ # $FreeBSD: src/sys/boot/Makefile,v 1.18 2003/08/16 02:48:20 obrien Exp $ # $DragonFly: src/sys/boot/Makefile,v 1.5 2007/05/18 07:41:40 dillon Exp $ -.if ${MACHINE_ARCH} == "amd64" -.MAKEFLAGS: MACHINE_ARCH=i386 MACHINE_PLATFORM=pc32 REALLY_AMD64=true +.if ${MACHINE_ARCH} == "x86_64" +.MAKEFLAGS: MACHINE_ARCH=i386 MACHINE_PLATFORM=pc32 REALLY_X86_64=true .endif .if !defined(NOFORTH) && ${MACHINE_ARCH} != "powerpc" diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc index ec83f3e5d0..614eec91d1 100644 --- a/sys/boot/common/Makefile.inc +++ b/sys/boot/common/Makefile.inc @@ -5,7 +5,7 @@ SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c SRCS+= module.c panic.c rel_open.c -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c .endif diff --git a/sys/boot/common/reloc_elf.c b/sys/boot/common/reloc_elf.c index ccc440d753..ece9d4aa46 100644 --- a/sys/boot/common/reloc_elf.c +++ b/sys/boot/common/reloc_elf.c @@ -169,7 +169,7 @@ __elfN(reloc)(struct elf_file *ef, symaddr_fn *symaddr, const void *reldata, if (reltype == ELF_RELOC_REL) addend = *where; -/* XXX, definitions not available on amd64. */ +/* XXX, definitions not available on x86_64. */ #define R_386_32 1 /* Add symbol value. */ #define R_386_GLOB_DAT 6 /* Set GOT entry to data address. */ #define R_386_RELATIVE 8 /* Add load address of shared object. */ diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile index 68226a6fac..fc1e5112f9 100644 --- a/sys/boot/ficl/Makefile +++ b/sys/boot/ficl/Makefile @@ -42,7 +42,7 @@ SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \ # Optional OO extension softwords #SOFTWORDS+= oo.fr classes.fr -.if defined(REALLY_AMD64) +.if defined(REALLY_X86_64) CFLAGS+= -m32 -I. .endif @@ -52,7 +52,7 @@ softcore.c: ${SOFTWORDS} softcore.awk (cd ${.CURDIR}/softwords; cat ${SOFTWORDS} \ | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET} -.if defined(REALLY_AMD64) +.if defined(REALLY_X86_64) ${SRCS:M*.c:R:S/$/.o/g}: machine beforedepend ${OBJS}: machine diff --git a/sys/boot/pc32/Makefile.inc b/sys/boot/pc32/Makefile.inc index e446b9c281..2819c3f931 100644 --- a/sys/boot/pc32/Makefile.inc +++ b/sys/boot/pc32/Makefile.inc @@ -11,7 +11,7 @@ CPUTYPE= i386 WARNS?= 1 -.if defined(REALLY_AMD64) +.if defined(REALLY_X86_64) .include "../pc64/Makefile.inc" .endif .endif diff --git a/sys/boot/pc32/boot2/Makefile b/sys/boot/pc32/boot2/Makefile index 10932b726c..45a8d7d220 100644 --- a/sys/boot/pc32/boot2/Makefile +++ b/sys/boot/pc32/boot2/Makefile @@ -172,8 +172,8 @@ install: .include -.if defined(REALLY_AMD64) -# For amd64, we need to fake up a complete machine/ tree +.if defined(REALLY_X86_64) +# For x86_64, we need to fake up a complete machine/ tree # so that types for -m32 appear correctly. boot2.o: machine diff --git a/sys/boot/pc32/libi386/Makefile b/sys/boot/pc32/libi386/Makefile index 39eee7833a..8e58b5e718 100644 --- a/sys/boot/pc32/libi386/Makefile +++ b/sys/boot/pc32/libi386/Makefile @@ -11,7 +11,7 @@ SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ comconsole.c devicename.c elf32_freebsd.c \ elf64_freebsd.c gatea20.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ - time.c vidconsole.c amd64_tramp.S + time.c vidconsole.c x86_64_tramp.S CFLAGS+= -ffreestanding BOOT_COMCONSOLE_PORT?= 0x3f8 diff --git a/sys/boot/pc32/libi386/elf64_freebsd.c b/sys/boot/pc32/libi386/elf64_freebsd.c index cd23e9f62a..7f51f9d9d0 100644 --- a/sys/boot/pc32/libi386/elf64_freebsd.c +++ b/sys/boot/pc32/libi386/elf64_freebsd.c @@ -43,8 +43,8 @@ static int elf64_exec(struct preloaded_file *amp); static int elf64_obj_exec(struct preloaded_file *amp); -struct file_format amd64_elf = { elf64_loadfile, elf64_exec }; -struct file_format amd64_elf_obj = { elf64_obj_loadfile, elf64_obj_exec }; +struct file_format x86_64_elf = { elf64_loadfile, elf64_exec }; +struct file_format x86_64_elf_obj = { elf64_obj_loadfile, elf64_obj_exec }; #define PG_V 0x001 #define PG_RW 0x002 @@ -61,7 +61,7 @@ extern p2_entry_t PT2[]; u_int32_t entry_hi; u_int32_t entry_lo; -extern int amd64_tramp(void); +extern int x86_64_tramp(void); /* * There is an ELF kernel and one or more ELF modules loaded. @@ -114,7 +114,7 @@ elf64_exec(struct preloaded_file *fp) #endif dev_cleanup(); - __exec((void *)VTOP(amd64_tramp), modulep, kernend); + __exec((void *)VTOP(x86_64_tramp), modulep, kernend); panic("exec returned"); } diff --git a/sys/boot/pc32/libi386/amd64_tramp.S b/sys/boot/pc32/libi386/x86_64_tramp.S similarity index 95% rename from sys/boot/pc32/libi386/amd64_tramp.S rename to sys/boot/pc32/libi386/x86_64_tramp.S index 71b65d2831..69259ec656 100644 --- a/sys/boot/pc32/libi386/amd64_tramp.S +++ b/sys/boot/pc32/libi386/x86_64_tramp.S @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/boot/i386/libi386/amd64_tramp.S,v 1.2 2003/05/17 00:30:51 peter Exp $ - * $DragonFly: src/sys/boot/pc32/libi386/amd64_tramp.S,v 1.3 2004/07/19 23:30:37 dillon Exp $ */ #include "../bootasm.h" @@ -73,8 +72,8 @@ gdtend: .text .code32 - .globl amd64_tramp -amd64_tramp: + .globl x86_64_tramp +x86_64_tramp: /* Be sure that interrupts are disabled */ cli diff --git a/sys/boot/pc32/loader/conf.c b/sys/boot/pc32/loader/conf.c index fb9d4025af..1062dde7df 100644 --- a/sys/boot/pc32/loader/conf.c +++ b/sys/boot/pc32/loader/conf.c @@ -81,14 +81,14 @@ struct fs_ops *file_system[] = { */ extern struct file_format i386_elf; extern struct file_format i386_elf_obj; -extern struct file_format amd64_elf; -extern struct file_format amd64_elf_obj; +extern struct file_format x86_64_elf; +extern struct file_format x86_64_elf_obj; struct file_format *file_formats[] = { &i386_elf, &i386_elf_obj, - &amd64_elf, - &amd64_elf_obj, + &x86_64_elf, + &x86_64_elf_obj, NULL }; diff --git a/sys/boot/pc64/Makefile.inc b/sys/boot/pc64/Makefile.inc index 26e35eddcb..508dc0615e 100644 --- a/sys/boot/pc64/Makefile.inc +++ b/sys/boot/pc64/Makefile.inc @@ -1,7 +1,7 @@ .if !target(__pc64__) __pc64__: -.MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true +.MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_X86_64=true CFLAGS+= -m32 LDFLAGS+= -m elf_i386 diff --git a/sys/bus/isa/isa.h b/sys/bus/isa/isa.h index 28559ca4f1..c51a7e34c2 100644 --- a/sys/bus/isa/isa.h +++ b/sys/bus/isa/isa.h @@ -39,8 +39,8 @@ #if defined(__i386__) #include "i386/isa.h" -#elif defined(__amd64__) -#include "amd64/isa.h" +#elif defined(__x86_64__) +#include "x86_64/isa.h" #else #error "No isa.h for this architecture" #endif diff --git a/sys/bus/isa/isa_compat.h b/sys/bus/isa/isa_compat.h index 34b63cb480..aa5b1ee51b 100644 --- a/sys/bus/isa/isa_compat.h +++ b/sys/bus/isa/isa_compat.h @@ -39,8 +39,8 @@ #if defined(__i386__) #include "i386/isa_compat.h" -#elif defined(__amd64__) -#include "amd64/isa_compat.h" +#elif defined(__x86_64__) +#include "x86_64/isa_compat.h" #else #error "No isa_compat.h for this architecture" #endif diff --git a/sys/bus/isa/isa_device.h b/sys/bus/isa/isa_device.h index b1277ee963..83cca17ba9 100644 --- a/sys/bus/isa/isa_device.h +++ b/sys/bus/isa/isa_device.h @@ -39,8 +39,8 @@ #if defined(__i386__) #include "i386/isa_device.h" -#elif defined(__amd64__) -#include "amd64/isa_device.h" +#elif defined(__x86_64__) +#include "x86_64/isa_device.h" #else #error "No isa_device.h for this architecture" #endif diff --git a/sys/bus/isa/amd64/isa.c b/sys/bus/isa/x86_64/isa.c similarity index 98% rename from sys/bus/isa/amd64/isa.c rename to sys/bus/isa/x86_64/isa.c index 93de6c4007..9a7c0883e2 100644 --- a/sys/bus/isa/amd64/isa.c +++ b/sys/bus/isa/x86_64/isa.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/isa.c,v 1.132.2.5 2002/03/03 05:42:50 nyan Exp $ - * $DragonFly: src/sys/bus/isa/amd64/isa.c,v 1.1 2008/08/02 05:22:17 dillon Exp $ */ /* diff --git a/sys/bus/isa/amd64/isa.h b/sys/bus/isa/x86_64/isa.h similarity index 98% rename from sys/bus/isa/amd64/isa.h rename to sys/bus/isa/x86_64/isa.h index 8a60a0c0bc..37cc81a0e9 100644 --- a/sys/bus/isa/amd64/isa.h +++ b/sys/bus/isa/x86_64/isa.h @@ -35,7 +35,6 @@ * * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/isa/isa.h,v 1.23 1999/08/28 00:44:54 peter Exp $ - * $DragonFly: src/sys/bus/isa/amd64/isa.h,v 1.1 2008/08/02 05:22:17 dillon Exp $ */ #ifndef _BUS_ISA_ARCH_ISA_H_ diff --git a/sys/bus/isa/amd64/isa_compat.c b/sys/bus/isa/x86_64/isa_compat.c similarity index 98% rename from sys/bus/isa/amd64/isa_compat.c rename to sys/bus/isa/x86_64/isa_compat.c index ddd0c5d8c3..b3542e86f6 100644 --- a/sys/bus/isa/amd64/isa_compat.c +++ b/sys/bus/isa/x86_64/isa_compat.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/isa_compat.c,v 1.18.2.1 2001/05/17 23:05:06 imp Exp $ - * $DragonFly: src/sys/bus/isa/amd64/isa_compat.c,v 1.1 2008/08/02 05:22:17 dillon Exp $ */ #include diff --git a/sys/bus/isa/amd64/isa_compat.h b/sys/bus/isa/x86_64/isa_compat.h similarity index 97% rename from sys/bus/isa/amd64/isa_compat.h rename to sys/bus/isa/x86_64/isa_compat.h index 3655c361f0..148502ee8f 100644 --- a/sys/bus/isa/amd64/isa_compat.h +++ b/sys/bus/isa/x86_64/isa_compat.h @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/isa_compat.h,v 1.27.2.11 2002/10/05 18:31:48 scottl Exp $ - * $DragonFly: src/sys/bus/isa/amd64/isa_compat.h,v 1.1 2008/08/02 05:22:17 dillon Exp $ */ #include "use_el.h" diff --git a/sys/bus/isa/amd64/isa_device.h b/sys/bus/isa/x86_64/isa_device.h similarity index 97% rename from sys/bus/isa/amd64/isa_device.h rename to sys/bus/isa/x86_64/isa_device.h index 0124d5b2e9..4864a98cfe 100644 --- a/sys/bus/isa/amd64/isa_device.h +++ b/sys/bus/isa/x86_64/isa_device.h @@ -32,7 +32,6 @@ * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/isa/isa_device.h,v 1.68 2000/01/29 18:01:10 peter Exp $ - * $DragonFly: src/sys/bus/isa/amd64/isa_device.h,v 1.1 2008/08/02 05:22:17 dillon Exp $ */ #ifndef _BUS_ISA_ARCH_ISA_DEVICE_H_ diff --git a/sys/bus/isa/amd64/isa_dma.c b/sys/bus/isa/x86_64/isa_dma.c similarity index 99% rename from sys/bus/isa/amd64/isa_dma.c rename to sys/bus/isa/x86_64/isa_dma.c index 0277fae927..fa55fab9d1 100644 --- a/sys/bus/isa/amd64/isa_dma.c +++ b/sys/bus/isa/x86_64/isa_dma.c @@ -35,7 +35,6 @@ * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * $FreeBSD: src/sys/i386/isa/isa_dma.c,v 1.4.2.1 2000/08/08 19:49:53 peter Exp $ - * $DragonFly: src/sys/bus/isa/amd64/isa_dma.c,v 1.1 2008/08/02 05:22:17 dillon Exp $ */ /* diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c index 998081614d..d3b843d29e 100644 --- a/sys/bus/pci/pci.c +++ b/sys/bus/pci/pci.c @@ -596,7 +596,7 @@ static void pci_read_cap_ht(device_t pcib, int ptr, int nextptr, pcicfgregs *cfg) { #ifdef notyet -#if defined(__i386__) || defined(__amd64__) +#if defined(__i386__) || defined(__x86_64__) #define REG(n, w) \ PCIB_READ_CONFIG(pcib, cfg->bus, cfg->slot, cfg->func, n, w) @@ -632,7 +632,7 @@ pci_read_cap_ht(device_t pcib, int ptr, int nextptr, pcicfgregs *cfg) #undef REG -#endif /* __i386__ || __amd64__ */ +#endif /* __i386__ || __x86_64__ */ #endif /* notyet */ } diff --git a/sys/bus/pci/pci_cfgreg.h b/sys/bus/pci/pci_cfgreg.h index 3ebadd2eac..503b54107d 100644 --- a/sys/bus/pci/pci_cfgreg.h +++ b/sys/bus/pci/pci_cfgreg.h @@ -39,8 +39,8 @@ #if defined(__i386__) #include "i386/pci_cfgreg.h" -#elif defined(__amd64__) -#include "amd64/pci_cfgreg.h" +#elif defined(__x86_64__) +#include "x86_64/pci_cfgreg.h" #else #error "No pci_cfgreg.h for this architecture" #endif diff --git a/sys/bus/pci/pcibus.h b/sys/bus/pci/pcibus.h index e857ace721..0004dad14f 100644 --- a/sys/bus/pci/pcibus.h +++ b/sys/bus/pci/pcibus.h @@ -39,8 +39,8 @@ #if defined(__i386__) #include "i386/pcibus.h" -#elif defined(__amd64__) -#include "amd64/pcibus.h" +#elif defined(__x86_64__) +#include "x86_64/pcibus.h" #else #error "No pcibus.h for this architecture" #endif diff --git a/sys/bus/pci/amd64/legacy.c b/sys/bus/pci/x86_64/legacy.c similarity index 100% rename from sys/bus/pci/amd64/legacy.c rename to sys/bus/pci/x86_64/legacy.c diff --git a/sys/bus/pci/amd64/legacyvar.h b/sys/bus/pci/x86_64/legacyvar.h similarity index 100% rename from sys/bus/pci/amd64/legacyvar.h rename to sys/bus/pci/x86_64/legacyvar.h diff --git a/sys/bus/pci/amd64/mptable_pci.c b/sys/bus/pci/x86_64/mptable_pci.c similarity index 100% rename from sys/bus/pci/amd64/mptable_pci.c rename to sys/bus/pci/x86_64/mptable_pci.c diff --git a/sys/bus/pci/amd64/pci_bus.c b/sys/bus/pci/x86_64/pci_bus.c similarity index 100% rename from sys/bus/pci/amd64/pci_bus.c rename to sys/bus/pci/x86_64/pci_bus.c diff --git a/sys/bus/pci/amd64/pci_cfgreg.c b/sys/bus/pci/x86_64/pci_cfgreg.c similarity index 100% rename from sys/bus/pci/amd64/pci_cfgreg.c rename to sys/bus/pci/x86_64/pci_cfgreg.c diff --git a/sys/bus/pci/amd64/pci_cfgreg.h b/sys/bus/pci/x86_64/pci_cfgreg.h similarity index 100% rename from sys/bus/pci/amd64/pci_cfgreg.h rename to sys/bus/pci/x86_64/pci_cfgreg.h diff --git a/sys/bus/pci/amd64/pci_pir.c b/sys/bus/pci/x86_64/pci_pir.c similarity index 100% rename from sys/bus/pci/amd64/pci_pir.c rename to sys/bus/pci/x86_64/pci_pir.c diff --git a/sys/bus/pci/amd64/pcibus.h b/sys/bus/pci/x86_64/pcibus.h similarity index 100% rename from sys/bus/pci/amd64/pcibus.h rename to sys/bus/pci/x86_64/pcibus.h diff --git a/sys/conf/files b/sys/conf/files index 30d716226f..16a8466ac6 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1302,7 +1302,7 @@ dev/agp/agp_via.c optional agp dev/agp/agp_sis.c optional agp dev/agp/agp_ali.c optional agp dev/agp/agp_amd.c optional agp -dev/agp/agp_amd64.c optional agp +dev/agp/agp_x86_64.c optional agp dev/agp/agp_i810.c optional agp dev/agp/agp_ati.c optional agp dev/agp/agp_if.m optional agp diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index bd2b9641b8..86d97c3152 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -128,7 +128,7 @@ CFLAGS+= -include ${BUILDING_WITH_KERNEL}/opt_global.h .endif CFLAGS+= ${DEBUG_FLAGS} -.if ${MACHINE_ARCH} == amd64 +.if ${MACHINE_ARCH} == x86_64 CFLAGS+= -fno-omit-frame-pointer .endif @@ -140,12 +140,12 @@ OBJS+= ${SRCS:N*.h:N*.patch:R:S/$/.o/g} PROG= ${KMOD}.ko .endif -.if ${MACHINE_ARCH} != amd64 +.if ${MACHINE_ARCH} != x86_64 ${PROG}: ${KMOD}.kld ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld .endif -.if ${MACHINE_ARCH} != amd64 +.if ${MACHINE_ARCH} != x86_64 ${KMOD}.kld: ${OBJS} ${LD} ${LDFLAGS} -r -o ${.TARGET} ${OBJS} .else diff --git a/sys/config/JG64 b/sys/config/JG64 index 6ff4813343..0d71ba6900 100644 --- a/sys/config/JG64 +++ b/sys/config/JG64 @@ -1,5 +1,5 @@ # -# JG64 -- Generic kernel configuration file for DragonFly/amd64 +# JG64 -- Generic kernel configuration file for DragonFly/x86_64 # # Check the LINT configuration file in sys/config, for an # exhaustive list of options. @@ -7,8 +7,8 @@ # $DragonFly: src/sys/config/JG64,v 1.2 2008/09/28 20:58:11 victor Exp $ platform pc64 -machine amd64 -machine_arch amd64 +machine x86_64 +machine_arch x86_64 cpu HAMMER_CPU ident JG64 maxusers 0 @@ -31,7 +31,7 @@ options NFS_ROOT #NFS usable as root device, NFS required options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem -#JG do we need it? does it work (on amd64)? +#JG do we need it? does it work (on x86_64)? options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] ##options COMPAT_DF12 #Compatible with DragonFly 1.2 and earlier options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI diff --git a/sys/config/AMD64_GENERIC b/sys/config/X86_64_GENERIC similarity index 98% rename from sys/config/AMD64_GENERIC rename to sys/config/X86_64_GENERIC index 7bfa8e5c43..0558cf0be1 100644 --- a/sys/config/AMD64_GENERIC +++ b/sys/config/X86_64_GENERIC @@ -1,16 +1,14 @@ # -# GENERIC -- Generic kernel configuration file for DragonFly/amd64 +# GENERIC -- Generic kernel configuration file for DragonFly/x86_64 # # Check the LINT configuration file in sys/config, for an # exhaustive list of options. -# -# $DragonFly: src/sys/config/AMD64_GENERIC,v 1.2 2008/01/31 11:48:54 swildner Exp $ platform pc64 -machine amd64 -machine_arch amd64 +machine x86_64 +machine_arch x86_64 cpu HAMMER_CPU -ident AMD64_GENERIC +ident X86_64_GENERIC maxusers 0 makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols diff --git a/sys/cpu/i386/include/elf.h b/sys/cpu/i386/include/elf.h index ae963506f8..ae950f3eb3 100644 --- a/sys/cpu/i386/include/elf.h +++ b/sys/cpu/i386/include/elf.h @@ -64,7 +64,7 @@ typedef struct { /* Auxiliary vector entry on initial stack */ } Elf32_Auxinfo; #if __ELF_WORD_SIZE == 64 -/* Fake for amd64 loader support */ +/* Fake for x86_64 loader support */ typedef struct { int fake; } Elf64_Auxinfo; diff --git a/sys/cpu/i386/include/ieee.h b/sys/cpu/i386/include/ieee.h index 7a3647b643..d98367f94e 100644 --- a/sys/cpu/i386/include/ieee.h +++ b/sys/cpu/i386/include/ieee.h @@ -60,8 +60,8 @@ * extended-precision type as implemented by the FPU. Per the * respective ABI specifications, it is followed by a tail padding of * - * amd64: 48 bits, - * i386: 16 bits. + * x86_64: 48 bits, + * i386: 16 bits. */ struct ieee_ext { u_int ext_fracl; diff --git a/sys/cpu/amd64/include/asm.h b/sys/cpu/x86_64/include/asm.h similarity index 97% rename from sys/cpu/amd64/include/asm.h rename to sys/cpu/x86_64/include/asm.h index 8975d16113..9b5f205389 100644 --- a/sys/cpu/amd64/include/asm.h +++ b/sys/cpu/x86_64/include/asm.h @@ -35,7 +35,6 @@ * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 * $FreeBSD: src/sys/amd64/include/asm.h,v 1.14 2003/06/02 05:59:35 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/asm.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ #ifndef _CPU_ASM_H_ diff --git a/sys/cpu/amd64/include/asmacros.h b/sys/cpu/x86_64/include/asmacros.h similarity index 98% rename from sys/cpu/amd64/include/asmacros.h rename to sys/cpu/x86_64/include/asmacros.h index 7f81c0e12a..b5a8e6b145 100644 --- a/sys/cpu/amd64/include/asmacros.h +++ b/sys/cpu/x86_64/include/asmacros.h @@ -28,7 +28,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/amd64/include/asmacros.h,v 1.32 2006/10/28 06:04:29 bde Exp $ - * $DragonFly: src/sys/cpu/amd64/include/asmacros.h,v 1.2 2008/08/29 17:07:06 dillon Exp $ */ #ifndef _CPU_ASMACROS_H_ diff --git a/sys/cpu/amd64/include/atomic.h b/sys/cpu/x86_64/include/atomic.h similarity index 100% rename from sys/cpu/amd64/include/atomic.h rename to sys/cpu/x86_64/include/atomic.h diff --git a/sys/cpu/amd64/include/bus_dma.h b/sys/cpu/x86_64/include/bus_dma.h similarity index 96% rename from sys/cpu/amd64/include/bus_dma.h rename to sys/cpu/x86_64/include/bus_dma.h index b06388ee1f..b2f856d2ae 100644 --- a/sys/cpu/amd64/include/bus_dma.h +++ b/sys/cpu/x86_64/include/bus_dma.h @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/cpu/amd64/include/bus_dma.h,v 1.1 2007/09/23 04:29:30 yanyh Exp $ */ #ifndef _CPU_BUS_DMA_H_ @@ -53,8 +51,8 @@ typedef uint64_t bus_space_handle_t; /* * Values for the amd64 bus space tag, not to be used directly by MI code. */ -#define AMD64_BUS_SPACE_IO 0 /* space is i/o space */ -#define AMD64_BUS_SPACE_MEM 1 /* space is mem space */ +#define X86_64_BUS_SPACE_IO 0 /* space is i/o space */ +#define X86_64_BUS_SPACE_MEM 1 /* space is mem space */ /* * Map a region of device bus space into CPU virtual address space. @@ -109,7 +107,7 @@ bus_space_subregion(bus_space_tag_t t __unused, bus_space_handle_t bsh, static __inline void * bus_space_kva(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) return ((void *)0); return ((void *)(handle + offset)); } @@ -158,7 +156,7 @@ bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) return (inb(handle + offset)); return (*(volatile u_int8_t *)(handle + offset)); } @@ -168,7 +166,7 @@ bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) return (inw(handle + offset)); return (*(volatile u_int16_t *)(handle + offset)); } @@ -178,7 +176,7 @@ bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) return (inl(handle + offset)); return (*(volatile u_int32_t *)(handle + offset)); } @@ -211,7 +209,7 @@ bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) insb(bsh + offset, addr, count); else { __asm __volatile(" \n\ @@ -230,7 +228,7 @@ bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) insw(bsh + offset, addr, count); else { __asm __volatile(" \n\ @@ -249,7 +247,7 @@ bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) insl(bsh + offset, addr, count); else { __asm __volatile(" \n\ @@ -293,7 +291,7 @@ bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == X86_64_BUS_SPACE_IO) { int _port_ = bsh + offset; __asm __volatile(" \n\ cld \n\ @@ -321,7 +319,7 @@ bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == X86_64_BUS_SPACE_IO) { int _port_ = bsh + offset; __asm __volatile(" \n\ cld \n\ @@ -349,7 +347,7 @@ bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == X86_64_BUS_SPACE_IO) { int _port_ = bsh + offset; __asm __volatile(" \n\ cld \n\ @@ -398,7 +396,7 @@ bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int8_t value) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) outb(bsh + offset, value); else *(volatile u_int8_t *)(bsh + offset) = value; @@ -409,7 +407,7 @@ bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int16_t value) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) outw(bsh + offset, value); else *(volatile u_int16_t *)(bsh + offset) = value; @@ -420,7 +418,7 @@ bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, u_int32_t value) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) outl(bsh + offset, value); else *(volatile u_int32_t *)(bsh + offset) = value; @@ -457,7 +455,7 @@ bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int8_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) outsb(bsh + offset, addr, count); else { __asm __volatile(" \n\ @@ -476,7 +474,7 @@ bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int16_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) outsw(bsh + offset, addr, count); else { __asm __volatile(" \n\ @@ -495,7 +493,7 @@ bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int32_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) outsl(bsh + offset, addr, count); else { __asm __volatile(" \n\ @@ -540,7 +538,7 @@ bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int8_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == X86_64_BUS_SPACE_IO) { int _port_ = bsh + offset; __asm __volatile(" \n\ cld \n\ @@ -568,7 +566,7 @@ bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int16_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == X86_64_BUS_SPACE_IO) { int _port_ = bsh + offset; __asm __volatile(" \n\ cld \n\ @@ -596,7 +594,7 @@ bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, const u_int32_t *addr, size_t count) { - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == X86_64_BUS_SPACE_IO) { int _port_ = bsh + offset; __asm __volatile(" \n\ cld \n\ @@ -648,7 +646,7 @@ bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) while (count--) outb(addr, value); else @@ -662,7 +660,7 @@ bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) while (count--) outw(addr, value); else @@ -676,7 +674,7 @@ bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) while (count--) outl(addr, value); else @@ -712,7 +710,7 @@ bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) for (; count != 0; count--, addr++) outb(addr, value); else @@ -726,7 +724,7 @@ bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) for (; count != 0; count--, addr += 2) outw(addr, value); else @@ -740,7 +738,7 @@ bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, { bus_space_handle_t addr = bsh + offset; - if (tag == AMD64_BUS_SPACE_IO) + if (tag == X86_64_BUS_SPACE_IO) for (; count != 0; count--, addr += 4) outl(addr, value); else @@ -783,7 +781,7 @@ bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == X86_64_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1++, addr2++) @@ -818,7 +816,7 @@ bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == X86_64_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 2, addr2 += 2) @@ -853,7 +851,7 @@ bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1, bus_space_handle_t addr1 = bsh1 + off1; bus_space_handle_t addr2 = bsh2 + off2; - if (tag == AMD64_BUS_SPACE_IO) { + if (tag == X86_64_BUS_SPACE_IO) { if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 4, addr2 += 4) diff --git a/sys/cpu/amd64/include/coredump.h b/sys/cpu/x86_64/include/coredump.h similarity index 65% rename from sys/cpu/amd64/include/coredump.h rename to sys/cpu/x86_64/include/coredump.h index aa7b88d414..ca131bc6c8 100644 --- a/sys/cpu/amd64/include/coredump.h +++ b/sys/cpu/x86_64/include/coredump.h @@ -1,7 +1,3 @@ -/* - * $DragonFly: src/sys/cpu/amd64/include/coredump.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ - */ - #ifndef _CPU_COREDUMP_H_ #define _CPU_COREDUMP_H_ /* diff --git a/sys/cpu/amd64/include/cpu.h b/sys/cpu/x86_64/include/cpu.h similarity index 99% rename from sys/cpu/amd64/include/cpu.h rename to sys/cpu/x86_64/include/cpu.h index ad0e7546ac..4817c8e15d 100644 --- a/sys/cpu/amd64/include/cpu.h +++ b/sys/cpu/x86_64/include/cpu.h @@ -42,7 +42,7 @@ #define _CPU_CPU_H_ /* - * Definitions unique to amd64 cpu support. + * Definitions unique to x86_64 cpu support. */ #ifndef _CPU_PSL_H_ #include diff --git a/sys/cpu/amd64/include/cpufunc.h b/sys/cpu/x86_64/include/cpufunc.h similarity index 99% rename from sys/cpu/amd64/include/cpufunc.h rename to sys/cpu/x86_64/include/cpufunc.h index 7969e19508..6b08fa9a94 100644 --- a/sys/cpu/amd64/include/cpufunc.h +++ b/sys/cpu/x86_64/include/cpufunc.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.139 2004/01/28 23:53:04 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/cpufunc.h,v 1.3 2008/08/29 17:07:06 dillon Exp $ */ /* diff --git a/sys/cpu/amd64/include/cputypes.h b/sys/cpu/x86_64/include/cputypes.h similarity index 96% rename from sys/cpu/amd64/include/cputypes.h rename to sys/cpu/x86_64/include/cputypes.h index b4c034475b..d54548f1ad 100644 --- a/sys/cpu/amd64/include/cputypes.h +++ b/sys/cpu/x86_64/include/cputypes.h @@ -25,7 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.19 2005/01/05 20:17:20 imp Exp $ - * $DragonFly: src/sys/cpu/amd64/include/cputypes.h,v 1.1 2007/09/23 04:29:30 yanyh Exp $ */ #ifndef _CPU_CPUTYPES_H_ diff --git a/sys/cpu/amd64/include/db_machdep.h b/sys/cpu/x86_64/include/db_machdep.h similarity index 94% rename from sys/cpu/amd64/include/db_machdep.h rename to sys/cpu/x86_64/include/db_machdep.h index a64693a595..baae6abed6 100644 --- a/sys/cpu/amd64/include/db_machdep.h +++ b/sys/cpu/x86_64/include/db_machdep.h @@ -24,7 +24,6 @@ * the rights to redistribute these changes. * * $FreeBSD: src/sys/amd64/include/db_machdep.h,v 1.22 2005/01/05 20:17:20 imp Exp $ - * $DragonFly: src/sys/cpu/amd64/include/db_machdep.h,v 1.1 2007/09/23 04:29:30 yanyh Exp $ */ #ifndef _CPU_DB_MACHDEP_H_ @@ -33,12 +32,12 @@ #include #include -#define amd64_saved_state trapframe +#define x86_64_saved_state trapframe typedef vm_offset_t db_addr_t; /* address - unsigned */ typedef long db_expr_t; /* expression - signed */ -typedef struct amd64_saved_state db_regs_t; +typedef struct x86_64_saved_state db_regs_t; #ifdef _KERNEL extern db_regs_t ddb_regs; /* register state */ diff --git a/sys/cpu/amd64/include/elf.h b/sys/cpu/x86_64/include/elf.h similarity index 97% rename from sys/cpu/amd64/include/elf.h rename to sys/cpu/x86_64/include/elf.h index 9d87acdcd7..f57d4506ca 100644 --- a/sys/cpu/amd64/include/elf.h +++ b/sys/cpu/x86_64/include/elf.h @@ -24,14 +24,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/amd64/include/elf.h,v 1.18 2004/08/03 08:21:48 dfr Exp $ - * $DragonFly: src/sys/cpu/amd64/include/elf.h,v 1.2 2007/09/23 04:29:30 yanyh Exp $ */ #ifndef _CPU_ELF_H_ #define _CPU_ELF_H_ /* - * ELF definitions for the AMD64 architecture. + * ELF definitions for the x86_64 architecture. */ diff --git a/sys/cpu/amd64/include/endian.h b/sys/cpu/x86_64/include/endian.h similarity index 98% rename from sys/cpu/amd64/include/endian.h rename to sys/cpu/x86_64/include/endian.h index b22677405f..cfa2989dc1 100644 --- a/sys/cpu/amd64/include/endian.h +++ b/sys/cpu/x86_64/include/endian.h @@ -32,7 +32,6 @@ * * @(#)endian.h 7.8 (Berkeley) 4/3/91 * $FreeBSD: src/sys/amd64/include/endian.h,v 1.5 2003/09/22 22:37:49 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/endian.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ #ifndef _CPU_ENDIAN_H_ diff --git a/sys/cpu/amd64/include/exec.h b/sys/cpu/x86_64/include/exec.h similarity index 95% rename from sys/cpu/amd64/include/exec.h rename to sys/cpu/x86_64/include/exec.h index 2b1c0e2ddc..48de3aafea 100644 --- a/sys/cpu/amd64/include/exec.h +++ b/sys/cpu/x86_64/include/exec.h @@ -32,7 +32,6 @@ * * @(#)exec.h 8.1 (Berkeley) 6/11/93 * $FreeBSD: src/sys/amd64/include/exec.h,v 1.8 1999/08/28 00:44:11 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/exec.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ #ifndef _EXEC_H_ diff --git a/sys/cpu/amd64/include/float.h b/sys/cpu/x86_64/include/float.h similarity index 97% rename from sys/cpu/amd64/include/float.h rename to sys/cpu/x86_64/include/float.h index 4bbd630b65..b2d89bbc4f 100644 --- a/sys/cpu/amd64/include/float.h +++ b/sys/cpu/x86_64/include/float.h @@ -28,7 +28,6 @@ * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 * $FreeBSD: src/sys/amd64/include/float.h,v 1.16 2008/01/17 13:12:46 bde Exp $ - * $DragonFly: src/sys/cpu/amd64/include/float.h,v 1.2 2008/04/09 06:44:37 hasso Exp $ */ #ifndef _CPU_FLOAT_H_ diff --git a/sys/cpu/amd64/include/floatingpoint.h b/sys/cpu/x86_64/include/floatingpoint.h similarity index 100% rename from sys/cpu/amd64/include/floatingpoint.h rename to sys/cpu/x86_64/include/floatingpoint.h diff --git a/sys/cpu/amd64/include/frame.h b/sys/cpu/x86_64/include/frame.h similarity index 97% rename from sys/cpu/amd64/include/frame.h rename to sys/cpu/x86_64/include/frame.h index 8a7472daa6..a063049806 100644 --- a/sys/cpu/amd64/include/frame.h +++ b/sys/cpu/x86_64/include/frame.h @@ -37,7 +37,6 @@ * * from: @(#)frame.h 5.2 (Berkeley) 1/18/91 * $FreeBSD: src/sys/amd64/include/frame.h,v 1.26 2003/11/08 04:39:22 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/frame.h,v 1.3 2008/08/29 17:07:06 dillon Exp $ */ #ifndef _CPU_FRAME_H_ diff --git a/sys/cpu/amd64/include/ieee.h b/sys/cpu/x86_64/include/ieee.h similarity index 96% rename from sys/cpu/amd64/include/ieee.h rename to sys/cpu/x86_64/include/ieee.h index 26000a1cd8..545b11c844 100644 --- a/sys/cpu/amd64/include/ieee.h +++ b/sys/cpu/x86_64/include/ieee.h @@ -1,5 +1,4 @@ /* $NetBSD: ieee.h,v 1.7 2003/10/26 21:46:46 kleink Exp $ */ -/* $DragonFly: src/sys/cpu/amd64/include/ieee.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ /* * Copyright (c) 1992, 1993 @@ -57,8 +56,8 @@ * extended-precision type as implemented by the FPU. Per the * respective ABI specifications, it is followed by a tail padding of * - * amd64: 48 bits, - * i386: 16 bits. + * x86_64: 48 bits, + * i386: 16 bits. */ struct ieee_ext { u_int ext_fracl; diff --git a/sys/cpu/amd64/include/ieeefp.h b/sys/cpu/x86_64/include/ieeefp.h similarity index 98% rename from sys/cpu/amd64/include/ieeefp.h rename to sys/cpu/x86_64/include/ieeefp.h index 4e15f111f6..2f5d55138d 100644 --- a/sys/cpu/amd64/include/ieeefp.h +++ b/sys/cpu/x86_64/include/ieeefp.h @@ -33,7 +33,6 @@ * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 * $FreeBSD: src/sys/amd64/include/ieeefp.h,v 1.11 2003/11/08 04:39:22 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/ieeefp.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ #ifndef _CPU_IEEEFP_H_ diff --git a/sys/cpu/amd64/include/int_const.h b/sys/cpu/x86_64/include/int_const.h similarity index 100% rename from sys/cpu/amd64/include/int_const.h rename to sys/cpu/x86_64/include/int_const.h diff --git a/sys/cpu/amd64/include/int_limits.h b/sys/cpu/x86_64/include/int_limits.h similarity index 100% rename from sys/cpu/amd64/include/int_limits.h rename to sys/cpu/x86_64/include/int_limits.h diff --git a/sys/cpu/amd64/include/inttypes.h b/sys/cpu/x86_64/include/inttypes.h similarity index 96% rename from sys/cpu/amd64/include/inttypes.h rename to sys/cpu/x86_64/include/inttypes.h index 2018bb1171..c455b7a27a 100644 --- a/sys/cpu/amd64/include/inttypes.h +++ b/sys/cpu/x86_64/include/inttypes.h @@ -35,7 +35,6 @@ * * From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $ * $FreeBSD: src/sys/amd64/include/_inttypes.h,v 1.3 2003/05/01 01:05:23 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/inttypes.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ #ifndef _CPU_INTTYPES_H_ @@ -58,7 +57,7 @@ #define PRIdFAST32 "d" /* int_fast32_t */ #define PRIdMAX "jd" /* intmax_t */ #define PRIdPTR "ld" /* intptr_t */ -#if defined(__amd64__) +#if defined(__x86_64__) #define PRId64 "ld" /* int64_t */ #define PRIdLEAST64 "ld" /* int_least64_t */ #define PRIdFAST64 "ld" /* int_fast64_t */ @@ -80,7 +79,7 @@ #define PRIiMAX "ji" /* intmax_t */ #define PRIiPTR "li" /* intptr_t */ -#if defined(__amd64__) +#if defined(__x86_64__) #define PRIi64 "li" /* int64_t */ #define PRIiLEAST64 "li" /* int_least64_t */ #define PRIiFAST64 "li" /* int_fast64_t */ @@ -104,7 +103,7 @@ #define PRIoMAX "jo" /* uintmax_t */ #define PRIoPTR "lo" /* uintptr_t */ -#if defined(__amd64__) +#if defined(__x86_64__) #define PRIo64 "lo" /* uint64_t */ #define PRIoLEAST64 "lo" /* uint_least64_t */ #define PRIoFAST64 "lo" /* uint_fast64_t */ @@ -126,7 +125,7 @@ #define PRIuMAX "ju" /* uintmax_t */ #define PRIuPTR "lu" /* uintptr_t */ -#if defined(__amd64__) +#if defined(__x86_64__) #define PRIu64 "lu" /* uint64_t */ #define PRIuLEAST64 "lu" /* uint_least64_t */ #define PRIuFAST64 "lu" /* uint_fast64_t */ @@ -148,7 +147,7 @@ #define PRIxMAX "jx" /* uintmax_t */ #define PRIxPTR "lx" /* uintptr_t */ -#if defined(__amd64__) +#if defined(__x86_64__) #define PRIx64 "lx" /* uint64_t */ #define PRIxLEAST64 "lx" /* uint_least64_t */ #define PRIxFAST64 "lx" /* uint_fast64_t */ @@ -170,7 +169,7 @@ #define PRIXMAX "jX" /* uintmax_t */ #define PRIXPTR "lX" /* uintptr_t */ -#if defined(__amd64__) +#if defined(__x86_64__) #define PRIX64 "lX" /* uint64_t */ #define PRIXLEAST64 "lX" /* uint_least64_t */ #define PRIXFAST64 "lX" /* uint_fast64_t */ @@ -193,7 +192,7 @@ #define SCNdFAST32 "d" /* int_fast32_t */ #define SCNdMAX "jd" /* intmax_t */ #define SCNdPTR "ld" /* intptr_t */ -#if defined(__amd64__) +#if defined(__x86_64__) #define SCNd64 "ld" /* int64_t */ #define SCNdLEAST64 "ld" /* int_least64_t */ #define SCNdFAST64 "ld" /* int_fast64_t */ @@ -215,7 +214,7 @@ #define SCNiMAX "ji" /* intmax_t */ #define SCNiPTR "li" /* intptr_t */ -#if defined(__amd64__) +#if defined(__x86_64__) #define SCNi64 "li" /* int64_t */ #define SCNiLEAST64 "li" /* int_least64_t */ #define SCNiFAST64 "li" /* int_fast64_t */ @@ -239,7 +238,7 @@ #define SCNoMAX "jo" /* uintmax_t */ #define SCNoPTR "lo" /* uintptr_t */ -#if defined(__amd64__) +#if defined(__x86_64__) #define SCNo64 "lo" /* uint64_t */ #define SCNoLEAST64 "lo" /* uint_least64_t */ #define SCNoFAST64 "lo" /* uint_fast64_t */ @@ -261,7 +260,7 @@ #define SCNuMAX "ju" /* uintmax_t */ #define SCNuPTR "lu" /* uintptr_t */ -#if defined(__amd64__) +#if defined(__x86_64__) #define SCNu64 "lu" /* uint64_t */ #define SCNuLEAST64 "lu" /* uint_least64_t */ #define SCNuFAST64 "lu" /* uint_fast64_t */ @@ -283,7 +282,7 @@ #define SCNxMAX "jx" /* uintmax_t */ #define SCNxPTR "lx" /* uintptr_t */ -#if defined(__amd64__) +#if defined(__x86_64__) #define SCNx64 "lx" /* uint64_t */ #define SCNxLEAST64 "lx" /* uint_least64_t */ #define SCNxFAST64 "lx" /* uint_fast64_t */ diff --git a/sys/cpu/amd64/include/limits.h b/sys/cpu/x86_64/include/limits.h similarity index 97% rename from sys/cpu/amd64/include/limits.h rename to sys/cpu/x86_64/include/limits.h index ceb1a41382..e8a67e0914 100644 --- a/sys/cpu/amd64/include/limits.h +++ b/sys/cpu/x86_64/include/limits.h @@ -32,7 +32,6 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * $FreeBSD: src/sys/i386/include/limits.h,v 1.14.2.2 2000/11/05 09:21:42 obrien Exp $ - * $DragonFly: src/sys/cpu/amd64/include/limits.h,v 1.3 2008/01/02 23:06:44 swildner Exp $ */ #ifndef _CPU_LIMITS_H_ @@ -76,7 +75,7 @@ #define LONG_MAX 0x7fffffffffffffffL /* max for a long */ #define LONG_MIN (-0x7fffffffffffffffL - 1) /* min for a long */ -/* XXX what is long long on amd64? */ +/* XXX what is long long on x86_64? */ #define ULLONG_MAX 0xffffffffffffffffULL /* max value for an unsigned long long */ #define LLONG_MAX 0x7fffffffffffffffLL /* max value for a long long */ #define LLONG_MIN (-0x7fffffffffffffffLL - 1) /* min for a long long */ diff --git a/sys/cpu/amd64/include/math.h b/sys/cpu/x86_64/include/math.h similarity index 76% rename from sys/cpu/amd64/include/math.h rename to sys/cpu/x86_64/include/math.h index 8256194e49..1e5e5e2b04 100644 --- a/sys/cpu/amd64/include/math.h +++ b/sys/cpu/x86_64/include/math.h @@ -1,6 +1,5 @@ /* * $NetBSD: math.h,v 1.2 2003/10/28 00:55:28 kleink Exp $ - * $DragonFly: src/sys/cpu/amd64/include/math.h,v 1.2 2008/04/09 06:44:37 hasso Exp $ */ #ifndef _CPU_MATH_H_ diff --git a/sys/cpu/amd64/include/npx.h b/sys/cpu/x86_64/include/npx.h similarity index 95% rename from sys/cpu/amd64/include/npx.h rename to sys/cpu/x86_64/include/npx.h index 04ad43dc20..02f124adce 100644 --- a/sys/cpu/amd64/include/npx.h +++ b/sys/cpu/x86_64/include/npx.h @@ -36,7 +36,6 @@ * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 * $FreeBSD: src/sys/i386/include/npx.h,v 1.18.2.1 2001/08/15 01:23:52 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/npx.h,v 1.3 2008/08/29 17:07:06 dillon Exp $ */ /* @@ -149,9 +148,9 @@ union savefpu { */ #define __INITIAL_NPXCW__ 0x127F -#define __INITIAL_FPUCW__ 0x037F /* used by libm/arch/amd64/fenv.c */ +#define __INITIAL_FPUCW__ 0x037F /* used by libm/arch/x86_64/fenv.c */ #define __INITIAL_FPUCW_I386__ 0x127F -#define __INITIAL_MXCSR__ 0x1F80 /* used by libm/arch/amd64/fenv.c */ +#define __INITIAL_MXCSR__ 0x1F80 /* used by libm/arch/x86_64/fenv.c */ #define __INITIAL_MXCSR_MASK__ 0xFFBF #ifdef _KERNEL diff --git a/sys/cpu/amd64/include/param.h b/sys/cpu/x86_64/include/param.h similarity index 96% rename from sys/cpu/amd64/include/param.h rename to sys/cpu/x86_64/include/param.h index d258571d89..d604edb049 100644 --- a/sys/cpu/amd64/include/param.h +++ b/sys/cpu/x86_64/include/param.h @@ -36,7 +36,6 @@ * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 * $FreeBSD: src/sys/i386/include/param.h,v 1.54.2.8 2002/08/31 21:15:55 dillon Exp $ - * $DragonFly: src/sys/cpu/amd64/include/param.h,v 1.4 2008/08/29 17:07:06 dillon Exp $ */ #ifndef _CPU_PARAM_H_ @@ -68,10 +67,10 @@ #endif #ifndef _MACHINE -#define _MACHINE amd64 +#define _MACHINE x86_64 #endif #ifndef _MACHINE_ARCH -#define _MACHINE_ARCH amd64 +#define _MACHINE_ARCH x86_64 #endif #endif /* _CPU_PARAM_H1_ */ @@ -79,10 +78,10 @@ #ifndef _NO_NAMESPACE_POLLUTION #ifndef MACHINE -#define MACHINE "amd64" +#define MACHINE "x86_64" #endif #ifndef MACHINE_ARCH -#define MACHINE_ARCH "amd64" +#define MACHINE_ARCH "x86_64" #endif /* @@ -222,8 +221,8 @@ #endif #define ptoa(x) ((vm_paddr_t)(x) << PAGE_SHIFT) -#define amd64_btop(x) ((vm_pindex_t)((x) >> PAGE_SHIFT)) -#define amd64_ptob(x) ((vm_paddr_t)(x) << PAGE_SHIFT) +#define x86_64_btop(x) ((vm_pindex_t)((x) >> PAGE_SHIFT)) +#define x86_64_ptob(x) ((vm_paddr_t)(x) << PAGE_SHIFT) #define pgtok(x) ((x) * (PAGE_SIZE / 1024)) diff --git a/sys/cpu/amd64/include/pmap.h b/sys/cpu/x86_64/include/pmap.h similarity index 97% rename from sys/cpu/amd64/include/pmap.h rename to sys/cpu/x86_64/include/pmap.h index 5c5d0b8b21..d8a5fecf06 100644 --- a/sys/cpu/amd64/include/pmap.h +++ b/sys/cpu/x86_64/include/pmap.h @@ -40,8 +40,6 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD$ - * $DragonFly: src/sys/cpu/amd64/include/pmap.h,v 1.3 2008/08/29 17:07:06 dillon Exp $ */ #ifndef _CPU_PMAP_H_ diff --git a/sys/cpu/amd64/include/profile.h b/sys/cpu/x86_64/include/profile.h similarity index 98% rename from sys/cpu/amd64/include/profile.h rename to sys/cpu/x86_64/include/profile.h index 7caa2d96d4..bb16769fd3 100644 --- a/sys/cpu/amd64/include/profile.h +++ b/sys/cpu/x86_64/include/profile.h @@ -32,7 +32,6 @@ * * @(#)profile.h 8.1 (Berkeley) 6/11/93 * $FreeBSD: src/sys/amd64/include/profile.h,v 1.33 2004/01/06 20:36:21 nectar Exp $ - * $DragonFly: src/sys/cpu/amd64/include/profile.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ #ifndef _CPU_PROFILE_H_ diff --git a/sys/cpu/amd64/include/psl.h b/sys/cpu/x86_64/include/psl.h similarity index 97% rename from sys/cpu/amd64/include/psl.h rename to sys/cpu/x86_64/include/psl.h index 7fddf8497b..2bbcaef97a 100644 --- a/sys/cpu/amd64/include/psl.h +++ b/sys/cpu/x86_64/include/psl.h @@ -35,7 +35,6 @@ * * from: @(#)psl.h 5.2 (Berkeley) 1/18/91 * $FreeBSD: src/sys/amd64/include/psl.h,v 1.12 2003/05/01 01:05:23 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/psl.h,v 1.2 2007/09/23 04:29:30 yanyh Exp $ */ #ifndef _CPU_PSL_H_ diff --git a/sys/cpu/amd64/include/reg.h b/sys/cpu/x86_64/include/reg.h similarity index 97% rename from sys/cpu/amd64/include/reg.h rename to sys/cpu/x86_64/include/reg.h index 1289d4a899..b765f6171d 100644 --- a/sys/cpu/amd64/include/reg.h +++ b/sys/cpu/x86_64/include/reg.h @@ -32,7 +32,6 @@ * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 * $FreeBSD: src/sys/amd64/include/reg.h,v 1.35 2004/04/05 23:55:14 imp Exp $ - * $DragonFly: src/sys/cpu/amd64/include/reg.h,v 1.2 2007/09/23 04:29:30 yanyh Exp $ */ #ifndef _CPU_REG_H_ diff --git a/sys/cpu/amd64/include/reloc.h b/sys/cpu/x86_64/include/reloc.h similarity index 96% rename from sys/cpu/amd64/include/reloc.h rename to sys/cpu/x86_64/include/reloc.h index d8d1dcb22f..aa59308c27 100644 --- a/sys/cpu/amd64/include/reloc.h +++ b/sys/cpu/x86_64/include/reloc.h @@ -32,7 +32,6 @@ * * @(#)reloc.h 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/amd64/include/reloc.h,v 1.7 1999/08/28 00:44:23 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/reloc.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ #ifndef _CPU_RELOC_H_ diff --git a/sys/cpu/amd64/include/segments.h b/sys/cpu/x86_64/include/segments.h similarity index 98% rename from sys/cpu/amd64/include/segments.h rename to sys/cpu/x86_64/include/segments.h index 86eae43ab4..b8dccf1e45 100644 --- a/sys/cpu/amd64/include/segments.h +++ b/sys/cpu/x86_64/include/segments.h @@ -37,14 +37,13 @@ * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/include/segments.h,v 1.24 1999/12/29 04:33:07 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/segments.h,v 1.3 2008/08/29 17:07:06 dillon Exp $ */ #ifndef _CPU_SEGMENTS_H_ #define _CPU_SEGMENTS_H_ /* - * AMD64 Segmentation Data Structures and definitions + * x86_64 Segmentation Data Structures and definitions */ /* diff --git a/sys/cpu/amd64/include/setjmp.h b/sys/cpu/x86_64/include/setjmp.h similarity index 94% rename from sys/cpu/amd64/include/setjmp.h rename to sys/cpu/x86_64/include/setjmp.h index 143c73cc3a..1b1edbc44f 100644 --- a/sys/cpu/amd64/include/setjmp.h +++ b/sys/cpu/x86_64/include/setjmp.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.9 2003/06/02 21:49:35 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/setjmp.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ #ifndef _CPU_SETJMP_H_ @@ -38,7 +37,7 @@ #include -#define _JBLEN 12 /* Size of the jmp_buf on AMD64. */ +#define _JBLEN 12 /* Size of the jmp_buf on x86_64. */ /* * jmp_buf and sigjmp_buf are encapsulated in different structs to force diff --git a/sys/cpu/amd64/include/sigframe.h b/sys/cpu/x86_64/include/sigframe.h similarity index 95% rename from sys/cpu/amd64/include/sigframe.h rename to sys/cpu/x86_64/include/sigframe.h index 1f98b215a0..da90a522e6 100644 --- a/sys/cpu/amd64/include/sigframe.h +++ b/sys/cpu/x86_64/include/sigframe.h @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/sigframe.h,v 1.5 1999/12/04 10:40:24 marcel Exp $ - * $DragonFly: src/sys/cpu/amd64/include/sigframe.h,v 1.1 2007/09/23 04:29:30 yanyh Exp $ */ #ifndef _CPU_SIGFRAME_H_ diff --git a/sys/cpu/amd64/include/signal.h b/sys/cpu/x86_64/include/signal.h similarity index 98% rename from sys/cpu/amd64/include/signal.h rename to sys/cpu/x86_64/include/signal.h index 8cdad1e503..2663e4bf72 100644 --- a/sys/cpu/amd64/include/signal.h +++ b/sys/cpu/x86_64/include/signal.h @@ -34,7 +34,6 @@ * * @(#)signal.h 8.1 (Berkeley) 6/11/93 * $FreeBSD: src/sys/i386/include/signal.h,v 1.12 1999/11/12 13:52:11 marcel Exp $ - * $DragonFly: src/sys/cpu/amd64/include/signal.h,v 1.3 2008/08/29 17:07:06 dillon Exp $ */ #ifndef _CPU_SIGNAL_H_ diff --git a/sys/cpu/amd64/include/specialreg.h b/sys/cpu/x86_64/include/specialreg.h similarity index 98% rename from sys/cpu/amd64/include/specialreg.h rename to sys/cpu/x86_64/include/specialreg.h index bc70fe0dc5..55782200ac 100644 --- a/sys/cpu/amd64/include/specialreg.h +++ b/sys/cpu/x86_64/include/specialreg.h @@ -29,7 +29,6 @@ * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.39 2007/05/31 11:26:44 des Exp $ - * $DragonFly: src/sys/cpu/amd64/include/specialreg.h,v 1.2 2008/08/29 17:07:06 dillon Exp $ */ #ifndef _CPU_SPECIALREG_H_ @@ -70,7 +69,7 @@ #define CR4_XMM 0x00000400 /* enable SIMD/MMX2 to use except 16 */ /* - * Bits in AMD64 special registers. EFER is 64 bits wide. + * Bits in x86_64 special registers. EFER is 64 bits wide. */ #define EFER_SCE 0x000000001 /* System Call Extensions (R/W) */ #define EFER_LME 0x000000100 /* Long mode enable (R/W) */ @@ -170,10 +169,10 @@ #define CPUID_FAMILY 0x00000f00 #define CPUID_EXT_MODEL 0x000f0000 #define CPUID_EXT_FAMILY 0x0ff00000 -#define AMD64_CPU_MODEL(id) \ +#define X86_64_CPU_MODEL(id) \ ((((id) & CPUID_MODEL) >> 4) | \ (((id) & CPUID_EXT_MODEL) >> 12)) -#define AMD64_CPU_FAMILY(id) \ +#define X86_64_CPU_FAMILY(id) \ ((((id) & CPUID_FAMILY) >> 8) + \ (((id) & CPUID_EXT_FAMILY) >> 20)) @@ -448,7 +447,7 @@ #define AMD_WT_ALLOC_PRE 0x20000 /* programmable range enable */ #define AMD_WT_ALLOC_FRE 0x10000 /* fixed (A0000-FFFFF) range enable */ -/* AMD64 MSR's */ +/* x86_64 MSR's */ #define MSR_EFER 0xc0000080 /* extended features */ #define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target/cs/ss */ #define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target rip */ diff --git a/sys/cpu/amd64/include/stdarg.h b/sys/cpu/x86_64/include/stdarg.h similarity index 97% rename from sys/cpu/amd64/include/stdarg.h rename to sys/cpu/x86_64/include/stdarg.h index 1c99f04ffd..da8afce765 100644 --- a/sys/cpu/amd64/include/stdarg.h +++ b/sys/cpu/x86_64/include/stdarg.h @@ -32,7 +32,6 @@ * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/i386/include/stdarg.h,v 1.10 1999/08/28 00:44:26 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/stdarg.h,v 1.2 2008/01/13 18:02:20 corecode Exp $ */ #ifndef _CPU_STDARG_H_ diff --git a/sys/cpu/amd64/include/stdint.h b/sys/cpu/x86_64/include/stdint.h similarity index 97% rename from sys/cpu/amd64/include/stdint.h rename to sys/cpu/x86_64/include/stdint.h index 01013d1811..5fa2f953aa 100644 --- a/sys/cpu/amd64/include/stdint.h +++ b/sys/cpu/x86_64/include/stdint.h @@ -36,7 +36,6 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/_stdint.h,v 1.1 2002/07/29 17:41:07 mike Exp $ - * $DragonFly: src/sys/cpu/amd64/include/stdint.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ #ifndef _CPU_STDINT_H_ @@ -63,7 +62,7 @@ typedef unsigned long __uint64_t; #elif defined(__GNUC__) typedef int __attribute__((__mode__(__DI__))) __int64_t; typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t; -#elif defined(__amd64__) +#elif defined(__x86_64__) typedef long __int64_t; typedef unsigned long __uint64_t; #elif defined(__i386__) @@ -77,7 +76,7 @@ typedef unsigned long long __uint64_t; typedef __int64_t __intmax_t; typedef __uint64_t __uintmax_t; -#if defined(__amd64__) +#if defined(__x86_64__) typedef __int64_t __intptr_t; typedef __uint64_t __uintptr_t; typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */ @@ -111,7 +110,7 @@ typedef __uint64_t __uint_least64_t; * do not wish to overly pollute their namespaces. */ -#if defined(__amd64__) +#if defined(__x86_64__) typedef __uint64_t __size_t; typedef __int64_t __ssize_t; typedef __int64_t __register_t; diff --git a/sys/cpu/amd64/include/sysarch.h b/sys/cpu/x86_64/include/sysarch.h similarity index 94% rename from sys/cpu/amd64/include/sysarch.h rename to sys/cpu/x86_64/include/sysarch.h index 0ef1a7da98..bc79fcb9f5 100644 --- a/sys/cpu/amd64/include/sysarch.h +++ b/sys/cpu/x86_64/include/sysarch.h @@ -31,11 +31,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/amd64/include/sysarch.h,v 1.22 2004/01/09 16:52:08 nectar Exp $ - * $DragonFly: src/sys/cpu/amd64/include/sysarch.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ /* - * Architecture specific syscalls (AMD64) + * Architecture specific syscalls (x86_64) */ #ifndef _CPU_SYSARCH_H_ #define _CPU_SYSARCH_H_ diff --git a/sys/cpu/amd64/include/tls.h b/sys/cpu/x86_64/include/tls.h similarity index 97% rename from sys/cpu/amd64/include/tls.h rename to sys/cpu/x86_64/include/tls.h index 7f17f32f78..3771dfa8cb 100644 --- a/sys/cpu/amd64/include/tls.h +++ b/sys/cpu/x86_64/include/tls.h @@ -27,8 +27,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/cpu/amd64/include/tls.h,v 1.2 2008/08/29 17:07:06 dillon Exp $ */ #ifndef _CPU_TLS_H_ diff --git a/sys/cpu/amd64/include/trap.h b/sys/cpu/x86_64/include/trap.h similarity index 98% rename from sys/cpu/amd64/include/trap.h rename to sys/cpu/x86_64/include/trap.h index 689ce3c41d..54c5d8c706 100644 --- a/sys/cpu/amd64/include/trap.h +++ b/sys/cpu/x86_64/include/trap.h @@ -35,7 +35,6 @@ * * from: @(#)trap.h 5.4 (Berkeley) 5/9/91 * $FreeBSD: src/sys/amd64/include/trap.h,v 1.13 2001/07/12 06:32:51 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/trap.h,v 1.2 2007/09/23 04:29:30 yanyh Exp $ */ #ifndef _CPU_TRAP_H_ diff --git a/sys/cpu/amd64/include/tss.h b/sys/cpu/x86_64/include/tss.h similarity index 96% rename from sys/cpu/amd64/include/tss.h rename to sys/cpu/x86_64/include/tss.h index eefafdf37a..7abf7ee936 100644 --- a/sys/cpu/amd64/include/tss.h +++ b/sys/cpu/x86_64/include/tss.h @@ -36,20 +36,19 @@ * * from: @(#)tss.h 5.4 (Berkeley) 1/18/91 * $FreeBSD: src/sys/amd64/include/tss.h,v 1.15 2003/11/17 08:58:14 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/tss.h,v 1.2 2008/08/29 17:07:06 dillon Exp $ */ #ifndef _CPU_TSS_H_ #define _CPU_TSS_H_ /* - * amd64 Context Data Type + * x86_64 Context Data Type * * The alignment is pretty messed up here due to reuse of the original 32 bit * fields. It might be worth trying to set the tss on a +4 byte offset to * make the 64 bit fields aligned in practice. */ -struct amd64tss { +struct x86_64tss { u_int32_t tss_rsvd0; u_int64_t tss_rsp0 __packed; /* kernel stack pointer ring 0 */ u_int64_t tss_rsp1 __packed; /* kernel stack pointer ring 1 */ diff --git a/sys/cpu/amd64/include/types.h b/sys/cpu/x86_64/include/types.h similarity index 96% rename from sys/cpu/amd64/include/types.h rename to sys/cpu/x86_64/include/types.h index cd610b45a3..a35b6ef2f7 100644 --- a/sys/cpu/amd64/include/types.h +++ b/sys/cpu/x86_64/include/types.h @@ -33,13 +33,12 @@ * * @(#)types.h 8.3 (Berkeley) 1/5/94 * $FreeBSD: src/sys/i386/include/types.h,v 1.19.2.1 2001/03/21 10:50:58 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/types.h,v 1.2 2008/08/29 17:07:06 dillon Exp $ */ #ifndef _CPU_TYPES_H_ #define _CPU_TYPES_H_ -#if defined(__amd64__) +#if defined(__x86_64__) typedef __int64_t __segsz_t; /* segment size */ typedef __int64_t register_t; typedef __uint64_t u_register_t; diff --git a/sys/cpu/amd64/include/ucontext.h b/sys/cpu/x86_64/include/ucontext.h similarity index 97% rename from sys/cpu/amd64/include/ucontext.h rename to sys/cpu/x86_64/include/ucontext.h index 396dd622a4..f0df094703 100644 --- a/sys/cpu/amd64/include/ucontext.h +++ b/sys/cpu/x86_64/include/ucontext.h @@ -28,7 +28,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.18 2003/11/08 04:39:22 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/ucontext.h,v 1.2 2008/08/29 17:07:06 dillon Exp $ */ #ifndef _CPU_UCONTEXT_H_ diff --git a/sys/cpu/amd64/include/varargs.h b/sys/cpu/x86_64/include/varargs.h similarity index 97% rename from sys/cpu/amd64/include/varargs.h rename to sys/cpu/x86_64/include/varargs.h index 791870a4cf..58e80025a9 100644 --- a/sys/cpu/amd64/include/varargs.h +++ b/sys/cpu/x86_64/include/varargs.h @@ -38,7 +38,6 @@ * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.14 2005/03/11 22:16:09 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/include/varargs.h,v 1.1 2007/08/21 19:40:24 corecode Exp $ */ #ifndef _CPU_VARARGS_H_ diff --git a/sys/cpu/amd64/include/vframe.h b/sys/cpu/x86_64/include/vframe.h similarity index 95% rename from sys/cpu/amd64/include/vframe.h rename to sys/cpu/x86_64/include/vframe.h index a4e3e18f5e..d84e684ca1 100644 --- a/sys/cpu/amd64/include/vframe.h +++ b/sys/cpu/x86_64/include/vframe.h @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/cpu/amd64/include/vframe.h,v 1.2 2007/09/23 04:29:30 yanyh Exp $ */ #ifndef _CPU_VFRAME_H_ diff --git a/sys/cpu/amd64/misc/amd64-gdbstub.c b/sys/cpu/x86_64/misc/x86_64-gdbstub.c similarity index 99% rename from sys/cpu/amd64/misc/amd64-gdbstub.c rename to sys/cpu/x86_64/misc/x86_64-gdbstub.c index b4beae852e..f34b3d7e40 100644 --- a/sys/cpu/amd64/misc/amd64-gdbstub.c +++ b/sys/cpu/x86_64/misc/x86_64-gdbstub.c @@ -93,7 +93,6 @@ ****************************************************************************/ /* * $FreeBSD: src/sys/i386/i386/i386-gdbstub.c,v 1.13.2.1 2000/08/03 00:54:41 peter Exp $ - * $DragonFly: src/sys/cpu/amd64/misc/amd64-gdbstub.c,v 1.1 2008/08/29 17:07:09 dillon Exp $ */ #include "opt_ddb.h" @@ -452,7 +451,7 @@ gdb_handle_exception (db_regs_t *raw_regs, int type, int code) long addr; int length; char * ptr; - struct amd64regs { + struct x86_64regs { unsigned long rax; unsigned long rbx; unsigned long rcx; @@ -474,7 +473,7 @@ gdb_handle_exception (db_regs_t *raw_regs, int type, int code) unsigned int cs; unsigned int ss; }; - struct amd64regs registers; + struct x86_64regs registers; registers.rax = raw_regs->tf_rax; registers.rbx = raw_regs->tf_rbx; diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c index 3510aa5cf9..de8b0eb645 100644 --- a/sys/crypto/via/padlock.c +++ b/sys/crypto/via/padlock.c @@ -33,7 +33,7 @@ #include #include #include -#if defined(__amd64__) || defined(__i386__) +#if defined(__x86_64__) || defined(__i386__) #include #include #include @@ -84,7 +84,7 @@ padlock_probe(device_t dev) { char capp[256]; -#if defined(__amd64__) || defined(__i386__) +#if defined(__x86_64__) || defined(__i386__) /* If there is no AES support, we has nothing to do here. */ if (!(via_feature_xcrypt & VIA_HAS_AES)) { device_printf(dev, "No ACE support.\n"); diff --git a/sys/crypto/via/padlock_hash.c b/sys/crypto/via/padlock_hash.c index 32aae26388..dfba0172fa 100644 --- a/sys/crypto/via/padlock_hash.c +++ b/sys/crypto/via/padlock_hash.c @@ -33,7 +33,7 @@ #include #include #include -#if defined(__amd64__) || defined(__i386__) +#if defined(__x86_64__) || defined(__i386__) #include #include #include diff --git a/sys/ddb/db_kld.c b/sys/ddb/db_kld.c index b11861633a..c6a4d863f3 100644 --- a/sys/ddb/db_kld.c +++ b/sys/ddb/db_kld.c @@ -43,7 +43,7 @@ #include #include -#if defined(__amd64__) +#if defined(__x86_64__) vm_offset_t ksym_start, ksym_end; #endif diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c index 52bf7a9bff..d546a4582d 100644 --- a/sys/ddb/db_run.c +++ b/sys/ddb/db_run.c @@ -106,7 +106,7 @@ db_stop_at_pc(boolean_t *is_breakpoint) } else if (*is_breakpoint) { #ifdef __i386__ /* XXx */ ddb_regs.tf_eip += 1; -#elif defined(__amd64__) +#elif defined(__x86_64__) ddb_regs.tf_rip += 1; #endif } diff --git a/sys/dev/acpica5/Makefile b/sys/dev/acpica5/Makefile index 30574a6986..ab32ac9c2b 100644 --- a/sys/dev/acpica5/Makefile +++ b/sys/dev/acpica5/Makefile @@ -103,7 +103,7 @@ SRCS+= acpi_pstate_machdep.c # Machine-specific code such as sleep/wakeup SRCS+= acpi_machdep.c acpi_wakecode.h SRCS+= acpi_wakeup.c -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" # APIC enumerators #SRCS+= madt.c SRCS+= pmtimer.c diff --git a/sys/dev/acpica5/Osd/OsdHardware.c b/sys/dev/acpica5/Osd/OsdHardware.c index b62bd2550d..7062ba584a 100644 --- a/sys/dev/acpica5/Osd/OsdHardware.c +++ b/sys/dev/acpica5/Osd/OsdHardware.c @@ -57,8 +57,8 @@ #define ACPI_BUS_SPACE_IO IA64_BUS_SPACE_IO #define ACPI_BUS_HANDLE 0 #endif -#ifdef __amd64__ -#define ACPI_BUS_SPACE_IO AMD64_BUS_SPACE_IO +#ifdef __x86_64__ +#define ACPI_BUS_SPACE_IO X86_64_BUS_SPACE_IO #define ACPI_BUS_HANDLE 0 #endif diff --git a/sys/dev/acpica5/acpi_timer.c b/sys/dev/acpica5/acpi_timer.c index 7c057638ee..fc11c53cb4 100644 --- a/sys/dev/acpica5/acpi_timer.c +++ b/sys/dev/acpica5/acpi_timer.c @@ -369,7 +369,7 @@ acpi_timer_test(void) /* Test the timer with interrupts disabled to get accurate results. */ #if defined(__i386__) s = read_eflags(); -#elif defined(__amd64__) +#elif defined(__x86_64__) s = read_rflags(); #else #error "no read_eflags" @@ -387,7 +387,7 @@ acpi_timer_test(void) } #if defined(__i386__) write_eflags(s); -#elif defined(__amd64__) +#elif defined(__x86_64__) write_rflags(s); #else #error "no read_eflags" diff --git a/sys/dev/agp/Makefile b/sys/dev/agp/Makefile index 4b5be3ddb9..0e63842637 100644 --- a/sys/dev/agp/Makefile +++ b/sys/dev/agp/Makefile @@ -3,7 +3,7 @@ KMOD = agp SRCS = agp.c -SRCS += agp_i810.c agp_ali.c agp_amd.c agp_amd64.c agp_ati.c agp_nvidia.c +SRCS += agp_i810.c agp_ali.c agp_amd.c agp_x86_64.c agp_ati.c agp_nvidia.c SRCS += agp_intel.c agp_sis.c agp_via.c SRCS += agp_if.c device_if.h bus_if.h agp_if.h pci_if.h SRCS += opt_bus.h opt_pci.h diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index 7da4e4ff83..d7e70d257a 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -82,7 +82,7 @@ static devclass_t agp_devclass; void agp_flush_cache(void) { -#if defined(__i386__) || defined(__amd64__) +#if defined(__i386__) || defined(__x86_64__) wbinvd(); #endif } diff --git a/sys/dev/agp/agp_amd64.c b/sys/dev/agp/agp_x86_64.c similarity index 100% rename from sys/dev/agp/agp_amd64.c rename to sys/dev/agp/agp_x86_64.c diff --git a/sys/dev/disk/mpt/mpt_user.c b/sys/dev/disk/mpt/mpt_user.c index a11d880268..86eb6da657 100644 --- a/sys/dev/disk/mpt/mpt_user.c +++ b/sys/dev/disk/mpt/mpt_user.c @@ -577,7 +577,7 @@ mpt_user_raid_action(struct mpt_softc *mpt, struct mpt_raid_action *raid_act, return (0); } -#ifdef __amd64__ +#ifdef __x86_64__ #define PTRIN(p) ((void *)(uintptr_t)(p)) #define PTROUT(v) ((u_int32_t)(uintptr_t)(v)) #endif @@ -590,7 +590,7 @@ mpt_ioctl(struct dev_ioctl_args *ap) struct mpt_ext_cfg_page_req *ext_page_req; struct mpt_raid_action *raid_act; struct mpt_page_memory mpt_page; -#ifdef __amd64__ +#ifdef __x86_64__ struct mpt_cfg_page_req32 *page_req32; struct mpt_cfg_page_req page_req_swab; struct mpt_ext_cfg_page_req32 *ext_page_req32; @@ -609,7 +609,7 @@ mpt_ioctl(struct dev_ioctl_args *ap) raid_act = (void *)arg; mpt_page.vaddr = NULL; -#ifdef __amd64__ +#ifdef __x86_64__ /* Convert 32-bit structs to native ones. */ page_req32 = (void *)arg; ext_page_req32 = (void *)arg; @@ -654,7 +654,7 @@ mpt_ioctl(struct dev_ioctl_args *ap) #endif switch (cmd) { -#ifdef __amd64__ +#ifdef __x86_64__ case MPTIO_READ_CFG_HEADER32: #endif case MPTIO_READ_CFG_HEADER: @@ -662,7 +662,7 @@ mpt_ioctl(struct dev_ioctl_args *ap) error = mpt_user_read_cfg_header(mpt, page_req); MPT_UNLOCK(mpt); break; -#ifdef __amd64__ +#ifdef __x86_64__ case MPTIO_READ_CFG_PAGE32: #endif case MPTIO_READ_CFG_PAGE: @@ -680,7 +680,7 @@ mpt_ioctl(struct dev_ioctl_args *ap) break; error = copyout(mpt_page.vaddr, page_req->buf, page_req->len); break; -#ifdef __amd64__ +#ifdef __x86_64__ case MPTIO_READ_EXT_CFG_HEADER32: #endif case MPTIO_READ_EXT_CFG_HEADER: @@ -688,7 +688,7 @@ mpt_ioctl(struct dev_ioctl_args *ap) error = mpt_user_read_extcfg_header(mpt, ext_page_req); MPT_UNLOCK(mpt); break; -#ifdef __amd64__ +#ifdef __x86_64__ case MPTIO_READ_EXT_CFG_PAGE32: #endif case MPTIO_READ_EXT_CFG_PAGE: @@ -707,7 +707,7 @@ mpt_ioctl(struct dev_ioctl_args *ap) error = copyout(mpt_page.vaddr, ext_page_req->buf, ext_page_req->len); break; -#ifdef __amd64__ +#ifdef __x86_64__ case MPTIO_WRITE_CFG_PAGE32: #endif case MPTIO_WRITE_CFG_PAGE: @@ -721,7 +721,7 @@ mpt_ioctl(struct dev_ioctl_args *ap) error = mpt_user_write_cfg_page(mpt, page_req, &mpt_page); MPT_UNLOCK(mpt); break; -#ifdef __amd64__ +#ifdef __x86_64__ case MPTIO_RAID_ACTION32: #endif case MPTIO_RAID_ACTION: @@ -753,7 +753,7 @@ mpt_ioctl(struct dev_ioctl_args *ap) if (error) return (error); -#ifdef __amd64__ +#ifdef __x86_64__ /* Convert native structs to 32-bit ones. */ switch (cmd) { case MPTIO_READ_CFG_HEADER32: diff --git a/sys/dev/disk/sym/sym_hipd.c b/sys/dev/disk/sym/sym_hipd.c index 6d1be2641d..1ff6c9728d 100644 --- a/sys/dev/disk/sym/sym_hipd.c +++ b/sys/dev/disk/sym/sym_hipd.c @@ -141,7 +141,7 @@ typedef u_int32_t u32; * make sense) to be used. */ -#if defined __i386__ || defined __amd64__ +#if defined __i386__ || defined __x86_64__ #define MEMORY_BARRIER() do { ; } while(0) #elif defined __powerpc__ #define MEMORY_BARRIER() __asm__ volatile("eieio; sync" : : : "memory") diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h index 7b7a3fec35..3f98d20237 100644 --- a/sys/dev/drm/drmP.h +++ b/sys/dev/drm/drmP.h @@ -95,7 +95,7 @@ struct drm_file; #define DRM_DEBUG_DEFAULT_ON 1 #endif /* DRM_DEBUG */ -#if defined(DRM_LINUX) && DRM_LINUX && !defined(__amd64__) && !defined(__DragonFly__) /* XXX */ +#if defined(DRM_LINUX) && DRM_LINUX && !defined(__x86_64__) && !defined(__DragonFly__) /* XXX */ #include #include #include @@ -221,7 +221,7 @@ typedef u_int8_t u8; #define DRM_READMEMORYBARRIER() alpha_mb(); #define DRM_WRITEMEMORYBARRIER() alpha_wmb(); #define DRM_MEMORYBARRIER() alpha_mb(); -#elif defined(__amd64__) +#elif defined(__x86_64__) #define DRM_READMEMORYBARRIER() __asm __volatile( \ "lock; addl $0,0(%%rsp)" : : : "memory"); #define DRM_WRITEMEMORYBARRIER() __asm __volatile("" : : : "memory"); diff --git a/sys/dev/misc/syscons/syscons.c b/sys/dev/misc/syscons/syscons.c index 95cbc53dae..45fee86309 100644 --- a/sys/dev/misc/syscons/syscons.c +++ b/sys/dev/misc/syscons/syscons.c @@ -1014,7 +1014,7 @@ scioctl(struct dev_ioctl_args *ap) return EPERM; #if defined(__i386__) curthread->td_lwp->lwp_md.md_regs->tf_eflags |= PSL_IOPL; -#elif defined(__amd64__) +#elif defined(__x86_64__) curthread->td_lwp->lwp_md.md_regs->tf_rflags |= PSL_IOPL; #endif return 0; @@ -1022,7 +1022,7 @@ scioctl(struct dev_ioctl_args *ap) case KDDISABIO: /* disallow io operations (default) */ #if defined(__i386__) curthread->td_lwp->lwp_md.md_regs->tf_eflags &= ~PSL_IOPL; -#elif defined(__amd64__) +#elif defined(__x86_64__) curthread->td_lwp->lwp_md.md_regs->tf_rflags &= ~PSL_IOPL; #endif return 0; diff --git a/sys/dev/netif/bce/if_bcereg.h b/sys/dev/netif/bce/if_bcereg.h index 8903f98be6..2adf6ea1d8 100644 --- a/sys/dev/netif/bce/if_bcereg.h +++ b/sys/dev/netif/bce/if_bcereg.h @@ -4380,7 +4380,7 @@ struct l2_fhdr { #define DMA_WRITE_CHANS 3 /* Use the natural page size of the host CPU. */ -/* XXX: This has only been tested on amd64/i386 systems using 4KB pages. */ +/* XXX: This has only been tested on x86_64/i386 systems using 4KB pages. */ #define BCM_PAGE_BITS PAGE_SHIFT #define BCM_PAGE_SIZE (1 << BCM_PAGE_BITS) diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c index 1b3758bde6..7379c75aff 100644 --- a/sys/dev/netif/mxge/if_mxge.c +++ b/sys/dev/netif/mxge/if_mxge.c @@ -75,7 +75,7 @@ POSSIBILITY OF SUCH DAMAGE. #include /* for pmap_mapdev() */ #include -#if defined(__i386) || defined(__amd64) +#if defined(__i386) || defined(__x86_64) #include #endif @@ -194,7 +194,7 @@ static void mxge_enable_wc(mxge_softc_t *sc) { #if 0 -#if defined(__i386) || defined(__amd64) +#if defined(__i386) || defined(__x86_64) vm_offset_t len; int err; @@ -471,7 +471,7 @@ static void mxge_enable_nvidia_ecrc(mxge_softc_t *sc) { device_printf(sc->dev, - "Nforce 4 chipset on non-x86/amd64!?!?!\n"); + "Nforce 4 chipset on non-x86/x86_64!?!?!\n"); return; } #endif diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c index edc30adea1..ef2b9c88d1 100644 --- a/sys/dev/serial/sio/sio.c +++ b/sys/dev/serial/sio/sio.c @@ -2738,7 +2738,7 @@ static cn_checkc_t siocncheckc; static cn_getc_t siocngetc; static cn_putc_t siocnputc; -#if defined(__i386__) || defined(__amd64__) +#if defined(__i386__) || defined(__x86_64__) CONS_DRIVER(sio, siocnprobe, siocninit, siocninit_fini, NULL, siocngetc, siocncheckc, siocnputc, NULL); #endif @@ -2947,7 +2947,7 @@ siocnprobe(struct consdev *cp) } } } -#if defined(__i386__) || defined(__amd64__) +#if defined(__i386__) || defined(__x86_64__) #if DDB > 0 /* * XXX Ugly Compatability. diff --git a/sys/dev/video/fb/fbreg.h b/sys/dev/video/fb/fbreg.h index 768cf1af75..7a5e4184d3 100644 --- a/sys/dev/video/fb/fbreg.h +++ b/sys/dev/video/fb/fbreg.h @@ -35,7 +35,7 @@ #define V_MAX_ADAPTERS 8 /* XXX */ /* some macros */ -#if defined(__i386__) || defined(__amd64__) +#if defined(__i386__) || defined(__x86_64__) #define bcopy_io(s, d, c) generic_bcopy((void *)(s), (void *)(d), (c)) #define bcopy_toio(s, d, c) generic_bcopy((void *)(s), (void *)(d), (c)) #define bcopy_fromio(s, d, c) generic_bcopy((void *)(s), (void *)(d), (c)) diff --git a/sys/dev/video/fb/vga.c b/sys/dev/video/fb/vga.c index 376ab42774..3cf293bed1 100644 --- a/sys/dev/video/fb/vga.c +++ b/sys/dev/video/fb/vga.c @@ -910,7 +910,7 @@ set_display_start(video_adapter_t *adp, int x, int y) } #ifndef VGA_NO_MODE_CHANGE -#if defined(__i386__) || defined(__amd64__) /* XXX */ +#if defined(__i386__) || defined(__x86_64__) /* XXX */ static void fill(int val, void *d, size_t size) { @@ -919,7 +919,7 @@ fill(int val, void *d, size_t size) while (size-- > 0) *p++ = val; } -#endif /* __i386__ || __amd64__ */ +#endif /* __i386__ || __x86_64__ */ static void filll_io(int val, vm_offset_t d, size_t size) @@ -1914,8 +1914,8 @@ vga_mmap_buf(video_adapter_t *adp, vm_offset_t offset, int prot) #if defined(__i386__) return i386_btop(adp->va_info.vi_window + offset); -#elif defined(__amd64__) - return amd64_btop(adp->va_info.vi_window + offset); +#elif defined(__x86_64__) + return x86_64_btop(adp->va_info.vi_window + offset); #else #error "vga_mmap_buf needs to return something" #endif diff --git a/sys/dev/video/amd64/Makefile b/sys/dev/video/x86_64/Makefile similarity index 100% rename from sys/dev/video/amd64/Makefile rename to sys/dev/video/x86_64/Makefile diff --git a/sys/emulation/Makefile b/sys/emulation/Makefile index 0bf2f4f651..9cdf66696e 100644 --- a/sys/emulation/Makefile +++ b/sys/emulation/Makefile @@ -3,7 +3,7 @@ .if ${MACHINE_ARCH} == i386 SUBDIR=linux ndis -.elif ${MACHINE_ARCH} == amd64 +.elif ${MACHINE_ARCH} == x86_64 SUBDIR= .else .error Unknown MACHINE_ARCH. diff --git a/sys/emulation/ndis/hal_var.h b/sys/emulation/ndis/hal_var.h index 738ab9047e..a2ed11cbfe 100644 --- a/sys/emulation/ndis/hal_var.h +++ b/sys/emulation/ndis/hal_var.h @@ -36,9 +36,9 @@ #ifndef _HAL_VAR_H_ #define _HAL_VAR_H_ -#ifdef __amd64__ -#define NDIS_BUS_SPACE_IO AMD64_BUS_SPACE_IO -#define NDIS_BUS_SPACE_MEM AMD64_BUS_SPACE_MEM +#ifdef __x86_64__ +#define NDIS_BUS_SPACE_IO X86_64_BUS_SPACE_IO +#define NDIS_BUS_SPACE_MEM X86_64_BUS_SPACE_MEM #else #define NDIS_BUS_SPACE_IO I386_BUS_SPACE_IO #define NDIS_BUS_SPACE_MEM I386_BUS_SPACE_MEM diff --git a/sys/emulation/ndis/regcall.h b/sys/emulation/ndis/regcall.h index d96e1c6686..a9e56cfbf5 100644 --- a/sys/emulation/ndis/regcall.h +++ b/sys/emulation/ndis/regcall.h @@ -84,7 +84,7 @@ * arguments passed on the stack. */ -#ifdef __amd64__ +#ifdef __x86_64__ #define __stdcall #define __regcall #define REGARGS1(decl1) decl1 diff --git a/sys/kern/kern_memio.c b/sys/kern/kern_memio.c index 1f2b1e16ee..c512e52fc2 100644 --- a/sys/kern/kern_memio.c +++ b/sys/kern/kern_memio.c @@ -341,8 +341,8 @@ memmmap(struct dev_mmap_args *ap) */ #if defined(__i386__) ap->a_result = i386_btop(ap->a_offset); -#elif defined(__amd64__) - ap->a_result = amd64_btop(ap->a_offset); +#elif defined(__x86_64__) + ap->a_result = x86_64_btop(ap->a_offset); #endif return 0; case 1: @@ -351,8 +351,8 @@ memmmap(struct dev_mmap_args *ap) */ #if defined(__i386__) ap->a_result = i386_btop(vtophys(ap->a_offset)); -#elif defined(__amd64__) - ap->a_result = amd64_btop(vtophys(ap->a_offset)); +#elif defined(__x86_64__) + ap->a_result = x86_64_btop(vtophys(ap->a_offset)); #endif return 0; diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index fbc9e9fc96..81d99eeb4d 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -656,7 +656,7 @@ link_elf_obj_load_file(const char *filename, linker_file_t * result) ef->address = (caddr_t) vm_map_min(&kernel_map); /* - * In order to satisfy amd64's architectural requirements on the + * In order to satisfy x86_64's architectural requirements on the * location of code and data in the kernel's address space, request a * mapping that is above the kernel. */ diff --git a/sys/kern/lwkt_ipiq.c b/sys/kern/lwkt_ipiq.c index 5d319a88c1..c4533af694 100644 --- a/sys/kern/lwkt_ipiq.c +++ b/sys/kern/lwkt_ipiq.c @@ -174,7 +174,7 @@ lwkt_send_ipiq3(globaldata_t target, ipifunc3_t func, void *arg1, int arg2) if (ip->ip_windex - ip->ip_rindex > MAXCPUFIFO / 2) { #if defined(__i386__) unsigned int eflags = read_eflags(); -#elif defined(__amd64__) +#elif defined(__x86_64__) unsigned long rflags = read_rflags(); #endif @@ -190,7 +190,7 @@ lwkt_send_ipiq3(globaldata_t target, ipifunc3_t func, void *arg1, int arg2) } #if defined(__i386__) write_eflags(eflags); -#elif defined(__amd64__) +#elif defined(__x86_64__) write_rflags(rflags); #endif } @@ -265,7 +265,7 @@ lwkt_send_ipiq3_passive(globaldata_t target, ipifunc3_t func, if (ip->ip_windex - ip->ip_rindex > MAXCPUFIFO / 2) { #if defined(__i386__) unsigned int eflags = read_eflags(); -#elif defined(__amd64__) +#elif defined(__x86_64__) unsigned long rflags = read_rflags(); #endif @@ -281,7 +281,7 @@ lwkt_send_ipiq3_passive(globaldata_t target, ipifunc3_t func, } #if defined(__i386__) write_eflags(eflags); -#elif defined(__amd64__) +#elif defined(__x86_64__) write_rflags(rflags); #endif } @@ -412,7 +412,7 @@ lwkt_wait_ipiq(globaldata_t target, int seq) if ((int)(ip->ip_xindex - seq) < 0) { #if defined(__i386__) unsigned int eflags = read_eflags(); -#elif defined(__amd64__) +#elif defined(__x86_64__) unsigned long rflags = read_rflags(); #endif cpu_enable_intr(); @@ -433,7 +433,7 @@ lwkt_wait_ipiq(globaldata_t target, int seq) } #if defined(__i386__) write_eflags(eflags); -#elif defined(__amd64__) +#elif defined(__x86_64__) write_rflags(rflags); #endif } diff --git a/sys/kern/lwkt_thread.c b/sys/kern/lwkt_thread.c index f4b1f8b615..959549cc89 100644 --- a/sys/kern/lwkt_thread.c +++ b/sys/kern/lwkt_thread.c @@ -107,7 +107,7 @@ extern void cpu_lwkt_restore(void); extern void cpu_kthread_restore(void); extern void cpu_idle_restore(void); -#ifdef __amd64__ +#ifdef __x86_64__ static int jg_tos_ok(struct thread *td) @@ -780,7 +780,7 @@ using_idle_thread: #endif if (td != ntd) { ++switch_count; -#ifdef __amd64__ +#ifdef __x86_64__ KKASSERT(jg_tos_ok(ntd)); #endif KTR_LOG(ctxsw_sw, td, ntd); diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index b13f9cdc9c..ee44f496ee 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -505,7 +505,7 @@ vn_set_fpf_offset(struct file *fp, off_t offset) static __inline off_t vn_poll_fpf_offset(struct file *fp) { -#if defined(__amd64__) || !defined(SMP) +#if defined(__x86_64__) || !defined(SMP) return(fp->f_offset); #else off_t off = vn_get_fpf_offset(fp); diff --git a/sys/platform/pc64/conf/files b/sys/platform/pc64/conf/files index 604dfedb1b..77f7057c88 100644 --- a/sys/platform/pc64/conf/files +++ b/sys/platform/pc64/conf/files @@ -5,7 +5,7 @@ # linux32_genassym.o optional compat_linux32 \ - dependency "$S/emulation/linux/amd64/linux32_genassym.c ${FORWARD_HEADERS_COOKIE}" \ + dependency "$S/emulation/linux/x86_64/linux32_genassym.c ${FORWARD_HEADERS_COOKIE}" \ compile-with "${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}" \ no-obj no-implicit-rule \ clean "linux32_genassym.o" @@ -43,12 +43,12 @@ emulation/linux/linux_stats.c optional compat_linux32 emulation/linux/linux_sysctl.c optional compat_linux32 emulation/linux/linux_uid16.c optional compat_linux32 emulation/linux/linux_util.c optional compat_linux32 -emulation/linux/amd64/linux32_dummy.c optional compat_linux32 -emulation/linux/amd64/linux32_locore.s optional compat_linux32 \ +emulation/linux/x86_64/linux32_dummy.c optional compat_linux32 +emulation/linux/x86_64/linux32_locore.s optional compat_linux32 \ dependency "linux32_assym.h" -emulation/linux/amd64/linux32_machdep.c optional compat_linux32 -emulation/linux/amd64/linux32_sysent.c optional compat_linux32 -emulation/linux/amd64/linux32_sysvec.c optional compat_linux32 +emulation/linux/x86_64/linux32_machdep.c optional compat_linux32 +emulation/linux/x86_64/linux32_sysent.c optional compat_linux32 +emulation/linux/x86_64/linux32_sysvec.c optional compat_linux32 # XXX use assembler versions of bf_enc and des_enc crypto/blowfish/bf_enc.c optional ipsec ipsec_esp @@ -88,18 +88,18 @@ vfs/smbfs/smbfs_subr.c optional smbfs vfs/smbfs/smbfs_vfsops.c optional smbfs vfs/smbfs/smbfs_vnops.c optional smbfs -platform/pc64/amd64/atomic.c standard \ +platform/pc64/x86_64/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" -platform/pc64/amd64/autoconf.c standard -platform/pc64/amd64/mpboot.S optional smp -platform/pc64/amd64/mplock.s optional smp +platform/pc64/x86_64/autoconf.c standard +platform/pc64/x86_64/mpboot.S optional smp +platform/pc64/x86_64/mplock.s optional smp # DDB XXX -cpu/amd64/misc/amd64-gdbstub.c optional ddb -platform/pc64/amd64/elf_machdep.c standard -platform/pc64/amd64/in_cksum2.s optional inet -platform/pc64/amd64/ktr.c optional ktr -platform/pc64/amd64/db_disasm.c optional ddb +cpu/x86_64/misc/x86_64-gdbstub.c optional ddb +platform/pc64/x86_64/elf_machdep.c standard +platform/pc64/x86_64/in_cksum2.s optional inet +platform/pc64/x86_64/ktr.c optional ktr +platform/pc64/x86_64/db_disasm.c optional ddb # # DOS mbr and gpt kern/subr_diskmbr.c standard @@ -113,58 +113,58 @@ libkern/stack_protector.c standard # PLATFORM FILES # -platform/pc64/amd64/exception.S standard -platform/pc64/amd64/ipl.s standard -platform/pc64/amd64/global.s standard -platform/pc64/amd64/support.s standard -platform/pc64/amd64/sigtramp.s standard -platform/pc64/amd64/swtch.s standard -platform/pc64/amd64/npx.c standard -platform/pc64/amd64/db_interface.c standard -platform/pc64/amd64/db_trace.c standard -platform/pc64/amd64/vm_machdep.c standard -platform/pc64/amd64/machdep.c standard -platform/pc64/amd64/userldt.c standard -platform/pc64/amd64/tls.c standard -platform/pc64/amd64/trap.c standard -platform/pc64/amd64/procfs_machdep.c standard -platform/pc64/amd64/initcpu.c standard -platform/pc64/amd64/identcpu.c standard -platform/pc64/amd64/cpufreq_machdep.c standard +platform/pc64/x86_64/exception.S standard +platform/pc64/x86_64/ipl.s standard +platform/pc64/x86_64/global.s standard +platform/pc64/x86_64/support.s standard +platform/pc64/x86_64/sigtramp.s standard +platform/pc64/x86_64/swtch.s standard +platform/pc64/x86_64/npx.c standard +platform/pc64/x86_64/db_interface.c standard +platform/pc64/x86_64/db_trace.c standard +platform/pc64/x86_64/vm_machdep.c standard +platform/pc64/x86_64/machdep.c standard +platform/pc64/x86_64/userldt.c standard +platform/pc64/x86_64/tls.c standard +platform/pc64/x86_64/trap.c standard +platform/pc64/x86_64/procfs_machdep.c standard +platform/pc64/x86_64/initcpu.c standard +platform/pc64/x86_64/identcpu.c standard +platform/pc64/x86_64/cpufreq_machdep.c standard platform/pc64/apic/apic_abi.c optional smp platform/pc64/apic/mpapic.c optional smp platform/pc64/apic/apic_ipl.s optional smp platform/pc64/apic/apic_vector.s optional smp -bus/isa/amd64/isa.c optional isa -bus/isa/amd64/isa_compat.c optional isa compat_oldisa -bus/isa/amd64/isa_dma.c optional isa +bus/isa/x86_64/isa.c optional isa +bus/isa/x86_64/isa_compat.c optional isa compat_oldisa +bus/isa/x86_64/isa_dma.c optional isa -platform/pc64/amd64/nexus.c standard +platform/pc64/x86_64/nexus.c standard platform/pc64/icu/icu_abi.c standard platform/pc64/icu/icu_ipl.s standard platform/pc64/icu/icu_vector.s standard -bus/pci/amd64/legacy.c optional pci -bus/pci/amd64/pci_bus.c optional pci -bus/pci/amd64/pci_cfgreg.c optional pci -bus/pci/amd64/mptable_pci.c optional pci smp apic_io +bus/pci/x86_64/legacy.c optional pci +bus/pci/x86_64/pci_bus.c optional pci +bus/pci/x86_64/pci_cfgreg.c optional pci +bus/pci/x86_64/mptable_pci.c optional pci smp apic_io # notyet (BIOS struct and functions) -#bus/pci/amd64/pci_pir.c optional pci +#bus/pci/x86_64/pci_pir.c optional pci -#platform/pc64/amd64/init.c standard -platform/pc64/amd64/globaldata.c standard -platform/pc64/amd64/pmap.c standard -platform/pc64/amd64/pmap_inval.c standard -platform/pc64/amd64/busdma_machdep.c standard -platform/pc64/amd64/sysarch.c standard -platform/pc64/amd64/systimer.c standard -platform/pc64/amd64/console.c standard -platform/pc64/amd64/ipl_funcs.c standard +#platform/pc64/x86_64/init.c standard +platform/pc64/x86_64/globaldata.c standard +platform/pc64/x86_64/pmap.c standard +platform/pc64/x86_64/pmap_inval.c standard +platform/pc64/x86_64/busdma_machdep.c standard +platform/pc64/x86_64/sysarch.c standard +platform/pc64/x86_64/systimer.c standard +platform/pc64/x86_64/console.c standard +platform/pc64/x86_64/ipl_funcs.c standard kern/syscalls.c standard -platform/pc64/amd64/mp_machdep.c optional smp +platform/pc64/x86_64/mp_machdep.c optional smp dev/misc/atkbd/atkbd_isa.c optional atkbd dev/misc/atkbdc_layer/atkbdc_isa.c optional atkbdc dev/misc/ppc/ppc.c optional ppc @@ -174,4 +174,4 @@ bus/isa/syscons_isa.c optional sc bus/isa/vga_isa.c optional vga platform/pc64/isa/clock.c standard platform/pc64/isa/intr_machdep.c standard -platform/pc64/amd64/spinlock.s standard +platform/pc64/x86_64/spinlock.s standard diff --git a/sys/platform/pc64/conf/kern.mk b/sys/platform/pc64/conf/kern.mk index 175a7f9f7d..115d35e21c 100644 --- a/sys/platform/pc64/conf/kern.mk +++ b/sys/platform/pc64/conf/kern.mk @@ -4,7 +4,7 @@ # # Warning flags for compiling the kernel and components of the kernel. # -# For AMD64, we explicitly prohibit the use of FPU, SSE and other SIMD +# For x86_64, we explicitly prohibit the use of FPU, SSE and other SIMD # operations inside the kernel itself. These operations are exclusively # reserved for user applications. # diff --git a/sys/platform/pc64/conf/ldscript.amd64 b/sys/platform/pc64/conf/ldscript.x86_64 similarity index 98% rename from sys/platform/pc64/conf/ldscript.amd64 rename to sys/platform/pc64/conf/ldscript.x86_64 index abfa23b3ff..9e85d79592 100644 --- a/sys/platform/pc64/conf/ldscript.amd64 +++ b/sys/platform/pc64/conf/ldscript.x86_64 @@ -1,6 +1,5 @@ /* * $FreeBSD: src/sys/conf/ldscript.amd64,v 1.9 2004/05/29 01:09:00 tjr Exp $ - * $DragonFly: src/sys/platform/pc64/conf/ldscript.amd64,v 1.1 2007/09/23 04:29:31 yanyh Exp $ */ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") OUTPUT_ARCH(i386:x86-64) diff --git a/sys/platform/pc64/conf/options b/sys/platform/pc64/conf/options index c2244a64ea..6b2147d6c9 100644 --- a/sys/platform/pc64/conf/options +++ b/sys/platform/pc64/conf/options @@ -17,7 +17,7 @@ CONSPEED opt_comconsole.h I586_PMC_GUPROF opt_i586_guprof.h BROKEN_KEYBOARD_RESET opt_reset.h -# amd64 SMP options +# x86_64 SMP options APIC_IO opt_global.h # The cpu type diff --git a/sys/platform/pc64/include/globaldata.h b/sys/platform/pc64/include/globaldata.h index aa6942f0c8..6d765cab3b 100644 --- a/sys/platform/pc64/include/globaldata.h +++ b/sys/platform/pc64/include/globaldata.h @@ -47,7 +47,7 @@ #include /* struct user_segment_descriptor */ #endif #ifndef _MACHINE_TSS_H_ -#include /* struct amd64tss */ +#include /* struct x86_64tss */ #endif #ifndef _MACHINE_NPX_H_ #include @@ -73,7 +73,7 @@ struct mdglobaldata { struct user_segment_descriptor gd_common_tssd; struct user_segment_descriptor *gd_tss_gdt; struct thread *gd_npxthread; - struct amd64tss gd_common_tss; + struct x86_64tss gd_common_tss; union savefpu gd_savefpu; /* fast bcopy/zero temp fpu save area */ int gd_fpu_lock; /* fast bcopy/zero cpu lock */ int gd_fpending; /* fast interrupt pending */ diff --git a/sys/platform/pc64/include/pcb.h b/sys/platform/pc64/include/pcb.h index 3f39481adf..71c135a33d 100644 --- a/sys/platform/pc64/include/pcb.h +++ b/sys/platform/pc64/include/pcb.h @@ -44,7 +44,7 @@ #define _MACHINE_PCB_H_ /* - * AMD64 process control block + * x86_64 process control block */ #include diff --git a/sys/platform/pc64/include/pcb_ext.h b/sys/platform/pc64/include/pcb_ext.h index 71effadd64..79467fb0bb 100644 --- a/sys/platform/pc64/include/pcb_ext.h +++ b/sys/platform/pc64/include/pcb_ext.h @@ -47,7 +47,7 @@ struct pcb_ext { struct user_segment_descriptor ext_tssd; /* tss descriptor */ - struct amd64tss ext_tss; /* per-process amd64tss */ + struct x86_64tss ext_tss; /* per-process x86_64tss */ caddr_t ext_iomap; /* i/o permission bitmap */ }; diff --git a/sys/platform/pc64/include/vmparam.h b/sys/platform/pc64/include/vmparam.h index 7e5ff5549a..7522133206 100644 --- a/sys/platform/pc64/include/vmparam.h +++ b/sys/platform/pc64/include/vmparam.h @@ -46,7 +46,7 @@ #define _MACHINE_VMPARAM_H_ /* - * Machine dependent constants for AMD64. + * Machine dependent constants for x86_64. */ /* diff --git a/sys/platform/pc64/amd64/atomic.c b/sys/platform/pc64/x86_64/atomic.c similarity index 95% rename from sys/platform/pc64/amd64/atomic.c rename to sys/platform/pc64/x86_64/atomic.c index 508e7b1565..9af3cbb55f 100644 --- a/sys/platform/pc64/amd64/atomic.c +++ b/sys/platform/pc64/x86_64/atomic.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/atomic.c,v 1.3 1999/08/28 00:43:40 peter Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/atomic.c,v 1.1 2007/09/23 04:29:31 yanyh Exp $ */ /* This file creates publically callable functions to perform various diff --git a/sys/platform/pc64/amd64/autoconf.c b/sys/platform/pc64/x86_64/autoconf.c similarity index 99% rename from sys/platform/pc64/amd64/autoconf.c rename to sys/platform/pc64/x86_64/autoconf.c index 098223769c..12fd11cc6b 100644 --- a/sys/platform/pc64/amd64/autoconf.c +++ b/sys/platform/pc64/x86_64/autoconf.c @@ -36,7 +36,6 @@ * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.146.2.2 2001/06/07 06:05:58 dd Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/autoconf.c,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ /* diff --git a/sys/platform/pc64/amd64/busdma_machdep.c b/sys/platform/pc64/x86_64/busdma_machdep.c similarity index 100% rename from sys/platform/pc64/amd64/busdma_machdep.c rename to sys/platform/pc64/x86_64/busdma_machdep.c diff --git a/sys/platform/pc64/amd64/console.c b/sys/platform/pc64/x86_64/console.c similarity index 95% rename from sys/platform/pc64/amd64/console.c rename to sys/platform/pc64/x86_64/console.c index 3b5813fb65..aab4f515f3 100644 --- a/sys/platform/pc64/amd64/console.c +++ b/sys/platform/pc64/x86_64/console.c @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/amd64/console.c,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ #include diff --git a/sys/platform/pc64/amd64/cpufreq_machdep.c b/sys/platform/pc64/x86_64/cpufreq_machdep.c similarity index 100% rename from sys/platform/pc64/amd64/cpufreq_machdep.c rename to sys/platform/pc64/x86_64/cpufreq_machdep.c diff --git a/sys/platform/pc64/amd64/db_disasm.c b/sys/platform/pc64/x86_64/db_disasm.c similarity index 99% rename from sys/platform/pc64/amd64/db_disasm.c rename to sys/platform/pc64/x86_64/db_disasm.c index 9b9794d5fb..4fb3a53b33 100644 --- a/sys/platform/pc64/amd64/db_disasm.c +++ b/sys/platform/pc64/x86_64/db_disasm.c @@ -53,8 +53,6 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $DragonFly: src/sys/platform/pc64/amd64/db_disasm.c,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ /* diff --git a/sys/platform/pc64/amd64/db_interface.c b/sys/platform/pc64/x86_64/db_interface.c similarity index 98% rename from sys/platform/pc64/amd64/db_interface.c rename to sys/platform/pc64/x86_64/db_interface.c index f3046e8ea5..249d874036 100644 --- a/sys/platform/pc64/amd64/db_interface.c +++ b/sys/platform/pc64/x86_64/db_interface.c @@ -55,7 +55,6 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_interface.c,v 1.48.2.1 2000/07/07 00:38:46 obrien Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/db_interface.c,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ /* @@ -100,7 +99,7 @@ static int db_global_jmpbuf_valid; * kdb_trap - field a TRACE or BPT trap */ int -kdb_trap(int type, int code, struct amd64_saved_state *regs) +kdb_trap(int type, int code, struct x86_64_saved_state *regs) { volatile int ddb_mode = !(boothowto & RB_GDB); diff --git a/sys/platform/pc64/amd64/db_trace.c b/sys/platform/pc64/x86_64/db_trace.c similarity index 92% rename from sys/platform/pc64/amd64/db_trace.c rename to sys/platform/pc64/x86_64/db_trace.c index f50c0cfc70..3ccef35241 100644 --- a/sys/platform/pc64/amd64/db_trace.c +++ b/sys/platform/pc64/x86_64/db_trace.c @@ -55,7 +55,6 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/i386/i386/db_trace.c,v 1.35.2.3 2002/02/21 22:31:25 silby Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/db_trace.c,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ #include @@ -134,8 +133,8 @@ struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); */ #define INKERNEL(va) (((vm_offset_t)(va)) >= USRSTACK) -struct amd64_frame { - struct amd64_frame *f_frame; +struct x86_64_frame { + struct x86_64_frame *f_frame; long f_retaddr; long f_arg0; }; @@ -145,16 +144,16 @@ struct amd64_frame { #define INTERRUPT 2 #define SYSCALL 3 -static void db_nextframe(struct amd64_frame **, db_addr_t *); -static int db_numargs(struct amd64_frame *); +static void db_nextframe(struct x86_64_frame **, db_addr_t *); +static int db_numargs(struct x86_64_frame *); static void db_print_stack_entry(const char *, int, char **, long *, db_addr_t); static void dl_symbol_values(long callpc, const char **name); static char *watchtype_str(int type); -static int kamd64_set_watch(int watchnum, unsigned int watchaddr, +static int kx86_64_set_watch(int watchnum, unsigned int watchaddr, int size, int access, struct dbreg * d); -static int kamd64_clr_watch(int watchnum, struct dbreg * d); +static int kx86_64_clr_watch(int watchnum, struct dbreg * d); int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); void db_md_list_watchpoints(void); @@ -164,7 +163,7 @@ void db_md_list_watchpoints(void); * Figure out how many arguments were passed into the frame at "fp". */ static int -db_numargs(struct amd64_frame *fp) +db_numargs(struct x86_64_frame *fp) { #if 1 return (0); /* regparm, needs dwarf2 info */ @@ -219,7 +218,7 @@ db_print_stack_entry(const char *name, int narg, char **argnp, long *argp, * Figure out the next frame up in the call stack. */ static void -db_nextframe(struct amd64_frame **fp, db_addr_t *ip) +db_nextframe(struct x86_64_frame **fp, db_addr_t *ip) { struct trapframe *tf; int frame_type; @@ -258,7 +257,7 @@ db_nextframe(struct amd64_frame **fp, db_addr_t *ip) */ if (frame_type == NORMAL) { *ip = (db_addr_t) rip; - *fp = (struct amd64_frame *) rbp; + *fp = (struct x86_64_frame *) rbp; return; } @@ -309,14 +308,14 @@ db_nextframe(struct amd64_frame **fp, db_addr_t *ip) } *ip = (db_addr_t) rip; - *fp = (struct amd64_frame *) rbp; + *fp = (struct x86_64_frame *) rbp; } void db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif) { - struct amd64_frame *frame; + struct x86_64_frame *frame; long *argp; db_addr_t callpc; boolean_t first; @@ -326,20 +325,20 @@ db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, count = 1024; if (!have_addr) { - frame = (struct amd64_frame *)BP_REGS(&ddb_regs); + frame = (struct x86_64_frame *)BP_REGS(&ddb_regs); if (frame == NULL) - frame = (struct amd64_frame *)(SP_REGS(&ddb_regs) - 8); + frame = (struct x86_64_frame *)(SP_REGS(&ddb_regs) - 8); callpc = PC_REGS(&ddb_regs); } else { /* * Look for something that might be a frame pointer, just as * a convenience. */ - frame = (struct amd64_frame *)addr; + frame = (struct x86_64_frame *)addr; for (i = 0; i < 4096; i += 8) { - struct amd64_frame *check; + struct x86_64_frame *check; - check = (struct amd64_frame *)db_get_value((long)((char *)&frame->f_frame + i), 8, FALSE); + check = (struct x86_64_frame *)db_get_value((long)((char *)&frame->f_frame + i), 8, FALSE); if ((char *)check - (char *)frame >= 0 && (char *)check - (char *)frame < 4096 ) { @@ -358,7 +357,7 @@ db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, first = TRUE; while (count--) { - struct amd64_frame *actframe; + struct x86_64_frame *actframe; int narg; const char * name; db_expr_t offset; @@ -389,11 +388,11 @@ db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, instr = db_get_value(callpc, 4, FALSE); if ((instr & 0xffffffff) == 0xe5894855) { /* pushq %rbp; movq %rsp, %rbp */ - actframe = (struct amd64_frame *) + actframe = (struct x86_64_frame *) (SP_REGS(&ddb_regs) - 8); } else if ((instr & 0xffffff) == 0xe58948) { /* movq %rsp, %rbp */ - actframe = (struct amd64_frame *) + actframe = (struct x86_64_frame *) SP_REGS(&ddb_regs); if (ddb_regs.tf_rbp == 0) { /* Fake caller's frame better. */ @@ -401,11 +400,11 @@ db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, } } else if ((instr & 0xff) == 0xc3) { /* ret */ - actframe = (struct amd64_frame *) + actframe = (struct x86_64_frame *) (SP_REGS(&ddb_regs) - 8); } else if (offset == 0) { /* Probably a symbol in assembler code. */ - actframe = (struct amd64_frame *) + actframe = (struct x86_64_frame *) (SP_REGS(&ddb_regs) - 8); } } else if (name != NULL && @@ -474,7 +473,7 @@ DB_DRX_FUNC(dr6) DB_DRX_FUNC(dr7) static int -kamd64_set_watch(int watchnum, unsigned int watchaddr, int size, int access, +kx86_64_set_watch(int watchnum, unsigned int watchaddr, int size, int access, struct dbreg *d) { int i; @@ -536,7 +535,7 @@ kamd64_set_watch(int watchnum, unsigned int watchaddr, int size, int access, int -kamd64_clr_watch(int watchnum, struct dbreg *d) +kx86_64_clr_watch(int watchnum, struct dbreg *d) { if (watchnum < 0 || watchnum >= 4) return(-1); @@ -576,7 +575,7 @@ db_md_set_watchpoint(db_expr_t addr, db_expr_t size) wsize = size; if (wsize == 3) wsize++; - kamd64_set_watch(i, addr, wsize, DBREG_DR7_WRONLY, &d); + kx86_64_set_watch(i, addr, wsize, DBREG_DR7_WRONLY, &d); addr += wsize; size -= wsize; } @@ -599,7 +598,7 @@ db_md_clr_watchpoint(db_expr_t addr, db_expr_t size) if (d.dr[7] & (3 << (i * 2))) { if ((DBREG_DRX((&d), i) >= addr) && (DBREG_DRX((&d), i) < addr + size)) - kamd64_clr_watch(i, &d); + kx86_64_clr_watch(i, &d); } } diff --git a/sys/platform/pc64/amd64/elf_machdep.c b/sys/platform/pc64/x86_64/elf_machdep.c similarity index 97% rename from sys/platform/pc64/amd64/elf_machdep.c rename to sys/platform/pc64/x86_64/elf_machdep.c index 258f27ad48..474b2b48a2 100644 --- a/sys/platform/pc64/amd64/elf_machdep.c +++ b/sys/platform/pc64/x86_64/elf_machdep.c @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/elf_machdep.c,v 1.8 1999/12/21 11:14:02 eivind Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/elf_machdep.c,v 1.2 2007/09/24 03:24:45 yanyh Exp $ */ #include diff --git a/sys/platform/pc64/amd64/est.c b/sys/platform/pc64/x86_64/est.c similarity index 100% rename from sys/platform/pc64/amd64/est.c rename to sys/platform/pc64/x86_64/est.c diff --git a/sys/platform/pc64/amd64/exception.S b/sys/platform/pc64/x86_64/exception.S similarity index 98% rename from sys/platform/pc64/amd64/exception.S rename to sys/platform/pc64/x86_64/exception.S index 7b72b33afd..b9ca27e7f5 100644 --- a/sys/platform/pc64/amd64/exception.S +++ b/sys/platform/pc64/x86_64/exception.S @@ -32,9 +32,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ - * $DragonFly: src/sys/platform/pc64/amd64/exception.S,v 1.1 2008/08/29 17:07:10 dillon Exp $ */ #if JG @@ -65,7 +62,7 @@ * This is equivalent to the i386 port's use of SDT_SYS386TGT. * * The cpu will push a certain amount of state onto the kernel stack for - * the current process. See amd64/include/frame.h. + * the current process. See x86_64/include/frame.h. * This includes the current RFLAGS (status register, which includes * the interrupt disable state prior to the trap), the code segment register, * and the return instruction pointer are pushed by the cpu. The cpu @@ -444,7 +441,7 @@ ENTRY(fork_trampoline) xorl %eax, %eax call panic pmsg4: .asciz "fork_trampoline mpcount %d after calling %p" - /* JG what's the purpose of this alignment and is it enough on amd64? */ + /* JG what's the purpose of this alignment and is it enough on x86_64? */ .p2align 2 1: #endif @@ -472,7 +469,7 @@ pmsg4: .asciz "fork_trampoline mpcount %d after calling %p" .text SUPERALIGN_TEXT -#include +#include #endif .data @@ -482,7 +479,7 @@ pmsg4: .asciz "fork_trampoline mpcount %d after calling %p" MCOUNT_LABEL(bintr) #if JG -#include +#include #endif #ifdef DEV_ATPIC @@ -491,7 +488,7 @@ MCOUNT_LABEL(bintr) .text SUPERALIGN_TEXT -#include +#include #endif .text diff --git a/sys/platform/pc64/amd64/genassym.c b/sys/platform/pc64/x86_64/genassym.c similarity index 98% rename from sys/platform/pc64/amd64/genassym.c rename to sys/platform/pc64/x86_64/genassym.c index 8d6930a0e1..bc4778019f 100644 --- a/sys/platform/pc64/amd64/genassym.c +++ b/sys/platform/pc64/x86_64/genassym.c @@ -36,7 +36,6 @@ * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.86.2.3 2002/03/03 05:42:49 nyan Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/genassym.c,v 1.2 2008/08/29 17:07:10 dillon Exp $ */ #include @@ -121,7 +120,7 @@ ASSYM(PCB_RBP, offsetof(struct pcb, pcb_rbp)); ASSYM(PCB_RSP, offsetof(struct pcb, pcb_rsp)); ASSYM(PCB_RBX, offsetof(struct pcb, pcb_rbx)); ASSYM(PCB_RIP, offsetof(struct pcb, pcb_rip)); -ASSYM(TSS_RSP0, offsetof(struct amd64tss, tss_rsp0)); +ASSYM(TSS_RSP0, offsetof(struct x86_64tss, tss_rsp0)); ASSYM(PCB_DR0, offsetof(struct pcb, pcb_dr0)); ASSYM(PCB_DR1, offsetof(struct pcb, pcb_dr1)); diff --git a/sys/platform/pc64/amd64/global.s b/sys/platform/pc64/x86_64/global.s similarity index 97% rename from sys/platform/pc64/amd64/global.s rename to sys/platform/pc64/x86_64/global.s index 84a5c94471..2d9cd17d11 100644 --- a/sys/platform/pc64/amd64/global.s +++ b/sys/platform/pc64/x86_64/global.s @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/globals.s,v 1.13.2.1 2000/05/16 06:58:06 dillon Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/global.s,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ #include diff --git a/sys/platform/pc64/amd64/globaldata.c b/sys/platform/pc64/x86_64/globaldata.c similarity index 95% rename from sys/platform/pc64/amd64/globaldata.c rename to sys/platform/pc64/x86_64/globaldata.c index 71a06ced66..eed3cab512 100644 --- a/sys/platform/pc64/amd64/globaldata.c +++ b/sys/platform/pc64/x86_64/globaldata.c @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/amd64/globaldata.c,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ #include diff --git a/sys/platform/pc64/amd64/identcpu.c b/sys/platform/pc64/x86_64/identcpu.c similarity index 98% rename from sys/platform/pc64/amd64/identcpu.c rename to sys/platform/pc64/x86_64/identcpu.c index 0fdcacb67e..2127219d0f 100644 --- a/sys/platform/pc64/amd64/identcpu.c +++ b/sys/platform/pc64/x86_64/identcpu.c @@ -37,7 +37,6 @@ * SUCH DAMAGE. * * from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp - * $DragonFly: src/sys/platform/pc64/amd64/identcpu.c,v 1.2 2008/11/24 13:14:21 swildner Exp $ */ #include "opt_cpu.h" @@ -71,7 +70,7 @@ static void print_AMD_assoc(int i); static void print_via_padlock_info(void); int cpu_class; -char machine[] = "amd64"; +char machine[] = "x86_64"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "Machine class"); @@ -88,7 +87,7 @@ static char cpu_brand[48]; static struct { char *cpu_name; int cpu_class; -} amd64_cpus[] = { +} x86_64_cpus[] = { { "Clawhammer", CPUCLASS_K8 }, /* CPU_CLAWHAMMER */ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; @@ -115,9 +114,9 @@ printcpuinfo(void) u_int regs[4], i; char *brand; - cpu_class = amd64_cpus[cpu].cpu_class; + cpu_class = x86_64_cpus[cpu].cpu_class; kprintf("CPU: "); - strncpy(cpu_model, amd64_cpus[cpu].cpu_name, sizeof (cpu_model)); + strncpy(cpu_model, x86_64_cpus[cpu].cpu_name, sizeof (cpu_model)); /* Check for extended CPUID information and a processor name. */ if (cpu_exthigh >= 0x80000004) { diff --git a/sys/platform/pc64/amd64/in_cksum2.s b/sys/platform/pc64/x86_64/in_cksum2.s similarity index 96% rename from sys/platform/pc64/amd64/in_cksum2.s rename to sys/platform/pc64/x86_64/in_cksum2.s index 2378b07d64..bf249cc9bc 100644 --- a/sys/platform/pc64/amd64/in_cksum2.s +++ b/sys/platform/pc64/x86_64/in_cksum2.s @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/amd64/in_cksum2.s,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ #include /* miscellaneous asm macros */ diff --git a/sys/platform/pc64/amd64/init.c b/sys/platform/pc64/x86_64/init.c similarity index 97% rename from sys/platform/pc64/amd64/init.c rename to sys/platform/pc64/x86_64/init.c index 952e8aa13e..a6ce60c44e 100644 --- a/sys/platform/pc64/amd64/init.c +++ b/sys/platform/pc64/x86_64/init.c @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/amd64/init.c,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ #include diff --git a/sys/platform/pc64/amd64/initcpu.c b/sys/platform/pc64/x86_64/initcpu.c similarity index 96% rename from sys/platform/pc64/amd64/initcpu.c rename to sys/platform/pc64/x86_64/initcpu.c index 11f4b89726..338d2d8048 100644 --- a/sys/platform/pc64/amd64/initcpu.c +++ b/sys/platform/pc64/x86_64/initcpu.c @@ -26,8 +26,6 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/amd64/initcpu.c,v 1.1 2008/08/29 17:07:10 dillon Exp $ */ #include "opt_cpu.h" @@ -155,7 +153,7 @@ initializecpu(void) #endif } if (cpu_vendor_id == CPU_VENDOR_CENTAUR && - AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + X86_64_CPU_FAMILY(cpu_id) == 0x6 && + X86_64_CPU_MODEL(cpu_id) >= 0xf) init_via(); } diff --git a/sys/platform/pc64/amd64/ipl.s b/sys/platform/pc64/x86_64/ipl.s similarity index 98% rename from sys/platform/pc64/amd64/ipl.s rename to sys/platform/pc64/x86_64/ipl.s index e81c10e25a..2037850334 100644 --- a/sys/platform/pc64/amd64/ipl.s +++ b/sys/platform/pc64/x86_64/ipl.s @@ -71,7 +71,6 @@ * @(#)ipl.s * * $FreeBSD: src/sys/i386/isa/ipl.s,v 1.32.2.3 2002/05/16 16:03:56 bde Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/ipl.s,v 1.1 2008/08/29 17:07:10 dillon Exp $ */ #include @@ -206,7 +205,7 @@ doreti_iret: /* * doreti_iret_fault. Alternative return code for * the case where we get a fault in the doreti_exit code - * above. trap() (sys/platform/pc64/amd64/trap.c) catches this specific + * above. trap() (sys/platform/pc64/x86_64/trap.c) catches this specific * case, sends the process a signal and continues in the * corresponding place in the code below. */ diff --git a/sys/platform/pc64/amd64/ipl_funcs.c b/sys/platform/pc64/x86_64/ipl_funcs.c similarity index 97% rename from sys/platform/pc64/amd64/ipl_funcs.c rename to sys/platform/pc64/x86_64/ipl_funcs.c index 8fae7c38d7..45cab2a067 100644 --- a/sys/platform/pc64/amd64/ipl_funcs.c +++ b/sys/platform/pc64/x86_64/ipl_funcs.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/ipl_funcs.c,v 1.32.2.5 2002/12/17 18:04:02 sam Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/ipl_funcs.c,v 1.2 2007/09/24 03:24:45 yanyh Exp $ */ #include diff --git a/sys/platform/pc64/amd64/ktr.c b/sys/platform/pc64/x86_64/ktr.c similarity index 97% rename from sys/platform/pc64/amd64/ktr.c rename to sys/platform/pc64/x86_64/ktr.c index da201dedde..a85a71c7d0 100644 --- a/sys/platform/pc64/amd64/ktr.c +++ b/sys/platform/pc64/x86_64/ktr.c @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/amd64/ktr.c,v 1.2 2007/09/24 03:24:45 yanyh Exp $ */ /* * Kernel tracepoint facility. diff --git a/sys/platform/pc64/amd64/locore.s b/sys/platform/pc64/x86_64/locore.s similarity index 97% rename from sys/platform/pc64/amd64/locore.s rename to sys/platform/pc64/x86_64/locore.s index 81237ab161..50827fc7ec 100644 --- a/sys/platform/pc64/amd64/locore.s +++ b/sys/platform/pc64/x86_64/locore.s @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/amd64/amd64/locore.S,v 1.175 2003/05/31 06:54:28 peter Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/locore.s,v 1.2 2008/08/29 17:07:10 dillon Exp $ */ #include diff --git a/sys/platform/pc64/amd64/machdep.c b/sys/platform/pc64/x86_64/machdep.c similarity index 99% rename from sys/platform/pc64/amd64/machdep.c rename to sys/platform/pc64/x86_64/machdep.c index ea3db09dcf..0d7cdc2856 100644 --- a/sys/platform/pc64/amd64/machdep.c +++ b/sys/platform/pc64/x86_64/machdep.c @@ -38,7 +38,6 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/machdep.c,v 1.1 2008/08/29 17:07:10 dillon Exp $ */ #include "use_ether.h" @@ -198,7 +197,7 @@ static int sysctl_hw_availpages(SYSCTL_HANDLER_ARGS) { int error = sysctl_handle_int(oidp, 0, - amd64_btop(avail_end - avail_start), req); + x86_64_btop(avail_end - avail_start), req); return (error); } @@ -566,7 +565,7 @@ cpu_sanitize_frame(struct trapframe *frame) /* * Sanitize the tls so loading the descriptor does not blow up - * on us. For AMD64 we don't have to do anything. + * on us. For x86_64 we don't have to do anything. */ int cpu_sanitize_tls(struct savetls *tls) @@ -1201,7 +1200,7 @@ struct soft_segment_descriptor gdt_segs[] = { /* GPROC0_SEL 6 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ - sizeof(struct amd64tss)-1,/* length - all address space */ + sizeof(struct x86_64tss)-1,/* length - all address space */ SDT_SYSTSS, /* segment type */ SEL_KPL, /* segment descriptor priority level */ 1, /* segment descriptor present */ @@ -1789,7 +1788,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) gd->gd_common_tss.tss_ist1 = (long)&dblfault_stack[sizeof(dblfault_stack)]; /* Set the IO permission bitmap (empty due to tss seg limit) */ - gd->gd_common_tss.tss_iobase = sizeof(struct amd64tss); + gd->gd_common_tss.tss_iobase = sizeof(struct x86_64tss); gsel_tss = GSEL(GPROC0_SEL, SEL_KPL); gd->gd_tss_gdt = &gdt[GPROC0_SEL]; diff --git a/sys/platform/pc64/amd64/mp_machdep.c b/sys/platform/pc64/x86_64/mp_machdep.c similarity index 99% rename from sys/platform/pc64/amd64/mp_machdep.c rename to sys/platform/pc64/x86_64/mp_machdep.c index 9b4301786d..4ba86bc322 100644 --- a/sys/platform/pc64/amd64/mp_machdep.c +++ b/sys/platform/pc64/x86_64/mp_machdep.c @@ -2117,7 +2117,7 @@ start_all_aps(u_int boot_addr) /* This is a bit verbose, it will go away soon. */ /* first page of AP's private space */ - pg = x * amd64_btop(sizeof(struct privatespace)); + pg = x * x86_64_btop(sizeof(struct privatespace)); /* allocate new private data page(s) */ gd = (struct mdglobaldata *)kmem_alloc(&kernel_map, diff --git a/sys/platform/pc64/amd64/mpboot.S b/sys/platform/pc64/x86_64/mpboot.S similarity index 100% rename from sys/platform/pc64/amd64/mpboot.S rename to sys/platform/pc64/x86_64/mpboot.S diff --git a/sys/platform/pc64/amd64/mplock.s b/sys/platform/pc64/x86_64/mplock.s similarity index 100% rename from sys/platform/pc64/amd64/mplock.s rename to sys/platform/pc64/x86_64/mplock.s diff --git a/sys/platform/pc64/amd64/nexus.c b/sys/platform/pc64/x86_64/nexus.c similarity index 99% rename from sys/platform/pc64/amd64/nexus.c rename to sys/platform/pc64/x86_64/nexus.c index 80f15002d7..6f2ca9e602 100644 --- a/sys/platform/pc64/amd64/nexus.c +++ b/sys/platform/pc64/x86_64/nexus.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/nexus.c,v 1.26.2.10 2003/02/22 13:16:45 imp Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/nexus.c,v 1.1 2008/08/29 17:07:10 dillon Exp $ */ /* diff --git a/sys/platform/pc64/amd64/npx.c b/sys/platform/pc64/x86_64/npx.c similarity index 99% rename from sys/platform/pc64/amd64/npx.c rename to sys/platform/pc64/x86_64/npx.c index b467dac8f4..a5d422d0e6 100644 --- a/sys/platform/pc64/amd64/npx.c +++ b/sys/platform/pc64/x86_64/npx.c @@ -34,7 +34,6 @@ * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/isa/npx.c,v 1.80.2.3 2001/10/20 19:04:38 tegge Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/npx.c,v 1.4 2008/08/29 17:07:10 dillon Exp $ */ #include "opt_debug_npx.h" diff --git a/sys/platform/pc64/amd64/pmap.c b/sys/platform/pc64/x86_64/pmap.c similarity index 99% rename from sys/platform/pc64/amd64/pmap.c rename to sys/platform/pc64/x86_64/pmap.c index 0e94de9495..246b4a5451 100644 --- a/sys/platform/pc64/amd64/pmap.c +++ b/sys/platform/pc64/x86_64/pmap.c @@ -42,7 +42,6 @@ * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.250.2.18 2002/03/06 22:48:53 silby Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/pmap.c,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ /* @@ -635,7 +634,7 @@ pmap_bootstrap(vm_paddr_t *firstaddr) * Note that we have enabled PSE mode */ pseflag = PG_PS; - ptditmp = *(PTmap + amd64_btop(KERNBASE)); + ptditmp = *(PTmap + x86_64_btop(KERNBASE)); ptditmp &= ~(NBPDR - 1); ptditmp |= PG_V | PG_RW | PG_PS | PG_U | pgeflag; pdir4mb = ptditmp; @@ -1110,7 +1109,7 @@ pmap_init_thread(thread_t td) /* enforce pcb placement */ td->td_pcb = (struct pcb *)(td->td_kstack + td->td_kstack_size) - 1; td->td_savefpu = &td->td_pcb->pcb_save; - td->td_sp = (char *)td->td_pcb - 16; /* JG is -16 needed on amd64? */ + td->td_sp = (char *)td->td_pcb - 16; /* JG is -16 needed on x86_64? */ } /* @@ -2708,7 +2707,7 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m) * Make a temporary mapping for a physical address. This is only intended * to be used for panic dumps. */ -/* JG Needed on amd64? */ +/* JG Needed on x86_64? */ void * pmap_kenter_temporary(vm_paddr_t pa, int i) { @@ -2748,7 +2747,7 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_prot_t prot, if (lp == NULL || pmap != vmspace_pmap(lp->lwp_vmspace)) return; - psize = amd64_btop(size); + psize = x86_64_btop(size); if ((object->type != OBJT_VNODE) || ((limit & MAP_PREFAULT_PARTIAL) && (psize > MAX_INIT_PT) && @@ -2806,7 +2805,7 @@ pmap_object_init_pt_callback(vm_page_t p, void *data) vm_page_busy(p); rel_index = p->pindex - info->start_pindex; pmap_enter_quick(info->pmap, - info->addr + amd64_ptob(rel_index), p); + info->addr + x86_64_ptob(rel_index), p); vm_page_wakeup(p); } return(0); @@ -3482,7 +3481,7 @@ pmap_page_protect(vm_page_t m, vm_prot_t prot) vm_paddr_t pmap_phys_address(vm_pindex_t ppn) { - return (amd64_ptob(ppn)); + return (x86_64_ptob(ppn)); } /* diff --git a/sys/platform/pc64/amd64/pmap_inval.c b/sys/platform/pc64/x86_64/pmap_inval.c similarity index 97% rename from sys/platform/pc64/amd64/pmap_inval.c rename to sys/platform/pc64/x86_64/pmap_inval.c index 7d65fa62e3..07a9c0ab33 100644 --- a/sys/platform/pc64/amd64/pmap_inval.c +++ b/sys/platform/pc64/x86_64/pmap_inval.c @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/amd64/pmap_inval.c,v 1.1 2008/08/29 17:07:10 dillon Exp $ */ /* diff --git a/sys/platform/pc64/amd64/procfs_machdep.c b/sys/platform/pc64/x86_64/procfs_machdep.c similarity index 97% rename from sys/platform/pc64/amd64/procfs_machdep.c rename to sys/platform/pc64/x86_64/procfs_machdep.c index 584d04b2f1..2a2b5d64b7 100644 --- a/sys/platform/pc64/amd64/procfs_machdep.c +++ b/sys/platform/pc64/x86_64/procfs_machdep.c @@ -38,7 +38,6 @@ * * From: * $FreeBSD: src/sys/i386/i386/procfs_machdep.c,v 1.14 1999/10/11 14:50:03 peter Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/procfs_machdep.c,v 1.2 2007/09/24 03:24:45 yanyh Exp $ */ /* diff --git a/sys/platform/pc64/amd64/sigtramp.s b/sys/platform/pc64/x86_64/sigtramp.s similarity index 95% rename from sys/platform/pc64/amd64/sigtramp.s rename to sys/platform/pc64/x86_64/sigtramp.s index 6ee2bfee96..6f91c913ce 100644 --- a/sys/platform/pc64/amd64/sigtramp.s +++ b/sys/platform/pc64/x86_64/sigtramp.s @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/amd64/amd64/sigtramp.S,v 1.1 2003/05/01 01:05:21 peter Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/sigtramp.s,v 1.1 2007/09/23 04:29:31 yanyh Exp $ */ #include diff --git a/sys/platform/pc64/amd64/spinlock.s b/sys/platform/pc64/x86_64/spinlock.s similarity index 97% rename from sys/platform/pc64/amd64/spinlock.s rename to sys/platform/pc64/x86_64/spinlock.s index d7410966c9..42c03a718c 100644 --- a/sys/platform/pc64/amd64/spinlock.s +++ b/sys/platform/pc64/x86_64/spinlock.s @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/simplelock.s,v 1.11.2.2 2003/02/04 20:55:28 jhb Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/spinlock.s,v 1.1 2008/08/29 17:07:10 dillon Exp $ */ #include /* miscellaneous macros */ diff --git a/sys/platform/pc64/amd64/support.s b/sys/platform/pc64/x86_64/support.s similarity index 98% rename from sys/platform/pc64/amd64/support.s rename to sys/platform/pc64/x86_64/support.s index 847e49ba40..83314d0b1f 100644 --- a/sys/platform/pc64/amd64/support.s +++ b/sys/platform/pc64/x86_64/support.s @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.127 2007/05/23 08:33:04 kib Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/support.s,v 1.2 2008/08/29 17:07:10 dillon Exp $ */ #include "opt_ddb.h" @@ -644,7 +643,7 @@ ENTRY(copystr) ret /* - * Handling of special amd64 registers and descriptor tables etc + * Handling of special x86_64 registers and descriptor tables etc * %rdi */ /* void lgdt(struct region_descriptor *rdp); */ diff --git a/sys/platform/pc64/amd64/swtch.s b/sys/platform/pc64/x86_64/swtch.s similarity index 99% rename from sys/platform/pc64/amd64/swtch.s rename to sys/platform/pc64/x86_64/swtch.s index d3c46f8827..68820680c4 100644 --- a/sys/platform/pc64/amd64/swtch.s +++ b/sys/platform/pc64/x86_64/swtch.s @@ -67,7 +67,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.89.2.10 2003/01/23 03:36:24 ps Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/swtch.s,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ //#include "use_npx.h" @@ -465,7 +464,7 @@ ENTRY(cpu_heavy_restore) movq %dr7,%rax /* load dr7 so as not to disturb */ /* JG correct value? */ andq $0x0000fc00,%rax /* reserved bits */ - /* JG we've got more registers on amd64 */ + /* JG we've got more registers on x86_64 */ pushq %rbx movq PCB_DR7(%rdx),%rbx /* JG correct value? */ @@ -624,7 +623,7 @@ ENTRY(cpu_kthread_restore) */ ENTRY(cpu_lwkt_switch) pushq %rbp /* JG note: GDB hacked to locate ebp relative to td_sp */ - /* JG we've got more registers on AMD64 */ + /* JG we've got more registers on x86_64 */ pushq %rbx movq PCPU(curthread),%rbx pushq %r12 diff --git a/sys/platform/pc64/amd64/sysarch.c b/sys/platform/pc64/x86_64/sysarch.c similarity index 95% rename from sys/platform/pc64/amd64/sysarch.c rename to sys/platform/pc64/x86_64/sysarch.c index afc3bdb1bd..c2a875b719 100644 --- a/sys/platform/pc64/amd64/sysarch.c +++ b/sys/platform/pc64/x86_64/sysarch.c @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/amd64/sysarch.c,v 1.2 2007/09/24 03:24:45 yanyh Exp $ */ #include #include diff --git a/sys/platform/pc64/amd64/systimer.c b/sys/platform/pc64/x86_64/systimer.c similarity index 96% rename from sys/platform/pc64/amd64/systimer.c rename to sys/platform/pc64/x86_64/systimer.c index e4c49ceaf8..38a949bd80 100644 --- a/sys/platform/pc64/amd64/systimer.c +++ b/sys/platform/pc64/x86_64/systimer.c @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/amd64/systimer.c,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ #include diff --git a/sys/platform/pc64/amd64/tls.c b/sys/platform/pc64/x86_64/tls.c similarity index 95% rename from sys/platform/pc64/amd64/tls.c rename to sys/platform/pc64/x86_64/tls.c index a0d44319f8..35bd83bf57 100644 --- a/sys/platform/pc64/amd64/tls.c +++ b/sys/platform/pc64/x86_64/tls.c @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/amd64/tls.c,v 1.4 2008/08/29 17:07:10 dillon Exp $ */ #include @@ -58,7 +56,7 @@ #include /* - * set a TLS descriptor. For AMD64 descriptor 0 identifies %fs and + * set a TLS descriptor. For x86_64 descriptor 0 identifies %fs and * descriptor 1 identifies %gs, and 0 is returned in sysmsg_result. * * Returns the value userland needs to load into %gs representing the @@ -100,7 +98,7 @@ sys_set_tls_area(struct set_tls_area_args *uap) return (EINVAL); /* - * For AMD64 we can only adjust FSBASE and GSBASE + * For x86_64 we can only adjust FSBASE and GSBASE */ curthread->td_tls.info[i] = info; set_user_TLS(); diff --git a/sys/platform/pc64/amd64/trap.c b/sys/platform/pc64/x86_64/trap.c similarity index 99% rename from sys/platform/pc64/amd64/trap.c rename to sys/platform/pc64/x86_64/trap.c index e1b98b0e92..da7499b0ce 100644 --- a/sys/platform/pc64/amd64/trap.c +++ b/sys/platform/pc64/x86_64/trap.c @@ -38,11 +38,10 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * $FreeBSD: src/sys/i386/i386/trap.c,v 1.147.2.11 2003/02/27 19:09:59 luoqi Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/trap.c,v 1.3 2008/09/09 04:06:18 dillon Exp $ */ /* - * AMD64 Trap and System call handling + * x86_64 Trap and System call handling */ #include "opt_ddb.h" @@ -873,7 +872,7 @@ nogo: } /* - * NOTE: on amd64 we have a tf_addr field in the trapframe, no + * NOTE: on x86_64 we have a tf_addr field in the trapframe, no * kludge is needed to pass the fault address to signal handlers. */ struct proc *p = td->td_proc; @@ -1100,7 +1099,7 @@ syscall2(struct trapframe *frame) narg = callp->sy_narg & SYF_ARGMASK; /* - * On amd64 we get up to six arguments in registers. The rest are + * On x86_64 we get up to six arguments in registers. The rest are * on the stack. The first six members of 'struct trapframe' happen * to be the registers used to pass arguments, in exactly the right * order. diff --git a/sys/platform/pc64/amd64/userldt.c b/sys/platform/pc64/x86_64/userldt.c similarity index 95% rename from sys/platform/pc64/amd64/userldt.c rename to sys/platform/pc64/x86_64/userldt.c index 8ef9a4d644..380f887d8c 100644 --- a/sys/platform/pc64/amd64/userldt.c +++ b/sys/platform/pc64/x86_64/userldt.c @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/amd64/userldt.c,v 1.2 2007/09/24 03:24:45 yanyh Exp $ */ #include diff --git a/sys/platform/pc64/amd64/vm_machdep.c b/sys/platform/pc64/x86_64/vm_machdep.c similarity index 98% rename from sys/platform/pc64/amd64/vm_machdep.c rename to sys/platform/pc64/x86_64/vm_machdep.c index 3fc1e4227c..8165d8d309 100644 --- a/sys/platform/pc64/amd64/vm_machdep.c +++ b/sys/platform/pc64/x86_64/vm_machdep.c @@ -40,7 +40,6 @@ * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $ - * $DragonFly: src/sys/platform/pc64/amd64/vm_machdep.c,v 1.3 2008/08/29 17:07:10 dillon Exp $ */ #include @@ -383,7 +382,7 @@ is_physical_memory(vm_offset_t addr) } /* - * platform-specific vmspace initialization (nothing for amd64) + * platform-specific vmspace initialization (nothing for x86_64) */ void cpu_vmspace_alloc(struct vmspace *vm __unused) diff --git a/sys/sys/disklabel32.h b/sys/sys/disklabel32.h index 80665a74ac..b944b830b7 100644 --- a/sys/sys/disklabel32.h +++ b/sys/sys/disklabel32.h @@ -56,7 +56,7 @@ */ /* XXX these should be defined per controller (or drive) elsewhere, not here! */ -#if defined(__i386__) || defined(__amd64__) +#if defined(__i386__) || defined(__x86_64__) #define LABELSECTOR32 1 /* sector containing label */ #define LABELOFFSET32 0 /* offset of label in sector */ #endif diff --git a/sys/sys/mpt_ioctl.h b/sys/sys/mpt_ioctl.h index 77c73aec3a..679866f418 100644 --- a/sys/sys/mpt_ioctl.h +++ b/sys/sys/mpt_ioctl.h @@ -89,7 +89,7 @@ struct mpt_raid_action { #define MPTIO_WRITE_CFG_PAGE _IOWR('M', 104, struct mpt_cfg_page_req) #define MPTIO_RAID_ACTION _IOWR('M', 105, struct mpt_raid_action) -#if defined(__amd64__) +#if defined(__x86_64__) struct mpt_cfg_page_req32 { CONFIG_PAGE_HEADER header; uint32_t page_address; diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 0495ba7852..f42dc93db5 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -96,7 +96,7 @@ extern int ncpus_fit; /* round up to a power of 2 */ extern int ncpus_fit_mask; /* ncpus_fit - 1 */ extern int clocks_running; /* timing/timeout subsystem is operational */ -/* XXX TGEN these don't belong here, they're MD on i386/amd64 */ +/* XXX TGEN these don't belong here, they're MD on i386/x86_64 */ extern u_int cpu_feature; /* CPUID_* features */ extern u_int cpu_feature2; /* CPUID2_* features */ @@ -295,7 +295,7 @@ typedef void timeout_t (void *); /* timeout function type */ * For the alpha arch, some of these functions are static __inline, and * the others should be. */ -#if defined(__i386__) || defined(__amd64__) +#if defined(__i386__) || defined(__x86_64__) void setdelayed (void); void setsoftcambio (void); void setsoftcamnet (void); diff --git a/sys/sys/tls.h b/sys/sys/tls.h index 69bfc3ade2..ba21b7ed5e 100644 --- a/sys/sys/tls.h +++ b/sys/sys/tls.h @@ -44,7 +44,7 @@ struct tls_info { int set_tls_area(int which, struct tls_info *info, size_t infosize); int get_tls_area(int which, struct tls_info *info, size_t infosize); -#ifdef __amd64__ +#ifdef __x86_64__ #define TLS_WHICH_FS 0 #define TLS_WHICH_GS 1 diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 717522b7d5..a10a6ead34 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -262,7 +262,7 @@ vm_page_startup(vm_offset_t vaddr) new_end = trunc_page(end - page_range * sizeof(struct vm_page)); mapped = pmap_map(mapped, new_end, end, VM_PROT_READ | VM_PROT_WRITE); -#ifdef __amd64__ +#ifdef __x86_64__ /* pmap_map() returns an address in the DMAP region */ vm_page_array = (vm_page_t) mapped; mapped = vaddr; diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 49ae5f2e8b..9c312edbf0 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -101,7 +101,7 @@ #include #endif -#ifdef __amd64__ +#ifdef __x86_64__ #include #endif @@ -609,7 +609,7 @@ vm_page_free(vm_page_t m) static __inline void vm_page_free_zero(vm_page_t m) { -#ifdef __amd64__ +#ifdef __x86_64__ /* JG DEBUG64 We check if the page is really zeroed. */ char *p = (char *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(m)); int i; diff --git a/test/sysperf/memcpy.S b/test/sysperf/memcpy.S index 4acc5214ce..bdc621c7a1 100644 --- a/test/sysperf/memcpy.S +++ b/test/sysperf/memcpy.S @@ -2,7 +2,7 @@ /* * memcpy.S * - * AMD64: MOVNTQ vs MOVQ, MOVNTDQ vs MOVDQ[A/U], PREFETCH[x] + * x86_64: MOVNTQ vs MOVQ, MOVNTDQ vs MOVDQ[A/U], PREFETCH[x] * * NT stands for 'non-temportal', which basically means * 'bypass L1 cache on write'. Write bandwidth is diff --git a/test/amd64/Makefile b/test/x86_64/Makefile similarity index 92% rename from test/amd64/Makefile rename to test/x86_64/Makefile index f07acdfaa3..c060e73241 100644 --- a/test/amd64/Makefile +++ b/test/x86_64/Makefile @@ -122,12 +122,12 @@ world32: checkq world64: checkq cd ${SRCDIR} && \ - make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 NO_GCC44=1 \ + make -j 4 TARGET_ARCH=x86_64 TARGET_PLATFORM=pc64 NO_GCC44=1 \ buildworld kernel64: checkq cd ${SRCDIR} && \ - make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 KERNCONF=JG64 \ + make -j 4 TARGET_ARCH=x86_64 TARGET_PLATFORM=pc64 KERNCONF=JG64 \ buildkernel # Quick build - just rebuild the kernel quickly @@ -135,12 +135,12 @@ kernel64: checkq # quickworld64: checkq cd ${SRCDIR} && \ - make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 NO_GCC44=1 \ + make -j 4 TARGET_ARCH=x86_64 TARGET_PLATFORM=pc64 NO_GCC44=1 \ quickworld quickkernel64: checkq cd ${SRCDIR} && \ - make TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 KERNCONF=JG64 \ + make TARGET_ARCH=x86_64 TARGET_PLATFORM=pc64 KERNCONF=JG64 \ quickkernel # Build and mount an empty filesystem for the emulated root disk @@ -175,10 +175,10 @@ umount: check # install64: mount cd ${SRCDIR} && \ - make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 \ + make -j 4 TARGET_ARCH=x86_64 TARGET_PLATFORM=pc64 \ DESTDIR=${QEMUDIR}/root NO_GCC44=1 installworld cd ${SRCDIR}/etc && \ - make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 \ + make -j 4 TARGET_ARCH=x86_64 TARGET_PLATFORM=pc64 \ DESTDIR=${QEMUDIR}/root distribution echo '/dev/ad0s1a / ufs rw 1 1' > ${QEMUDIR}/root/etc/fstab echo 'proc /proc procfs rw 0 0' >> ${QEMUDIR}/root/etc/fstab @@ -186,7 +186,7 @@ install64: mount (egrep -v '^console' ${QEMUDIR}/root/etc/ttys; echo 'console "/usr/libexec/getty Pc" cons25 on secure') > ${QEMUDIR}/root/etc/ttys.new mv -f ${QEMUDIR}/root/etc/ttys.new ${QEMUDIR}/root/etc/ttys cd ${SRCDIR} && \ - make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 \ + make -j 4 TARGET_ARCH=x86_64 TARGET_PLATFORM=pc64 \ DESTDIR=${QEMUDIR}/root KERNCONF=JG64 \ installkernel @echo "WARNING: 64 bit loader installed, if it doesn't work" @@ -200,12 +200,12 @@ reinstall64: mount @echo " This loader should still be able to boot the" @echo " 64 bit kernel" cd ${SRCDIR} && \ - make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 \ + make -j 4 TARGET_ARCH=x86_64 TARGET_PLATFORM=pc64 \ DESTDIR=${QEMUDIR}/root NO_GCC44=1 installworld reinstallkernel64: mount cd ${SRCDIR} && \ - make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 \ + make -j 4 TARGET_ARCH=x86_64 TARGET_PLATFORM=pc64 \ DESTDIR=${QEMUDIR}/root KERNCONF=JG64 \ installkernel @@ -235,7 +235,7 @@ rungdb: check # build a gdb capable of debugging 64 bit binaries # gdb64: - cd /usr/src/gnu/usr.bin/gdb && (make clean; make TARGET_ARCH=amd64) + cd /usr/src/gnu/usr.bin/gdb && (make clean; make TARGET_ARCH=x86_64) cp /usr/obj/usr/src/gnu/usr.bin/gdb/gdb/gdb /usr/local/bin/gdb64 cd /usr/src/gnu/usr.bin/gdb && make clean diff --git a/test/amd64/qemu.patch b/test/x86_64/qemu.patch similarity index 100% rename from test/amd64/qemu.patch rename to test/x86_64/qemu.patch diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h index 84ee1ca401..d780b85853 100644 --- a/usr.bin/gprof/gprof.h +++ b/usr.bin/gprof/gprof.h @@ -63,8 +63,8 @@ #if mips # include "mips.h" #endif -#if __amd64__ -# include "amd64.h" +#if __x86_64__ +# include "x86_64.h" #endif diff --git a/usr.bin/gprof/amd64.h b/usr.bin/gprof/x86_64.h similarity index 96% rename from usr.bin/gprof/amd64.h rename to usr.bin/gprof/x86_64.h index 49cb8c8a32..c869875864 100644 --- a/usr.bin/gprof/amd64.h +++ b/usr.bin/gprof/x86_64.h @@ -32,7 +32,6 @@ * * @(#)i386.h 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.bin/gprof/amd64.h,v 1.2 2002/02/21 07:12:57 bde Exp $ - * $DragonFly: src/usr.bin/gprof/amd64.h,v 1.1 2006/07/31 12:12:08 corecode Exp $ */ /* diff --git a/usr.bin/mandoc/arch.in b/usr.bin/mandoc/arch.in index b1c23eea38..1de5fd18ed 100644 --- a/usr.bin/mandoc/arch.in +++ b/usr.bin/mandoc/arch.in @@ -25,7 +25,6 @@ */ LINE("alpha", "Alpha") -LINE("amd64", "AMD64") LINE("amiga", "Amiga") LINE("arc", "ARC") LINE("arm", "ARM") @@ -49,4 +48,5 @@ LINE("sparc", "SPARC") LINE("sparc64", "SPARC64") LINE("sun3", "Sun3") LINE("vax", "VAX") +LINE("x86_64", "x86_64") LINE("zaurus", "Zaurus") diff --git a/usr.bin/mandoc/mdoc.7 b/usr.bin/mandoc/mdoc.7 index 80441bd1a7..cb2a244a32 100644 --- a/usr.bin/mandoc/mdoc.7 +++ b/usr.bin/mandoc/mdoc.7 @@ -1290,7 +1290,6 @@ This specifies a specific relevant architecture. If is not provided, it may be used in its place, else it may be used subsequent that. It, too, is optional. It must be one of .Ar alpha , -.Ar amd64 , .Ar amiga , .Ar arc , .Ar arm , @@ -1314,6 +1313,7 @@ subsequent that. It, too, is optional. It must be one of .Ar sparc64 , .Ar sun3 , .Ar vax , +.Ar x86_64 , or .Ar zaurus . .El diff --git a/usr.bin/xlint/lint1/param.h b/usr.bin/xlint/lint1/param.h index c8c7971f72..f1968fc2f3 100644 --- a/usr.bin/xlint/lint1/param.h +++ b/usr.bin/xlint/lint1/param.h @@ -63,7 +63,7 @@ * Should be set to 1 if the difference of two pointers is of type long * or the value of sizeof is of type unsigned long. */ -#ifdef __amd64__ +#ifdef __x86_64__ #define PTRDIFF_IS_LONG 1 #define SIZEOF_IS_ULONG 1 #elif __i386__ diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index e5b3472d2c..89a4348d51 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -172,7 +172,7 @@ SUBDIR+=editmap \ sendmail .endif -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" SUBDIR+= btxld .endif diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index e9cb48e09a..834ad8faf0 100644 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -611,7 +611,7 @@ CONFIRMED_UMASK=${NEW_UMASK:-0022} # Warn users who still have old rc files # for file in atm devfs diskless1 diskless2 isdn network network6 pccard \ - serial syscons sysctl alpha amd64 i386 ia64 sparc64; do + serial syscons sysctl alpha x86_64 i386 ia64 sparc64; do if [ -f "${DESTDIR}/etc/rc.${file}" ]; then OLD_RC_PRESENT=1 break @@ -637,7 +637,7 @@ case "${OLD_RC_PRESENT}" in *) mkdir -p /var/tmp/mergemaster/old_rc for file in atm devfs diskless1 diskless2 isdn network network6 pccard \ - serial syscons sysctl alpha amd64 i386 ia64 sparc64; do + serial syscons sysctl alpha x86_64 i386 ia64 sparc64; do if [ -f "${DESTDIR}/etc/rc.${file}" ]; then mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/ fi diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c index c908017ce9..1c1606b0ff 100644 --- a/usr.sbin/pppd/main.c +++ b/usr.sbin/pppd/main.c @@ -1492,7 +1492,7 @@ vfmtmsg(char *buf, int buflen, char *fmt, va_list args) break; case 'r': f = va_arg(args, char *); -#if !defined(__powerpc__) && !defined(__amd64__) +#if !defined(__powerpc__) && !defined(__x86_64__) n = vfmtmsg(buf, buflen + 1, f, va_arg(args, va_list)); #else /* On the powerpc, a va_list is an array of 1 structure */