aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/lib/gcclib.h
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-06-22 17:35:06 -0700
committerSteve French <sfrench@hera.kernel.org>2005-06-22 17:35:06 -0700
commit1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (patch)
tree7741cfd476f9c622a10c198da421fdb3e38708b9 /arch/arm/lib/gcclib.h
parentac67055ef2378ea95c34b593ddf9d0a0737a240a (diff)
parenta4936044001694f033fe4ea94d6034d51a6b465c (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/arm/lib/gcclib.h')
-rw-r--r--arch/arm/lib/gcclib.h27
1 files changed, 12 insertions, 15 deletions
diff --git a/arch/arm/lib/gcclib.h b/arch/arm/lib/gcclib.h
index 65314a3d9e2..8b6dcc656de 100644
--- a/arch/arm/lib/gcclib.h
+++ b/arch/arm/lib/gcclib.h
@@ -1,25 +1,22 @@
/* gcclib.h -- definitions for various functions 'borrowed' from gcc-2.95.3 */
/* I Molton 29/07/01 */
-#define BITS_PER_UNIT 8
-#define SI_TYPE_SIZE (sizeof (SItype) * BITS_PER_UNIT)
+#include <linux/types.h>
-typedef unsigned int UQItype __attribute__ ((mode (QI)));
-typedef int SItype __attribute__ ((mode (SI)));
-typedef unsigned int USItype __attribute__ ((mode (SI)));
-typedef int DItype __attribute__ ((mode (DI)));
-typedef int word_type __attribute__ ((mode (__word__)));
-typedef unsigned int UDItype __attribute__ ((mode (DI)));
+#define BITS_PER_UNIT 8
+#define SI_TYPE_SIZE (sizeof(s32) * BITS_PER_UNIT)
#ifdef __ARMEB__
- struct DIstruct {SItype high, low;};
+struct DIstruct {
+ s32 high, low;
+};
#else
- struct DIstruct {SItype low, high;};
+struct DIstruct {
+ s32 low, high;
+};
#endif
-typedef union
-{
- struct DIstruct s;
- DItype ll;
+typedef union {
+ struct DIstruct s;
+ s64 ll;
} DIunion;
-