summaryrefslogtreecommitdiff
path: root/StdLib/Include/X64
diff options
context:
space:
mode:
Diffstat (limited to 'StdLib/Include/X64')
-rw-r--r--StdLib/Include/X64/machine/ansi.h106
-rw-r--r--StdLib/Include/X64/machine/asm.h146
-rw-r--r--StdLib/Include/X64/machine/atomic.h95
-rw-r--r--StdLib/Include/X64/machine/bswap.h13
-rw-r--r--StdLib/Include/X64/machine/byte_swap.h71
-rw-r--r--StdLib/Include/X64/machine/endian.h3
-rw-r--r--StdLib/Include/X64/machine/endian_machdep.h3
-rw-r--r--StdLib/Include/X64/machine/float.h3
-rw-r--r--StdLib/Include/X64/machine/fpu.h103
-rw-r--r--StdLib/Include/X64/machine/ieee.h3
-rw-r--r--StdLib/Include/X64/machine/int_const.h63
-rw-r--r--StdLib/Include/X64/machine/int_fmtio.h219
-rw-r--r--StdLib/Include/X64/machine/int_limits.h135
-rw-r--r--StdLib/Include/X64/machine/int_mwgwtypes.h82
-rw-r--r--StdLib/Include/X64/machine/int_types.h73
-rw-r--r--StdLib/Include/X64/machine/limits.h40
-rw-r--r--StdLib/Include/X64/machine/math.h3
-rw-r--r--StdLib/Include/X64/machine/param.h105
-rw-r--r--StdLib/Include/X64/machine/signal.h22
-rw-r--r--StdLib/Include/X64/machine/types.h74
20 files changed, 0 insertions, 1362 deletions
diff --git a/StdLib/Include/X64/machine/ansi.h b/StdLib/Include/X64/machine/ansi.h
deleted file mode 100644
index e6ff195a82..0000000000
--- a/StdLib/Include/X64/machine/ansi.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/** @file
- Machine dependent ANSI type definitions.
-
- Copyright (c) 2010-2012, Intel Corporation. All rights reserved.<BR>
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License that accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
- Copyright (c) 1990, 1993
- The Regents of the University of California. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- - Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
-
- NetBSD: ansi.h,v 1.4 2006/10/04 13:51:59 tnozaki Exp
- ansi.h 8.2 (Berkeley) 1/4/94
-**/
-#ifndef _ANSI_H_
-#define _ANSI_H_
-
-#include <sys/EfiCdefs.h>
-
-#include <machine/int_types.h>
-
-/*
- * Types which are fundamental to the implementation and may appear in
- * more than one standard header are defined here. Standard headers
- * then use:
- * #ifdef _BSD_SIZE_T_
- * typedef _BSD_SIZE_T_ size_t;
- * #undef _BSD_SIZE_T_
- * #endif
- */
-#define _BSD_CLOCK_T_ _EFI_CLOCK_T /* clock() */
-#define _BSD_PTRDIFF_T_ _EFI_PTRDIFF_T_ /* ptr1 - ptr2 */
-#define _BSD_SIZE_T_ _EFI_SIZE_T_ /* sizeof() */
-#define _BSD_SSIZE_T_ INTN /* byte count or error */
-#define _BSD_TIME_T_ _EFI_TIME_T /* time() */
-#define _BSD_VA_LIST_ VA_LIST
-#define _BSD_CLOCKID_T_ INT64 /* clockid_t */
-#define _BSD_TIMER_T_ INT64 /* timer_t */
-#define _BSD_SUSECONDS_T_ INT64 /* suseconds_t */
-#define _BSD_USECONDS_T_ UINT64 /* useconds_t */
-
-/*
- * NOTE: rune_t is not covered by ANSI nor other standards, and should not
- * be instantiated outside of lib/libc/locale. use wchar_t.
- *
- * Runes (wchar_t) is declared to be an ``int'' instead of the more natural
- * ``unsigned long'' or ``long''. Two things are happening here. It is not
- * unsigned so that EOF (-1) can be naturally assigned to it and used. Also,
- * it looks like 10646 will be a 31 bit standard. This means that if your
- * ints cannot hold 32 bits, you will be in trouble. The reason an int was
- * chosen over a long is that the is*() and to*() routines take ints (says
- * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you
- * lose a bit of ANSI conformance, but your programs will still work.
- *
- * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t
- * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains
- * defined for ctype.h.
- */
-#define _BSD_WCHAR_T_ _EFI_WCHAR_T /* wchar_t */
-#define _BSD_WINT_T_ _EFI_WINT_T /* wint_t */
-#define _BSD_RUNE_T_ _EFI_WCHAR_T /* rune_t */
-#define _BSD_WCTRANS_T_ void * /* wctrans_t */
-#define _BSD_WCTYPE_T_ unsigned int /* wctype_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions. The content must not be referenced by user programs.
- */
-typedef struct {
- UINT32 A; // Np;
- UINT32 B; // U;
- UINT32 E; // L
- UINT8 C[4]; // n[4]
- UINT16 D[2]; // w[2]
-} __mbstate_t;
-#define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */
-
-#endif /* _ANSI_H_ */
diff --git a/StdLib/Include/X64/machine/asm.h b/StdLib/Include/X64/machine/asm.h
deleted file mode 100644
index 109d1e1879..0000000000
--- a/StdLib/Include/X64/machine/asm.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* $NetBSD: asm.h,v 1.6 2006/09/05 19:00:42 ad Exp $ */
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY 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.
- *
- * @(#)asm.h 5.5 (Berkeley) 5/7/91
- */
-
-#ifndef _AMD64_ASM_H_
-#define _AMD64_ASM_H_
-
-#ifdef PIC
-#define PIC_PLT(x) x@PLT
-#define PIC_GOT(x) x@GOTPCREL(%rip)
-#else
-#define PIC_PLT(x) x
-#define PIC_GOT(x) x
-#endif
-
-# define _C_LABEL(x) x
-#define _ASM_LABEL(x) x
-
-#define CVAROFF(x,y) (_C_LABEL(x)+y)(%rip)
-
-#ifdef __STDC__
-# define __CONCAT(x,y) x ## y
-# define __STRING(x) #x
-#else
-# define __CONCAT(x,y) x/**/y
-# define __STRING(x) "x"
-#endif
-
-/* let kernels and others override entrypoint alignment */
-#ifndef _ALIGN_TEXT
-#define _ALIGN_TEXT .align 4
-#endif
-
-#define _ENTRY(x) \
- .text; _ALIGN_TEXT; .globl x; .type x,@function; x:
-
-#ifdef _KERNEL
-/* XXX Can't use __CONCAT() here, as it would be evaluated incorrectly. */
-#ifdef __STDC__
-#define IDTVEC(name) \
- ALIGN_TEXT; .globl X ## name; .type X ## name,@function; X ## name:
-#else
-#define IDTVEC(name) \
- ALIGN_TEXT; .globl X/**/name; .type X/**/name,@function; X/**/name:
-#endif /* __STDC__ */
-#endif /* _KERNEL */
-
-#ifdef __STDC__
-#define CPUVAR(off) %gs:CPU_INFO_ ## off
-#else
-#define CPUVAR(off) %gs:CPU_INFO_/**/off
-#endif
-
-
-#ifdef GPROF
-# define _PROF_PROLOGUE \
- pushq %rbp; leaq (%rsp),%rbp; call PIC_PLT(__mcount); popq %rbp
-#else
-# define _PROF_PROLOGUE
-#endif
-
-#define ENTRY(y) _ENTRY(_C_LABEL(y)); _PROF_PROLOGUE
-#define NENTRY(y) _ENTRY(_C_LABEL(y))
-#define ASENTRY(y) _ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE
-
-#define ASMSTR .asciz
-
-#define RCSID(x) .text; .asciz x
-
-#define WEAK_ALIAS(alias,sym) \
- .weak alias; \
- alias = sym
-
-/*
- * STRONG_ALIAS: create a strong alias.
- */
-#define STRONG_ALIAS(alias,sym) \
- .globl alias; \
- alias = sym
-
-/* XXXfvdl do not use stabs here */
-#ifdef __STDC__
-#define WARN_REFERENCES(sym,msg) \
- .stabs msg ## ,30,0,0,0 ; \
- .stabs __STRING(_C_LABEL(sym)) ## ,1,0,0,0
-#else
-#define WARN_REFERENCES(sym,msg) \
- .stabs msg,30,0,0,0 ; \
- .stabs __STRING(sym),1,0,0,0
-#endif /* __STDC__ */
-
-/*
- * Assembley equivalent of spllower(). Label contains the label to jump to
- * if we need to fire off pending interrupts (e.g. _C_LABEL(Xspllower)).
- *
- * On entry %rcx = new SPL.
- */
-#define SPLLOWER(label) \
- movq CPUVAR(SELF), %r9 ; \
- cmpl CPU_INFO_ILEVEL(%r9), %ecx ; \
- jae 99f ; \
- movl CPU_INFO_IUNMASK(%r9,%rcx,4), %edi ; \
- pushfq ; \
- popq %rax ; \
- cli ; \
- testl CPU_INFO_IPENDING(%r9), %edi ; \
- movq %rcx, %rdi ; \
- jnz label ; \
- movl %ecx, CPU_INFO_ILEVEL(%r9) ; \
- pushq %rax ; \
- popfq ; \
-99:
-
-#endif /* !_AMD64_ASM_H_ */
diff --git a/StdLib/Include/X64/machine/atomic.h b/StdLib/Include/X64/machine/atomic.h
deleted file mode 100644
index fa5672b4d3..0000000000
--- a/StdLib/Include/X64/machine/atomic.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $NetBSD: atomic.h,v 1.4 2005/12/28 19:09:29 perry Exp $ */
-
-/*
- * Copyright 2002 (c) Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Frank van der Linden for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed for the NetBSD Project by
- * Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
- */
-
-#ifndef _ATOMIC_H
-#define _ATOMIC_H
-
-#ifndef _LOCORE
-
-static __inline u_int64_t
-x86_atomic_testset_u64(volatile u_int64_t *ptr, u_int64_t val) {
- __asm volatile ("xchgq %0,(%2)" :"=r" (val):"0" (val),"r" (ptr));
- return val;
-}
-
-static __inline u_int32_t
-x86_atomic_testset_u32(volatile u_int32_t *ptr, u_int32_t val) {
- __asm volatile ("xchgl %0,(%2)" :"=r" (val):"0" (val),"r" (ptr));
- return val;
-}
-
-
-
-static __inline int32_t
-x86_atomic_testset_i32(volatile int32_t *ptr, int32_t val) {
- __asm volatile ("xchgl %0,(%2)" :"=r" (val):"0" (val),"r" (ptr));
- return val;
-}
-
-
-
-static __inline void
-x86_atomic_setbits_u32(volatile u_int32_t *ptr, u_int32_t bits) {
- __asm volatile("lock ; orl %1,%0" : "=m" (*ptr) : "ir" (bits));
-}
-
-static __inline void
-x86_atomic_clearbits_u32(volatile u_int32_t *ptr, u_int32_t bits) {
- __asm volatile("lock ; andl %1,%0" : "=m" (*ptr) : "ir" (~bits));
-}
-
-
-
-static __inline void
-x86_atomic_setbits_u64(volatile u_int64_t *ptr, u_int64_t bits) {
- __asm volatile("lock ; orq %1,%0" : "=m" (*ptr) : "ir" (~bits));
-}
-
-static __inline void
-x86_atomic_clearbits_u64(volatile u_int64_t *ptr, u_int64_t bits) {
- __asm volatile("lock ; andq %1,%0" : "=m" (*ptr) : "ir" (~bits));
-}
-
-#define x86_atomic_testset_ul x86_atomic_testset_u32
-#define x86_atomic_testset_i x86_atomic_testset_i32
-#define x86_atomic_setbits_l x86_atomic_setbits_u32
-#define x86_atomic_setbits_ul x86_atomic_setbits_u32
-#define x86_atomic_clearbits_l x86_atomic_clearbits_u32
-#define x86_atomic_clearbits_ul x86_atomic_clearbits_u32
-
-#endif
-#endif
diff --git a/StdLib/Include/X64/machine/bswap.h b/StdLib/Include/X64/machine/bswap.h
deleted file mode 100644
index 1c8caaad4c..0000000000
--- a/StdLib/Include/X64/machine/bswap.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $NetBSD: bswap.h,v 1.2 2006/01/31 07:49:18 dsl Exp $ */
-
-/* Written by Manuel Bouyer. Public domain */
-
-#ifndef _MACHINE_BSWAP_H_
-#define _MACHINE_BSWAP_H_
-
-#include <machine/byte_swap.h>
-
-#define __BSWAP_RENAME
-#include <sys/bswap.h>
-
-#endif /* !_MACHINE_BSWAP_H_ */
diff --git a/StdLib/Include/X64/machine/byte_swap.h b/StdLib/Include/X64/machine/byte_swap.h
deleted file mode 100644
index dec8a24015..0000000000
--- a/StdLib/Include/X64/machine/byte_swap.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* $NetBSD: byte_swap.h,v 1.4 2006/01/30 22:46:35 dsl Exp $ */
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
- */
-
-/*
- * Copy of the i386 version. 64 bit versions may be added later.
- */
-
-#ifndef _AMD64_BYTE_SWAP_H_
-#define _AMD64_BYTE_SWAP_H_
-
-#ifdef __GNUC__
-#include <sys/types.h>
-__BEGIN_DECLS
-
-#define __BYTE_SWAP_U32_VARIABLE __byte_swap_u32_variable
-static __inline uint32_t __byte_swap_u32_variable(uint32_t);
-static __inline uint32_t
-__byte_swap_u32_variable(uint32_t x)
-{
- __asm volatile ( "bswap %1" : "=r" (x) : "0" (x));
- return (x);
-}
-
-#define __BYTE_SWAP_U16_VARIABLE __byte_swap_u16_variable
-static __inline uint16_t __byte_swap_u16_variable(uint16_t);
-static __inline uint16_t
-__byte_swap_u16_variable(uint16_t x)
-{
- __asm volatile ("rorw $8, %w1" : "=r" (x) : "0" (x));
- return (x);
-}
-
-__END_DECLS
-#endif
-
-#endif /* !_AMD64_BYTE_SWAP_H_ */
diff --git a/StdLib/Include/X64/machine/endian.h b/StdLib/Include/X64/machine/endian.h
deleted file mode 100644
index 53de9c6ef4..0000000000
--- a/StdLib/Include/X64/machine/endian.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: endian.h,v 1.1 2003/04/26 18:39:40 fvdl Exp $ */
-
-#include <sys/endian.h>
diff --git a/StdLib/Include/X64/machine/endian_machdep.h b/StdLib/Include/X64/machine/endian_machdep.h
deleted file mode 100644
index efe81a3ec3..0000000000
--- a/StdLib/Include/X64/machine/endian_machdep.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: endian_machdep.h,v 1.4 2006/01/30 21:52:38 dsl Exp $ */
-
-#define _BYTE_ORDER _LITTLE_ENDIAN
diff --git a/StdLib/Include/X64/machine/float.h b/StdLib/Include/X64/machine/float.h
deleted file mode 100644
index 620601e169..0000000000
--- a/StdLib/Include/X64/machine/float.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: float.h,v 1.1 2003/04/26 18:39:40 fvdl Exp $ */
-
-#include <x86/float.h>
diff --git a/StdLib/Include/X64/machine/fpu.h b/StdLib/Include/X64/machine/fpu.h
deleted file mode 100644
index b463062f31..0000000000
--- a/StdLib/Include/X64/machine/fpu.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* $NetBSD: fpu.h,v 1.1 2003/04/26 18:39:40 fvdl Exp $ */
-
-#ifndef _AMD64_FPU_H_
-#define _AMD64_FPU_H_
-
-/*
- * NetBSD/amd64 only uses the extended save/restore format used
- * by fxsave/fsrestore, to always deal with the SSE registers,
- * which are part of the ABI to pass floating point values.
- * Must be stored in memory on a 16-byte boundary.
- */
-
-struct fxsave64 {
- u_int16_t fx_fcw;
- u_int16_t fx_fsw;
- u_int8_t fx_ftw;
- u_int8_t fx_unused1;
- u_int16_t fx_fop;
- u_int64_t fx_rip;
- u_int64_t fx_rdp;
- u_int32_t fx_mxcsr;
- u_int32_t fx_mxcsr_mask;
- u_int64_t fx_st[8][2]; /* 8 normal FP regs */
- u_int64_t fx_xmm[16][2]; /* 16 SSE2 registers */
- u_int8_t fx_unused3[96];
-} __attribute__((packed));
-
-struct savefpu {
- struct fxsave64 fp_fxsave; /* see above */
- u_int16_t fp_ex_sw; /* saved status from last exception */
- u_int16_t fp_ex_tw; /* saved tag from last exception */
-};
-
-#ifdef _KERNEL
-
-/*
- * This one only used for backward compat coredumping.
- */
-struct oldfsave {
- u_int16_t fs_control;
- u_int16_t fs_unused0;
- u_int16_t fs_status;
- u_int16_t fs_unused1;
- u_int16_t fs_tag;
- u_int16_t fs_unused2;
- u_int32_t fs_ipoff;
- u_int16_t fs_ipsel;
- u_int16_t fs_op;
- u_int32_t fs_opoff;
- u_int16_t fs_opsel;
-} __attribute__ ((packed));
-
-#endif
-
-
-/*
- * The i387 defaults to Intel extended precision mode and round to nearest,
- * with all exceptions masked.
- */
-#define __INITIAL_NPXCW__ 0x037f
-#define __INITIAL_MXCSR__ 0x1f80
-#define __INITIAL_MXCSR_MASK__ 0xffbf
-
-/* NetBSD uses IEEE double precision. */
-#define __NetBSD_NPXCW__ 0x127f
-/* Linux just uses the default control word. */
-#define __Linux_NPXCW__ 0x037f
-
-/*
- * The standard control word from finit is 0x37F, giving:
- * round to nearest
- * 64-bit precision
- * all exceptions masked.
- *
- * Now we want:
- * affine mode (if we decide to support 287's)
- * round to nearest
- * 53-bit precision
- * all exceptions masked.
- *
- * 64-bit precision often gives bad results with high level languages
- * because it makes the results of calculations depend on whether
- * intermediate values are stored in memory or in FPU registers.
- */
-
-#ifdef _KERNEL
-/*
- * XXX
- */
-struct trapframe;
-struct cpu_info;
-
-void fpuinit(struct cpu_info *);
-void fpudrop(void);
-void fpusave(struct lwp *);
-void fpudiscard(struct lwp *);
-void fputrap(struct trapframe *);
-void fpusave_lwp(struct lwp *, int);
-void fpusave_cpu(struct cpu_info *, int);
-
-#endif
-
-#endif /* _AMD64_FPU_H_ */
diff --git a/StdLib/Include/X64/machine/ieee.h b/StdLib/Include/X64/machine/ieee.h
deleted file mode 100644
index 6f942256dc..0000000000
--- a/StdLib/Include/X64/machine/ieee.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: ieee.h,v 1.1 2003/04/26 18:39:41 fvdl Exp $ */
-
-#include <x86/ieee.h>
diff --git a/StdLib/Include/X64/machine/int_const.h b/StdLib/Include/X64/machine/int_const.h
deleted file mode 100644
index 084796358d..0000000000
--- a/StdLib/Include/X64/machine/int_const.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* $NetBSD: int_const.h,v 1.1 2003/04/26 18:39:42 fvdl Exp $ */
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
- */
-
-#ifndef _AMD64_INT_CONST_H_
-#define _AMD64_INT_CONST_H_
-
-/*
- * 7.18.4 Macros for integer constants
- */
-
-/* 7.18.4.1 Macros for minimum-width integer constants */
-
-#define INT8_C(c) c
-#define INT16_C(c) c
-#define INT32_C(c) c
-#define INT64_C(c) c ## LL
-
-#define UINT8_C(c) c ## U
-#define UINT16_C(c) c ## U
-#define UINT32_C(c) c ## U
-#define UINT64_C(c) c ## ULL
-
-/* 7.18.4.2 Macros for greatest-width integer constants */
-
-#define INTMAX_C(c) c ## LL
-#define UINTMAX_C(c) c ## ULL
-
-#endif /* !_AMD64_INT_CONST_H_ */
diff --git a/StdLib/Include/X64/machine/int_fmtio.h b/StdLib/Include/X64/machine/int_fmtio.h
deleted file mode 100644
index 181cc26e84..0000000000
--- a/StdLib/Include/X64/machine/int_fmtio.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* $NetBSD: int_fmtio.h,v 1.4 2005/12/11 12:16:25 christos Exp $ */
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
- */
-
-#ifndef _AMD64_INT_FMTIO_H_
-#define _AMD64_INT_FMTIO_H_
-
-/*
- * 7.8.1 Macros for format specifiers
- */
-
-/* fprintf macros for signed integers */
-
-#define PRId8 "d" /* int8_t */
-#define PRId16 "d" /* int16_t */
-#define PRId32 "d" /* int32_t */
-#define PRId64 "ld" /* int64_t */
-#define PRIdLEAST8 "d" /* int_least8_t */
-#define PRIdLEAST16 "d" /* int_least16_t */
-#define PRIdLEAST32 "d" /* int_least32_t */
-#define PRIdLEAST64 "ld" /* int_least64_t */
-#define PRIdFAST8 "d" /* int_fast8_t */
-#define PRIdFAST16 "d" /* int_fast16_t */
-#define PRIdFAST32 "d" /* int_fast32_t */
-#define PRIdFAST64 "ld" /* int_fast64_t */
-#define PRIdMAX "ld" /* intmax_t */
-#define PRIdPTR "ld" /* intptr_t */
-
-#define PRIi8 "i" /* int8_t */
-#define PRIi16 "i" /* int16_t */
-#define PRIi32 "i" /* int32_t */
-#define PRIi64 "li" /* int64_t */
-#define PRIiLEAST8 "i" /* int_least8_t */
-#define PRIiLEAST16 "i" /* int_least16_t */
-#define PRIiLEAST32 "i" /* int_least32_t */
-#define PRIiLEAST64 "li" /* int_least64_t */
-#define PRIiFAST8 "i" /* int_fast8_t */
-#define PRIiFAST16 "i" /* int_fast16_t */
-#define PRIiFAST32 "i" /* int_fast32_t */
-#define PRIiFAST64 "li" /* int_fast64_t */
-#define PRIiMAX "li" /* intmax_t */
-#define PRIiPTR "li" /* intptr_t */
-
-/* fprintf macros for unsigned integers */
-
-#define PRIo8 "o" /* uint8_t */
-#define PRIo16 "o" /* uint16_t */
-#define PRIo32 "o" /* uint32_t */
-#define PRIo64 "lo" /* uint64_t */
-#define PRIoLEAST8 "o" /* uint_least8_t */
-#define PRIoLEAST16 "o" /* uint_least16_t */
-#define PRIoLEAST32 "o" /* uint_least32_t */
-#define PRIoLEAST64 "lo" /* uint_least64_t */
-#define PRIoFAST8 "o" /* uint_fast8_t */
-#define PRIoFAST16 "o" /* uint_fast16_t */
-#define PRIoFAST32 "o" /* uint_fast32_t */
-#define PRIoFAST64 "lo" /* uint_fast64_t */
-#define PRIoMAX "lo" /* uintmax_t */
-#define PRIoPTR "lo" /* uintptr_t */
-
-#define PRIu8 "u" /* uint8_t */
-#define PRIu16 "u" /* uint16_t */
-#define PRIu32 "u" /* uint32_t */
-#define PRIu64 "lu" /* uint64_t */
-#define PRIuLEAST8 "u" /* uint_least8_t */
-#define PRIuLEAST16 "u" /* uint_least16_t */
-#define PRIuLEAST32 "u" /* uint_least32_t */
-#define PRIuLEAST64 "lu" /* uint_least64_t */
-#define PRIuFAST8 "u" /* uint_fast8_t */
-#define PRIuFAST16 "u" /* uint_fast16_t */
-#define PRIuFAST32 "u" /* uint_fast32_t */
-#define PRIuFAST64 "lu" /* uint_fast64_t */
-#define PRIuMAX "lu" /* uintmax_t */
-#define PRIuPTR "lu" /* uintptr_t */
-
-#define PRIx8 "x" /* uint8_t */
-#define PRIx16 "x" /* uint16_t */
-#define PRIx32 "x" /* uint32_t */
-#define PRIx64 "lx" /* uint64_t */
-#define PRIxLEAST8 "x" /* uint_least8_t */
-#define PRIxLEAST16 "x" /* uint_least16_t */
-#define PRIxLEAST32 "x" /* uint_least32_t */
-#define PRIxLEAST64 "lx" /* uint_least64_t */
-#define PRIxFAST8 "x" /* uint_fast8_t */
-#define PRIxFAST16 "x" /* uint_fast16_t */
-#define PRIxFAST32 "x" /* uint_fast32_t */
-#define PRIxFAST64 "lx" /* uint_fast64_t */
-#define PRIxMAX "lx" /* uintmax_t */
-#define PRIxPTR "lx" /* uintptr_t */
-
-#define PRIX8 "X" /* uint8_t */
-#define PRIX16 "X" /* uint16_t */
-#define PRIX32 "X" /* uint32_t */
-#define PRIX64 "lX" /* uint64_t */
-#define PRIXLEAST8 "X" /* uint_least8_t */
-#define PRIXLEAST16 "X" /* uint_least16_t */
-#define PRIXLEAST32 "X" /* uint_least32_t */
-#define PRIXLEAST64 "lX" /* uint_least64_t */
-#define PRIXFAST8 "X" /* uint_fast8_t */
-#define PRIXFAST16 "X" /* uint_fast16_t */
-#define PRIXFAST32 "X" /* uint_fast32_t */
-#define PRIXFAST64 "lX" /* uint_fast64_t */
-#define PRIXMAX "lX" /* uintmax_t */
-#define PRIXPTR "lX" /* uintptr_t */
-
-/* fscanf macros for signed integers */
-
-#define SCNd8 "hhd" /* int8_t */
-#define SCNd16 "hd" /* int16_t */
-#define SCNd32 "d" /* int32_t */
-#define SCNd64 "ld" /* int64_t */
-#define SCNdLEAST8 "hhd" /* int_least8_t */
-#define SCNdLEAST16 "hd" /* int_least16_t */
-#define SCNdLEAST32 "d" /* int_least32_t */
-#define SCNdLEAST64 "ld" /* int_least64_t */
-#define SCNdFAST8 "d" /* int_fast8_t */
-#define SCNdFAST16 "d" /* int_fast16_t */
-#define SCNdFAST32 "d" /* int_fast32_t */
-#define SCNdFAST64 "ld" /* int_fast64_t */
-#define SCNdMAX "ld" /* intmax_t */
-#define SCNdPTR "ld" /* intptr_t */
-
-#define SCNi8 "hhi" /* int8_t */
-#define SCNi16 "hi" /* int16_t */
-#define SCNi32 "i" /* int32_t */
-#define SCNi64 "li" /* int64_t */
-#define SCNiLEAST8 "hhi" /* int_least8_t */
-#define SCNiLEAST16 "hi" /* int_least16_t */
-#define SCNiLEAST32 "i" /* int_least32_t */
-#define SCNiLEAST64 "li" /* int_least64_t */
-#define SCNiFAST8 "i" /* int_fast8_t */
-#define SCNiFAST16 "i" /* int_fast16_t */
-#define SCNiFAST32 "i" /* int_fast32_t */
-#define SCNiFAST64 "li" /* int_fast64_t */
-#define SCNiMAX "li" /* intmax_t */
-#define SCNiPTR "li" /* intptr_t */
-
-/* fscanf macros for unsigned integers */
-
-#define SCNo8 "hho" /* uint8_t */
-#define SCNo16 "ho" /* uint16_t */
-#define SCNo32 "o" /* uint32_t */
-#define SCNo64 "lo" /* uint64_t */
-#define SCNoLEAST8 "hho" /* uint_least8_t */
-#define SCNoLEAST16 "ho" /* uint_least16_t */
-#define SCNoLEAST32 "o" /* uint_least32_t */
-#define SCNoLEAST64 "lo" /* uint_least64_t */
-#define SCNoFAST8 "o" /* uint_fast8_t */
-#define SCNoFAST16 "o" /* uint_fast16_t */
-#define SCNoFAST32 "o" /* uint_fast32_t */
-#define SCNoFAST64 "lo" /* uint_fast64_t */
-#define SCNoMAX "lo" /* uintmax_t */
-#define SCNoPTR "lo" /* uintptr_t */
-
-#define SCNu8 "hhu" /* uint8_t */
-#define SCNu16 "hu" /* uint16_t */
-#define SCNu32 "u" /* uint32_t */
-#define SCNu64 "lu" /* uint64_t */
-#define SCNuLEAST8 "hhu" /* uint_least8_t */
-#define SCNuLEAST16 "hu" /* uint_least16_t */
-#define SCNuLEAST32 "u" /* uint_least32_t */
-#define SCNuLEAST64 "lu" /* uint_least64_t */
-#define SCNuFAST8 "u" /* uint_fast8_t */
-#define SCNuFAST16 "u" /* uint_fast16_t */
-#define SCNuFAST32 "u" /* uint_fast32_t */
-#define SCNuFAST64 "lu" /* uint_fast64_t */
-#define SCNuMAX "lu" /* uintmax_t */
-#define SCNuPTR "lu" /* uintptr_t */
-
-#define SCNx8 "hhx" /* uint8_t */
-#define SCNx16 "hx" /* uint16_t */
-#define SCNx32 "x" /* uint32_t */
-#define SCNx64 "lx" /* uint64_t */
-#define SCNxLEAST8 "hhx" /* uint_least8_t */
-#define SCNxLEAST16 "hx" /* uint_least16_t */
-#define SCNxLEAST32 "x" /* uint_least32_t */
-#define SCNxLEAST64 "lx" /* uint_least64_t */
-#define SCNxFAST8 "x" /* uint_fast8_t */
-#define SCNxFAST16 "x" /* uint_fast16_t */
-#define SCNxFAST32 "x" /* uint_fast32_t */
-#define SCNxFAST64 "lx" /* uint_fast64_t */
-#define SCNxMAX "lx" /* uintmax_t */
-#define SCNxPTR "lx" /* uintptr_t */
-
-#endif /* !_AMD64_INT_FMTIO_H_ */
diff --git a/StdLib/Include/X64/machine/int_limits.h b/StdLib/Include/X64/machine/int_limits.h
deleted file mode 100644
index 8543760e53..0000000000
--- a/StdLib/Include/X64/machine/int_limits.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* $NetBSD: int_limits.h,v 1.3 2005/12/11 12:16:25 christos Exp $ */
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
- */
-
-#ifndef _AMD64_INT_LIMITS_H_
-#define _AMD64_INT_LIMITS_H_
-
-/*
- * 7.18.2 Limits of specified-width integer types
- */
-
-/* 7.18.2.1 Limits of exact-width integer types */
-
-/* minimum values of exact-width signed integer types */
-#define INT8_MIN (-0x7f-1) /* int8_t */
-#define INT16_MIN (-0x7fff-1) /* int16_t */
-#define INT32_MIN (-0x7fffffff-1) /* int32_t */
-#define INT64_MIN (-0x7fffffffffffffffLL-1) /* int64_t */
-
-/* maximum values of exact-width signed integer types */
-#define INT8_MAX 0x7f /* int8_t */
-#define INT16_MAX 0x7fff /* int16_t */
-#define INT32_MAX 0x7fffffff /* int32_t */
-#define INT64_MAX 0x7fffffffffffffffLL /* int64_t */
-
-/* maximum values of exact-width unsigned integer types */
-#define UINT8_MAX 0xffU /* uint8_t */
-#define UINT16_MAX 0xffffU /* uint16_t */
-#define UINT32_MAX 0xffffffffU /* uint32_t */
-#define UINT64_MAX 0xffffffffffffffffULL /* uint64_t */
-
-/* 7.18.2.2 Limits of minimum-width integer types */
-
-/* minimum values of minimum-width signed integer types */
-#define INT_LEAST8_MIN (-0x7f-1) /* int_least8_t */
-#define INT_LEAST16_MIN (-0x7fff-1) /* int_least16_t */
-#define INT_LEAST32_MIN (-0x7fffffff-1) /* int_least32_t */
-#define INT_LEAST64_MIN (-0x7fffffffffffffffLL-1) /* int_least64_t */
-
-/* maximum values of minimum-width signed integer types */
-#define INT_LEAST8_MAX 0x7f /* int_least8_t */
-#define INT_LEAST16_MAX 0x7fff /* int_least16_t */
-#define INT_LEAST32_MAX 0x7fffffff /* int_least32_t */
-#define INT_LEAST64_MAX 0x7fffffffffffffffLL /* int_least64_t */
-
-/* maximum values of minimum-width unsigned integer types */
-#define UINT_LEAST8_MAX 0xffU /* uint_least8_t */
-#define UINT_LEAST16_MAX 0xffffU /* uint_least16_t */
-#define UINT_LEAST32_MAX 0xffffffffU /* uint_least32_t */
-#define UINT_LEAST64_MAX 0xffffffffffffffffULL /* uint_least64_t */
-
-/* 7.18.2.3 Limits of fastest minimum-width integer types */
-
-/* minimum values of fastest minimum-width signed integer types */
-#define INT_FAST8_MIN (-0x7fffffff-1) /* int_fast8_t */
-#define INT_FAST16_MIN (-0x7fffffff-1) /* int_fast16_t */
-#define INT_FAST32_MIN (-0x7fffffff-1) /* int_fast32_t */
-#define INT_FAST64_MIN (-0x7fffffffffffffffLL-1) /* int_fast64_t */
-
-/* maximum values of fastest minimum-width signed integer types */
-#define INT_FAST8_MAX 0x7fffffff /* int_fast8_t */
-#define INT_FAST16_MAX 0x7fffffff /* int_fast16_t */
-#define INT_FAST32_MAX 0x7fffffff /* int_fast32_t */
-#define INT_FAST64_MAX 0x7fffffffffffffffLL /* int_fast64_t */
-
-/* maximum values of fastest minimum-width unsigned integer types */
-#define UINT_FAST8_MAX 0xffffffffU /* uint_fast8_t */
-#define UINT_FAST16_MAX 0xffffffffU /* uint_fast16_t */
-#define UINT_FAST32_MAX 0xffffffffU /* uint_fast32_t */
-#define UINT_FAST64_MAX 0xffffffffffffffffULL /* uint_fast64_t */
-
-/* 7.18.2.4 Limits of integer types capable of holding object pointers */
-
-#define INTPTR_MIN (-0x7fffffffffffffffLL-1) /* intptr_t */
-#define INTPTR_MAX 0x7fffffffffffffffLL /* intptr_t */
-#define UINTPTR_MAX 0xffffffffffffffffULL /* uintptr_t */
-
-/* 7.18.2.5 Limits of greatest-width integer types */
-
-#define INTMAX_MIN (-0x7fffffffffffffffLL-1) /* intmax_t */
-#define INTMAX_MAX 0x7fffffffffffffffLL /* intmax_t */
-#define UINTMAX_MAX 0xffffffffffffffffULL /* uintmax_t */
-
-
-/*
- * 7.18.3 Limits of other integer types
- */
-
-/* limits of ptrdiff_t */
-#define PTRDIFF_MIN (-0x7fffffffffffffffLL-1) /* ptrdiff_t */
-#define PTRDIFF_MAX 0x7fffffffffffffffLL /* ptrdiff_t */
-
-/* limits of sig_atomic_t */
-#define SIG_ATOMIC_MIN (-0x7fffffffffffffffLL-1) /* sig_atomic_t */
-#define SIG_ATOMIC_MAX 0x7fffffffffffffffLL /* sig_atomic_t */
-
-/* limit of size_t */
-#define SIZE_MAX 0xffffffffffffffffULL /* size_t */
-#define SIZE_T_MAX SIZE_MAX
-
-#endif /* !_AMD64_INT_LIMITS_H_ */
diff --git a/StdLib/Include/X64/machine/int_mwgwtypes.h b/StdLib/Include/X64/machine/int_mwgwtypes.h
deleted file mode 100644
index 5e28108f8e..0000000000
--- a/StdLib/Include/X64/machine/int_mwgwtypes.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/** @file
- Minimum and Greatest Width Integer types.
-
- Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
- This program and the accompanying materials are licensed and made available under
- the terms and conditions of the BSD License that accompanies this distribution.
- The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
- Portions Copyright (c) 2001 The NetBSD Foundation, Inc.
- All rights reserved.
-
- This code is derived from software contributed to The NetBSD Foundation
- by Klaus Klein.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- This product includes software developed by the NetBSD
- Foundation, Inc. and its contributors.
- 4. Neither the name of The NetBSD Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
-
- NetBSD: int_mwgwtypes.h,v 1.5 2005/12/24 20:06:47 perry Exp
-**/
-#ifndef _AMD64_INT_MWGWTYPES_H_
-#define _AMD64_INT_MWGWTYPES_H_
-
-/*
- * 7.18.1 Integer types
- */
-
-/* 7.18.1.2 Minimum-width integer types */
-
-typedef CHAR8 int_least8_t;
-typedef UINT8 uint_least8_t;
-typedef INT16 int_least16_t;
-typedef UINT16 uint_least16_t;
-typedef INT32 int_least32_t;
-typedef UINT32 uint_least32_t;
-typedef INT64 int_least64_t;
-typedef UINT64 uint_least64_t;
-
-/* 7.18.1.3 Fastest minimum-width integer types */
-typedef INT32 int_fast8_t;
-typedef UINT32 uint_fast8_t;
-typedef INT32 int_fast16_t;
-typedef UINT32 uint_fast16_t;
-typedef INT32 int_fast32_t;
-typedef UINT32 uint_fast32_t;
-typedef INT64 int_fast64_t;
-typedef UINT64 uint_fast64_t;
-
-/* 7.18.1.5 Greatest-width integer types */
-
-typedef INT64 intmax_t;
-typedef UINT64 uintmax_t;
-
-#endif /* !_AMD64_INT_MWGWTYPES_H_ */
diff --git a/StdLib/Include/X64/machine/int_types.h b/StdLib/Include/X64/machine/int_types.h
deleted file mode 100644
index 5797db8e7f..0000000000
--- a/StdLib/Include/X64/machine/int_types.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/** @file
- Machine dependent integer type definitions.
-
- Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
- This program and the accompanying materials are licensed and made available
- under the terms and conditions of the BSD License that accompanies this
- distribution. The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.php.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
- Copyright (c) 1990, 1993
- The Regents of the University of California. All rights reserved.
-
- This code is derived from software contributed to Berkeley by
- Chris Torek.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- - Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
-
- NetBSD: int_types.h,v 1.5 2005/12/24 20:06:47 perry Exp
- types.h 7.5 (Berkeley) 3/9/91
-**/
-#ifndef _AMD64_INT_TYPES_H_
-#define _AMD64_INT_TYPES_H_
-
-#include <sys/EfiCdefs.h>
-
-/*
- * 7.18.1 Integer types
- */
-
-/* 7.18.1.1 Exact-width integer types */
-
-typedef INT8 __int8_t;
-typedef UINT8 __uint8_t;
-typedef INT16 __int16_t;
-typedef UINT16 __uint16_t;
-typedef INT32 __int32_t;
-typedef UINT32 __uint32_t;
-typedef INT64 __int64_t;
-typedef UINT64 __uint64_t;
-
-#define __BIT_TYPES_DEFINED__
-
-/* 7.18.1.4 Integer types capable of holding object pointers */
-
-typedef INTN __intptr_t;
-typedef UINTN __uintptr_t;
-
-#endif /* !_AMD64_INT_TYPES_H_ */
diff --git a/StdLib/Include/X64/machine/limits.h b/StdLib/Include/X64/machine/limits.h
deleted file mode 100644
index 193ce366f4..0000000000
--- a/StdLib/Include/X64/machine/limits.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <x86/limits.h>
-
-#define __POINTER_BIT 64
-
-#if defined(__GNUC__)
-#if __GNUC_PREREQ__(4,4)
- #define __LONG_BIT 64
-
- /** minimum value for an object of type long int **/
- #define __LONG_MIN (-9223372036854775807LL - 1LL) // -(2^63 - 2)
-
- /** maximum value for an object of type long int **/
- #define __LONG_MAX (9223372036854775807LL) // 2^63 - 1
-
- /** maximum value for an object of type unsigned long int **/
- #define __ULONG_MAX 0xFFFFFFFFFFFFFFFFULL // 2^64 - 1
-#else
- #define __LONG_BIT 32
- /** minimum value for an object of type long int **/
- #define __LONG_MIN (-2147483647L - 1L) // -(2^31 - 1)
-
- /** maximum value for an object of type long int **/
- #define __LONG_MAX 2147483647L // 2^31 - 1
-
- /** maximum value for an object of type unsigned long int **/
- #define __ULONG_MAX 0xffffffff // 2^32 - 1
-#endif
-
-
-#else /* NOT defined(__GNUC__) */
-#define __LONG_BIT 32
-/** minimum value for an object of type long int **/
-#define __LONG_MIN (-2147483647L - 1L) // -(2^31 - 1)
-
-/** maximum value for an object of type long int **/
-#define __LONG_MAX 2147483647L // 2^31 - 1
-
-/** maximum value for an object of type unsigned long int **/
-#define __ULONG_MAX 0xffffffff // 2^32 - 1
-#endif
diff --git a/StdLib/Include/X64/machine/math.h b/StdLib/Include/X64/machine/math.h
deleted file mode 100644
index a53422933c..0000000000
--- a/StdLib/Include/X64/machine/math.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: math.h,v 1.3 2005/12/11 12:16:25 christos Exp $ */
-
-#include <x86/math.h>
diff --git a/StdLib/Include/X64/machine/param.h b/StdLib/Include/X64/machine/param.h
deleted file mode 100644
index 8526909024..0000000000
--- a/StdLib/Include/X64/machine/param.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/** @file
- Machine dependent constants for the Intel64 Architecture(X64).
-
- Copyright (c) 2010-2012, Intel Corporation. All rights reserved.<BR>
- This program and the accompanying materials are licensed and made available under
- the terms and conditions of the BSD License that accompanies this distribution.
- The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
- * $NetBSD: param.h,v 1.3 2006/08/28 13:43:35 yamt Exp
-**/
-#ifndef _X64_PARAM_H_
-#define _X64_PARAM_H_
-
-#define _MACHINE amd64
-#define MACHINE "amd64"
-#define _MACHINE_ARCH x86_64
-#define MACHINE_ARCH "x86_64"
-#define MID_MACHINE MID_X86_64
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...). The result is u_int and
- * must be cast to any desired pointer type.
- *
- * ALIGNED_POINTER is a boolean macro that checks whether an address
- * is valid to fetch data elements of type t from on this architecture.
- * This does not reflect the optimal alignment, just the possibility
- * (within reasonable limits).
- *
- */
-#define ALIGNBYTES (sizeof(INT64) - 1)
-#define ALIGN(p) (((UINT64)(p) + ALIGNBYTES) &~ALIGNBYTES)
-#define ALIGNED_POINTER(p,t) 1
-
-#define ALIGNBYTES32 (sizeof(INT32) - 1)
-#define ALIGN32(p) (((UINT64)(p) + ALIGNBYTES32) &~ALIGNBYTES32)
-
-#define PGSHIFT 12 /* LOG2(NBPG) */
-#define NBPG (1 << PGSHIFT) /* bytes/page */
-#define PGOFSET (NBPG-1) /* byte offset into page */
-#define NPTEPG (NBPG/(sizeof (pt_entry_t)))
-
-#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
-#define DEV_BSIZE (1 << DEV_BSHIFT)
-#define BLKDEV_IOSIZE 2048
-#ifndef MAXPHYS
- #define MAXPHYS (64 * 1024) /* max raw I/O transfer size */
-#endif
-
-#define SSIZE 1 /* initial stack size/NBPG */
-#define SINCR 1 /* increment of stack/NBPG */
-#define UPAGES 5 /* pages of u-area */
-#define USPACE (UPAGES * NBPG) /* total size of u-area */
-
-#ifndef MSGBUFSIZE
- #define MSGBUFSIZE 4*NBPG /* default message buffer size */
-#endif
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than NBPG (the software page size), and,
- * on machines that exchange pages of input or output buffers with mbuf
- * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
- * of the hardware page size.
- */
-#define MSIZE 512 /* size of an mbuf */
-
-#ifndef MCLSHIFT
- #define MCLSHIFT 11 /* convert bytes to m_buf clusters */
- /* 2K cluster can hold Ether frame */
-#endif /* MCLSHIFT */
-
-#define MCLBYTES (1 << MCLSHIFT) /* size of a m_buf cluster */
-
-#ifndef NMBCLUSTERS
- #ifdef GATEWAY
- #define NMBCLUSTERS 4096 /* map size, max cluster allocation */
- #else
- #define NMBCLUSTERS 2048 /* map size, max cluster allocation */
- #endif
-#endif
-
-#ifndef NFS_RSIZE
- #define NFS_RSIZE 32768
-#endif
-#ifndef NFS_WSIZE
- #define NFS_WSIZE 32768
-#endif
-
-#define x86_round_page(x) ((((EFI_ULONG_T)(x)) + PGOFSET) & ~PGOFSET)
-#define x86_trunc_page(x) ((EFI_ULONG_T)(x) & ~PGOFSET)
-#define x86_btop(x) ((EFI_ULONG_T)(x) >> PGSHIFT)
-#define x86_ptob(x) ((EFI_ULONG_T)(x) << PGSHIFT)
-
-#define btop(x) x86_btop(x)
-#define ptob(x) x86_ptob(x)
-#define round_pdr(x) x86_round_pdr(x)
-
-#define mstohz(ms) ((ms + 0UL) * hz / 1000)
-
-#endif /* _X64_PARAM_H_ */
diff --git a/StdLib/Include/X64/machine/signal.h b/StdLib/Include/X64/machine/signal.h
deleted file mode 100644
index 6628eb9e94..0000000000
--- a/StdLib/Include/X64/machine/signal.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-#ifndef _MACHINE_SIGNAL_H
-#define _MACHINE_SIGNAL_H
-#include <sys/EfiCdefs.h>
-
-/** The type sig_atomic_t is the (possibly volatile-qualified) integer type of
- an object that can be accessed as an atomic entity, even in the presence
- of asynchronous interrupts.
-**/
-typedef INTN sig_atomic_t;
-
-#endif /* _MACHINE_SIGNAL_H */
diff --git a/StdLib/Include/X64/machine/types.h b/StdLib/Include/X64/machine/types.h
deleted file mode 100644
index f14625b4cd..0000000000
--- a/StdLib/Include/X64/machine/types.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/** @file
- Machine dependent type definitions.
-
- Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
- This program and the accompanying materials are licensed and made available under
- the terms and conditions of the BSD License that accompanies this distribution.
- The full text of the license may be found at
- http://opensource.org/licenses/bsd-license.
-
- THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
- Copyright (c) 1990, 1993
- The Regents of the University of California. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- - Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
-
- NetBSD: types.h,v 1.14 2006/09/03 20:42:14 perry Exp
- types.h 7.5 (Berkeley) 3/9/91
-**/
-#ifndef _MACHTYPES_H_
-#define _MACHTYPES_H_
-
-#include <sys/EfiCdefs.h>
-#include <machine/int_types.h>
-
-typedef PHYSICAL_ADDRESS paddr_t;
-typedef UINT64 psize_t;
-typedef PHYSICAL_ADDRESS vaddr_t;
-typedef UINT64 vsize_t;
-
-typedef INTN register_t;
-typedef INT32 register32_t;
-
-typedef volatile INT32 __cpu_simple_lock_t;
-
-#define __SIMPLELOCK_LOCKED 1
-#define __SIMPLELOCK_UNLOCKED 0
-
-/* The amd64 does not have strict alignment requirements. */
-#define __NO_STRICT_ALIGNMENT
-
-#define __HAVE_DEVICE_REGISTER
-#define __HAVE_CPU_COUNTER
-#define __HAVE_SYSCALL_INTERN
-#define __HAVE_MINIMAL_EMUL
-#define __HAVE_GENERIC_SOFT_INTERRUPTS
-#define __HAVE_CPU_MAXPROC
-#define __HAVE_TIMECOUNTER
-#define __HAVE_GENERIC_TODR
-
-#endif /* _MACHTYPES_H_ */