[llvm-commits] [llvm-gcc-4.2] r54190 - in /llvm-gcc-4.2/trunk/gcc: config/darwin.c stub-objc.c

[Bill Wendling]

Author: void
Date: Tue Jul 29 19:52:15 2008
New Revision: 54190

URL: http://llvm.org/viewvc/llvm-project?rev=54190&view=rev
Log:
More merges with Apple's GCC 4.2

Modified:
    llvm-gcc-4.2/trunk/gcc/config/darwin.c
    llvm-gcc-4.2/trunk/gcc/stub-objc.c

Modified: llvm-gcc-4.2/trunk/gcc/config/darwin.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin.c?rev=54190&r1=54189&r2=54190&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.c Tue Jul 29 19:52:15 2008
@@ -229,6 +229,15 @@
 	  if (DECL_COMMON (decl))
 	    return false;
 	}
+      /* APPLE LOCAL begin 6077274 */
+      /* Weak functions should always be indirected.  */
+      else if (SYMBOL_REF_FLAGS (sym_ref) & SYMBOL_FLAG_FUNCTION)
+	{
+	  tree decl = SYMBOL_REF_DECL (sym_ref);
+	  if (decl && DECL_WEAK (decl))
+	    return false;
+	}
+      /* APPLE LOCAL end 6077274 */
       return true;
     }
   return false;
@@ -2395,7 +2404,7 @@
         {
           size_t numUniChars;
           const unsigned char *inbuf = (unsigned char *)TREE_STRING_POINTER (str);
-          utf16_str = objc_create_init_utf16_var (inbuf, length, &numUniChars);
+          utf16_str = create_init_utf16_var (inbuf, length, &numUniChars);
           if (!utf16_str)
             {
               warning (0, "input conversion stopped due to an input byte "
@@ -2553,9 +2562,13 @@
       /* APPLE LOCAL end kext v2 */
     }
   /* APPLE LOCAL begin axe stubs 5571540 */
+  /* APPLE LOCAL begin ARM 5683689 */
+
   /* Go ahead and generate stubs for old systems, just in case.  */
-  if (strverscmp (darwin_macosx_version_min, "10.5") < 0)
+  if (darwin_macosx_version_min
+      && strverscmp (darwin_macosx_version_min, "10.5") < 0)
     darwin_stubs = true;
+  /* APPLE LOCAL end ARM 5683689 */
   /* APPLE LOCAL end axe stubs 5571540 */
 /* APPLE LOCAL diff confuses me */
 }

Modified: llvm-gcc-4.2/trunk/gcc/stub-objc.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/stub-objc.c?rev=54190&r1=54189&r2=54190&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/stub-objc.c (original)
+++ llvm-gcc-4.2/trunk/gcc/stub-objc.c Tue Jul 29 19:52:15 2008
@@ -562,15 +562,6 @@
   return false;
 }
 /* APPLE LOCAL end radar 4985544 */
-/* APPLE LOCAL begin radar 2996215 */
-tree
-objc_create_init_utf16_var (const unsigned char * ARG_UNUSED (inbuf), 
-			    size_t  ARG_UNUSED (length),
-			    size_t  *ARG_UNUSED (numUniChars))
-{
-  return NULL_TREE;
-}
-/* APPLE LOCAL end radar 2996215 */
 /* APPLE LOCAL begin radar 5202926 */
 bool
 objc_anonymous_local_objc_name (const char * ARG_UNUSED (name))
@@ -585,3 +576,35 @@
 }
 /* APPLE LOCAL end radar 5195402 */
 /* APPLE LOCAL end radar 5202926 */
+
+/* APPLE LOCAL begin radar 5782740 - blocks */
+tree copy_in_object (tree exp)
+{
+  return exp;
+}
+tree retain_block_component (tree ARG_UNUSED (exp))
+{
+  return NULL_TREE;
+}
+tree release_block_component (tree ARG_UNUSED (exp))
+{
+  return NULL_TREE;
+}
+bool block_requires_copying (tree exp)
+{
+  return TREE_CODE (TREE_TYPE (exp)) == BLOCK_POINTER_TYPE;
+}
+/* APPLE LOCAL end radar 5782740 - blocks */
+
+/* APPLE LOCAL begin radar 5802025 */
+tree objc_build_property_getter_func_call (tree object)
+{
+  return object;
+}
+/* APPLE LOCAL end radar 5802025 */
+/* APPLE LOCAL begin radar 5932809 - copyable byref blocks */
+tree cast_to_pointer_to_id (tree exp)
+{
+  return exp;
+}
+/* APPLE LOCAL end radar 5932809 - copyable byref blocks */