[llvm-commits] [llvm-gcc-4.2] r55655 - in /llvm-gcc-4.2/trunk/gcc: c-convert.c c-incpath.c collect2.c langhooks.c tlink.c unwind-dw2.c

[Bill Wendling]

Author: void
Date: Tue Sep  2 16:45:01 2008
New Revision: 55655

URL: http://llvm.org/viewvc/llvm-project?rev=55655&view=rev
Log:
Default to Wformat-security and comment fixes

Modified:
    llvm-gcc-4.2/trunk/gcc/c-convert.c
    llvm-gcc-4.2/trunk/gcc/c-incpath.c
    llvm-gcc-4.2/trunk/gcc/collect2.c
    llvm-gcc-4.2/trunk/gcc/langhooks.c
    llvm-gcc-4.2/trunk/gcc/tlink.c
    llvm-gcc-4.2/trunk/gcc/unwind-dw2.c

Modified: llvm-gcc-4.2/trunk/gcc/c-convert.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-convert.c?rev=55655&r1=55654&r2=55655&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-convert.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-convert.c Tue Sep  2 16:45:01 2008
@@ -80,7 +80,8 @@
   if ((invalid_conv_diag
        = targetm.invalid_conversion (TREE_TYPE (expr), type)))
     {
-      error (invalid_conv_diag);
+      /* APPLE LOCAL default to Wformat-security 5764921 */
+      error (invalid_conv_diag, "");
       return error_mark_node;
     }
 

Modified: llvm-gcc-4.2/trunk/gcc/c-incpath.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-incpath.c?rev=55655&r1=55654&r2=55655&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-incpath.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-incpath.c Tue Sep  2 16:45:01 2008
@@ -74,7 +74,8 @@
     case REASON_DUP_SYS:
       fprintf (stderr, _("ignoring duplicate directory \"%s\"\n"), path->name);
       if (reason == REASON_DUP_SYS)
-	fprintf (stderr,
+	/* APPLE LOCAL default to Wformat-security 5764921 */
+	fprintf (stderr, "%s",
  _("  as it is a non-system directory that duplicates a system directory\n"));
       break;
 
@@ -483,11 +484,13 @@
     {
       struct cpp_dir *p;
 
-      fprintf (stderr, _("#include \"...\" search starts here:\n"));
+      /* APPLE LOCAL default to Wformat-security 5764921 */
+      fprintf (stderr, "%s", _("#include \"...\" search starts here:\n"));
       for (p = heads[QUOTE];; p = p->next)
 	{
 	  if (p == heads[BRACKET])
-	    fprintf (stderr, _("#include <...> search starts here:\n"));
+	    /* APPLE LOCAL default to Wformat-security 5764921 */
+	    fprintf (stderr, "%s", _("#include <...> search starts here:\n"));
 	  if (!p)
 	    break;
 	  /* APPLE LOCAL begin 5033355 */
@@ -499,7 +502,8 @@
 	    fprintf (stderr, " %s (framework directory)\n", p->name);
 	  /* APPLE LOCAL end 5033355 */
 	}
-      fprintf (stderr, _("End of search list.\n"));
+      /* APPLE LOCAL default to Wformat-security 5764921 */
+      fprintf (stderr, "%s", _("End of search list.\n"));
     }
 }
 

Modified: llvm-gcc-4.2/trunk/gcc/collect2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/collect2.c?rev=55655&r1=55654&r2=55655&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/collect2.c (original)
+++ llvm-gcc-4.2/trunk/gcc/collect2.c Tue Sep  2 16:45:01 2008
@@ -1572,10 +1572,12 @@
       if (err != 0)
 	{
 	  errno = err;
-	  fatal_perror (errmsg);
+	  /* APPLE LOCAL default to Wformat-security 5764921 */
+	  fatal_perror ("%s", errmsg);
 	}
       else
-	fatal (errmsg);
+	/* APPLE LOCAL default to Wformat-security 5764921 */
+	fatal ("%s", errmsg);
     }
 
   return pex;
@@ -2060,10 +2062,12 @@
       if (err != 0)
 	{
 	  errno = err;
-	  fatal_perror (errmsg);
+	  /* APPLE LOCAL default to Wformat-security 5764921 */
+	  fatal_perror ("%s", errmsg);
 	}
       else
-	fatal (errmsg);
+	/* APPLE LOCAL default to Wformat-security 5764921 */
+	fatal ("%s", errmsg);
     }
 
   int_handler  = (void (*) (int)) signal (SIGINT,  SIG_IGN);

Modified: llvm-gcc-4.2/trunk/gcc/langhooks.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/langhooks.c?rev=55655&r1=55654&r2=55655&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/langhooks.c (original)
+++ llvm-gcc-4.2/trunk/gcc/langhooks.c Tue Sep  2 16:45:01 2008
@@ -522,7 +522,8 @@
       pp_set_prefix (context->printer, new_prefix);
 
       if (current_function_decl == NULL)
-	pp_printf (context->printer, _("At top level:"));
+	/* APPLE LOCAL default to Wformat-security 5764921 */
+	pp_printf (context->printer, "%s", _("At top level:"));
       else
 	{
 	  if (TREE_CODE (TREE_TYPE (current_function_decl)) == METHOD_TYPE)

Modified: llvm-gcc-4.2/trunk/gcc/tlink.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tlink.c?rev=55655&r1=55654&r2=55655&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tlink.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tlink.c Tue Sep  2 16:45:01 2008
@@ -785,7 +785,8 @@
 	    if (! recompile_files ())
 	      break;
 	    if (tlink_verbose)
-	      fprintf (stderr, _("collect: relinking\n"));
+	      /* APPLE LOCAL default to Wformat-security 5764921 */
+	      fprintf (stderr, "%s", _("collect: relinking\n"));
 	    exit = tlink_execute ("ld", ld_argv, ldout, lderrout);
 	  }
     }

Modified: llvm-gcc-4.2/trunk/gcc/unwind-dw2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/unwind-dw2.c?rev=55655&r1=55654&r2=55655&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/unwind-dw2.c (original)
+++ llvm-gcc-4.2/trunk/gcc/unwind-dw2.c Tue Sep  2 16:45:01 2008
@@ -1514,6 +1514,7 @@
 /* LLVM LOCAL begin
    This change is needed to match Apple's installed libgcc. */
 #ifdef LLVM_STACKSENSITIVE_UNWIND_RESUME
+  /* APPLE LOCAL libgcc 6148462 */
   return _Unwind_GetCFA (context);
 #else
   return _Unwind_GetIP (context);