Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Copy amd64 _types.h to x86 and merge with i386 _types.h. Replace exis…
…ting amd64/i386/pc98 _types.h with stubs.
- Loading branch information
1 parent
f0e8d44
commit f3148b2
Showing
4 changed files
with
167 additions
and
239 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,116 +1,6 @@ | ||
| /*- | ||
| * Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org> | ||
| * 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: | ||
| * 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 University of | ||
| * California, Berkeley and its contributors. | ||
| * 4. 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. | ||
| * | ||
| * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 | ||
| * From: @(#)types.h 8.3 (Berkeley) 1/5/94 | ||
| * $FreeBSD$ | ||
| * This file is in the public domain. | ||
| */ | ||
| /* $FreeBSD$ */ | ||
|
|
||
| #ifndef _MACHINE__TYPES_H_ | ||
| #define _MACHINE__TYPES_H_ | ||
|
|
||
| #ifndef _SYS_CDEFS_H_ | ||
| #error this file needs sys/cdefs.h as a prerequisite | ||
| #endif | ||
|
|
||
| #define __NO_STRICT_ALIGNMENT | ||
|
|
||
| /* | ||
| * Basic types upon which most other types are built. | ||
| */ | ||
| typedef signed char __int8_t; | ||
| typedef unsigned char __uint8_t; | ||
| typedef short __int16_t; | ||
| typedef unsigned short __uint16_t; | ||
| typedef int __int32_t; | ||
| typedef unsigned int __uint32_t; | ||
| typedef long __int64_t; | ||
| typedef unsigned long __uint64_t; | ||
|
|
||
| /* | ||
| * Standard type definitions. | ||
| */ | ||
| typedef __int32_t __clock_t; /* clock()... */ | ||
| typedef __int64_t __critical_t; | ||
| typedef double __double_t; | ||
| typedef float __float_t; | ||
| typedef __int64_t __intfptr_t; | ||
| typedef __int64_t __intmax_t; | ||
| typedef __int64_t __intptr_t; | ||
| typedef __int32_t __int_fast8_t; | ||
| typedef __int32_t __int_fast16_t; | ||
| typedef __int32_t __int_fast32_t; | ||
| typedef __int64_t __int_fast64_t; | ||
| typedef __int8_t __int_least8_t; | ||
| typedef __int16_t __int_least16_t; | ||
| typedef __int32_t __int_least32_t; | ||
| typedef __int64_t __int_least64_t; | ||
| typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */ | ||
| typedef __int64_t __register_t; | ||
| typedef __int64_t __segsz_t; /* segment size (in pages) */ | ||
| typedef __uint64_t __size_t; /* sizeof() */ | ||
| typedef __int64_t __ssize_t; /* byte count or error */ | ||
| typedef __int64_t __time_t; /* time()... */ | ||
| typedef __uint64_t __uintfptr_t; | ||
| typedef __uint64_t __uintmax_t; | ||
| typedef __uint64_t __uintptr_t; | ||
| typedef __uint32_t __uint_fast8_t; | ||
| typedef __uint32_t __uint_fast16_t; | ||
| typedef __uint32_t __uint_fast32_t; | ||
| typedef __uint64_t __uint_fast64_t; | ||
| typedef __uint8_t __uint_least8_t; | ||
| typedef __uint16_t __uint_least16_t; | ||
| typedef __uint32_t __uint_least32_t; | ||
| typedef __uint64_t __uint_least64_t; | ||
| typedef __uint64_t __u_register_t; | ||
| typedef __uint64_t __vm_offset_t; | ||
| typedef __int64_t __vm_ooffset_t; | ||
| typedef __uint64_t __vm_paddr_t; | ||
| typedef __uint64_t __vm_pindex_t; | ||
| typedef __uint64_t __vm_size_t; | ||
|
|
||
| /* | ||
| * Unusual type definitions. | ||
| */ | ||
| #ifdef __GNUCLIKE_BUILTIN_VARARGS | ||
| typedef __builtin_va_list __va_list; /* internally known to gcc */ | ||
| #elif defined(lint) | ||
| typedef char * __va_list; /* pretend */ | ||
| #endif | ||
| #if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ | ||
| && !defined(__NO_GNUC_VA_LIST) | ||
| #define __GNUC_VA_LIST | ||
| typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ | ||
| #endif | ||
|
|
||
| #endif /* !_MACHINE__TYPES_H_ */ | ||
| #include <x86/_types.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,128 +1,6 @@ | ||
| /*- | ||
| * Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org> | ||
| * 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: | ||
| * 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 University of | ||
| * California, Berkeley and its contributors. | ||
| * 4. 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. | ||
| * | ||
| * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 | ||
| * From: @(#)types.h 8.3 (Berkeley) 1/5/94 | ||
| * $FreeBSD$ | ||
| * This file is in the public domain. | ||
| */ | ||
| /* $FreeBSD$ */ | ||
|
|
||
| #ifndef _MACHINE__TYPES_H_ | ||
| #define _MACHINE__TYPES_H_ | ||
|
|
||
| #ifndef _SYS_CDEFS_H_ | ||
| #error this file needs sys/cdefs.h as a prerequisite | ||
| #endif | ||
|
|
||
| #define __NO_STRICT_ALIGNMENT | ||
|
|
||
| /* | ||
| * Basic types upon which most other types are built. | ||
| */ | ||
| typedef signed char __int8_t; | ||
| typedef unsigned char __uint8_t; | ||
| typedef short __int16_t; | ||
| typedef unsigned short __uint16_t; | ||
| typedef int __int32_t; | ||
| typedef unsigned int __uint32_t; | ||
| #ifndef lint | ||
| __extension__ | ||
| #endif | ||
| /* LONGLONG */ | ||
| typedef long long __int64_t; | ||
| #ifndef lint | ||
| __extension__ | ||
| #endif | ||
| /* LONGLONG */ | ||
| typedef unsigned long long __uint64_t; | ||
|
|
||
| /* | ||
| * Standard type definitions. | ||
| */ | ||
| typedef unsigned long __clock_t; /* clock()... */ | ||
| typedef __int32_t __critical_t; | ||
| typedef long double __double_t; | ||
| typedef long double __float_t; | ||
| typedef __int32_t __intfptr_t; | ||
| typedef __int64_t __intmax_t; | ||
| typedef __int32_t __intptr_t; | ||
| typedef __int32_t __int_fast8_t; | ||
| typedef __int32_t __int_fast16_t; | ||
| typedef __int32_t __int_fast32_t; | ||
| typedef __int64_t __int_fast64_t; | ||
| typedef __int8_t __int_least8_t; | ||
| typedef __int16_t __int_least16_t; | ||
| typedef __int32_t __int_least32_t; | ||
| typedef __int64_t __int_least64_t; | ||
| typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */ | ||
| typedef __int32_t __register_t; | ||
| typedef __int32_t __segsz_t; /* segment size (in pages) */ | ||
| typedef __uint32_t __size_t; /* sizeof() */ | ||
| typedef __int32_t __ssize_t; /* byte count or error */ | ||
| typedef __int32_t __time_t; /* time()... */ | ||
| typedef __uint32_t __uintfptr_t; | ||
| typedef __uint64_t __uintmax_t; | ||
| typedef __uint32_t __uintptr_t; | ||
| typedef __uint32_t __uint_fast8_t; | ||
| typedef __uint32_t __uint_fast16_t; | ||
| typedef __uint32_t __uint_fast32_t; | ||
| typedef __uint64_t __uint_fast64_t; | ||
| typedef __uint8_t __uint_least8_t; | ||
| typedef __uint16_t __uint_least16_t; | ||
| typedef __uint32_t __uint_least32_t; | ||
| typedef __uint64_t __uint_least64_t; | ||
| typedef __uint32_t __u_register_t; | ||
| typedef __uint32_t __vm_offset_t; | ||
| typedef __int64_t __vm_ooffset_t; | ||
| #ifdef PAE | ||
| typedef __uint64_t __vm_paddr_t; | ||
| #else | ||
| typedef __uint32_t __vm_paddr_t; | ||
| #endif | ||
| typedef __uint64_t __vm_pindex_t; | ||
| typedef __uint32_t __vm_size_t; | ||
|
|
||
| /* | ||
| * Unusual type definitions. | ||
| */ | ||
| #ifdef __GNUCLIKE_BUILTIN_VARARGS | ||
| typedef __builtin_va_list __va_list; /* internally known to gcc */ | ||
| #else | ||
| typedef char * __va_list; | ||
| #endif /* __GNUCLIKE_BUILTIN_VARARGS */ | ||
| #if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ | ||
| && !defined(__NO_GNUC_VA_LIST) | ||
| #define __GNUC_VA_LIST | ||
| typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ | ||
| #endif | ||
|
|
||
| #endif /* !_MACHINE__TYPES_H_ */ | ||
| #include <x86/_types.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,4 +3,4 @@ | |
| */ | ||
| /* $FreeBSD$ */ | ||
|
|
||
| #include <i386/_types.h> | ||
| #include <x86/_types.h> | ||
Oops, something went wrong.