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