source:
patches/e2fsprogs-1.39-cross-1.patch@
ad4134f
Last change on this file since ad4134f was bbaf626, checked in by , 18 years ago | |
---|---|
|
|
File size: 7.4 KB |
-
lib/ext2fs/ext2_types.h.in
Submitted By: Ken Moffat <ken at linuxfromscratch dot org> Date: 2006-07-29 Initial Package Version: 1.39 Origin: Self. Upstream status: not submitted, pending comments on bug 1529730 for e2fsprogs. Description: Revert changes to two .h.in files which prevent cross-compilation for powerpc64 from x86 and x86_64. I believe the problem will appear whenever the machine doing the build uses long long for __{s,u}64and the target uses long, and perhaps also the other way around. The following arches that are in the book use long: alpha, mips64, ppc64, sparc64. None except ppc64 have reported this, so perhaps there is something different there.
old new 7 7 !defined(_EXT2_TYPES_H)) 8 8 #define _EXT2_TYPES_H 9 9 10 @ASM_TYPES_HEADER@11 12 #ifdef __U8_TYPEDEF13 typedef __U8_TYPEDEF __u8;14 #else15 10 typedef unsigned char __u8; 16 #endif17 18 #ifdef __S8_TYPEDEF19 typedef __S8_TYPEDEF __s8;20 #else21 11 typedef signed char __s8; 22 #endif23 12 24 #ifdef __U16_TYPEDEF 25 typedef __U16_TYPEDEF __u16; 13 #if (@SIZEOF_INT@ == 8) 14 typedef int __s64; 15 typedef unsigned int __u64; 26 16 #else 27 #if (@SIZEOF_INT@ == 2) 28 typedef unsigned int __u16; 17 #if (@SIZEOF_LONG@ == 8) 18 typedef long __s64; 19 typedef unsigned long __u64; 29 20 #else 30 #if (@SIZEOF_SHORT@ == 2) 31 typedef unsigned short __u16; 21 #if (@SIZEOF_LONG_LONG@ == 8) 22 #if defined(__GNUC__) 23 typedef __signed__ long long __s64; 32 24 #else 33 ?==error: undefined 16 bit type 34 #endif /* SIZEOF_SHORT == 2 */ 35 #endif /* SIZEOF_INT == 2 */ 36 #endif /* __U16_TYPEDEF */ 25 typedef signed long long __s64; 26 #endif /* __GNUC__ */ 27 typedef unsigned long long __u64; 28 #endif /* SIZEOF_LONG_LONG == 8 */ 29 #endif /* SIZEOF_LONG == 8 */ 30 #endif /* SIZEOF_INT == 8 */ 37 31 38 #ifdef __S16_TYPEDEF39 typedef __S16_TYPEDEF __s16;40 #else41 32 #if (@SIZEOF_INT@ == 2) 42 33 typedef int __s16; 34 typedef unsigned int __u16; 43 35 #else 44 36 #if (@SIZEOF_SHORT@ == 2) 45 37 typedef short __s16; 38 typedef unsigned short __u16; 46 39 #else 47 40 ?==error: undefined 16 bit type 48 41 #endif /* SIZEOF_SHORT == 2 */ 49 42 #endif /* SIZEOF_INT == 2 */ 50 #endif /* __S16_TYPEDEF */51 52 53 #ifdef __U32_TYPEDEF54 typedef __U32_TYPEDEF __u32;55 #else56 #if (@SIZEOF_INT@ == 4)57 typedef unsigned int __u32;58 #else59 #if (@SIZEOF_LONG@ == 4)60 typedef unsigned long __u32;61 #else62 #if (@SIZEOF_SHORT@ == 4)63 typedef unsigned short __u32;64 #else65 ?== error: undefined 32 bit type66 #endif /* SIZEOF_SHORT == 4 */67 #endif /* SIZEOF_LONG == 4 */68 #endif /* SIZEOF_INT == 4 */69 #endif /* __U32_TYPEDEF */70 43 71 #ifdef __S32_TYPEDEF72 typedef __S32_TYPEDEF __s32;73 #else74 44 #if (@SIZEOF_INT@ == 4) 75 45 typedef int __s32; 46 typedef unsigned int __u32; 76 47 #else 77 48 #if (@SIZEOF_LONG@ == 4) 78 49 typedef long __s32; 50 typedef unsigned long __u32; 79 51 #else 80 52 #if (@SIZEOF_SHORT@ == 4) 81 53 typedef short __s32; 54 typedef unsigned short __u32; 82 55 #else 83 56 ?== error: undefined 32 bit type 84 57 #endif /* SIZEOF_SHORT == 4 */ 85 58 #endif /* SIZEOF_LONG == 4 */ 86 59 #endif /* SIZEOF_INT == 4 */ 87 #endif /* __S32_TYPEDEF */88 89 #ifdef __U64_TYPEDEF90 typedef __U64_TYPEDEF __u64;91 #else92 #if (@SIZEOF_INT@ == 8)93 typedef unsigned int __u64;94 #else95 #if (@SIZEOF_LONG@ == 8)96 typedef unsigned long __u64;97 #else98 #if (@SIZEOF_LONG_LONG@ == 8)99 typedef unsigned long long __u64;100 #endif /* SIZEOF_LONG_LONG == 8 */101 #endif /* SIZEOF_LONG == 8 */102 #endif /* SIZEOF_INT == 8 */103 #endif /* __U64_TYPEDEF */104 105 #ifdef __S64_TYPEDEF106 typedef __S64_TYPEDEF __s64;107 #else108 #if (@SIZEOF_INT@ == 8)109 typedef int __s64;110 #else111 #if (@SIZEOF_LONG@ == 8)112 typedef long __s64;113 #else114 #if (@SIZEOF_LONG_LONG@ == 8)115 #if defined(__GNUC__)116 typedef __signed__ long long __s64;117 #else118 typedef signed long long __s64;119 #endif /* __GNUC__ */120 #endif /* SIZEOF_LONG_LONG == 8 */121 #endif /* SIZEOF_LONG == 8 */122 #endif /* SIZEOF_INT == 8 */123 #endif /* __S64_TYPEDEF */124 125 #undef __S8_TYPEDEF126 #undef __U8_TYPEDEF127 #undef __S16_TYPEDEF128 #undef __U16_TYPEDEF129 #undef __S32_TYPEDEF130 #undef __U32_TYPEDEF131 #undef __S64_TYPEDEF132 #undef __U64_TYPEDEF133 60 134 61 #endif /* _*_TYPES_H */ -
lib/blkid/blkid_types.h.in
old new 7 7 !defined(_EXT2_TYPES_H)) 8 8 #define _BLKID_TYPES_H 9 9 10 @ASM_TYPES_HEADER@11 12 #ifdef __U8_TYPEDEF13 typedef __U8_TYPEDEF __u8;14 #else15 10 typedef unsigned char __u8; 16 #endif17 18 #ifdef __S8_TYPEDEF19 typedef __S8_TYPEDEF __s8;20 #else21 11 typedef signed char __s8; 22 #endif23 12 24 #ifdef __U16_TYPEDEF 25 typedef __U16_TYPEDEF __u16; 13 #if (@SIZEOF_INT@ == 8) 14 typedef int __s64; 15 typedef unsigned int __u64; 26 16 #else 27 #if (@SIZEOF_INT@ == 2) 28 typedef unsigned int __u16; 17 #if (@SIZEOF_LONG@ == 8) 18 typedef long __s64; 19 typedef unsigned long __u64; 29 20 #else 30 #if (@SIZEOF_SHORT@ == 2) 31 typedef unsigned short __u16; 21 #if (@SIZEOF_LONG_LONG@ == 8) 22 #if defined(__GNUC__) 23 typedef __signed__ long long __s64; 32 24 #else 33 ?==error: undefined 16 bit type 34 #endif /* SIZEOF_SHORT == 2 */ 35 #endif /* SIZEOF_INT == 2 */ 36 #endif /* __U16_TYPEDEF */ 25 typedef signed long long __s64; 26 #endif /* __GNUC__ */ 27 typedef unsigned long long __u64; 28 #endif /* SIZEOF_LONG_LONG == 8 */ 29 #endif /* SIZEOF_LONG == 8 */ 30 #endif /* SIZEOF_INT == 8 */ 37 31 38 #ifdef __S16_TYPEDEF39 typedef __S16_TYPEDEF __s16;40 #else41 32 #if (@SIZEOF_INT@ == 2) 42 33 typedef int __s16; 34 typedef unsigned int __u16; 43 35 #else 44 36 #if (@SIZEOF_SHORT@ == 2) 45 37 typedef short __s16; 38 typedef unsigned short __u16; 46 39 #else 47 40 ?==error: undefined 16 bit type 48 41 #endif /* SIZEOF_SHORT == 2 */ 49 42 #endif /* SIZEOF_INT == 2 */ 50 #endif /* __S16_TYPEDEF */51 52 53 #ifdef __U32_TYPEDEF54 typedef __U32_TYPEDEF __u32;55 #else56 #if (@SIZEOF_INT@ == 4)57 typedef unsigned int __u32;58 #else59 #if (@SIZEOF_LONG@ == 4)60 typedef unsigned long __u32;61 #else62 #if (@SIZEOF_SHORT@ == 4)63 typedef unsigned short __u32;64 #else65 ?== error: undefined 32 bit type66 #endif /* SIZEOF_SHORT == 4 */67 #endif /* SIZEOF_LONG == 4 */68 #endif /* SIZEOF_INT == 4 */69 #endif /* __U32_TYPEDEF */70 43 71 #ifdef __S32_TYPEDEF72 typedef __S32_TYPEDEF __s32;73 #else74 44 #if (@SIZEOF_INT@ == 4) 75 45 typedef int __s32; 46 typedef unsigned int __u32; 76 47 #else 77 48 #if (@SIZEOF_LONG@ == 4) 78 49 typedef long __s32; 50 typedef unsigned long __u32; 79 51 #else 80 52 #if (@SIZEOF_SHORT@ == 4) 81 53 typedef short __s32; 54 typedef unsigned short __u32; 82 55 #else 83 56 ?== error: undefined 32 bit type 84 57 #endif /* SIZEOF_SHORT == 4 */ 85 58 #endif /* SIZEOF_LONG == 4 */ 86 59 #endif /* SIZEOF_INT == 4 */ 87 #endif /* __S32_TYPEDEF */88 89 #ifdef __U64_TYPEDEF90 typedef __U64_TYPEDEF __u64;91 #else92 #if (@SIZEOF_INT@ == 8)93 typedef unsigned int __u64;94 #else95 #if (@SIZEOF_LONG@ == 8)96 typedef unsigned long __u64;97 #else98 #if (@SIZEOF_LONG_LONG@ == 8)99 typedef unsigned long long __u64;100 #endif /* SIZEOF_LONG_LONG == 8 */101 #endif /* SIZEOF_LONG == 8 */102 #endif /* SIZEOF_INT == 8 */103 #endif /* __U64_TYPEDEF */104 105 #ifdef __S64_TYPEDEF106 typedef __S64_TYPEDEF __s64;107 #else108 #if (@SIZEOF_INT@ == 8)109 typedef int __s64;110 #else111 #if (@SIZEOF_LONG@ == 8)112 typedef long __s64;113 #else114 #if (@SIZEOF_LONG_LONG@ == 8)115 #if defined(__GNUC__)116 typedef __signed__ long long __s64;117 #else118 typedef signed long long __s64;119 #endif /* __GNUC__ */120 #endif /* SIZEOF_LONG_LONG == 8 */121 #endif /* SIZEOF_LONG == 8 */122 #endif /* SIZEOF_INT == 8 */123 #endif /* __S64_TYPEDEF */124 125 #undef __S8_TYPEDEF126 #undef __U8_TYPEDEF127 #undef __S16_TYPEDEF128 #undef __U16_TYPEDEF129 #undef __S32_TYPEDEF130 #undef __U32_TYPEDEF131 #undef __S64_TYPEDEF132 #undef __U64_TYPEDEF133 60 134 61 #endif /* _*_TYPES_H */
Note:
See TracBrowser
for help on using the repository browser.