Eliminate "int8_type", "int16_type", "int32_type", and their

variants from the BFD universe.  Leave the 64-bit types for now,
since they are in flux.

* hosts/*.h:  Remove declarations of all these types.

diff --git a/bfd/hosts/alphaosf.h b/bfd/hosts/alphaosf.h
index c3df539f2bf40f4e921eab54f8ebc8b6a070e676..b8060bce8609548d713663f78bbf0a82068c4b69 100644 (file)
--- a/bfd/hosts/alphaosf.h
+++ b/bfd/hosts/alphaosf.h
@@ -12,33 +12,10 @@
 /* Make the basic types 64-bit quantities on the host */
 #define        HOST_64_BIT     long 
 
-
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-
-
 typedef unsigned  long uint64e_type;
-
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
-
 typedef unsigned  long uint64_type;
 typedef  long int64_type;
 
-
 #define BYTES_IN_PRINTF_INT 4
 
 #define uint64_typeLOW(x) (uint32_type)(((x) & 0xffffffff))

diff --git a/bfd/hosts/amix.h b/bfd/hosts/amix.h
index ed0a1db741813607ca745b1bf28a4a95ecfe2698..848a43f7b0715883b46ea5271056f547cf146a31 100644 (file)
--- a/bfd/hosts/amix.h
+++ b/bfd/hosts/amix.h
@@ -47,20 +47,4 @@ extern long atol();
 extern int fputc();
 extern int unlink();
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/apollo68.h b/bfd/hosts/apollo68.h
index b9900d65a9f01b634eff5fc0060f850e33ffe2b1..8dad598d304eb85b5fb43be06d9793b56bb4124f 100644 (file)
--- a/bfd/hosts/apollo68.h
+++ b/bfd/hosts/apollo68.h
@@ -23,20 +23,4 @@ extern PTR  EXFUN(realloc, (PTR, unsigned));
 extern void EXFUN( free,(PTR));
 #endif
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/apollov68.h b/bfd/hosts/apollov68.h
index e425310326eebaf86aedb646978750253dbdf46a..c13dfbf77554deefee2d756948d8d44178d7b22f 100644 (file)
--- a/bfd/hosts/apollov68.h
+++ b/bfd/hosts/apollov68.h
@@ -34,20 +34,4 @@ extern PTR  EXFUN(realloc, (PTR, unsigned));
 extern void EXFUN( free,(PTR));
 #endif
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/delta88.h b/bfd/hosts/delta88.h
index 046b7c209c39ef266d4d26b69e54648a9b6bdcc8..fe8d76d5670839c30ae1235b7ef380bd15fe8c98 100644 (file)
--- a/bfd/hosts/delta88.h
+++ b/bfd/hosts/delta88.h
@@ -77,20 +77,4 @@ extern int fputc();
 extern int unlink();
 
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/dose.h b/bfd/hosts/dose.h
index 359d15b34c425ee9dec7019aa68989c8cc4b93bb..5b2f24f02da8c7af2acc539e1ae2049e26d0e8ff 100644 (file)
--- a/bfd/hosts/dose.h
+++ b/bfd/hosts/dose.h
@@ -12,20 +12,4 @@
 #define SEEK_SET 0
 #define SEEK_CUR 1
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-bin.h"

diff --git a/bfd/hosts/go32.h b/bfd/hosts/go32.h
index 34aff36312c13f001af2a4ff14568a8327d5b9dc..2c71b2e7d90435ed13c08e076cd3f04b3df135a4 100644 (file)
--- a/bfd/hosts/go32.h
+++ b/bfd/hosts/go32.h
@@ -15,20 +15,4 @@
 
 #define NO_FCNTL
 
-/* EXACT TYPES */
- typedef char int8e_type;
- typedef unsigned char uint8e_type;
- typedef short int16e_type;
- typedef unsigned short uint16e_type;
- typedef int int32e_type;
- typedef unsigned int uint32e_type;
- 
- /* CORRECT SIZE OR GREATER */
- typedef char int8_type;
- typedef unsigned char uint8_type;
- typedef short int16_type;
- typedef unsigned short uint16_type;
- typedef int int32_type;
- typedef unsigned int uint32_type;
-
 #include "fopen-bin.h"

diff --git a/bfd/hosts/harris.h b/bfd/hosts/harris.h
index 274ccbdf9b9c21f534c9a846e3730a69aeaaee55..e628680ecca5480cd34b9f7585bd754427c2ff40 100644 (file)
--- a/bfd/hosts/harris.h
+++ b/bfd/hosts/harris.h
@@ -21,19 +21,5 @@ extern void EXFUN(exit,(int));
 extern void EXFUN(bzero,(char *, int));
 
 extern int strtol();
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
 
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
 #include "fopen-same.h"

diff --git a/bfd/hosts/hp300.h b/bfd/hosts/hp300.h
index e9d764a740016f071b150453832ddaa4df004607..48f1e3da04ccaa03f52a699d43fca4f30f580d19 100644 (file)
--- a/bfd/hosts/hp300.h
+++ b/bfd/hosts/hp300.h
@@ -33,20 +33,4 @@ rename(from, to)
 }
 #endif
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/hppabsd.h b/bfd/hosts/hppabsd.h
index a1ffcbbc79993339b80aa94ca460da2517e64689..db35a858e87d5355f6cdbaaf2ca20e7df8104e76 100644 (file)
--- a/bfd/hosts/hppabsd.h
+++ b/bfd/hosts/hppabsd.h
@@ -33,21 +33,6 @@ extern void free   PARAMS ((PTR));
 #define HOST_DATA_START_ADDR           UDATASEG
 #define        HOST_STACK_END_ADDR             KSTAKSEG
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
 #include "fopen-same.h"
 
 #endif /* _HPPABSD_H */

diff --git a/bfd/hosts/hppahpux.h b/bfd/hosts/hppahpux.h
index 5f5e7c31a35427973672df78d2de62f918fcbf11..e36ed9bf88864abe886f982f09cb1c7e3186aee9 100644 (file)
--- a/bfd/hosts/hppahpux.h
+++ b/bfd/hosts/hppahpux.h
@@ -37,22 +37,6 @@ rename(from, to)
 }
 #endif
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"
 
 #endif /* _HPPAHPUX_H */

diff --git a/bfd/hosts/i386aix.h b/bfd/hosts/i386aix.h
index ce1a8c69dbb09822ede150f3ae77c48aa6abe04c..d4d8d8a1e4559edc6b2e2c4da70e66d834907d0a 100644 (file)
--- a/bfd/hosts/i386aix.h
+++ b/bfd/hosts/i386aix.h
@@ -44,20 +44,4 @@ extern long atol();
 extern int fputc();
 extern int unlink();
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/i386isc.h b/bfd/hosts/i386isc.h
index 67d74f740c729ab5ec8b49e4887fee8883ce6e11..239bcd9f132b7f292f40555fba10c3a222bd3509 100644 (file)
--- a/bfd/hosts/i386isc.h
+++ b/bfd/hosts/i386isc.h
@@ -35,22 +35,6 @@ extern PTR  EXFUN(realloc, (PTR, unsigned));
 extern void EXFUN(free,(PTR));
 #endif
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"
 
 #ifndef fileno

diff --git a/bfd/hosts/i386mach.h b/bfd/hosts/i386mach.h
index 874ead482a7fbb7a78afb907aebdfa9e531edbea..997aa7c8b36602af0f2b536e06154df9eac4f1ee 100644 (file)
--- a/bfd/hosts/i386mach.h
+++ b/bfd/hosts/i386mach.h
@@ -28,19 +28,4 @@ extern void EXFUN(free, (PTR));
 #define        HOST_TEXT_START_ADDR    0x10000         /* By inspection */
 #define        HOST_STACK_END_ADDR     KERNBASE
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
 #include "fopen-same.h"

diff --git a/bfd/hosts/i386v.h b/bfd/hosts/i386v.h
index a971991d02b11ca200625d7a09b5475803c11995..b81aa5b5ffa0a4c38ec3ad7a1e397a85ba75fc36 100644 (file)
--- a/bfd/hosts/i386v.h
+++ b/bfd/hosts/i386v.h
@@ -33,20 +33,4 @@ extern PTR  EXFUN(realloc, (PTR, unsigned));
 extern void EXFUN(free,(PTR));
 #endif
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/i386v4.h b/bfd/hosts/i386v4.h
index 7b7205926a5b8235778908fd019cca538745ddca..3e835144d5b4e4cb68a310d371e5c35913b416b8 100644 (file)
--- a/bfd/hosts/i386v4.h
+++ b/bfd/hosts/i386v4.h
@@ -47,20 +47,4 @@ extern long atol();
 extern int fputc();
 extern int unlink();
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/irix3.h b/bfd/hosts/irix3.h
index 1ae0a584a1b0f41ae5edc4dfcc5505654d076f7b..caa7901dee809a6734457fc80ca50d0bf71db3b5 100644 (file)
--- a/bfd/hosts/irix3.h
+++ b/bfd/hosts/irix3.h
@@ -22,20 +22,4 @@
 #define SEEK_CUR 1
 #endif
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/irix4.h b/bfd/hosts/irix4.h
index c9a15fd118d4d0555310e33a4f6b40ba2f4cdbd1..5da363652c533b3c8f5bfb5740ebb6bf64ca8fad 100644 (file)
--- a/bfd/hosts/irix4.h
+++ b/bfd/hosts/irix4.h
@@ -24,20 +24,4 @@
 #define SEEK_CUR 1
 #endif
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/ncr3000.h b/bfd/hosts/ncr3000.h
index 7b7205926a5b8235778908fd019cca538745ddca..3e835144d5b4e4cb68a310d371e5c35913b416b8 100644 (file)
--- a/bfd/hosts/ncr3000.h
+++ b/bfd/hosts/ncr3000.h
@@ -47,20 +47,4 @@ extern long atol();
 extern int fputc();
 extern int unlink();
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/rs6000.h b/bfd/hosts/rs6000.h
index 1d5863b20249946bda4cbc9e5c6b6173bf292e07..5b206490d9061c2b539eac86dcce21b93782bc13 100644 (file)
--- a/bfd/hosts/rs6000.h
+++ b/bfd/hosts/rs6000.h
@@ -14,20 +14,4 @@
 #define SEEK_SET 0
 #define SEEK_CUR 1
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/rtbsd.h b/bfd/hosts/rtbsd.h
index 071ee04f98937f6e56bab4dc1c8bd99788f93f02..d4c309003bcfe05f342b4ba6e564eb3a2a037b8f 100644 (file)
--- a/bfd/hosts/rtbsd.h
+++ b/bfd/hosts/rtbsd.h
@@ -17,20 +17,4 @@
 extern char     *malloc();
 extern void     free();
 
-
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
 #include "fopen-same.h"

diff --git a/bfd/hosts/sparc-ll.h b/bfd/hosts/sparc-ll.h
index 1f7c6952a8c5aabf1f5cfc7acc7c9013144477eb..32618f2126cca4af23d295a1ee0bd92bd29d330a 100644 (file)
--- a/bfd/hosts/sparc-ll.h
+++ b/bfd/hosts/sparc-ll.h
@@ -74,53 +74,37 @@ extern int fputc();
 extern int unlink();
 
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-
 #ifdef __GNUC__
 typedef unsigned long long uint64e_type;
 
 #else
 typedef struct {
-  uint32e_type low, high;
+  unsigned long low, high;
 } uint64e_type;
 
 #endif
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
 
 #ifdef __GNUC__
 typedef unsigned long long uint64_type;
 typedef long long int64_type;
 #else
 typedef struct {
-  uint32e_type low, high;
+  unsigned long low, high;
 } uint64_type;
 
 typedef struct {
-  uint32e_type low, high;
+  unsigned long low, high;
 } int64_type;
 
 #endif
 
-
 #define BYTES_IN_PRINTF_INT 4
 #ifndef __GNUC__
-#define uint64_typeLOW(x) (uint32_type)(((x).low))
-#define uint64_typeHIGH(x) (uint32_type)(((x).high))
+#define uint64_typeLOW(x) (unsigned long)(((x).low))
+#define uint64_typeHIGH(x) (unsigned long)(((x).high))
 #else
-#define uint64_typeLOW(x) (uint32_type)(((x) & 0xffffffff))
-#define uint64_typeHIGH(x) (uint32_type)(((x) >> 32) & 0xffffffff)
+#define uint64_typeLOW(x) (unsigned long)(((x) & 0xffffffff))
+#define uint64_typeHIGH(x) (unsigned long)(((x) >> 32) & 0xffffffff)
 #endif
+
 #include "fopen-same.h"

diff --git a/bfd/hosts/std-host.h b/bfd/hosts/std-host.h
index 4bb3e15433e0c72ac4720196ad1e0c11e2ce1a35..966d0c6d47823858ce90ec1a3b1eba9a92f86995 100644 (file)
--- a/bfd/hosts/std-host.h
+++ b/bfd/hosts/std-host.h
@@ -85,61 +85,23 @@ extern int fputc();
 extern int unlink();
 #endif /* STDC_HEADERS */
 
-/* EXACT TYPES */
-#ifndef int8e_type
-#define int8e_type char
-#endif
-#ifndef uint8e_type
-#define uint8e_type unsigned char
-#endif
-#ifndef int16e_type
-#define int16e_type short
-#endif
-#ifndef uint16e_type
-#define uint16e_type unsigned short
-#endif
-#ifndef int32e_type
-#define int32e_type int
-#endif
-#ifndef uint32e_type
-#define uint32e_type unsigned int
-#endif
 #ifndef uint64e_type
 #ifdef __GNUC__
 #define uint64e_type unsigned long long
 #define int64e_type long long
-#define uint64_typeLOW(x) (uint32_type)(((x) & 0xffffffff))
-#define uint64_typeHIGH(x) (uint32_type)(((x) >> 32) & 0xffffffff)
+#define uint64_typeLOW(x) (unsigned long)(((x) & 0xffffffff))
+#define uint64_typeHIGH(x) (unsigned long)(((x) >> 32) & 0xffffffff)
 #else
 struct  uint64e_struct {
-  uint32e_type low, high;
+  unsigned long low, high;
 };
 #define uint64e_type struct uint64e_struct
 #define int64e_type struct uint64e_struct
-#define uint64_typeLOW(x) (uint32_type)(((x).low))
-#define uint64_typeHIGH(x) (uint32_type)(((x).high))
+#define uint64_typeLOW(x) (unsigned long)(((x).low))
+#define uint64_typeHIGH(x) (unsigned long)(((x).high))
 #endif
 #endif
 
-/* CORRECT SIZE OR GREATER */
-#ifndef int8_type
-#define int8_type int8e_type
-#endif
-#ifndef uint8_type
-#define uint8_type uint8e_type
-#endif
-#ifndef int16_type
-#define int16_type int16e_type
-#endif
-#ifndef uint16_type
-#define uint16_type uint16e_type
-#endif
-#ifndef int32_type
-#define int32_type int32e_type
-#endif
-#ifndef uint32_type
-#define uint32_type uint32e_type
-#endif
 #ifndef int64_type
 #define int64_type int64e_type
 #endif

diff --git a/bfd/hosts/stratus.h b/bfd/hosts/stratus.h
index dbe7a010b9348091e44c40ca941863e8b34b5679..6d7d50c84379cedcdf4785135da0aefaeff33f1c 100644 (file)
--- a/bfd/hosts/stratus.h
+++ b/bfd/hosts/stratus.h
@@ -47,20 +47,4 @@ extern long atol();
 extern int fputc();
 extern int unlink();
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/sun3.h b/bfd/hosts/sun3.h
index 03008363e051b93e8465b108f17d2d4925217058..8d2d1820f3e0ab94acaace4d91a291feab48dddf 100644 (file)
--- a/bfd/hosts/sun3.h
+++ b/bfd/hosts/sun3.h
@@ -60,20 +60,4 @@ extern int fputc();
 extern int unlink();
 
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/sysv4.h b/bfd/hosts/sysv4.h
index 5c9107bbc92387b82d3ff1a97b0d100a1c482c0d..796c21d9be42a30857f543ee1aa401d57f6e1a22 100644 (file)
--- a/bfd/hosts/sysv4.h
+++ b/bfd/hosts/sysv4.h
@@ -48,20 +48,4 @@ extern long atol();
 extern int fputc();
 extern int unlink();
 
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
-
 #include "fopen-same.h"

diff --git a/bfd/hosts/ultra3.h b/bfd/hosts/ultra3.h
index 17aad5aba5898253b24c35a37c7e9a5008e1d866..7d9935be3b068010d0fb6edecd01e8e8ae0d1ea7 100644 (file)
--- a/bfd/hosts/ultra3.h
+++ b/bfd/hosts/ultra3.h
@@ -17,19 +17,4 @@
 extern char    *malloc();
 extern void    free();
 
-/* EXACT TYPES */
-typedef char           int8e_type;
-typedef unsigned char  uint8e_type;
-typedef short          int16e_type;
-typedef unsigned short         uint16e_type;
-typedef int            int32e_type;
-typedef unsigned int   uint32e_type;
-
-/* CORRECT SIZE OR GREATER */
-typedef char           int8_type;
-typedef unsigned char  uint8_type;
-typedef short          int16_type;
-typedef unsigned short         uint16_type;
-typedef int            int32_type;
-typedef unsigned int   uint32_type;
 #include "fopen-same.h"

diff --git a/bfd/hosts/we32k.h b/bfd/hosts/we32k.h
index 6de135ebc6e15d82753159e8fcc2ded2cba3be84..9a767235e297a85aa00252ca195f599a493aca36 100644 (file)
--- a/bfd/hosts/we32k.h
+++ b/bfd/hosts/we32k.h
@@ -24,20 +24,4 @@ extern void EXFUN(bzero,(char *, int));
 extern int strtol();
 #define NO_STDARG 1
  
-/* EXACT TYPES */
-typedef char int8e_type;
-typedef unsigned char uint8e_type;
-typedef short int16e_type;
-typedef unsigned short uint16e_type;
-typedef int int32e_type;
-typedef unsigned int uint32e_type;
- 
-/* CORRECT SIZE OR GREATER */
-typedef char int8_type;
-typedef unsigned char uint8_type;
-typedef short int16_type;
-typedef unsigned short uint16_type;
-typedef int int32_type;
-typedef unsigned int uint32_type;
- 
 #include "fopen-same.h"