Fix newbie hack that attempted to enable format security warnings by default on darwin platform.
llvm-svn: 56905
diff --git a/llvm-gcc-4.2/gcc/c-common.c b/llvm-gcc-4.2/gcc/c-common.c
index 446a3df..a77ae2d 100644
--- a/llvm-gcc-4.2/gcc/c-common.c
+++ b/llvm-gcc-4.2/gcc/c-common.c
@@ -302,8 +302,7 @@
/* Warn about format/argument anomalies in calls to formatted I/O functions
(*printf, *scanf, strftime, strfmon, etc.). */
-/* APPLE LOCAL default to Wformat-security 5764921 */
-int warn_format = 1;
+int warn_format;
/* Warn about using __null (as NULL in C++) as sentinel. For code compiled
with GCC this doesn't matter as __null is guaranteed to have the right
diff --git a/llvm-gcc-4.2/gcc/config/i386/darwin.h b/llvm-gcc-4.2/gcc/config/i386/darwin.h
index aaf8eae..fe3c103 100644
--- a/llvm-gcc-4.2/gcc/config/i386/darwin.h
+++ b/llvm-gcc-4.2/gcc/config/i386/darwin.h
@@ -101,6 +101,8 @@
%{!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} \
%{g: %{!fno-eliminate-unused-debug-symbols: -feliminate-unused-debug-symbols }}"
/* APPLE LOCAL AltiVec */
diff --git a/llvm-gcc-4.2/gcc/config/rs6000/darwin.h b/llvm-gcc-4.2/gcc/config/rs6000/darwin.h
index 8992c2a..1cff5bb 100644
--- a/llvm-gcc-4.2/gcc/config/rs6000/darwin.h
+++ b/llvm-gcc-4.2/gcc/config/rs6000/darwin.h
@@ -113,6 +113,8 @@
%{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} \
"/* APPLE LOCAL -fast or -fastf or -fastcp */"\
%{!mkernel:%{!static:%{!fast:%{!fastf:%{!fastcp:%{!mdynamic-no-pic:-fPIC}}}}}}"
