[llvm-commits] [llvm-gcc-4.2] r53251 - in /llvm-gcc-4.2/trunk: build_gcc libcpp/include/cpplib.h

[Bill Wendling]

Author: void
Date: Tue Jul  8 16:32:00 2008
New Revision: 53251

URL: http://llvm.org/viewvc/llvm-project?rev=53251&view=rev
Log:
Support for building 64-bit on x86.

Modified:
    llvm-gcc-4.2/trunk/build_gcc
    llvm-gcc-4.2/trunk/libcpp/include/cpplib.h

Modified: llvm-gcc-4.2/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=53251&r1=53250&r2=53251&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Tue Jul  8 16:32:00 2008
@@ -9,6 +9,7 @@
 TRANSLATE_ARCH="sed -e s/ppc/powerpc/ -e s/i386/i686/ -e s/ppc64/powerpc64/"
 TRANSLATE_TARGETS="sed -e s/ppc/powerpc/ -e s/i386/i686/ -e s/x86_64// \
   -e s/powerpc64// -e s/ppc64//"
+OMIT_X86_64="sed -e s/x86_64//"
 
 # Build GCC the "Apple way".
 # Parameters:
@@ -22,7 +23,7 @@
 # compilers will generate code for.  If the current machine isn't in
 # the list, a compiler for it will get built anyway, but won't be
 # installed.
-TARGETS=`echo $2 | $TRANSLATE_TARGETS`
+TARGETS=`echo $2 | $TRANSLATE_TARGETS | $OMIT_X86_64`
 
 # The GNU makefile target ('bootstrap' by default).
 BOOTSTRAP=${BOOTSTRAP-bootstrap}

Modified: llvm-gcc-4.2/trunk/libcpp/include/cpplib.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/libcpp/include/cpplib.h?rev=53251&r1=53250&r2=53251&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/libcpp/include/cpplib.h (original)
+++ llvm-gcc-4.2/trunk/libcpp/include/cpplib.h Tue Jul  8 16:32:00 2008
@@ -908,34 +908,31 @@
 				 const char *msgid, ...) ATTRIBUTE_PRINTF_5;
 
 /* APPLE LOCAL begin headermaps 3871393 */
+#include <stdint.h>
+
 #define HMAP_SAME_ENDIANNESS_MAGIC      (((((('h' << 8) | 'm') << 8) | 'a') << 8) | 'p')
 #define HMAP_OPPOSITE_ENDIANNESS_MAGIC  (((((('p' << 8) | 'a') << 8) | 'm') << 8) | 'h')
 
 #define HMAP_NOT_A_KEY   0x00000000
 
-#if !defined(uint32)
-typedef unsigned short  uint16;
-typedef unsigned long   uint32;
-#endif
-
 struct hmap_bucket
 {
-  uint32 key;          /* Offset (into strings) of key                */
+  uint32_t key;        /* Offset (into strings) of key                */
   struct {
-    uint32 prefix;     /* Offset (into strings) of value prefix   */
-    uint32 suffix;     /* Offset (into strings) of value suffix   */
+    uint32_t prefix;   /* Offset (into strings) of value prefix   */
+    uint32_t suffix;   /* Offset (into strings) of value suffix   */
   } value;             /* Value (prefix- and suffix-strings)          */
 };
 
 struct hmap_header_map
 {
-  uint32 magic;             /* Magic word, also indicates byte order       */
-  uint16 version;           /* Version number -- currently 1               */
-  uint16 _reserved;         /* Reserved for future use -- zero for now     */
-  uint32 strings_offset;    /* Offset to start of string pool              */
-  uint32 count;             /* Number of entries in the string table       */
-  uint32 capacity;          /* Number of buckets (always a power of 2)     */
-  uint32 max_value_length;  /* Length of longest result path (excl. '\0')  */
+  uint32_t magic;             /* Magic word, also indicates byte order       */
+  uint16_t version;           /* Version number -- currently 1               */
+  uint16_t _reserved;         /* Reserved for future use -- zero for now     */
+  uint32_t strings_offset;    /* Offset to start of string pool              */
+  uint32_t count;             /* Number of entries in the string table       */
+  uint32_t capacity;          /* Number of buckets (always a power of 2)     */
+  uint32_t max_value_length;  /* Length of longest result path (excl. '\0')  */
   struct hmap_bucket buckets[1]; /* Inline array of 'capacity' maptable buckets */
   /* Strings follow the buckets, at strings_offset.  */
 };