gcc-5666.3

Author: Apple

ChangeLog.apple

@@ -1,3 +1,9 @@
+2010-08-06  Bob Wilson  <[email protected]>
+
+      Radar 8277973
+      * Makefile.in (FLAGS_FOR_TARGET): Add $(SYSROOT_CFLAGS_FOR_TARGET).
+      * build_gcc: Configure for powerpc using --with-build-sysroot.
+
 2010-02-08  Jim Grosbach <[email protected]>
 
 	Radar 7148788

Makefile.in

@@ -308,7 +308,8 @@ STAGE1_LANGUAGES=@stage1_languages@
 # Programs producing files for the TARGET machine
 # -----------------------------------------------
 
-FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
+# APPLE LOCAL 8277973 Add sysroot flag here.
+FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ $(SYSROOT_CFLAGS_FOR_TARGET)
 
 AR_FOR_TARGET=@AR_FOR_TARGET@
 AS_FOR_TARGET=@AS_FOR_TARGET@

build_gcc

@@ -86,6 +86,10 @@ if [ ! -d "$DEST_ROOT/include/c++/$LIBSTDCXX_VERSION" ]; then
 fi
 NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=\${prefix}/include/c++/$LIBSTDCXX_VERSION"
 
+# Build against the MacOSX10.5 SDK for PowerPC.
+PPC_SYSROOT=/Developer/SDKs/MacOSX10.5.sdk
+PPC_CONFIGFLAGS="$NON_ARM_CONFIGFLAGS --with-build-sysroot=\"$PPC_SYSROOT\""
+
 DARWIN_VERS=`uname -r | sed 's/\..*//'`
 echo DARWIN_VERS = $DARWIN_VERS
 
@@ -297,6 +301,8 @@ for t in $CROSS_TARGETS ; do
       AS_FOR_TARGET=$DIR/bin/${t}-apple-darwin$DARWIN_VERS-as \
       LD_FOR_TARGET=$DIR/bin/${t}-apple-darwin$DARWIN_VERS-ld \
       $SRC_DIR/configure $T_CONFIGFLAGS $ARM_CONFIGFLAGS || exit 1
+    elif [ $t = 'powerpc' ] ; then
+      $SRC_DIR/configure $T_CONFIGFLAGS $PPC_CONFIGFLAGS || exit 1
     else
       $SRC_DIR/configure $T_CONFIGFLAGS $NON_ARM_CONFIGFLAGS || exit 1
     fi
@@ -345,6 +351,8 @@ for h in $HOSTS ; do
           --target=$t-apple-darwin$DARWIN_VERS"
 	if [ $t = 'arm' ] && [ $h != 'arm' ] ; then
           T_CONFIGFLAGS="$T_CONFIGFLAGS $ARM_CONFIGFLAGS"
+	elif [ $t = 'powerpc' ] && [ $h != 'powerpc' ] ; then
+          T_CONFIGFLAGS="$T_CONFIGFLAGS $PPC_CONFIGFLAGS"
         else
           T_CONFIGFLAGS="$T_CONFIGFLAGS $NON_ARM_CONFIGFLAGS"
         fi

configure

@@ -1496,7 +1496,8 @@ AC_ARG_WITH([build-sysroot],
   [  --with-build-sysroot=sysroot
                           use sysroot as the system root during the build],
   [if test x"$withval" != x ; then
-     SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
+     # APPLE LOCAL 7852964 Use -isysroot instead of --sysroot.
+     SYSROOT_CFLAGS_FOR_TARGET="-isysroot $withval"
    fi],
   [SYSROOT_CFLAGS_FOR_TARGET=])
 AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)

configure.in

@@ -1,3 +1,35 @@
+2010-09-27  Bob Wilson  <[email protected]>
+
+	Radar 8392704
+	* doc/cppopts.texi: Fix description of -isysroot for Apple's GCC.
+	* doc/invoke.texi (Directory Options): Update --sysroot description to
+	refer Apple users to -isysroot.
+
+2010-08-13  Bob Wilson  <[email protected]>
+
+	Radar 8307333
+	* config/i386/darwin.h (DARWIN_IPHONEOS_LIBGCC_SPEC): Do not link
+	against libgcc_s.10.5.dylib.
+	* config/rs6000/darwin.h (DARWIN_IPHONEOS_LIBGCC_SPEC): Likewise.
+
+2010-04-16 Fariborz Jahanian <[email protected]>
+
+	Radar 7865106 is backed out.
+
+2010-04-15 Fariborz Jahanian <[email protected]>
+
+        Radar 7865106
+	* config/darwin.h (objc_weak_import_class): New decl.
+	(ASM_WEAKEN_DECL): Call objc_weak_import_class see if
+	we have a 'weak_reference' decl.
+	* darwin.c (objc_weak_import_class): New definition.
+	
+2010-04-13  Stuart Hastings  <[email protected]>
+
+        Radar 7212824
+        * cp/decl.c (redeclaration_error_message): Insure we're looking
+        at a VAR_DECL before diagnosing a redeclaration.
+
 2010-03-18  Stuart Hastings  <[email protected]>
 
         Radar 7763139

gcc/ChangeLog.apple

@@ -730,6 +730,7 @@ DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRCAT_CHK, "__strcat_chk", BT_FN_STRING_STRING
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRCPY_CHK, "__strcpy_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE, ATTR_NOTHROW_NONNULL)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRNCAT_CHK, "__strncat_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE_SIZE, ATTR_NOTHROW_NONNULL)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_STRNCPY_CHK, "__strncpy_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE_SIZE, ATTR_NOTHROW_NONNULL)
+DEF_EXT_LIB_BUILTIN    (BUILT_IN_STPNCPY_CHK, "__stpncpy_chk", BT_FN_STRING_STRING_CONST_STRING_SIZE_SIZE, ATTR_NOTHROW_NONNULL)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_SNPRINTF_CHK, "__snprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_5_6)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_SPRINTF_CHK, "__sprintf_chk", BT_FN_INT_STRING_INT_SIZE_CONST_STRING_VAR, ATTR_FORMAT_PRINTF_4_5)
 DEF_EXT_LIB_BUILTIN    (BUILT_IN_VSNPRINTF_CHK, "__vsnprintf_chk", BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VALIST_ARG, ATTR_FORMAT_PRINTF_5_0)

gcc/builtins.def

@@ -138,8 +138,8 @@ Boston, MA 02110-1301, USA.  */
 #define DARWIN_DEFAULT_VERSION_TYPE DARWIN_VERSION_MACOSX
 /* APPLE LOCAL end ARM 5683689 */
 
-/* APPLE LOCAL ARM 5681645 */
-#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc_s.10.5 -lgcc"
+/* APPLE LOCAL ARM 5681645 8307333 */
+#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc"
 
 /* APPLE LOCAL begin link optimizations 6499452 */
 #undef DARWIN_CRT1_SPEC

gcc/config/i386/darwin.h

@@ -168,8 +168,8 @@
 #define DARWIN_DEFAULT_VERSION_TYPE  DARWIN_VERSION_MACOSX
 /* APPLE LOCAL end ARM 5683689 */
 
-/* APPLE LOCAL ARM 5681645 */
-#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc_s.10.5 -lgcc"
+/* APPLE LOCAL ARM 5681645 8307333 */
+#define DARWIN_IPHONEOS_LIBGCC_SPEC "-lgcc"
 
 /* APPLE LOCAL begin mainline */
 #undef SUBTARGET_EXTRA_SPECS

gcc/config/rs6000/darwin.h

@@ -2197,8 +2197,10 @@ redeclaration_error_message (tree newdecl, tree olddecl)
 	   union { int i; };
 
 	   is invalid.  */
-      if (DECL_ANON_UNION_VAR_P (newdecl)
-	  || DECL_ANON_UNION_VAR_P (olddecl))
+      if (TREE_CODE (olddecl) == VAR_DECL
+          && TREE_CODE (newdecl) == VAR_DECL
+          && (DECL_ANON_UNION_VAR_P (newdecl)
+              || DECL_ANON_UNION_VAR_P (olddecl)))
 	return "redeclaration of %q#D";
       /* If at least one declaration is a reference, there is no
 	 conflict.  For example:

gcc/cp/decl.c

@@ -491,7 +491,10 @@ would; @option{-iwithprefix} puts it where @option{-idirafter} would.
 @item -isysroot @var{dir}
 @opindex isysroot
 This option is like the @option{--sysroot} option, but applies only to
-header files.  See the @option{--sysroot} option for more information.
+header files, except for Apple's version of GCC, where it applies to
+both header files and libraries and effectively replaces the
+@option{--sysroot} option.
+See the @option{--sysroot} option for more information.
 
 @item -imultilib @var{dir}
 @opindex imultilib

gcc/doc/cppopts.texi

@@ -7502,7 +7502,10 @@ For example, if the compiler would normally search for headers in
 @file{/usr/include} and libraries in @file{/usr/lib}, it will instead
 search @file{@var{dir}/usr/include} and @file{@var{dir}/usr/lib}.  
 
-If you use both this option and the @option{-isysroot} option, then
+With Apple's version of GCC, this option is effectively replaced by
+@option{-isysroot}, which you should use instead of @option{--sysroot}.
+For other (non-Apple) versions of GCC,
+if you use both this option and the @option{-isysroot} option, then
 the @option{--sysroot} option will apply to libraries, but the
 @option{-isysroot} option will apply to header files.
 

gcc/doc/invoke.texi

@@ -1,3 +1,26 @@
+2010-04-18 Fariborz Jahanian <[email protected]>
+
+	Radar 7865106 - Take two
+	* objc-act.c (objc_class_weak_import,
+	objc_build_weak_reference_internal_classname): New.
+	(objc_start_class_interface): For weak_import
+	class declaration generate asm(.weak_reference ...)
+	statement.
+	(objc_warn_on_class_attributes): Do not warn on existance
+	of 'weak_import' attribute on a class.
+	
+2010-04-15 Fariborz Jahanian <[email protected]>
+
+	Radar 7865106
+	* objc-act.c (objc_class_weak_import): New
+	(objc_create_global_decl_for_class): Tag metaclass
+	with weak_import attribute if class has one.
+	(ivar_offset_ref): Call to objc_create_global_decl_for_class takes
+	extra flag arg.
+	(generate_v2_shared_structures): Ditto.
+	(objc_warn_on_class_attributes): Do not warn on existance
+	of 'weak_import' attribute on a class.
+	
 2010-04-02 Fariborz Jahanian <[email protected]>
 
         Radar 7591784

gcc/objc/ChangeLog.apple

@@ -912,6 +912,28 @@ lookup_protocol_in_reflist (tree rproto_list, tree lproto)
   return 0;
 }
 
+/* APPLE LOCAL begin radar 7865106 */
+static bool objc_class_weak_import(tree class)
+{
+  tree chain;
+  gcc_assert (class && TREE_CODE (class) == CLASS_INTERFACE_TYPE);
+  for (chain = CLASS_ATTRIBUTES (class); chain; chain = TREE_CHAIN (chain))
+    if (is_attribute_p ("weak_import", TREE_PURPOSE (chain)))
+      return true;
+  return false;
+}
+
+static char*
+objc_build_weak_reference_internal_classname (tree ident, bool metaclass)
+{
+  static char string[BUFSIZE];
+  sprintf (string, ".weak_reference %s_%s", !metaclass ? "_OBJC_CLASS_$" 
+				       : "_OBJC_METACLASS_$", 
+			    IDENTIFIER_POINTER (ident));
+  return string;
+}
+/* APPLE LOCAL end radar 7865106 */
+
 void
 /* APPLE LOCAL radar 4548636 */
 objc_start_class_interface (tree class, tree super_class, tree protos, tree attributes)
@@ -923,6 +945,17 @@ objc_start_class_interface (tree class, tree super_class, tree protos, tree attr
   CLASS_ATTRIBUTES (objc_interface_context) = attributes;
   objc_warn_on_class_attributes (objc_interface_context, false);
 /* APPLE LOCAL end radar 4548636 */
+  /* APPLE LOCAL begin radar 7865106 */
+  if (flag_objc_abi == 2 && objc_class_weak_import(objc_interface_context)) {
+    const char * name = 
+      objc_build_weak_reference_internal_classname(CLASS_NAME(objc_interface_context) , 0);
+    tree asm_str = build_string(strlen(name), name);
+    cgraph_add_asm_node(asm_str);
+    name = objc_build_weak_reference_internal_classname(CLASS_NAME(objc_interface_context) , 1);
+    asm_str = build_string(strlen(name), name);
+    cgraph_add_asm_node(asm_str);
+  }
+  /* APPLE LOCAL end radar 7865106 */
   objc_public_flag = 0;
 }
 
@@ -14756,6 +14789,10 @@ objc_warn_on_class_attributes (tree class, bool use)
       else if (is_attribute_p ("objc_exception", TREE_PURPOSE (chain)))
         ;
       /* APPLE LOCAL end radar 5008110 */
+      /* APPLE LOCAL begin radar 7865106 */
+      else if (is_attribute_p ("weak_import", TREE_PURPOSE (chain)))
+        ;
+      /* APPLE LOCAL end radar 7865106 */
       else if (!use)
 	warning (0, "attribute %s is unknown - ignored",
 		  IDENTIFIER_POINTER (TREE_PURPOSE (chain)));