gcc-5664

Imported from gcc-5664.tar.gz

Author: AppleOSSDistributions

ChangeLog.apple

@@ -1,3 +1,9 @@
+2010-02-08  Jim Grosbach <[email protected]>
+
+	Radar 7148788
+	* driverdriver.c (get_arch_name): Issue diagnostic for ARM archs not
+	explicitly recognized.
+
 2009-05-27  Bob Wilson  <[email protected]>
 
 	Radar 6915254

config/mh-x86-darwin

@@ -3,3 +3,7 @@
 # position-independent-code -- the usual default on Darwin.
 
 BOOT_CFLAGS=-g -O2 -mdynamic-no-pic
+
+# For hosts after darwin10 we want to pass in -no-pie
+BOOT_LDFLAGS=`case ${host} in *-*-darwin[1][1-9]*) echo -Wl,-no_pie ;; esac;`
+LDFLAGS=$(BOOT_LDFLAGS)

configure

@@ -966,6 +966,9 @@ case "${host}" in
     host_makefile_frag="config/mh-ppc-darwin"
     ;;
   # APPLE LOCAL begin dynamic-no-pic
+  x86_64-*-darwin*)
+    host_makefile_frag="config/mh-x86-darwin"
+    ;;
   i[[3456789]]86-*-darwin*)
     host_makefile_frag="config/mh-x86-darwin"
     # gcc can default to x86_64 code generation, avoid that

configure.in

@@ -123,6 +123,8 @@ struct arch_config_guess_map arch_config_map [] =
   {"ppc", "powerpc"},
   {"ppc64", "powerpc"},
   {"x86_64", "i686"},
+  /* Note: It's required that all supported ARM architectures be listed
+   * here explicitly */
   {"arm", "arm"},
   {"armv4t", "arm"},
   {"armv5", "arm"},
@@ -210,6 +212,10 @@ get_arch_name (const char *name)
       else map++;
     }
     a_info = (NXArchInfo *) NXGetArchInfoFromName (name);
+    /* radr://7148788  emit diagnostic for ARM architectures not explicitly
+     * handled by the driver. */
+    if (a_info && a_info->cputype == CPU_TYPE_ARM)
+      a_info = NULL;
   } else {
     a_info = (NXArchInfo *) NXGetLocalArchInfo();
     if (a_info) {

driverdriver.c

@@ -1,3 +1,64 @@
+2010-03-18  Stuart Hastings  <[email protected]>
+
+        Radar 7763139
+        * config/i386/i386.c (iasm_x86_canonicalize_operands): Add LEA
+          to list of opcodes that ignore 2nd type attribute.
+
+2010-03-16  Fariborz Jahanian <[email protected]>
+
+        Radar 7760213
+	* c-common.h (HasByrefArray): New decl.
+	* c-common.c (HasByrefArray): New definition.
+	* c-typeck.c (build_external_ref): Diagnose access of
+	__block array.
+
+2010-03-12  Jim Grosbach <[email protected]>
+
+	Radar 7744816
+
+	* expmed.c (synth_mult): Remove incorrect special case handling for
+	0xffffffff.
+
+2010-03-12  Fariborz Jahanian <[email protected]>
+
+        Radar 7735196
+        * c-parser.c (build_block_struct_initlist): 
+        Set BLOCK_USE_STRET flag in block descriptor for
+        blocks which return their aggregate value in memory.
+	* c-common.h (BLOCK_USE_STRET): New flag.
+
+2010-03-05  Fariborz Jahanian <[email protected]>
+
+	Radar 7721728
+	* c-typeck.c (build_external_ref): Diagnose
+	importation of copied-in variables.
+
+2010-02-16  Jim Grosbach <[email protected]>
+
+	Radar 7649286
+
+	* config/arm/arm.md (call_value_mem, call): Rename call_value_mem_v4,
+	call_mem_v4.  Restrict to only when blx is not available (pre-ARMv5).
+
+2010-02-08  Jim Grosbach <[email protected]>
+
+	Radar 7590305
+	* config/arm/arm.c (handle_thumb_unexpanded_prologue): When calling
+	helper function to save off VFP regs, update the DWARF call frame
+	information.
+
+2010-02-01  Stuart Hastings  <[email protected]>
+
+        Radar 7599272
+        * gcc/config/darwin-c.c (create_init_utf16_var): Apply Evan's
+        LLVM-GCC r95013 patch to GCC.
+
+2010-01-27  Jim Grosbach <[email protected]>
+
+	Radar 7581650
+	* dwarf2out.c (gen_subprogram_die): DW_AT_APPLE_isa should use data1
+	encoding.
+
 2010-01-13  Jim Grosbach <[email protected]>
 
         Radar 7511696

gcc/ChangeLog.apple

@@ -9110,4 +9110,20 @@ tree build_block_object_dispose_call_exp (tree src, int flag)
   return build_function_call (build_block_object_dispose_decl (), func_params);
 }
 /* APPLE LOCAL end radar 5847976 */
+/* APPLE LOCAL begin radar 7760213 */
+int HasByrefArray(tree byrefType)
+{
+  tree s1;
+  /* Check for possibility of an error condition. */
+  if (TREE_CODE(byrefType) != RECORD_TYPE)
+    return 0;
+
+  for (s1 = TYPE_FIELDS (byrefType); s1; s1 = TREE_CHAIN (s1))
+    {
+      if (TREE_CODE(TREE_TYPE(s1)) == ARRAY_TYPE)
+        return 1;
+    }
+  return 0;
+}
+/* APPLE LOCAL end radar 7760213 */
 #include "gt-c-common.h"

gcc/c-common.c

@@ -1145,8 +1145,8 @@ enum {
      BLOCK_IS_GC =             (1 << 27),
      /* APPLE LOCAL radar 5822844 */
      BLOCK_IS_GLOBAL = 	       (1 << 28),
-     /* APPLE LOCAL radar 5847213 */
-     BLOCK_HAS_DESCRIPTOR =    (1 << 29)
+     /* APPLE LOCAL radar 7735196 */
+     BLOCK_USE_STRET =    (1 << 29)
 };
 
 struct block_sema_info {
@@ -1231,6 +1231,9 @@ extern tree build_block_helper_name (int);
 /* APPLE LOCAL radar 6353006  */
 extern tree c_build_generic_block_struct_type (void);
 
+/* APPLE LOCAL radar 7760213 */
+extern int HasByrefArray(tree);
+
 /* In c-omp.c  */
 extern tree c_finish_omp_master (tree);
 extern tree c_finish_omp_critical (tree, tree);

gcc/c-common.h

@@ -9635,7 +9635,7 @@ build_descriptor_block_decl (tree block_struct_type, struct block_sema_info *blo
 /**
  build_block_struct_initlist - builds the initializer list:
  { &_NSConcreteStackBlock or &_NSConcreteGlobalBlock // __isa,
-   BLOCK_HAS_DESCRIPTOR | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL // __flags,
+   BLOCK_USE_STRET | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL // __flags,
    0, // __reserved
    &helper_1, // __FuncPtr,
    &static_descriptor_variable // __descriptor,
@@ -9650,7 +9650,8 @@ build_block_struct_initlist (tree block_struct_type,
 {
   tree initlist, helper_addr;
   tree chain, fields;
-  unsigned int flags = BLOCK_HAS_DESCRIPTOR;
+  /* APPLE LOCAL radar 7735196 */
+  unsigned int flags = 0;
   static tree NSConcreteStackBlock_decl = NULL_TREE;
   static tree NSConcreteGlobalBlock_decl = NULL_TREE;
   tree descriptor_block_decl = build_descriptor_block_decl (block_struct_type, block_impl);
@@ -9660,6 +9661,10 @@ build_block_struct_initlist (tree block_struct_type,
        we have destroy_helper_block/copy_helper_block helper
        routines. */
     flags |= BLOCK_HAS_COPY_DISPOSE;
+  /* APPLE LOCAL begin radar 7735196 */
+  if (block_impl->return_type && aggregate_value_p(block_impl->return_type, 0))
+    flags |= BLOCK_USE_STRET;
+  /* APPLE LOCAL end 7735196 */
 
   fields = TYPE_FIELDS (block_struct_type);
   /* APPLE LOCAL begin radar 6230297 */
@@ -9805,7 +9810,7 @@ build_block_struct_initlist (tree block_struct_type,
  3) build the temporary initialization:
  struct __block_literal_n I = {
    &_NSConcreteStackBlock or &_NSConcreteGlobalBlock // __isa,
-   BLOCK_HAS_DESCRIPTOR | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL // __flags,
+   BLOCK_USE_STRET | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL // __flags,
    0, // __reserved
    &helper_1, // __FuncPtr 
    &static_descriptor_variable // __descriptor,

gcc/c-parser.c

@@ -2113,6 +2113,7 @@ build_array_ref (tree array, tree index)
 				 "array indexing");
     }
 }
+
 
 /* Build an external reference to identifier ID.  FUN indicates
    whether this will be used for a function call.  LOC is the source
@@ -2176,20 +2177,30 @@ build_external_ref (tree id, int fun, location_t loc)
 	    {
 	      /* APPLE LOCAL begin radar 5803600 (C++ ci) */
 	      /* byref globals are directly accessed. */
-	      if (!gdecl)
+              /* APPLE LOCAL begin radar 7760213 */
+	      if (!gdecl) {
+                if (HasByrefArray(TREE_TYPE (decl)))
+       		  error ("cannot access __block variable of array type inside block");
 		/* build a decl for the byref variable. */
 		decl = build_block_byref_decl (id, decl, decl);
+              }
+              /* APPLE LOCAL end radar 7760213 */
 	      else
 		add_block_global_byref_list (decl);
 	    }
 	  else
 	    {
 	      /* 'byref' globals are never copied-in. So, do not add
 		 them to the copied-in list. */
-	      if (!in_block_global_byref_list (decl))
+	      if (!in_block_global_byref_list (decl)) {
+		/* APPLE LOCAL begin radar 7721728 */
+                if (TREE_CODE (TREE_TYPE (decl)) == ARRAY_TYPE)
+       		  error ("cannot access copied-in variable of array type inside block");
+		/* APPLE LOCAL end radar 7721728 */
 		/* build a new decl node. set its type to 'const' type
 		   of the old decl. */
 		decl = build_block_ref_decl (id, decl);
+              }
 	      /* APPLE LOCAL end radar 5803600 (C++ ci) */
 	      /* APPLE LOCAL end radar 5803005 (C++ ci) */
 	    }

gcc/c-typeck.c

@@ -21223,7 +21223,17 @@ handle_thumb_unexpanded_prologue (FILE *f, bool emit)
     {
       bytes += 4;
       if (emit)
-        asm_fprintf (f, "\tblx ___save_vfp_d8_d15_regs\n");
+        {
+          asm_fprintf (f, "\tblx ___save_vfp_d8_d15_regs\n");
+          /* Let the debugger know about the additional space used */
+          if (dwarf2out_do_frame ())
+            {
+              char *l = dwarf2out_cfi_label ();
+              /* d8 - d15 save is 64 bytes of space */
+              cfa_offset = cfa_offset + 64;
+              dwarf2out_def_cfa (l, SP_REGNUM, cfa_offset);
+            }
+	}
     }
   /* APPLE LOCAL end 6465387 exception handling interworking VFP save */
   return bytes;

gcc/config/arm/arm.c

@@ -8798,19 +8798,21 @@
    (set_attr "predicable" "yes")]
 )
 
-(define_insn "*call_mem"
+;; APPLE LOCAL begin 7649286 always use blx for indirect call when available
+(define_insn "*call_mem_v4"
   [(call (mem:SI (match_operand:SI 0 "call_memory_operand" "m"))
 	 (match_operand 1 "" ""))
    (use (match_operand 2 "" ""))
    (clobber (reg:SI LR_REGNUM))]
-  "TARGET_ARM"
+  "TARGET_ARM && !arm_arch5"
   "*
   return output_call_mem (operands);
   "
   [(set_attr "length" "12")
    (set_attr "type" "call")
    (set_attr "predicable" "yes")]
 )
+;; APPLE LOCAL end 7649286 always use blx for indirect call when available
 
 ;; APPLE LOCAL v7 support. Merge from mainline
 (define_insn "*call_reg_thumb1_v5"
@@ -8908,20 +8910,22 @@
    (set_attr "predicable" "yes")]
 )
 
-(define_insn "*call_value_mem"
+;; APPLE LOCAL begin 7649286 always use blx for indirect call when available
+(define_insn "*call_value_mem_v4"
   [(set (match_operand 0 "" "")
 	(call (mem:SI (match_operand:SI 1 "call_memory_operand" "m"))
 	      (match_operand 2 "" "")))
    (use (match_operand 3 "" ""))
    (clobber (reg:SI LR_REGNUM))]
-  "TARGET_ARM && (!CONSTANT_ADDRESS_P (XEXP (operands[1], 0)))"
+  "TARGET_ARM && (!CONSTANT_ADDRESS_P (XEXP (operands[1], 0))) && !arm_arch5"
   "*
   return output_call_mem (&operands[1]);
   "
   [(set_attr "length" "12")
    (set_attr "type" "call")
    (set_attr "predicable" "yes")]
 )
+;; APPLE LOCAL end 7649286 always use blx for indirect call when available
 
 ;; APPLE LOCAL v7 support. Merge from mainline
 (define_insn "*call_value_reg_thumb1_v5"

gcc/config/arm/arm.md

@@ -1195,10 +1195,22 @@ create_init_utf16_var (const unsigned char *inbuf, size_t length, size_t *numUni
   static int num;
   const char *name_prefix = "__utf16_string_";
   char *name;
+  int embedNull = 0;
 
   if (!cvt_utf8_utf16 (inbuf, length, &uniCharBuf, numUniChars))
     return NULL_TREE;
 
+  /* APPLE LOCAL begin 7589850 */
+  /* ustring with embedded null should go into __const. It should not be forced
+     into "__TEXT,__ustring" section. */
+  for (l = 0; l < length; l++) {
+    if (!inbuf[l]) {
+      embedNull = 1;
+      break;
+    }
+  }
+  /* APPLE LOCAL end 7589850 */
+
   for (l = 0; l < *numUniChars; l++)
     initlist = tree_cons (NULL_TREE, build_int_cst (char_type_node, uniCharBuf[l]), initlist);
   type = build_array_type (char_type_node,
@@ -1212,9 +1224,13 @@ create_init_utf16_var (const unsigned char *inbuf, size_t length, size_t *numUni
   DECL_ARTIFICIAL (decl) = 1;
   DECL_CONTEXT (decl) = NULL_TREE;
 
-  attribute = tree_cons (NULL_TREE, build_string (len, section_name), NULL_TREE);
-  attribute = tree_cons (get_identifier ("section"), attribute, NULL_TREE);
-  decl_attributes (&decl, attribute, 0);
+  /* APPLE LOCAL begin 7589850 */
+  if (!embedNull) {
+    attribute = tree_cons (NULL_TREE, build_string (len, section_name), NULL_TREE);
+    attribute = tree_cons (get_identifier ("section"), attribute, NULL_TREE);
+    decl_attributes (&decl, attribute, 0);
+  }
+  /* APPLE LOCAL end 7589850 */
   attribute = tree_cons (NULL_TREE, build_int_cst (NULL_TREE, 2), NULL_TREE);
   attribute = tree_cons (get_identifier ("aligned"), attribute, NULL_TREE);
   decl_attributes (&decl, attribute, 0);

gcc/config/darwin-c.c

@@ -418,6 +418,11 @@ do {					\
    %{Zmultiplydefinedunused*:-multiply_defined_unused %*} \
    "/* APPLE LOCAL mainline 2007-06-01 5238485 */" \
    %{fpie:-pie} \
+   "/* APPLE LOCAL begin <rdar://problem/7651045> */" \
+   %{fPIE:-pie} \
+   %{fno-pie:-no_pie} \
+   %{fno-PIE:-no_pie} \
+   "/* APPLE LOCAL end <rdar://problem/7651045> */" \
    %{prebind} %{noprebind} %{nofixprebinding} %{prebind_all_twolevel_modules} \
    %{read_only_relocs} \
    %{sectcreate*} %{sectorder*} %{seg1addr*} %{segprot*} \

gcc/config/darwin.h

@@ -23220,8 +23220,9 @@ iasm_x86_canonicalize_operands (const char **opcode_p, tree iargs, void *ep)
 	   || strcasecmp (opcode, "str") == 0
 	   || strcasecmp (opcode, "xlat") == 0)
     e->mod[0] = 0;
-  else if (strcasecmp (opcode, "rcr") == 0
+  else if (strcasecmp (opcode, "lea") == 0
 	   || strcasecmp (opcode, "rcl") == 0
+	   || strcasecmp (opcode, "rcr") == 0
 	   || strcasecmp (opcode, "rol") == 0
 	   || strcasecmp (opcode, "ror") == 0
 	   || strcasecmp (opcode, "sal") == 0

gcc/config/i386/i386.c

@@ -1,3 +1,22 @@
+2010-03-16  Fariborz Jahanian <[email protected]>
+
+        Radar 7760213
+        * semantics.c (get_final_block_variable): Diagnose 
+	access of __block array.
+	
+2010-03-12  Fariborz Jahanian <[email protected]>
+
+	Radar 7735196
+	* cp/parser.c (build_block_struct_initlist): 
+	Set BLOCK_USE_STRET flag in block descriptor for
+        blocks which return their aggregate value in memory.
+
+2010-03-05  Fariborz Jahanian <[email protected]>
+
+        Radar 7721728
+        * semantics.c  (get_final_block_variable): Diagnose
+        importation of copied-in variables.
+
 2010-01-05  Jim Grosbach <[email protected]>
 
 	Radar 7465602