[llvm-commits] [llvm-gcc-4.2] r54155 - in /llvm-gcc-4.2/trunk/libcpp: ChangeLog.apple charset.c include/cpplib.h

[Bill Wendling]

Author: void
Date: Tue Jul 29 03:24:19 2008
New Revision: 54155

URL: http://llvm.org/viewvc/llvm-project?rev=54155&view=rev
Log:
Update to GCC 4.2 TOT from r142930.

- Eat UTF-8 BOM.

Modified:
    llvm-gcc-4.2/trunk/libcpp/ChangeLog.apple
    llvm-gcc-4.2/trunk/libcpp/charset.c
    llvm-gcc-4.2/trunk/libcpp/include/cpplib.h

Modified: llvm-gcc-4.2/trunk/libcpp/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/libcpp/ChangeLog.apple?rev=54155&r1=54154&r2=54155&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/libcpp/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/libcpp/ChangeLog.apple Tue Jul 29 03:24:19 2008
@@ -1,3 +1,8 @@
+2008-05-01  Mike Stump  <mrs at apple.com>
+
+	Radar 5774975
+	* charset.c (_cpp_convert_input): Eat UTF-8 BOM.
+
 2007-05-17  Fariborz Jahanian <fjahanian at apple.com>
 
         Radar 2996215

Modified: llvm-gcc-4.2/trunk/libcpp/charset.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/libcpp/charset.c?rev=54155&r1=54154&r2=54155&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/libcpp/charset.c (original)
+++ llvm-gcc-4.2/trunk/libcpp/charset.c Tue Jul 29 03:24:19 2008
@@ -1650,6 +1650,17 @@
   input_cset = init_iconv_desc (pfile, SOURCE_CHARSET, input_charset);
   if (input_cset.func == convert_no_conversion)
     {
+      /* APPLE LOCAL begin UTF-8 BOM 5774975 */
+      /* Eat the UTF-8 BOM.  */
+      if (len >= 3
+	  && input[0] == 0xef
+	  && input[1] == 0xbb
+	  && input[2] == 0xbf)
+	{
+	  memmove (&input[0], &input[3], size-3);
+	  len -= 3;
+	}
+      /* APPLE LOCAL end UTF-8 BOM 5774975 */
       to.text = input;
       to.asize = size;
       to.len = len;

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=54155&r1=54154&r2=54155&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/libcpp/include/cpplib.h (original)
+++ llvm-gcc-4.2/trunk/libcpp/include/cpplib.h Tue Jul 29 03:24:19 2008
@@ -926,13 +926,13 @@
 
 struct hmap_header_map
 {
-  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')  */
+  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.  */
 };