#
# See src/UPDATING `COMMON ITEMS' for more complete information.
#
-# If TARGET_ARCH=arch (e.g. amd64) is specified you can
+# If TARGET_ARCH=arch (e.g. x86_64) is specified you can
# cross build world for other architectures using the buildworld target,
# and once the world is built you can cross build a kernel using the
# buildkernel target.
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}
.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
.if !defined(TARGET_PLATFORM)
.if ${TARGET_ARCH} == "i386"
TARGET_PLATFORM= pc32
-.elif ${TARGET_ARCH} == "amd64"
+.elif ${TARGET_ARCH} == "x86_64"
TARGET_PLATFORM= pc64
.else
.error Unknown target architecture.
.if ${TARGET_ARCH} == "i386"
KERNCONF?= GENERIC
.else
-KERNCONF?= AMD64_GENERIC
+KERNCONF?= X86_64_GENERIC
.endif
.endif
INSTKERNNAME?= kernel
./Configure shared no-asm --prefix=/usr --openssldir=/etc/ssl BSD-x86-elf
cp crypto/opensslconf.h ../../secure/lib/libcrypto/opensslconf-i386.h
./Configure shared no-asm --prefix=/usr --openssldir=/etc/ssl BSD-x86_64
-cp crypto/opensslconf.h ../../secure/lib/libcrypto/opensslconf-amd64.h
+cp crypto/opensslconf.h ../../secure/lib/libcrypto/opensslconf-x86_64.h
cd ../../secure/lib/libcrypto
# Update the version in Makefile.inc
# Add DragonFly keywords to opensslconf-*.h
.if ${MACHINE_ARCH} == "i386" && !empty(MACHINE_CPU:Mi486)
MARCHDIR= i486
-.elif ${MACHINE_ARCH} == "amd64"
+.elif ${MACHINE_ARCH} == "x86_64"
MARCHDIR= i486
.else
MARCHDIR= ${MACHINE_ARCH}
.if ${MACHINE_ARCH} == "i386" && !empty(MACHINE_CPU:Mi486)
MARCHDIR= i486
-.elif ${MACHINE_ARCH} == "amd64"
+.elif ${MACHINE_ARCH} == "x86_64"
MARCHDIR= i486
.else
MARCHDIR= ${MACHINE_ARCH}
/* Define if int64_t is a long long. */
#define HAVE_INT64_T_LONG_LONG 1
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
/* Define if int64_t is a long. */
#define HAVE_INT64_T_LONG 1
+++ /dev/null
-/*
- * $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"
+++ /dev/null
-/*
- * $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"
+++ /dev/null
-/*
- * $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"
+++ /dev/null
-/*
- * Default target format spec for the assembler
- *
- * $DragonFly: src/gnu/usr.bin/binutils217/as/amd64-dragonfly/targ-env.h,v 1.1 2007/04/13 12:24:32 corecode Exp $
- */
-
-#define LOCAL_LABELS_DOLLAR 1
-#define LOCAL_LABELS_FB 1
-
-#include "obj-format.h"
-
-# $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
.include "${.CURDIR}/../Makefile.inc0"
CFLAGS += -I${.OBJDIR}/../../libbfd
-.if ${TARGET_ARCH} != "amd64"
-BINDIR= /usr/libexec/cross/amd64-dragonfly
+.if ${TARGET_ARCH} != "x86_64"
+BINDIR= /usr/libexec/cross/x86_64-dragonfly
.endif
SRCS+= obj-elf.c tc-i386-local.c
CLEANFILES= tc-i386-local.c
-# $DragonFly: src/gnu/usr.bin/binutils217/ld/Makefile.amd64,v 1.1 2007/04/13 12:24:32 corecode Exp $
-
TARGET_TUPLE?= x86_64-just-dragonfly
NATIVE_EMULATION= elf_x86_64
HOST= ${TARGET_TUPLE}
CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_amd64_path= ${USRDATA_PREFIX}/usr/lib
+_x86_64_path= ${USRDATA_PREFIX}/usr/lib
EMS+= ${NATIVE_EMULATION}
.for ext in ${ELF_SCR_EXT}
LDSCRIPTS_${NATIVE_EMULATION}+= ${NATIVE_EMULATION}.${ext}
scripttempl/elf.sc genscripts.sh stringify.sed sort-sections.sh
sh ${SRCDIR}/ld/genscripts.sh \
${SRCDIR:Q}/ld \
- ${_amd64_path:Q} \
+ ${_x86_64_path:Q} \
"" \
"" \
${HOST} \
# XXX broken
SELARCH=
-.if ${BINUTIL_ARCH} == "amd64"
+.if ${BINUTIL_ARCH} == "x86_64"
SELARCH= &bfd_i386_arch
.else
.for _a in ${ARCHS}
mv -f bfdver.h.new bfdver.h
# match targets defined in the assembler's targ-env.h with an output vector.
-# XXX i386-*-dragonfly and amd64-*-dragonfly are obsolete, but not quite
+# XXX i386-*-dragonfly and x86_64-*-dragonfly are obsolete, but not quite
# removed from the binutils build yet.
targmatch.h: targmatch.sed config.bfd
sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}.new
-# $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
DEFAULT_VECTOR?= bfd_elf64_x86_64_vec
-TARGMATCH+= { "elf64-amd64-dragonfly*", &bfd_elf64_x86_64_vec },
-TARGMATCH+= { "amd64-*-dragonfly*", &bfd_elf64_x86_64_vec },
+TARGMATCH+= { "elf64-x86_64-dragonfly*", &bfd_elf64_x86_64_vec },
TARGMATCH+= { "x86_64-*-dragonfly*", &bfd_elf64_x86_64_vec },
CLEANFILES+= elf64-target.h
+++ /dev/null
-# $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
--- /dev/null
+SRCS+= i386-dis.c
+CFLAGS+= -DARCH_i386
.include "${.CURDIR}/../Makefile.inc0"
CFLAGS += -I${.OBJDIR}/../../libbfd
-.if ${TARGET_ARCH} != "amd64"
-BINDIR= /usr/libexec/cross/amd64-dragonfly
+.if ${TARGET_ARCH} != "x86_64"
+BINDIR= /usr/libexec/cross/x86_64-dragonfly
.endif
SRCS+= obj-elf.c tc-i386.c
HOST= ${TARGET_TUPLE}
CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_amd64_path= ${USRDATA_PREFIX}/usr/lib
+_x86_64_path= ${USRDATA_PREFIX}/usr/lib
EMS+= ${NATIVE_EMULATION}
.for ext in ${ELF_SCR_EXT}
LDSCRIPTS_${NATIVE_EMULATION}+= ${NATIVE_EMULATION}.${ext}
scripttempl/elf.sc genscripts.sh stringify.sed
sh ${SRCDIR}/ld/genscripts.sh \
${SRCDIR:Q}/ld \
- ${_amd64_path:Q} \
+ ${_x86_64_path:Q} \
"" \
"" \
${HOST} \
target_machine= ${TARGET_ARCH}-pc-dragonflybsd
GCC_CPU?= ${TARGET_ARCH}
-.if ${TARGET_ARCH} == "amd64"
+.if ${TARGET_ARCH} == "x86_64"
GCC_CPU= i386
.endif
# This is ordered to avoid build warnings/errors
TARGET_INC= options.h
-.if ${TARGET_ARCH} == "amd64"
+.if ${TARGET_ARCH} == "x86_64"
TARGET_INC+= i386/biarch64.h
.endif
TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h
-.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
+.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64"
TARGET_INC+= ${GCC_CPU}/unix.h
TARGET_INC+= ${GCC_CPU}/att.h
.endif
TARGET_INC+= elfos.h
TARGET_INC+= dragonfly-spec.h
TARGET_INC+= dragonfly.h
-.if ${TARGET_ARCH} == "amd64"
+.if ${TARGET_ARCH} == "x86_64"
TARGET_INC+= ${GCC_CPU}/x86-64.h
.endif
TARGET_INC+= ${GCC_CPU}/dragonfly.h
-.if ${TARGET_ARCH} == "amd64"
+.if ${TARGET_ARCH} == "x86_64"
TARGET_INC+= ${GCC_CPU}/dragonfly64.h
.endif
TARGET_INC+= defaults.h
#ifndef USED_FOR_TARGET
#if defined(__i386__)
#define SIZEOF_LONG SIZEOF_INT
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
#define SIZEOF_LONG SIZEOF_LONG_LONG
#else
#error "Unknown architecture"
/* The size of a `int', as computed by sizeof. */
#if defined(__i386__)
#define SIZEOF_INT 4
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
#define SIZEOF_INT 8
#else
#error "Unknown target platform"
target_machine= ${TARGET_ARCH}-pc-dragonflybsd
GCC_CPU?= ${TARGET_ARCH}
-.if ${TARGET_ARCH} == "amd64"
+.if ${TARGET_ARCH} == "x86_64"
GCC_CPU= i386
.endif
# This is ordered to avoid build warnings/errors
TARGET_INC= options.h
-.if ${TARGET_ARCH} == "amd64"
+.if ${TARGET_ARCH} == "x86_64"
TARGET_INC+= i386/biarch64.h
.endif
TARGET_INC+= ${GCC_CPU}/${GCC_CPU}.h
-.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
+.if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86_64"
TARGET_INC+= ${GCC_CPU}/unix.h
TARGET_INC+= ${GCC_CPU}/att.h
.endif
TARGET_INC+= dragonfly.h
.if ${TARGET_ARCH} == "i386"
TARGET_INC+= ${GCC_CPU}/dragonfly.h
-.elif ${TARGET_ARCH} == "amd64"
+.elif ${TARGET_ARCH} == "x86_64"
TARGET_INC+= ${GCC_CPU}/x86-64.h
TARGET_INC+= ${GCC_CPU}/dragonfly64.h
.endif
#ifndef USED_FOR_TARGET
#if defined(__i386__)
#define SIZEOF_LONG SIZEOF_INT
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
#define SIZEOF_LONG SIZEOF_LONG_LONG
#else
#error "Unknown architecture"
#if ! defined (__GMP_WITHIN_CONFIGURE)
#if defined(__i386__)
#define __GMP_BITS_PER_MP_LIMB 32
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
#define __GMP_BITS_PER_MP_LIMB 64
#else
#error port me!
/* The size of a `int', as computed by sizeof. */
#if defined(__i386__)
#define SIZEOF_INT 4
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
#define SIZEOF_INT 8
#else
#error "Unknown target platform"
/* The size of `long', as computed by sizeof. */
#if defined(__i386__)
#define SIZEOF_LONG 4
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
#define SIZEOF_LONG 8
#else
#error Unsupported platform
/* The size of `void *', as computed by sizeof. */
#if defined(__i386__)
#define SIZEOF_VOID_P 4
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
#define SIZEOF_VOID_P 8
#else
#error Unsupported platform
#endif
-#ifdef __amd64__
+#ifdef __x86_64__
#include "amd64-tdep.h"
# $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
* 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
__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 $\"");
* 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
_fini:
.section .rodata
-.ascii "$DragonFly: src/lib/csu/amd64/crti.S,v 1.1 2004/02/02 05:43:13 dillon Exp $\0"
* 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
ret
.section .rodata
-.ascii "$DragonFly: src/lib/csu/amd64/crtn.S,v 1.1 2004/02/02 05:43:13 dillon Exp $\0"
.include "${.CURDIR}/../libc/locale/Makefile.inc"
.include "${.CURDIR}/../libc/net/Makefile.inc"
.include "${.CURDIR}/../libc/nls/Makefile.inc"
-.if ${MACHINE_ARCH} != "amd64"
+.if ${MACHINE_ARCH} != "x86_64"
.include "${.CURDIR}/../libc/quad/Makefile.inc"
.endif
.include "${.CURDIR}/../libc/regex/Makefile.inc"
/* calculate section header table size */
shdr_size = ehdr.e_shentsize * ehdr.e_shnum;
-#ifndef __amd64__
+#ifndef __x86_64__
/* Make sure it's not too big to mmap */
if (shdr_size > SIZE_T_MAX) {
errno = EFBIG;
}
}
-#ifndef __amd64__
+#ifndef __x86_64__
/* Check for files too large to mmap. */
if (symstrsize > SIZE_T_MAX) {
errno = EFBIG;
#include "libc_private.h"
-#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__) || defined(__powerpc__)
extern char *minbrk __asm (".minbrk");
#else
extern char *minbrk __asm ("minbrk");
# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.6 2007/12/03 07:17:32 das Exp $
-# $DragonFly: src/lib/libc/amd64/Makefile.inc,v 1.1 2004/02/02 05:43:14 dillon Exp $
#
-# Machine dependent definitions for the amd64 architecture.
+# Machine dependent definitions for the x86_64 architecture.
#
# Long double is 80 bits
*
* @(#)SYS.h 5.5 (Berkeley) 5/7/91
* $FreeBSD: src/lib/libc/amd64/SYS.h,v 1.30 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/SYS.h,v 1.2 2006/07/27 00:43:42 corecode Exp $
*/
#include <sys/syscall.h>
* 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 {
* 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 $
*/
/*
# @(#)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\
*
* @(#)_setjmp.s 5.1 (Berkeley) 4/23/90
* $FreeBSD: src/lib/libc/amd64/gen/_setjmp.S,v 1.21 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/gen/_setjmp.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
* SUCH DAMAGE.
*
* $FreeBSD: src/lib/libc/amd64/gen/fabs.S,v 1.4 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/gen/fabs.S,v 1.2 2006/07/27 00:46:57 corecode Exp $
*/
#include <machine/asm.h>
/*
* Written by J.T. Conklin, Apr 10, 1995
* Public domain.
- *
- * $DragonFly: src/lib/libc/amd64/gen/flt_rounds.c,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <sys/cdefs.h>
* POSSIBILITY OF SUCH DAMAGE.
*
* $NetBSD: fpclassifyl.c,v 1.2 2004/01/18 19:33:01 matt Exp $
- * $DragonFly: src/lib/libc/amd64/gen/fpclassifyl.c,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <sys/cdefs.h>
* Public domain.
*
* $NetBSD: fpgetmask.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $
- * $DragonFly: src/lib/libc/amd64/gen/fpgetmask.S,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <machine/asm.h>
* Public domain.
*
* $NetBSD: fpgetround.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $
- * $DragonFly: src/lib/libc/amd64/gen/fpgetround.S,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <machine/asm.h>
* Public domain.
*
* $NetBSD: fpgetsticky.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $
- * $DragonFly: src/lib/libc/amd64/gen/fpgetsticky.S,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <machine/asm.h>
* Public domain.
*
* $NetBSD: fpsetmask.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $
- * $DragonFly: src/lib/libc/amd64/gen/fpsetmask.S,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <machine/asm.h>
* Public domain.
*
* $NetBSD: fpsetround.S,v 1.3 2002/06/12 19:17:22 fvdl Exp $
- * $DragonFly: src/lib/libc/amd64/gen/fpsetround.S,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <machine/asm.h>
* Public domain.
*
* $NetBSD: fpsetsticky.S,v 1.5 2004/03/09 17:16:13 drochner Exp $
- * $DragonFly: src/lib/libc/amd64/gen/fpsetsticky.S,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <machine/asm.h>
/*
* IEEE-compatible infinityl.c for little-endian 80-bit format -- public domain.
- * Note that the representation includes 48 bits of tail padding per amd64 ABI.
+ * Note that the representation includes 48 bits of tail padding per x86_64 ABI.
*
* $NetBSD: infinityl.c,v 1.2 2005/06/12 05:21:27 lukem Exp $
- * $DragonFly: src/lib/libc/amd64/gen/infinityl.c,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <sys/cdefs.h>
* POSSIBILITY OF SUCH DAMAGE.
*
* $NetBSD: isfinitel.c,v 1.1 2003/10/29 20:03:51 kleink Exp $
- * $DragonFly: src/lib/libc/amd64/gen/isfinitel.c,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <sys/cdefs.h>
*
* from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
* $NetBSD: isinfl.c,v 1.5 2004/03/04 23:42:39 kleink Exp $
- * $DragonFly: src/lib/libc/amd64/gen/isinfl.c,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <sys/cdefs.h>
*
* from: Header: isinf.c,v 1.1 91/07/08 19:03:34 torek Exp
* $NetBSD: isnanl.c,v 1.5 2004/03/04 23:42:39 kleink Exp $
- * $DragonFly: src/lib/libc/amd64/gen/isnanl.c,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <sys/cdefs.h>
*
* @(#)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 $
*/
/*
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $DragonFly: src/lib/libc/amd64/gen/mcontext.S,v 1.2 2008/08/28 23:36:31 dillon Exp $
*/
#include <machine/asm.h>
* from: @(#)modf.s 5.5 (Berkeley) 3/18/91
* $NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $
* $FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.4 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/gen/modf.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
-/*
- * $DragonFly: src/lib/libc/amd64/gen/nanf.c,v 1.1 2006/07/27 00:46:57 corecode Exp $
- */
-
#include <sys/cdefs.h>
#include <math.h>
* SUCH DAMAGE.
*
* $FreeBSD: src/lib/libc/amd64/gen/rfork_thread.S,v 1.2 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/gen/rfork_thread.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
*
* @(#)setjmp.s 5.1 (Berkeley) 4/23/90
* $FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.29 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/gen/setjmp.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
* POSSIBILITY OF SUCH DAMAGE.
*
* $NetBSD: signbitl.c,v 1.1 2004/01/15 19:43:45 kleink Exp $
- * $DragonFly: src/lib/libc/amd64/gen/signbitl.c,v 1.1 2006/07/27 00:46:57 corecode Exp $
*/
#include <sys/cdefs.h>
* @(#)setjmp.s 5.1 (Berkeley) 4/23/90
* $Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $
* $FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.30 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
# 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
* SUCH DAMAGE.
*
* $FreeBSD: src/lib/libc/amd64/sys/amd64_get_fsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $
- * $DragonFly: src/lib/libc/amd64/sys/amd64_get_fsbase.c,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/sysarch.h>
* SUCH DAMAGE.
*
* $FreeBSD: src/lib/libc/amd64/sys/amd64_get_gsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $
- * $DragonFly: src/lib/libc/amd64/sys/amd64_get_gsbase.c,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/sysarch.h>
* SUCH DAMAGE.
*
* $FreeBSD: src/lib/libc/amd64/sys/amd64_set_fsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $
- * $DragonFly: src/lib/libc/amd64/sys/amd64_set_fsbase.c,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/sysarch.h>
* SUCH DAMAGE.
*
* $FreeBSD: src/lib/libc/amd64/sys/amd64_set_gsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $
- * $DragonFly: src/lib/libc/amd64/sys/amd64_set_gsbase.c,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/sysarch.h>
-/* $DragonFly: src/lib/libc/amd64/sys/asmcontext.c,v 1.2 2008/08/28 23:36:47 dillon Exp $ */
-
#define _KERNEL_STRUCTURES
#include <sys/types.h>
#include <sys/ucontext.h>
ASSYM(UC_MCONTEXT, offsetof(ucontext_t, uc_mcontext));
ASSYM(SIG_BLOCK, SIG_BLOCK);
ASSYM(SIG_SETMASK, SIG_SETMASK);
-#ifdef __amd64__
+#ifdef __x86_64__
ASSYM(MC_ONSTACK, offsetof(mcontext_t, mc_onstack));
ASSYM(MC_RDI, offsetof(mcontext_t, mc_rdi));
ASSYM(MC_RSI, offsetof(mcontext_t, mc_rsi));
*
* @(#)brk.s 5.2 (Berkeley) 12/17/90
* $FreeBSD: src/lib/libc/amd64/sys/brk.S,v 1.15 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/sys/brk.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
*
* @(#)cerror.s 5.1 (Berkeley) 4/23/90
* $FreeBSD: src/lib/libc/amd64/sys/cerror.S,v 1.13 2003/04/30 18:16:33 peter Exp $
- * $DragonFly: src/lib/libc/amd64/sys/cerror.S,v 1.3 2008/08/28 23:38:52 dillon Exp $
*/
#include <machine/asm.h>
*
* @(#)exect.s 5.1 (Berkeley) 4/23/90
* $FreeBSD: src/lib/libc/amd64/sys/exect.S,v 1.13 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/sys/exect.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
*
* @(#)pipe.s 5.1 (Berkeley) 4/23/90
* $FreeBSD: src/lib/libc/amd64/sys/pipe.S,v 1.15 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/sys/pipe.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
*
* @(#)ptrace.s 5.1 (Berkeley) 4/23/90
* $FreeBSD: src/lib/libc/amd64/sys/ptrace.S,v 1.11 2003/05/24 17:35:23 peter Exp $
- * $DragonFly: src/lib/libc/amd64/sys/ptrace.S,v 1.2 2006/07/27 00:44:27 corecode Exp $
*/
#include <machine/asm.h>
*
* @(#)reboot.s 5.1 (Berkeley) 4/23/90
* $FreeBSD: src/lib/libc/amd64/sys/reboot.S,v 1.11 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/sys/reboot.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
*
* @(#)sbrk.s 5.1 (Berkeley) 4/23/90
* $FreeBSD: src/lib/libc/amd64/sys/sbrk.S,v 1.15 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/sys/sbrk.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
*
* @(#)setlogin.s 5.2 (Berkeley) 4/12/91
* $FreeBSD: src/lib/libc/amd64/sys/setlogin.S,v 1.14 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/sys/setlogin.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
*
* @(#)sigreturn.s 5.2 (Berkeley) 12/17/90
* $FreeBSD: src/lib/libc/amd64/sys/sigreturn.S,v 1.13 2007/01/09 00:27:49 imp Exp $
- * $DragonFly: src/lib/libc/amd64/sys/sigreturn.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
*
* @(#)Ovfork.s 5.1 (Berkeley) 4/23/90
* $FreeBSD: src/lib/libc/amd64/sys/vfork.S,v 1.24 2008/11/02 01:10:54 peter Exp $
- * $DragonFly: src/lib/libc/amd64/sys/vfork.S,v 1.1 2004/02/02 05:43:14 dillon Exp $
*/
#include <machine/asm.h>
#if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
defined(__arm__) || defined(__ppc__) || defined(__ia64__) || \
- defined(__arm26__) || defined(__sparc64__) || defined(__amd64__)
+ defined(__arm26__) || defined(__sparc64__) || defined(__x86_64__)
#include <machine/endian.h>
#define IEEEFP
#endif
* SUCH DAMAGE.
*
* $FreeBSD: src/lib/libc_r/arch/i386/_atomic_lock.S,v 1.3 1999/08/28 00:03:01 peter Exp $
- * $DragonFly: src/lib/libc_r/arch/amd64/_atomic_lock.S,v 1.1 2006/07/27 00:43:35 corecode Exp $
*/
#include <machine/asm.h>
#define SET_STACK_SJB(sjb, stk) (sjb)[0]._sjb[2] = (int)(stk)
#define SET_STACK_UC(ucp, stk) (ucp)->uc_mcontext.mc_esp = (int)(stk)
#define SET_RETURN_ADDR_JB(jb, ra) (jb)[0]._jb[0] = (int)(ra)
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
#define GET_STACK_JB(jb) ((unsigned long)((jb)[0]._jb[2]))
#define GET_STACK_SJB(sjb) ((unsigned long)((sjb)[0]._sjb[2]))
#define GET_STACK_UC(ucp) ((unsigned long)((ucp)->uc_mcontext.mc_rsp))
*
* @(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93
* $FreeBSD: src/lib/libkvm/kvm_amd64.c,v 1.16 2003/04/30 21:05:33 peter Exp $
- * $DragonFly: src/lib/libkvm/kvm_amd64.c,v 1.2 2007/04/29 01:36:04 dillon Exp $
*/
/*
- * AMD64 machine dependent routines for kvm. Hopefully, the forthcoming
+ * x86_64 machine dependent routines for kvm. Hopefully, the forthcoming
* vm code will one day obsolete this module.
*/
#include "kvm_private.h"
#ifndef btop
-#define btop(x) (amd64_btop(x))
-#define ptob(x) (amd64_ptob(x))
+#define btop(x) (x86_64_btop(x))
+#define ptob(x) (x86_64_ptob(x))
#endif
struct vmstate {
s_scalbn.S s_scalbnf.S s_significand.S s_significandf.S s_sin.S \
s_sinf.S s_tan.S s_tanf.S
-# This file is included by arch/amd64/Makefile.inc, so pull in the right
+# This file is included by arch/x86_64/Makefile.inc, so pull in the right
# fenv.[ch].
#
.if ${MACHINE_ARCH} == "i386"
-.PATH: ${.CURDIR}/arch/amd64
+.PATH: ${.CURDIR}/arch/x86_64
SRCS+= fenv.c
INCS= fenv.h
# Mostly OK, some of the libc imports are a bit noisy
CFLAGS+= -ffreestanding -std=c99
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "x86_64"
CFLAGS+= -m32 -mpreferred-stack-boundary=2
projects / dragonfly.git / commitdiff