[llvm-commits] [llvm-gcc-4.2] r57326 - in /llvm-gcc-4.2/trunk/gcc: c.opt config/i386/darwin.h config/rs6000/darwin.h

[Devang Patel]

Author: dpatel
Date: Thu Oct  9 15:56:07 2008
New Revision: 57326

URL: http://llvm.org/viewvc/llvm-project?rev=57326&view=rev
Log:
Do not enable all formating related warnings on darwin by default.

Modified:
    llvm-gcc-4.2/trunk/gcc/c.opt
    llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h
    llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h

Modified: llvm-gcc-4.2/trunk/gcc/c.opt
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c.opt?rev=57326&r1=57325&r2=57326&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c.opt (original)
+++ llvm-gcc-4.2/trunk/gcc/c.opt Thu Oct  9 15:56:07 2008
@@ -246,9 +246,11 @@
 C ObjC C++ ObjC++ Var(warn_format_y2k)
 Warn about strftime formats yielding 2-digit years
 
+; LLVM LOCAL begin enable for C++
 Wformat-zero-length
-C ObjC Var(warn_format_zero_length)
+C ObjC C++ ObjC++ Var(warn_format_zero_length)
 Warn about zero-length formats
+; LLVM LOCAL end enable for C++
 
 Wformat=
 C ObjC C++ ObjC++ Joined

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h?rev=57326&r1=57325&r2=57326&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h Thu Oct  9 15:56:07 2008
@@ -101,8 +101,13 @@
   %{!mmacosx-version-min=*: %{!miphoneos-version-min=*: %(darwin_cc1_minversion)}} \
   "/* APPLE LOCAL ignore -mcpu=G4 -mcpu=G5 */"\
   %<faltivec %<mno-fused-madd %<mlong-branch %<mlongcall %<mcpu=G4 %<mcpu=G5 \
-  "/* APPLE LOCAL enable format security warnings */"\
-  %{!Wno-format:-Wformat -Wformat-security} \
+  "/* APPLE LOCAL begin enable format security warnings */"\
+  %{!Wno-format:-Wformat \
+                 %{!-Wno-format-security:-Wformat-security} \
+                 %{!-Wformat-extra-args:-Wno-format-extra-args} \
+                 %{!-Wformat-zero-length:-Wno-format-zero-length} \
+                 %{!-Wnonnull:-Wno-nonnull}} \
+  "/* APPLE LOCAL end enable format security warnings */"\
   %{g: %{!fno-eliminate-unused-debug-symbols: -feliminate-unused-debug-symbols }}"
 
 /* APPLE LOCAL AltiVec */

Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h?rev=57326&r1=57325&r2=57326&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h Thu Oct  9 15:56:07 2008
@@ -113,8 +113,13 @@
   %{static: %{Zdynamic: %e conflicting code gen style switches are used}}\
   "/* APPLE LOCAL ARM 5683689 */"\
   %{!mmacosx-version-min=*: %{!miphoneos-version-min=*: %(darwin_cc1_minversion)}} \
-  "/* APPLE LOCAL enable format security warnings */"\
-  %{!Wno-format:-Wformat -Wformat-security} \
+  "/* APPLE LOCAL begin enable format security warnings */"\
+  %{!Wno-format:-Wformat \
+                 %{!-Wno-format-security:-Wformat-security} \
+                 %{!-Wformat-extra-args:-Wno-format-extra-args} \
+                 %{!-Wformat-zero-length:-Wno-format-zero-length} \
+                 %{!-Wnonnull:-Wno-nonnull}} \
+  "/* APPLE LOCAL end enable format security warnings */"\
   "/* APPLE LOCAL -fast or -fastf or -fastcp */"\
   %{!mkernel:%{!static:%{!fast:%{!fastf:%{!fastcp:%{!mdynamic-no-pic:-fPIC}}}}}}"