rename amd64 architecture to x86_64
authorSimon Schubert <corecode@dragonflybsd.org>
Wed, 4 Nov 2009 16:22:28 +0000 (08:22 -0800)
committerSimon 'corecode' Schubert <corecode@fs.ei.tum.de>
Sat, 7 Nov 2009 12:07:31 +0000 (04:07 -0800)
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@

319 files changed:
Makefile
Makefile.inc1
crypto/openssl/README.DRAGONFLY
etc/etc.x86_64/disktab [moved from etc/etc.amd64/disktab with 100% similarity]
etc/etc.x86_64/ttys [moved from etc/etc.amd64/ttys with 100% similarity]
gnu/lib/gcc41/libstdc++/Makefile
gnu/lib/gcc44/libstdc++/Makefile
gnu/lib/gcc44/libstdc++/config.h
gnu/usr.bin/binutils217/as/amd64-dragonfly/itbl-cpu.h [deleted file]
gnu/usr.bin/binutils217/as/amd64-dragonfly/obj-format.h [deleted file]
gnu/usr.bin/binutils217/as/amd64-dragonfly/targ-cpu.h [deleted file]
gnu/usr.bin/binutils217/as/amd64-dragonfly/targ-env.h [deleted file]
gnu/usr.bin/binutils217/as/x86_64-dragonfly/Makefile [moved from gnu/usr.bin/binutils217/as/amd64-dragonfly/Makefile with 68% similarity]
gnu/usr.bin/binutils217/as/x86_64-dragonfly/itbl-cpu.h [copied from gnu/usr.bin/binutils220/as/amd64-dragonfly/itbl-cpu.h with 100% similarity]
gnu/usr.bin/binutils217/as/x86_64-dragonfly/obj-format.h [copied from gnu/usr.bin/binutils220/as/amd64-dragonfly/obj-format.h with 100% similarity]
gnu/usr.bin/binutils217/as/x86_64-dragonfly/targ-cpu.h [copied from gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-cpu.h with 100% similarity]
gnu/usr.bin/binutils217/as/x86_64-dragonfly/targ-env.h [copied from gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-env.h with 100% similarity]
gnu/usr.bin/binutils217/ld/Makefile.x86_64 [moved from gnu/usr.bin/binutils217/ld/Makefile.amd64 with 90% similarity]
gnu/usr.bin/binutils217/libbfd/Makefile
gnu/usr.bin/binutils217/libbfd/Makefile.x86_64 [moved from gnu/usr.bin/binutils217/libbfd/Makefile.amd64 with 61% similarity]
gnu/usr.bin/binutils217/libopcodes/Makefile.amd64 [deleted file]
gnu/usr.bin/binutils217/libopcodes/Makefile.x86_64 [new file with mode: 0644]
gnu/usr.bin/binutils220/as/x86_64-dragonfly/Makefile [moved from gnu/usr.bin/binutils220/as/amd64-dragonfly/Makefile with 82% similarity]
gnu/usr.bin/binutils220/as/x86_64-dragonfly/itbl-cpu.h [moved from gnu/usr.bin/binutils220/as/amd64-dragonfly/itbl-cpu.h with 100% similarity]
gnu/usr.bin/binutils220/as/x86_64-dragonfly/obj-format.h [moved from gnu/usr.bin/binutils220/as/amd64-dragonfly/obj-format.h with 100% similarity]
gnu/usr.bin/binutils220/as/x86_64-dragonfly/targ-cpu.h [moved from gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-cpu.h with 100% similarity]
gnu/usr.bin/binutils220/as/x86_64-dragonfly/targ-env.h [moved from gnu/usr.bin/binutils220/as/amd64-dragonfly/targ-env.h with 100% similarity]
gnu/usr.bin/binutils220/ld/Makefile.x86_64 [moved from gnu/usr.bin/binutils220/ld/Makefile.amd64 with 95% similarity]
gnu/usr.bin/binutils220/libbfd/Makefile.host.x86_64 [moved from gnu/usr.bin/binutils220/libbfd/Makefile.host.amd64 with 100% similarity]
gnu/usr.bin/binutils220/libbfd/Makefile.x86_64 [moved from gnu/usr.bin/binutils220/libbfd/Makefile.amd64 with 100% similarity]
gnu/usr.bin/binutils220/libbinutils/Makefile.x86_64 [moved from gnu/usr.bin/binutils220/libbinutils/Makefile.amd64 with 100% similarity]
gnu/usr.bin/binutils220/libopcodes/Makefile.x86_64 [moved from gnu/usr.bin/binutils220/libopcodes/Makefile.amd64 with 100% similarity]
gnu/usr.bin/cc41/Makefile.tgt
gnu/usr.bin/cc41/cc_prep/dragonfly-native.h
gnu/usr.bin/cc41/libiberty/config.h
gnu/usr.bin/cc44/Makefile.tgt
gnu/usr.bin/cc44/cc_prep/auto-host.h
gnu/usr.bin/cc44/gmp/Makefile.x86_64 [moved from gnu/usr.bin/cc44/gmp/Makefile.amd64 with 100% similarity]
gnu/usr.bin/cc44/gmp/gmp.h
gnu/usr.bin/cc44/libiberty/config.h
gnu/usr.bin/gdb/kgdb/trgt_x86_64.c [moved from gnu/usr.bin/gdb/kgdb/trgt_amd64.c with 100% similarity]
gnu/usr.bin/gdb/libbfd/Makefile.host.x86_64 [moved from gnu/usr.bin/gdb/libbfd/Makefile.host.amd64 with 100% similarity]
gnu/usr.bin/gdb/libbfd/Makefile.x86_64 [moved from gnu/usr.bin/gdb/libbfd/Makefile.amd64 with 100% similarity]
gnu/usr.bin/gdb/libbfd/config.h
gnu/usr.bin/gdb/libgdb/Makefile.x86_64 [moved from gnu/usr.bin/gdb/libgdb/Makefile.amd64 with 100% similarity]
gnu/usr.bin/gdb/libgdb/freebsd-uthread.c
gnu/usr.bin/gdb/libopcodes/Makefile.x86_64 [moved from gnu/usr.bin/gdb/libopcodes/Makefile.amd64 with 100% similarity]
lib/csu/x86_64/Makefile.csu [moved from lib/csu/amd64/Makefile.csu with 79% similarity]
lib/csu/x86_64/crt1.c [moved from lib/csu/amd64/crt1.c with 94% similarity]
lib/csu/x86_64/crti.S [moved from lib/csu/amd64/crti.S with 90% similarity]
lib/csu/x86_64/crtn.S [moved from lib/csu/amd64/crtn.S with 90% similarity]
lib/libc/Makefile.inc
lib/libc/gen/nlist.c
lib/libc/gmon/gmon.c
lib/libc/x86_64/Makefile.inc [moved from lib/libc/amd64/Makefile.inc with 51% similarity]
lib/libc/x86_64/SYS.h [moved from lib/libc/amd64/SYS.h with 97% similarity]
lib/libc/x86_64/_fpmath.h [moved from lib/libc/amd64/_fpmath.h with 96% similarity]
lib/libc/x86_64/arith.h [moved from lib/libc/amd64/arith.h with 86% similarity]
lib/libc/x86_64/gd_qnan.h [moved from lib/libc/amd64/gd_qnan.h with 100% similarity]
lib/libc/x86_64/gen/Makefile.inc [moved from lib/libc/amd64/gen/Makefile.inc with 81% similarity]
lib/libc/x86_64/gen/_setjmp.S [moved from lib/libc/amd64/gen/_setjmp.S with 97% similarity]
lib/libc/x86_64/gen/fabs.S [moved from lib/libc/amd64/gen/fabs.S with 95% similarity]
lib/libc/x86_64/gen/flt_rounds.c [moved from lib/libc/amd64/gen/flt_rounds.c with 82% similarity]
lib/libc/x86_64/gen/fpclassifyl.c [moved from lib/libc/amd64/gen/fpclassifyl.c with 96% similarity]
lib/libc/x86_64/gen/fpgetmask.S [moved from lib/libc/amd64/gen/fpgetmask.S with 84% similarity]
lib/libc/x86_64/gen/fpgetround.S [moved from lib/libc/amd64/gen/fpgetround.S with 83% similarity]
lib/libc/x86_64/gen/fpgetsticky.S [moved from lib/libc/amd64/gen/fpgetsticky.S with 84% similarity]
lib/libc/x86_64/gen/fpsetmask.S [moved from lib/libc/amd64/gen/fpsetmask.S with 89% similarity]
lib/libc/x86_64/gen/fpsetround.S [moved from lib/libc/amd64/gen/fpsetround.S with 89% similarity]
lib/libc/x86_64/gen/fpsetsticky.S [moved from lib/libc/amd64/gen/fpsetsticky.S with 89% similarity]
lib/libc/x86_64/gen/infinityl.c [moved from lib/libc/amd64/gen/infinityl.c with 77% similarity]
lib/libc/x86_64/gen/isfinitel.c [moved from lib/libc/amd64/gen/isfinitel.c with 96% similarity]
lib/libc/x86_64/gen/isinfl.c [moved from lib/libc/amd64/gen/isinfl.c with 96% similarity]
lib/libc/x86_64/gen/isnanl.c [moved from lib/libc/amd64/gen/isnanl.c with 96% similarity]
lib/libc/x86_64/gen/ldexp.c [moved from lib/libc/amd64/gen/ldexp.c with 96% similarity]
lib/libc/x86_64/gen/mcontext.S [moved from lib/libc/amd64/gen/mcontext.S with 97% similarity]
lib/libc/x86_64/gen/modf.S [moved from lib/libc/amd64/gen/modf.S with 96% similarity]
lib/libc/x86_64/gen/nanf.c [moved from lib/libc/amd64/gen/nanf.c with 66% similarity]
lib/libc/x86_64/gen/rfork_thread.S [moved from lib/libc/amd64/gen/rfork_thread.S with 96% similarity]
lib/libc/x86_64/gen/setjmp.S [moved from lib/libc/amd64/gen/setjmp.S with 97% similarity]
lib/libc/x86_64/gen/signbitl.c [moved from lib/libc/amd64/gen/signbitl.c with 96% similarity]
lib/libc/x86_64/gen/sigsetjmp.S [moved from lib/libc/amd64/gen/sigsetjmp.S with 97% similarity]
lib/libc/x86_64/stdlib/Makefile.inc [moved from lib/libc/amd64/stdlib/Makefile.inc with 100% similarity]
lib/libc/x86_64/stdlib/div.S [moved from lib/libc/amd64/stdlib/div.S with 100% similarity]
lib/libc/x86_64/stdlib/ldiv.S [moved from lib/libc/amd64/stdlib/ldiv.S with 100% similarity]
lib/libc/x86_64/stdlib/lldiv.S [moved from lib/libc/amd64/stdlib/lldiv.S with 100% similarity]
lib/libc/x86_64/string/Makefile.inc [moved from lib/libc/amd64/string/Makefile.inc with 100% similarity]
lib/libc/x86_64/string/bcmp.S [moved from lib/libc/amd64/string/bcmp.S with 100% similarity]
lib/libc/x86_64/string/bcopy.S [moved from lib/libc/amd64/string/bcopy.S with 100% similarity]
lib/libc/x86_64/string/bzero.S [moved from lib/libc/amd64/string/bzero.S with 100% similarity]
lib/libc/x86_64/string/memcmp.S [moved from lib/libc/amd64/string/memcmp.S with 100% similarity]
lib/libc/x86_64/string/memcpy.S [moved from lib/libc/amd64/string/memcpy.S with 100% similarity]
lib/libc/x86_64/string/memmove.S [moved from lib/libc/amd64/string/memmove.S with 100% similarity]
lib/libc/x86_64/string/memset.S [moved from lib/libc/amd64/string/memset.S with 100% similarity]
lib/libc/x86_64/string/strcat.S [moved from lib/libc/amd64/string/strcat.S with 100% similarity]
lib/libc/x86_64/string/strcmp.S [moved from lib/libc/amd64/string/strcmp.S with 100% similarity]
lib/libc/x86_64/string/strcpy.S [moved from lib/libc/amd64/string/strcpy.S with 100% similarity]
lib/libc/x86_64/sys/Makefile.inc [moved from lib/libc/amd64/sys/Makefile.inc with 90% similarity]
lib/libc/x86_64/sys/amd64_get_fsbase.c [moved from lib/libc/amd64/sys/amd64_get_fsbase.c with 94% similarity]
lib/libc/x86_64/sys/amd64_get_gsbase.c [moved from lib/libc/amd64/sys/amd64_get_gsbase.c with 94% similarity]
lib/libc/x86_64/sys/amd64_set_fsbase.c [moved from lib/libc/amd64/sys/amd64_set_fsbase.c with 94% similarity]
lib/libc/x86_64/sys/amd64_set_gsbase.c [moved from lib/libc/amd64/sys/amd64_set_gsbase.c with 94% similarity]
lib/libc/x86_64/sys/asmcontext.c [moved from lib/libc/amd64/sys/asmcontext.c with 93% similarity]
lib/libc/x86_64/sys/brk.S [moved from lib/libc/amd64/sys/brk.S with 96% similarity]
lib/libc/x86_64/sys/cerror.S [moved from lib/libc/amd64/sys/cerror.S with 96% similarity]
lib/libc/x86_64/sys/exect.S [moved from lib/libc/amd64/sys/exect.S with 96% similarity]
lib/libc/x86_64/sys/pipe.S [moved from lib/libc/amd64/sys/pipe.S with 96% similarity]
lib/libc/x86_64/sys/ptrace.S [moved from lib/libc/amd64/sys/ptrace.S with 96% similarity]
lib/libc/x86_64/sys/reboot.S [moved from lib/libc/amd64/sys/reboot.S with 96% similarity]
lib/libc/x86_64/sys/sbrk.S [moved from lib/libc/amd64/sys/sbrk.S with 96% similarity]
lib/libc/x86_64/sys/setlogin.S [moved from lib/libc/amd64/sys/setlogin.S with 96% similarity]
lib/libc/x86_64/sys/sigreturn.S [moved from lib/libc/amd64/sys/sigreturn.S with 95% similarity]
lib/libc/x86_64/sys/vfork.S [moved from lib/libc/amd64/sys/vfork.S with 96% similarity]
lib/libc/xdr/xdr_float.c
lib/libc_r/arch/x86_64/_atomic_lock.S [moved from lib/libc_r/arch/amd64/_atomic_lock.S with 93% similarity]
lib/libc_r/uthread/pthread_private.h
lib/libkvm/kvm_x86_64.c [moved from lib/libkvm/kvm_amd64.c with 96% similarity]
lib/libm/arch/i386/Makefile.inc
lib/libm/arch/x86_64/Makefile.inc [moved from lib/libm/arch/amd64/Makefile.inc with 71% similarity]
lib/libm/arch/x86_64/fenv.c [moved from lib/libm/arch/amd64/fenv.c with 100% similarity]
lib/libm/arch/x86_64/fenv.h [moved from lib/libm/arch/amd64/fenv.h with 100% similarity]
lib/libstand/Makefile
lib/libthread_xu/arch/x86_64/Makefile.inc [moved from lib/libthread_xu/arch/amd64/Makefile.inc with 50% similarity]
lib/libthread_xu/arch/x86_64/include/pthread_md.h [moved from lib/libthread_xu/arch/amd64/include/pthread_md.h with 94% similarity]
lib/libthread_xu/arch/x86_64/x86_64/_umtx_sleep_wakeup_err.S [moved from lib/libthread_xu/arch/amd64/amd64/_umtx_sleep_wakeup_err.S with 100% similarity]
lib/libthread_xu/arch/x86_64/x86_64/pthread_md.c [moved from lib/libthread_xu/arch/amd64/amd64/pthread_md.c with 94% similarity]
libexec/rtld-elf/x86_64/Makefile.inc [moved from libexec/rtld-elf/amd64/Makefile.inc with 64% similarity]
libexec/rtld-elf/x86_64/lockdflt.c [moved from libexec/rtld-elf/amd64/lockdflt.c with 98% similarity]
libexec/rtld-elf/x86_64/reloc.c [moved from libexec/rtld-elf/amd64/reloc.c with 99% similarity]
libexec/rtld-elf/x86_64/rtld_machdep.h [moved from libexec/rtld-elf/amd64/rtld_machdep.h with 96% similarity]
libexec/rtld-elf/x86_64/rtld_start.S [moved from libexec/rtld-elf/amd64/rtld_start.S with 97% similarity]
nrelease/Makefile
sbin/Makefile
sbin/gpt/migrate.c
secure/lib/libcrypto/opensslconf-x86_64.h [moved from secure/lib/libcrypto/opensslconf-amd64.h with 100% similarity]
share/man/man3/fpgetround.3
share/man/man4/acpi.4
share/man/man5/kernconf.5
share/man/man7/build.7
share/mk/bsd.cpu.custom.mk
share/mk/bsd.cpu.gcc41.mk
share/mk/bsd.cpu.gcc44.mk
share/mk/sys.mk
sys/boot/Makefile
sys/boot/common/Makefile.inc
sys/boot/common/reloc_elf.c
sys/boot/ficl/Makefile
sys/boot/pc32/Makefile.inc
sys/boot/pc32/boot2/Makefile
sys/boot/pc32/libi386/Makefile
sys/boot/pc32/libi386/elf64_freebsd.c
sys/boot/pc32/libi386/x86_64_tramp.S [moved from sys/boot/pc32/libi386/amd64_tramp.S with 95% similarity]
sys/boot/pc32/loader/conf.c
sys/boot/pc64/Makefile.inc
sys/bus/isa/isa.h
sys/bus/isa/isa_compat.h
sys/bus/isa/isa_device.h
sys/bus/isa/x86_64/isa.c [moved from sys/bus/isa/amd64/isa.c with 98% similarity]
sys/bus/isa/x86_64/isa.h [moved from sys/bus/isa/amd64/isa.h with 98% similarity]
sys/bus/isa/x86_64/isa_compat.c [moved from sys/bus/isa/amd64/isa_compat.c with 98% similarity]
sys/bus/isa/x86_64/isa_compat.h [moved from sys/bus/isa/amd64/isa_compat.h with 97% similarity]
sys/bus/isa/x86_64/isa_device.h [moved from sys/bus/isa/amd64/isa_device.h with 97% similarity]
sys/bus/isa/x86_64/isa_dma.c [moved from sys/bus/isa/amd64/isa_dma.c with 99% similarity]
sys/bus/pci/pci.c
sys/bus/pci/pci_cfgreg.h
sys/bus/pci/pcibus.h
sys/bus/pci/x86_64/legacy.c [moved from sys/bus/pci/amd64/legacy.c with 100% similarity]
sys/bus/pci/x86_64/legacyvar.h [moved from sys/bus/pci/amd64/legacyvar.h with 100% similarity]
sys/bus/pci/x86_64/mptable_pci.c [moved from sys/bus/pci/amd64/mptable_pci.c with 100% similarity]
sys/bus/pci/x86_64/pci_bus.c [moved from sys/bus/pci/amd64/pci_bus.c with 100% similarity]
sys/bus/pci/x86_64/pci_cfgreg.c [moved from sys/bus/pci/amd64/pci_cfgreg.c with 100% similarity]
sys/bus/pci/x86_64/pci_cfgreg.h [moved from sys/bus/pci/amd64/pci_cfgreg.h with 100% similarity]
sys/bus/pci/x86_64/pci_pir.c [moved from sys/bus/pci/amd64/pci_pir.c with 100% similarity]
sys/bus/pci/x86_64/pcibus.h [moved from sys/bus/pci/amd64/pcibus.h with 100% similarity]
sys/conf/files
sys/conf/kmod.mk
sys/config/JG64
sys/config/X86_64_GENERIC [moved from sys/config/AMD64_GENERIC with 98% similarity]
sys/cpu/i386/include/elf.h
sys/cpu/i386/include/ieee.h
sys/cpu/x86_64/include/asm.h [moved from sys/cpu/amd64/include/asm.h with 97% similarity]
sys/cpu/x86_64/include/asmacros.h [moved from sys/cpu/amd64/include/asmacros.h with 98% similarity]
sys/cpu/x86_64/include/atomic.h [moved from sys/cpu/amd64/include/atomic.h with 100% similarity]
sys/cpu/x86_64/include/bus_dma.h [moved from sys/cpu/amd64/include/bus_dma.h with 96% similarity]
sys/cpu/x86_64/include/coredump.h [moved from sys/cpu/amd64/include/coredump.h with 65% similarity]
sys/cpu/x86_64/include/cpu.h [moved from sys/cpu/amd64/include/cpu.h with 99% similarity]
sys/cpu/x86_64/include/cpufunc.h [moved from sys/cpu/amd64/include/cpufunc.h with 99% similarity]
sys/cpu/x86_64/include/cputypes.h [moved from sys/cpu/amd64/include/cputypes.h with 96% similarity]
sys/cpu/x86_64/include/db_machdep.h [moved from sys/cpu/amd64/include/db_machdep.h with 94% similarity]
sys/cpu/x86_64/include/elf.h [moved from sys/cpu/amd64/include/elf.h with 97% similarity]
sys/cpu/x86_64/include/endian.h [moved from sys/cpu/amd64/include/endian.h with 98% similarity]
sys/cpu/x86_64/include/exec.h [moved from sys/cpu/amd64/include/exec.h with 95% similarity]
sys/cpu/x86_64/include/float.h [moved from sys/cpu/amd64/include/float.h with 97% similarity]
sys/cpu/x86_64/include/floatingpoint.h [moved from sys/cpu/amd64/include/floatingpoint.h with 100% similarity]
sys/cpu/x86_64/include/frame.h [moved from sys/cpu/amd64/include/frame.h with 97% similarity]
sys/cpu/x86_64/include/ieee.h [moved from sys/cpu/amd64/include/ieee.h with 96% similarity]
sys/cpu/x86_64/include/ieeefp.h [moved from sys/cpu/amd64/include/ieeefp.h with 98% similarity]
sys/cpu/x86_64/include/int_const.h [moved from sys/cpu/amd64/include/int_const.h with 100% similarity]
sys/cpu/x86_64/include/int_limits.h [moved from sys/cpu/amd64/include/int_limits.h with 100% similarity]
sys/cpu/x86_64/include/inttypes.h [moved from sys/cpu/amd64/include/inttypes.h with 96% similarity]
sys/cpu/x86_64/include/limits.h [moved from sys/cpu/amd64/include/limits.h with 97% similarity]
sys/cpu/x86_64/include/math.h [moved from sys/cpu/amd64/include/math.h with 76% similarity]
sys/cpu/x86_64/include/npx.h [moved from sys/cpu/amd64/include/npx.h with 95% similarity]
sys/cpu/x86_64/include/param.h [moved from sys/cpu/amd64/include/param.h with 96% similarity]
sys/cpu/x86_64/include/pmap.h [moved from sys/cpu/amd64/include/pmap.h with 97% similarity]
sys/cpu/x86_64/include/profile.h [moved from sys/cpu/amd64/include/profile.h with 98% similarity]
sys/cpu/x86_64/include/psl.h [moved from sys/cpu/amd64/include/psl.h with 97% similarity]
sys/cpu/x86_64/include/reg.h [moved from sys/cpu/amd64/include/reg.h with 97% similarity]
sys/cpu/x86_64/include/reloc.h [moved from sys/cpu/amd64/include/reloc.h with 96% similarity]
sys/cpu/x86_64/include/segments.h [moved from sys/cpu/amd64/include/segments.h with 98% similarity]
sys/cpu/x86_64/include/setjmp.h [moved from sys/cpu/amd64/include/setjmp.h with 94% similarity]
sys/cpu/x86_64/include/sigframe.h [moved from sys/cpu/amd64/include/sigframe.h with 95% similarity]
sys/cpu/x86_64/include/signal.h [moved from sys/cpu/amd64/include/signal.h with 98% similarity]
sys/cpu/x86_64/include/specialreg.h [moved from sys/cpu/amd64/include/specialreg.h with 98% similarity]
sys/cpu/x86_64/include/stdarg.h [moved from sys/cpu/amd64/include/stdarg.h with 97% similarity]
sys/cpu/x86_64/include/stdint.h [moved from sys/cpu/amd64/include/stdint.h with 97% similarity]
sys/cpu/x86_64/include/sysarch.h [moved from sys/cpu/amd64/include/sysarch.h with 94% similarity]
sys/cpu/x86_64/include/tls.h [moved from sys/cpu/amd64/include/tls.h with 97% similarity]
sys/cpu/x86_64/include/trap.h [moved from sys/cpu/amd64/include/trap.h with 98% similarity]
sys/cpu/x86_64/include/tss.h [moved from sys/cpu/amd64/include/tss.h with 96% similarity]
sys/cpu/x86_64/include/types.h [moved from sys/cpu/amd64/include/types.h with 96% similarity]
sys/cpu/x86_64/include/ucontext.h [moved from sys/cpu/amd64/include/ucontext.h with 97% similarity]
sys/cpu/x86_64/include/varargs.h [moved from sys/cpu/amd64/include/varargs.h with 97% similarity]
sys/cpu/x86_64/include/vframe.h [moved from sys/cpu/amd64/include/vframe.h with 95% similarity]
sys/cpu/x86_64/misc/x86_64-gdbstub.c [moved from sys/cpu/amd64/misc/amd64-gdbstub.c with 99% similarity]
sys/crypto/via/padlock.c
sys/crypto/via/padlock_hash.c
sys/ddb/db_kld.c
sys/ddb/db_run.c
sys/dev/acpica5/Makefile
sys/dev/acpica5/Osd/OsdHardware.c
sys/dev/acpica5/acpi_timer.c
sys/dev/agp/Makefile
sys/dev/agp/agp.c
sys/dev/agp/agp_x86_64.c [moved from sys/dev/agp/agp_amd64.c with 100% similarity]
sys/dev/disk/mpt/mpt_user.c
sys/dev/disk/sym/sym_hipd.c
sys/dev/drm/drmP.h
sys/dev/misc/syscons/syscons.c
sys/dev/netif/bce/if_bcereg.h
sys/dev/netif/mxge/if_mxge.c
sys/dev/serial/sio/sio.c
sys/dev/video/fb/fbreg.h
sys/dev/video/fb/vga.c
sys/dev/video/x86_64/Makefile [moved from sys/dev/video/amd64/Makefile with 100% similarity]
sys/emulation/Makefile
sys/emulation/ndis/hal_var.h
sys/emulation/ndis/regcall.h
sys/kern/kern_memio.c
sys/kern/link_elf_obj.c
sys/kern/lwkt_ipiq.c
sys/kern/lwkt_thread.c
sys/kern/vfs_vnops.c
sys/platform/pc64/conf/files
sys/platform/pc64/conf/kern.mk
sys/platform/pc64/conf/ldscript.x86_64 [moved from sys/platform/pc64/conf/ldscript.amd64 with 98% similarity]
sys/platform/pc64/conf/options
sys/platform/pc64/include/globaldata.h
sys/platform/pc64/include/pcb.h
sys/platform/pc64/include/pcb_ext.h
sys/platform/pc64/include/vmparam.h
sys/platform/pc64/x86_64/atomic.c [moved from sys/platform/pc64/amd64/atomic.c with 95% similarity]
sys/platform/pc64/x86_64/autoconf.c [moved from sys/platform/pc64/amd64/autoconf.c with 99% similarity]
sys/platform/pc64/x86_64/busdma_machdep.c [moved from sys/platform/pc64/amd64/busdma_machdep.c with 100% similarity]
sys/platform/pc64/x86_64/console.c [moved from sys/platform/pc64/amd64/console.c with 95% similarity]
sys/platform/pc64/x86_64/cpufreq_machdep.c [moved from sys/platform/pc64/amd64/cpufreq_machdep.c with 100% similarity]
sys/platform/pc64/x86_64/db_disasm.c [moved from sys/platform/pc64/amd64/db_disasm.c with 99% similarity]
sys/platform/pc64/x86_64/db_interface.c [moved from sys/platform/pc64/amd64/db_interface.c with 98% similarity]
sys/platform/pc64/x86_64/db_trace.c [moved from sys/platform/pc64/amd64/db_trace.c with 92% similarity]
sys/platform/pc64/x86_64/elf_machdep.c [moved from sys/platform/pc64/amd64/elf_machdep.c with 97% similarity]
sys/platform/pc64/x86_64/est.c [moved from sys/platform/pc64/amd64/est.c with 100% similarity]
sys/platform/pc64/x86_64/exception.S [moved from sys/platform/pc64/amd64/exception.S with 98% similarity]
sys/platform/pc64/x86_64/genassym.c [moved from sys/platform/pc64/amd64/genassym.c with 98% similarity]
sys/platform/pc64/x86_64/global.s [moved from sys/platform/pc64/amd64/global.s with 97% similarity]
sys/platform/pc64/x86_64/globaldata.c [moved from sys/platform/pc64/amd64/globaldata.c with 95% similarity]
sys/platform/pc64/x86_64/identcpu.c [moved from sys/platform/pc64/amd64/identcpu.c with 98% similarity]
sys/platform/pc64/x86_64/in_cksum2.s [moved from sys/platform/pc64/amd64/in_cksum2.s with 96% similarity]
sys/platform/pc64/x86_64/init.c [moved from sys/platform/pc64/amd64/init.c with 97% similarity]
sys/platform/pc64/x86_64/initcpu.c [moved from sys/platform/pc64/amd64/initcpu.c with 96% similarity]
sys/platform/pc64/x86_64/ipl.s [moved from sys/platform/pc64/amd64/ipl.s with 98% similarity]
sys/platform/pc64/x86_64/ipl_funcs.c [moved from sys/platform/pc64/amd64/ipl_funcs.c with 97% similarity]
sys/platform/pc64/x86_64/ktr.c [moved from sys/platform/pc64/amd64/ktr.c with 97% similarity]
sys/platform/pc64/x86_64/locore.s [moved from sys/platform/pc64/amd64/locore.s with 97% similarity]
sys/platform/pc64/x86_64/machdep.c [moved from sys/platform/pc64/amd64/machdep.c with 99% similarity]
sys/platform/pc64/x86_64/mp_machdep.c [moved from sys/platform/pc64/amd64/mp_machdep.c with 99% similarity]
sys/platform/pc64/x86_64/mpboot.S [moved from sys/platform/pc64/amd64/mpboot.S with 100% similarity]
sys/platform/pc64/x86_64/mplock.s [moved from sys/platform/pc64/amd64/mplock.s with 100% similarity]
sys/platform/pc64/x86_64/nexus.c [moved from sys/platform/pc64/amd64/nexus.c with 99% similarity]
sys/platform/pc64/x86_64/npx.c [moved from sys/platform/pc64/amd64/npx.c with 99% similarity]
sys/platform/pc64/x86_64/pmap.c [moved from sys/platform/pc64/amd64/pmap.c with 99% similarity]
sys/platform/pc64/x86_64/pmap_inval.c [moved from sys/platform/pc64/amd64/pmap_inval.c with 97% similarity]
sys/platform/pc64/x86_64/procfs_machdep.c [moved from sys/platform/pc64/amd64/procfs_machdep.c with 97% similarity]
sys/platform/pc64/x86_64/sigtramp.s [moved from sys/platform/pc64/amd64/sigtramp.s with 95% similarity]
sys/platform/pc64/x86_64/spinlock.s [moved from sys/platform/pc64/amd64/spinlock.s with 97% similarity]
sys/platform/pc64/x86_64/support.s [moved from sys/platform/pc64/amd64/support.s with 98% similarity]
sys/platform/pc64/x86_64/swtch.s [moved from sys/platform/pc64/amd64/swtch.s with 99% similarity]
sys/platform/pc64/x86_64/sysarch.c [moved from sys/platform/pc64/amd64/sysarch.c with 95% similarity]
sys/platform/pc64/x86_64/systimer.c [moved from sys/platform/pc64/amd64/systimer.c with 96% similarity]
sys/platform/pc64/x86_64/tls.c [moved from sys/platform/pc64/amd64/tls.c with 95% similarity]
sys/platform/pc64/x86_64/trap.c [moved from sys/platform/pc64/amd64/trap.c with 99% similarity]
sys/platform/pc64/x86_64/userldt.c [moved from sys/platform/pc64/amd64/userldt.c with 95% similarity]
sys/platform/pc64/x86_64/vm_machdep.c [moved from sys/platform/pc64/amd64/vm_machdep.c with 98% similarity]
sys/sys/disklabel32.h
sys/sys/mpt_ioctl.h
sys/sys/systm.h
sys/sys/tls.h
sys/vm/vm_page.c
sys/vm/vm_page.h
test/sysperf/memcpy.S
test/x86_64/Makefile [moved from test/amd64/Makefile with 92% similarity]
test/x86_64/qemu.patch [moved from test/amd64/qemu.patch with 100% similarity]
usr.bin/gprof/gprof.h
usr.bin/gprof/x86_64.h [moved from usr.bin/gprof/amd64.h with 96% similarity]
usr.bin/mandoc/arch.in
usr.bin/mandoc/mdoc.7
usr.bin/xlint/lint1/param.h
usr.sbin/Makefile
usr.sbin/mergemaster/mergemaster.sh
usr.sbin/pppd/main.c

index 6cbffba..6a286bc 100644 (file)
--- 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.
index 34e2250..dd0f629 100644 (file)
@@ -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
index 36836ee..96942a0 100644 (file)
@@ -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
similarity index 100%
rename from etc/etc.amd64/disktab
rename to etc/etc.x86_64/disktab
similarity index 100%
rename from etc/etc.amd64/ttys
rename to etc/etc.x86_64/ttys
index bafe045..24ece1d 100644 (file)
@@ -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}
index 87d91a9..fdf5403 100644 (file)
@@ -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}
index d43bdca..5c0cb06 100644 (file)
 
 /* 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 (file)
index eb88bb1..0000000
+++ /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 (file)
index d4ad9fa..0000000
+++ /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 (file)
index c1ffb83..0000000
+++ /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 (file)
index e4346ea..0000000
+++ /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"
-
@@ -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
similarity index 90%
rename from gnu/usr.bin/binutils217/ld/Makefile.amd64
rename to gnu/usr.bin/binutils217/ld/Makefile.x86_64
index eec3067..4e652a0 100644 (file)
@@ -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} \
index b9e5376..42bad0f 100644 (file)
@@ -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
@@ -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 (file)
index ffea0f0..0000000
+++ /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 (file)
index 0000000..2909164
--- /dev/null
@@ -0,0 +1,2 @@
+SRCS+= i386-dis.c
+CFLAGS+= -DARCH_i386
@@ -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
 
similarity index 95%
rename from gnu/usr.bin/binutils220/ld/Makefile.amd64
rename to gnu/usr.bin/binutils220/ld/Makefile.x86_64
index a9155de..8e1f794 100644 (file)
@@ -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} \
index 9462239..8b7ce92 100644 (file)
@@ -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
index 05e795c..6612d6f 100644 (file)
 #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"
index 107c9cb..66abeea 100644 (file)
 /* 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"
index dac15ad..84bfe32 100644 (file)
@@ -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
index 704b2d1..144f42a 100644 (file)
 #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"
index d5b4783..f303828 100644 (file)
@@ -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!
index 0565b0c..fb4c0dd 100644 (file)
 /* 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"
index f6e896c..40ef46a 100644 (file)
 /* 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
 /* 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
index 6b75a22..e22cf0e 100644 (file)
@@ -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"
 
similarity index 79%
rename from lib/csu/amd64/Makefile.csu
rename to lib/csu/x86_64/Makefile.csu
index 9efa444..a49c8f3 100644 (file)
@@ -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
similarity index 94%
rename from lib/csu/amd64/crt1.c
rename to lib/csu/x86_64/crt1.c
index 71ce7ca..e2db276 100644 (file)
@@ -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 $\"");
similarity index 90%
rename from lib/csu/amd64/crti.S
rename to lib/csu/x86_64/crti.S
index e0b4328..e2fee49 100644 (file)
@@ -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"
similarity index 90%
rename from lib/csu/amd64/crtn.S
rename to lib/csu/x86_64/crtn.S
index 498f310..1dbbb44 100644 (file)
@@ -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"
index 1a83c29..772b85a 100644 (file)
@@ -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"
index 08d71bb..a5c3272 100644 (file)
@@ -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;
index 47bfa18..7051ed7 100644 (file)
@@ -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");
similarity index 51%
rename from lib/libc/amd64/Makefile.inc
rename to lib/libc/x86_64/Makefile.inc
index 1fb1310..e067a24 100644 (file)
@@ -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
similarity index 97%
rename from lib/libc/amd64/SYS.h
rename to lib/libc/x86_64/SYS.h
index 85f2281..e2d38d0 100644 (file)
@@ -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 <sys/syscall.h>
similarity index 96%
rename from lib/libc/amd64/_fpmath.h
rename to lib/libc/x86_64/_fpmath.h
index 8a1396d..41b01c3 100644 (file)
@@ -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 {
similarity index 86%
rename from lib/libc/amd64/arith.h
rename to lib/libc/x86_64/arith.h
index f4dafa9..8d3b5f6 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 81%
rename from lib/libc/amd64/gen/Makefile.inc
rename to lib/libc/x86_64/gen/Makefile.inc
index 54be1f7..fb0a5a8 100644 (file)
@@ -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\
similarity index 97%
rename from lib/libc/amd64/gen/_setjmp.S
rename to lib/libc/x86_64/gen/_setjmp.S
index 3e82ac0..5b6af71 100644 (file)
@@ -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 <machine/asm.h>
similarity index 95%
rename from lib/libc/amd64/gen/fabs.S
rename to lib/libc/x86_64/gen/fabs.S
index 4be6b3e..171e3e0 100644 (file)
@@ -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 <machine/asm.h>
similarity index 82%
rename from lib/libc/amd64/gen/flt_rounds.c
rename to lib/libc/x86_64/gen/flt_rounds.c
index 43717b9..d0bba7d 100644 (file)
@@ -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 <sys/cdefs.h>
similarity index 96%
rename from lib/libc/amd64/gen/fpclassifyl.c
rename to lib/libc/x86_64/gen/fpclassifyl.c
index 0c93348..25c2d34 100644 (file)
@@ -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 <sys/cdefs.h>
similarity index 84%
rename from lib/libc/amd64/gen/fpgetmask.S
rename to lib/libc/x86_64/gen/fpgetmask.S
index 8c16876..589818e 100644 (file)
@@ -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 <machine/asm.h>
similarity index 83%
rename from lib/libc/amd64/gen/fpgetround.S
rename to lib/libc/x86_64/gen/fpgetround.S
index 3308fa5..1a08850 100644 (file)
@@ -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 <machine/asm.h>
similarity index 84%
rename from lib/libc/amd64/gen/fpgetsticky.S
rename to lib/libc/x86_64/gen/fpgetsticky.S
index a0f8fdd..76ffeb3 100644 (file)
@@ -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 <machine/asm.h>
similarity index 89%
rename from lib/libc/amd64/gen/fpsetmask.S
rename to lib/libc/x86_64/gen/fpsetmask.S
index 475206f..42476f9 100644 (file)
@@ -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 <machine/asm.h>
similarity index 89%
rename from lib/libc/amd64/gen/fpsetround.S
rename to lib/libc/x86_64/gen/fpsetround.S
index f7106f4..43d7e50 100644 (file)
@@ -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 <machine/asm.h>
similarity index 89%
rename from lib/libc/amd64/gen/fpsetsticky.S
rename to lib/libc/x86_64/gen/fpsetsticky.S
index ad763de..1659045 100644 (file)
@@ -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 <machine/asm.h>
similarity index 77%
rename from lib/libc/amd64/gen/infinityl.c
rename to lib/libc/x86_64/gen/infinityl.c
index 3ed0e85..fa62487 100644 (file)
@@ -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 <sys/cdefs.h>
similarity index 96%
rename from lib/libc/amd64/gen/isfinitel.c
rename to lib/libc/x86_64/gen/isfinitel.c
index 7af01cf..5c9aef3 100644 (file)
@@ -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 <sys/cdefs.h>
similarity index 96%
rename from lib/libc/amd64/gen/isinfl.c
rename to lib/libc/x86_64/gen/isinfl.c
index 28b20d3..cad0ae1 100644 (file)
@@ -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 <sys/cdefs.h>
similarity index 96%
rename from lib/libc/amd64/gen/isnanl.c
rename to lib/libc/x86_64/gen/isnanl.c
index 67ed436..55f3bb4 100644 (file)
@@ -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 <sys/cdefs.h>
similarity index 96%
rename from lib/libc/amd64/gen/ldexp.c
rename to lib/libc/x86_64/gen/ldexp.c
index 2783f40..c991544 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 97%
rename from lib/libc/amd64/gen/mcontext.S
rename to lib/libc/x86_64/gen/mcontext.S
index 1dd5010..ea31674 100644 (file)
@@ -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 <machine/asm.h>
similarity index 96%
rename from lib/libc/amd64/gen/modf.S
rename to lib/libc/x86_64/gen/modf.S
index 8b857de..42895d0 100644 (file)
@@ -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 <machine/asm.h>
similarity index 66%
rename from lib/libc/amd64/gen/nanf.c
rename to lib/libc/x86_64/gen/nanf.c
index 58257cc..7959f78 100644 (file)
@@ -1,7 +1,3 @@
-/*
- * $DragonFly: src/lib/libc/amd64/gen/nanf.c,v 1.1 2006/07/27 00:46:57 corecode Exp $
- */
-
 #include <sys/cdefs.h>
 
 #include <math.h>
similarity index 96%
rename from lib/libc/amd64/gen/rfork_thread.S
rename to lib/libc/x86_64/gen/rfork_thread.S
index eebef2a..9f1fd06 100644 (file)
@@ -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 <machine/asm.h>
similarity index 97%
rename from lib/libc/amd64/gen/setjmp.S
rename to lib/libc/x86_64/gen/setjmp.S
index f854281..f22bd55 100644 (file)
@@ -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 <machine/asm.h>
similarity index 96%
rename from lib/libc/amd64/gen/signbitl.c
rename to lib/libc/x86_64/gen/signbitl.c
index 541403e..c5003bb 100644 (file)
@@ -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 <sys/cdefs.h>
similarity index 97%
rename from lib/libc/amd64/gen/sigsetjmp.S
rename to lib/libc/x86_64/gen/sigsetjmp.S
index 519e8bb..6463634 100644 (file)
@@ -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 <machine/asm.h>
similarity index 90%
rename from lib/libc/amd64/sys/Makefile.inc
rename to lib/libc/x86_64/sys/Makefile.inc
index 6a80ceb..5145e76 100644 (file)
@@ -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
 
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 7de04bc..e024c71 100644 (file)
@@ -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 <machine/sysarch.h>
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 defd958..2b2b6f7 100644 (file)
@@ -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 <machine/sysarch.h>
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 d803ced..e077a78 100644 (file)
@@ -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 <machine/sysarch.h>
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 7aefaef..d55b83c 100644 (file)
@@ -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 <machine/sysarch.h>
similarity index 93%
rename from lib/libc/amd64/sys/asmcontext.c
rename to lib/libc/x86_64/sys/asmcontext.c
index 4e54b30..166bdb4 100644 (file)
@@ -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 <sys/types.h>
 #include <sys/ucontext.h>
@@ -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));
similarity index 96%
rename from lib/libc/amd64/sys/brk.S
rename to lib/libc/x86_64/sys/brk.S
index 53eeea9..2314546 100644 (file)
@@ -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 <machine/asm.h>
similarity index 96%
rename from lib/libc/amd64/sys/cerror.S
rename to lib/libc/x86_64/sys/cerror.S
index 94c15bb..b1835e4 100644 (file)
@@ -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 <machine/asm.h>
similarity index 96%
rename from lib/libc/amd64/sys/exect.S
rename to lib/libc/x86_64/sys/exect.S
index 41d47d1..1782990 100644 (file)
@@ -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 <machine/asm.h>
similarity index 96%
rename from lib/libc/amd64/sys/pipe.S
rename to lib/libc/x86_64/sys/pipe.S
index 3aa3fc0..0357f20 100644 (file)
@@ -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 <machine/asm.h>
similarity index 96%
rename from lib/libc/amd64/sys/ptrace.S
rename to lib/libc/x86_64/sys/ptrace.S
index 74770da..5246112 100644 (file)
@@ -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 <machine/asm.h>
similarity index 96%
rename from lib/libc/amd64/sys/reboot.S
rename to lib/libc/x86_64/sys/reboot.S
index 0d38b9a..fdca804 100644 (file)
@@ -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 <machine/asm.h>
similarity index 96%
rename from lib/libc/amd64/sys/sbrk.S
rename to lib/libc/x86_64/sys/sbrk.S
index f651197..4f6e5a7 100644 (file)
@@ -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 <machine/asm.h>
similarity index 96%
rename from lib/libc/amd64/sys/setlogin.S
rename to lib/libc/x86_64/sys/setlogin.S
index eb0d59d..6dabe7e 100644 (file)
@@ -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 <machine/asm.h>
similarity index 95%
rename from lib/libc/amd64/sys/sigreturn.S
rename to lib/libc/x86_64/sys/sigreturn.S
index 95af738..b51a82c 100644 (file)
@@ -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 <machine/asm.h>
similarity index 96%
rename from lib/libc/amd64/sys/vfork.S
rename to lib/libc/x86_64/sys/vfork.S
index 744d9b5..6831835 100644 (file)
@@ -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 <machine/asm.h>
index 7c52dc4..cb2f2f9 100644 (file)
@@ -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 <machine/endian.h>
 #define IEEEFP
 #endif
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 fc95692..1045152 100644 (file)
@@ -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 <machine/asm.h>
index a0e1fae..8c1d1e6 100644 (file)
@@ -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))
similarity index 96%
rename from lib/libkvm/kvm_amd64.c
rename to lib/libkvm/kvm_x86_64.c
index be28db1..300007e 100644 (file)
  *
  * @(#)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 {
index b43d364..6dece21 100644 (file)
@@ -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"
similarity index 71%
rename from lib/libm/arch/amd64/Makefile.inc
rename to lib/libm/arch/x86_64/Makefile.inc
index a6fa209..2b2164d 100644 (file)
@@ -1,4 +1,4 @@
-.PATH: ${.CURDIR}/arch/amd64
+.PATH: ${.CURDIR}/arch/x86_64
 
 SRCS+= fenv.c
 INCS=  fenv.h
index 0cfdf2e..3612521 100644 (file)
@@ -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 <bsd.lib.mk>
 
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "x86_64"
 CFLAGS+= -I${.OBJDIR}
 
 beforedepend ${OBJS}: machine cpu
similarity index 50%
rename from lib/libthread_xu/arch/amd64/Makefile.inc
rename to lib/libthread_xu/arch/x86_64/Makefile.inc
index 5dac39d..6cc1f63 100644 (file)
@@ -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
@@ -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 $
  */
 
 /*
@@ -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 <sys/types.h>
similarity index 64%
rename from libexec/rtld-elf/amd64/Makefile.inc
rename to libexec/rtld-elf/x86_64/Makefile.inc
index 53e34c8..ba39193 100644 (file)
@@ -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
similarity index 98%
rename from libexec/rtld-elf/amd64/lockdflt.c
rename to libexec/rtld-elf/x86_64/lockdflt.c
index 59d89ce..21bb8f4 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 99%
rename from libexec/rtld-elf/amd64/reloc.c
rename to libexec/rtld-elf/x86_64/reloc.c
index f0b7842..81ed53b 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 96%
rename from libexec/rtld-elf/amd64/rtld_machdep.h
rename to libexec/rtld-elf/x86_64/rtld_machdep.h
index e375bf7..308178f 100644 (file)
@@ -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
similarity index 97%
rename from libexec/rtld-elf/amd64/rtld_start.S
rename to libexec/rtld-elf/x86_64/rtld_start.S
index 09b99d3..5e7c33f 100644 (file)
@@ -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 $
  */
 
 /*
index b043d23..d407869 100644 (file)
@@ -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
 
index ba29172..12b42f3 100644 (file)
@@ -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
index 93ea6ac..3c5a6c9 100644 (file)
@@ -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
index 66551da..9a7fbeb 100644 (file)
@@ -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
index f7cee7b..88665ed 100644 (file)
@@ -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 ,
index fbda29d..e0ac48a 100644 (file)
@@ -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
index b46fe8c..416ece0 100644 (file)
@@ -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
index 65ca858..39c68c6 100644 (file)
@@ -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
index a252871..5dbd3e1 100644 (file)
@@ -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
index 2098dfe..5596e99 100644 (file)
@@ -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
index 5fa9766..3e41899 100644 (file)
@@ -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"
index c6e2f3b..9beebbe 100644 (file)
@@ -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"
index ec83f3e..614eec9 100644 (file)
@@ -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
index ccc440d..ece9d4a 100644 (file)
@@ -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. */
index 68226a6..fc1e511 100644 (file)
@@ -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
index e446b9c..2819c3f 100644 (file)
@@ -11,7 +11,7 @@ CPUTYPE=              i386
 
 WARNS?=        1
 
-.if defined(REALLY_AMD64)
+.if defined(REALLY_X86_64)
 .include "../pc64/Makefile.inc"
 .endif
 .endif
index 10932b7..45a8d7d 100644 (file)
@@ -172,8 +172,8 @@ install:
 
 .include <bsd.prog.mk>
 
-.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
index 39eee78..8e58b5e 100644 (file)
@@ -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
index cd23e9f..7f51f9d 100644 (file)
@@ -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");
 }
similarity index 95%
rename from sys/boot/pc32/libi386/amd64_tramp.S
rename to sys/boot/pc32/libi386/x86_64_tramp.S
index 71b65d2..69259ec 100644 (file)
@@ -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
 
index fb9d402..1062dde 100644 (file)
@@ -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
 };
 
index 26e35ed..508dc06 100644 (file)
@@ -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
index 28559ca..c51a7e3 100644 (file)
@@ -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
index 34b63cb..aa5b1ee 100644 (file)
@@ -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
index b1277ee..83cca17 100644 (file)
@@ -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
similarity index 98%
rename from sys/bus/isa/amd64/isa.c
rename to sys/bus/isa/x86_64/isa.c
index 93de6c4..9a7c088 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 98%
rename from sys/bus/isa/amd64/isa.h
rename to sys/bus/isa/x86_64/isa.h
index 8a60a0c..37cc81a 100644 (file)
@@ -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_
similarity index 98%
rename from sys/bus/isa/amd64/isa_compat.c
rename to sys/bus/isa/x86_64/isa_compat.c
index ddd0c5d..b3542e8 100644 (file)
@@ -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 <sys/param.h>
similarity index 97%
rename from sys/bus/isa/amd64/isa_compat.h
rename to sys/bus/isa/x86_64/isa_compat.h
index 3655c36..148502e 100644 (file)
@@ -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"
similarity index 97%
rename from sys/bus/isa/amd64/isa_device.h
rename to sys/bus/isa/x86_64/isa_device.h
index 0124d5b..4864a98 100644 (file)
@@ -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_
similarity index 99%
rename from sys/bus/isa/amd64/isa_dma.c
rename to sys/bus/isa/x86_64/isa_dma.c
index 0277fae..fa55fab 100644 (file)
@@ -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 $
  */
 
 /*
index 9980816..d3b843d 100644 (file)
@@ -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 */
 }
 
index 3ebadd2..503b541 100644 (file)
@@ -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
index e857ace..0004dad 100644 (file)
@@ -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
index 30d7162..16a8466 100644 (file)
@@ -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
index bd2b964..86d97c3 100644 (file)
@@ -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
index 6ff4813..0d71ba6 100644 (file)
@@ -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
similarity index 98%
rename from sys/config/AMD64_GENERIC
rename to sys/config/X86_64_GENERIC
index 7bfa8e5..0558cf0 100644 (file)
@@ -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
index ae96350..ae950f3 100644 (file)
@@ -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;
index 7a3647b..d98367f 100644 (file)
@@ -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;
similarity index 97%
rename from sys/cpu/amd64/include/asm.h
rename to sys/cpu/x86_64/include/asm.h
index 8975d16..9b5f205 100644 (file)
@@ -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_
similarity index 98%
rename from sys/cpu/amd64/include/asmacros.h
rename to sys/cpu/x86_64/include/asmacros.h
index 7f81c0e..b5a8e6b 100644 (file)
@@ -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_
similarity index 96%
rename from sys/cpu/amd64/include/bus_dma.h
rename to sys/cpu/x86_64/include/bus_dma.h
index b06388e..b2f856d 100644 (file)
@@ -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)
similarity index 65%
rename from sys/cpu/amd64/include/coredump.h
rename to sys/cpu/x86_64/include/coredump.h
index aa7b88d..ca131bc 100644 (file)
@@ -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_
 /*
similarity index 99%
rename from sys/cpu/amd64/include/cpu.h
rename to sys/cpu/x86_64/include/cpu.h
index ad0e754..4817c8e 100644 (file)
@@ -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 <machine/psl.h>
similarity index 99%
rename from sys/cpu/amd64/include/cpufunc.h
rename to sys/cpu/x86_64/include/cpufunc.h
index 7969e19..6b08fa9 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 96%
rename from sys/cpu/amd64/include/cputypes.h
rename to sys/cpu/x86_64/include/cputypes.h
index b4c0344..d54548f 100644 (file)
@@ -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_
similarity index 94%
rename from sys/cpu/amd64/include/db_machdep.h
rename to sys/cpu/x86_64/include/db_machdep.h
index a64693a..baae6ab 100644 (file)
@@ -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_
 #include <cpu/frame.h>
 #include <cpu/trap.h>
 
-#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 */
similarity index 97%
rename from sys/cpu/amd64/include/elf.h
rename to sys/cpu/x86_64/include/elf.h
index 9d87acd..f57d450 100644 (file)
  * 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.
  */
 
 
similarity index 98%
rename from sys/cpu/amd64/include/endian.h
rename to sys/cpu/x86_64/include/endian.h
index b226774..cfa2989 100644 (file)
@@ -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_
similarity index 95%
rename from sys/cpu/amd64/include/exec.h
rename to sys/cpu/x86_64/include/exec.h
index 2b1c0e2..48de3aa 100644 (file)
@@ -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_
similarity index 97%
rename from sys/cpu/amd64/include/float.h
rename to sys/cpu/x86_64/include/float.h
index 4bbd630..b2d89bb 100644 (file)
@@ -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_
similarity index 97%
rename from sys/cpu/amd64/include/frame.h
rename to sys/cpu/x86_64/include/frame.h
index 8a7472d..a063049 100644 (file)
@@ -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_
similarity index 96%
rename from sys/cpu/amd64/include/ieee.h
rename to sys/cpu/x86_64/include/ieee.h
index 26000a1..545b11c 100644 (file)
@@ -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;
similarity index 98%
rename from sys/cpu/amd64/include/ieeefp.h
rename to sys/cpu/x86_64/include/ieeefp.h
index 4e15f11..2f5d551 100644 (file)
@@ -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_
similarity index 96%
rename from sys/cpu/amd64/include/inttypes.h
rename to sys/cpu/x86_64/include/inttypes.h
index 2018bb1..c455b7a 100644 (file)
@@ -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 */
 #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 */
 #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 */
 #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 */
 #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 */
 #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 */
 #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 */
 #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 */
 #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 */
 #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 */
similarity index 97%
rename from sys/cpu/amd64/include/limits.h
rename to sys/cpu/x86_64/include/limits.h
index ceb1a41..e8a67e0 100644 (file)
@@ -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 */
similarity index 76%
rename from sys/cpu/amd64/include/math.h
rename to sys/cpu/x86_64/include/math.h
index 8256194..1e5e5e2 100644 (file)
@@ -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_
similarity index 95%
rename from sys/cpu/amd64/include/npx.h
rename to sys/cpu/x86_64/include/npx.h
index 04ad43d..02f124a 100644 (file)
@@ -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
similarity index 96%
rename from sys/cpu/amd64/include/param.h
rename to sys/cpu/x86_64/include/param.h
index d258571..d604edb 100644 (file)
@@ -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_
 #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_ */
 #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
 
 /*
 #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))
 
similarity index 97%
rename from sys/cpu/amd64/include/pmap.h
rename to sys/cpu/x86_64/include/pmap.h
index 5c5d0b8..d8a5fec 100644 (file)
@@ -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_
similarity index 98%
rename from sys/cpu/amd64/include/profile.h
rename to sys/cpu/x86_64/include/profile.h
index 7caa2d9..bb16769 100644 (file)
@@ -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_
similarity index 97%
rename from sys/cpu/amd64/include/psl.h
rename to sys/cpu/x86_64/include/psl.h
index 7fddf84..2bbcaef 100644 (file)
@@ -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_
similarity index 97%
rename from sys/cpu/amd64/include/reg.h
rename to sys/cpu/x86_64/include/reg.h
index 1289d4a..b765f61 100644 (file)
@@ -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_
similarity index 96%
rename from sys/cpu/amd64/include/reloc.h
rename to sys/cpu/x86_64/include/reloc.h
index d8d1dcb..aa59308 100644 (file)
@@ -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_
similarity index 98%
rename from sys/cpu/amd64/include/segments.h
rename to sys/cpu/x86_64/include/segments.h
index 86eae43..b8dccf1 100644 (file)
  *
  *     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
  */
 
 /*
similarity index 94%
rename from sys/cpu/amd64/include/setjmp.h
rename to sys/cpu/x86_64/include/setjmp.h
index 143c73c..1b1edbc 100644 (file)
@@ -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 <sys/cdefs.h>
 
-#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
similarity index 95%
rename from sys/cpu/amd64/include/sigframe.h
rename to sys/cpu/x86_64/include/sigframe.h
index 1f98b21..da90a52 100644 (file)
@@ -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_
similarity index 98%
rename from sys/cpu/amd64/include/signal.h
rename to sys/cpu/x86_64/include/signal.h
index 8cdad1e..2663e4b 100644 (file)
@@ -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_
similarity index 98%
rename from sys/cpu/amd64/include/specialreg.h
rename to sys/cpu/x86_64/include/specialreg.h
index bc70fe0..5578220 100644 (file)
@@ -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) */
 #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))
 
 #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 */
similarity index 97%
rename from sys/cpu/amd64/include/stdarg.h
rename to sys/cpu/x86_64/include/stdarg.h
index 1c99f04..da8afce 100644 (file)
@@ -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_
similarity index 97%
rename from sys/cpu/amd64/include/stdint.h
rename to sys/cpu/x86_64/include/stdint.h
index 01013d1..5fa2f95 100644 (file)
@@ -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;
similarity index 94%
rename from sys/cpu/amd64/include/sysarch.h
rename to sys/cpu/x86_64/include/sysarch.h
index 0ef1a7d..bc79fcb 100644 (file)
  * 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_
similarity index 97%
rename from sys/cpu/amd64/include/tls.h
rename to sys/cpu/x86_64/include/tls.h
index 7f17f32..3771dfa 100644 (file)
@@ -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_
similarity index 98%
rename from sys/cpu/amd64/include/trap.h
rename to sys/cpu/x86_64/include/trap.h
index 689ce3c..54c5d8c 100644 (file)
@@ -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_
similarity index 96%
rename from sys/cpu/amd64/include/tss.h
rename to sys/cpu/x86_64/include/tss.h
index eefafdf..7abf7ee 100644 (file)
  *
  *     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 */
similarity index 96%
rename from sys/cpu/amd64/include/types.h
rename to sys/cpu/x86_64/include/types.h
index cd610b4..a35b6ef 100644 (file)
  *
  *     @(#)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;
similarity index 97%
rename from sys/cpu/amd64/include/ucontext.h
rename to sys/cpu/x86_64/include/ucontext.h
index 396dd62..f0df094 100644 (file)
@@ -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_
similarity index 97%
rename from sys/cpu/amd64/include/varargs.h
rename to sys/cpu/x86_64/include/varargs.h
index 791870a..58e8002 100644 (file)
@@ -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_
similarity index 95%
rename from sys/cpu/amd64/include/vframe.h
rename to sys/cpu/x86_64/include/vframe.h
index a4e3e18..d84e684 100644 (file)
@@ -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_
similarity index 99%
rename from sys/cpu/amd64/misc/amd64-gdbstub.c
rename to sys/cpu/x86_64/misc/x86_64-gdbstub.c
index b4beae8..f34b3d7 100644 (file)
@@ -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;
index 3510aa5..de8b0eb 100644 (file)
@@ -33,7 +33,7 @@
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/libkern.h>
-#if defined(__amd64__) || defined(__i386__)
+#if defined(__x86_64__) || defined(__i386__)
 #include <machine/cpufunc.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
@@ -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");
index 32aae26..dfba017 100644 (file)
@@ -33,7 +33,7 @@
 #include <sys/malloc.h>
 #include <sys/libkern.h>
 #include <sys/endian.h>
-#if defined(__amd64__) || defined(__i386__)
+#if defined(__x86_64__) || defined(__i386__)
 #include <machine/cpufunc.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
index b118616..c6a4d86 100644 (file)
@@ -43,7 +43,7 @@
 #include <ddb/ddb.h>
 #include <ddb/db_sym.h>
 
-#if defined(__amd64__)
+#if defined(__x86_64__)
 vm_offset_t    ksym_start, ksym_end;
 #endif
 
index 52bf7a9..d546a45 100644 (file)
@@ -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
        }
index 30574a6..ab32ac9 100644 (file)
@@ -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
index b62bd25..7062ba5 100644 (file)
@@ -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
 
index 7c05763..fc11c53 100644 (file)
@@ -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"
index 4b5be3d..0e63842 100644 (file)
@@ -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
index 7da4e4f..d7e70d2 100644 (file)
@@ -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
 }
index a11d880..86eb6da 100644 (file)
@@ -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:
index 6d1be26..1ff6c97 100644 (file)
@@ -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")
index 7b7a3fe..3f98d20 100644 (file)
@@ -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 <sys/file.h>
 #include <sys/proc.h>
 #include <machine/../linux/linux.h>
@@ -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");
index 95cbc53..45fee86 100644 (file)
@@ -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;
index 8903f98..2adf6ea 100644 (file)
@@ -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)
 
index 1b3758b..7379c75 100644 (file)
@@ -75,7 +75,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <vm/vm.h>             /* for pmap_mapdev() */
 #include <vm/pmap.h>
 
-#if defined(__i386) || defined(__amd64)
+#if defined(__i386) || defined(__x86_64)
 #include <machine/specialreg.h>
 #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
index edc30ad..ef2b9c8 100644 (file)
@@ -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.
index 768cf1a..7a5e418 100644 (file)
@@ -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))
index 376ab42..3cf293b 100644 (file)
@@ -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
index 0bf2f4f..9cdf666 100644 (file)
@@ -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.
index 738ab90..a2ed11c 100644 (file)
@@ -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
index d96e1c6..a9e56cf 100644 (file)
@@ -84,7 +84,7 @@
  * arguments passed on the stack.
  */
 
-#ifdef __amd64__
+#ifdef __x86_64__
 #define        __stdcall
 #define __regcall
 #define REGARGS1(decl1)                decl1
index 1f2b1e1..c512e52 100644 (file)
@@ -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;
 
index fbc9e9f..81d99ee 100644 (file)
@@ -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.
         */
index 5d319a8..c4533af 100644 (file)
@@ -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
        }
index f4b1f8b..959549c 100644 (file)
@@ -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);
index b13f9cd..ee44f49 100644 (file)
@@ -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);
index 604dfed..77f7057 100644 (file)
@@ -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
index 175a7f9..115d35e 100644 (file)
@@ -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.
 #
similarity index 98%
rename from sys/platform/pc64/conf/ldscript.amd64
rename to sys/platform/pc64/conf/ldscript.x86_64
index abfa23b..9e85d79 100644 (file)
@@ -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)
index c2244a6..6b2147d 100644 (file)
@@ -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
index aa6942f..6d765ca 100644 (file)
@@ -47,7 +47,7 @@
 #include <machine/segments.h>  /* struct user_segment_descriptor */
 #endif
 #ifndef _MACHINE_TSS_H_
-#include <machine/tss.h>       /* struct amd64tss */
+#include <machine/tss.h>       /* struct x86_64tss */
 #endif
 #ifndef _MACHINE_NPX_H_
 #include <machine/npx.h>
@@ -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 */
index 3f39481..71c135a 100644 (file)
@@ -44,7 +44,7 @@
 #define _MACHINE_PCB_H_
 
 /*
- * AMD64 process control block
+ * x86_64 process control block
  */
 #include <machine/npx.h>
 
index 71effad..79467fb 100644 (file)
@@ -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 */
 };
 
index 7e5ff55..7522133 100644 (file)
@@ -46,7 +46,7 @@
 #define        _MACHINE_VMPARAM_H_
 
 /*
- * Machine dependent constants for AMD64.
+ * Machine dependent constants for x86_64.
  */
 
 /*
similarity index 95%
rename from sys/platform/pc64/amd64/atomic.c
rename to sys/platform/pc64/x86_64/atomic.c
index 508e7b1..9af3cbb 100644 (file)
@@ -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
similarity index 99%
rename from sys/platform/pc64/amd64/autoconf.c
rename to sys/platform/pc64/x86_64/autoconf.c
index 0982237..12fd11c 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 95%
rename from sys/platform/pc64/amd64/console.c
rename to sys/platform/pc64/x86_64/console.c
index 3b5813f..aab4f51 100644 (file)
@@ -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 <sys/systm.h>
similarity index 99%
rename from sys/platform/pc64/amd64/db_disasm.c
rename to sys/platform/pc64/x86_64/db_disasm.c
index 9b9794d..4fb3a53 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 98%
rename from sys/platform/pc64/amd64/db_interface.c
rename to sys/platform/pc64/x86_64/db_interface.c
index f3046e8..249d874 100644 (file)
@@ -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);
 
similarity index 92%
rename from sys/platform/pc64/amd64/db_trace.c
rename to sys/platform/pc64/x86_64/db_trace.c
index f50c0cf..3ccef35 100644 (file)
@@ -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 <sys/param.h>
@@ -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) {
                  &