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

[Bill Wendling]

Author: void
Date: Tue Jan 20 12:52:09 2009
New Revision: 62595

URL: http://llvm.org/viewvc/llvm-project?rev=62595&view=rev
Log:
Fix build on Linux. Patch by Rafael.

Modified:
    llvm-gcc-4.2/trunk/gcc/c-common.c
    llvm-gcc-4.2/trunk/gcc/c-common.h
    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-common.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.c?rev=62595&r1=62594&r2=62595&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-common.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-common.c Tue Jan 20 12:52:09 2009
@@ -294,21 +294,7 @@
 
 int warn_unknown_pragmas; /* Tri state variable.  */
 
-/* Warn about format/argument anomalies in calls to formatted I/O functions
-   (*printf, *scanf, strftime, strfmon, etc.).  */
-
-/* APPLE LOCAL begin default to Wformat-security 5764921 */
-/* LLVM LOCAL begin initialize via config/darwin.h */
-#ifndef WARN_FORMAT_INIT
-#define WARN_FORMAT_INIT 0
-#endif
-#ifndef WARN_FORMAT_SECURITY_INIT
-#define WARN_FORMAT_SECURITY_INIT 0
-#endif
-int warn_format = WARN_FORMAT_INIT;
-int warn_format_security = WARN_FORMAT_SECURITY_INIT;
-/* LLVM LOCAL end initialize via config/darwin.h */
-/* APPLE LOCAL end default to Wformat-security 5764921 */
+/* LLVM LOCAL no definition of warn_format or warn_format_security.  */
 
 /* 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

Modified: llvm-gcc-4.2/trunk/gcc/c-common.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.h?rev=62595&r1=62594&r2=62595&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-common.h (original)
+++ llvm-gcc-4.2/trunk/gcc/c-common.h Tue Jan 20 12:52:09 2009
@@ -461,16 +461,7 @@
 
 extern int warn_unknown_pragmas; /* Tri state variable.  */
 
-/* Warn about format/argument anomalies in calls to formatted I/O functions
-   (*printf, *scanf, strftime, strfmon, etc.).  */
-
-extern int warn_format;
-
-/* LLVM LOCAL begin */
-/* Warn about possible security problems with format functions  */
-
-extern int warn_format_security;
-/* LLVM LOCAL end */
+/* LLVM LOCAL no decl of warn_format or warn_format_security.  */
 
 /* APPLE LOCAL begin disable_typechecking_for_spec_flag */
 /* This makes type conflicts a warning, instead of an error,

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=62595&r1=62594&r2=62595&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c.opt (original)
+++ llvm-gcc-4.2/trunk/gcc/c.opt Tue Jan 20 12:52:09 2009
@@ -224,9 +224,11 @@
 C ObjC C++ ObjC++ Var(warn_float_equal)
 Warn if testing floating point numbers for equality
 
+; LLVM LOCAL begin keep "Var(warn_format) Warning"
 Wformat
-C ObjC C++ ObjC++
+C ObjC C++ ObjC++ Var(warn_format) Warning
 Warn about printf/scanf/strftime/strfmon format string anomalies
+; LLVM LOCAL end keep "Var(warn_format) Warning"
 
 Wformat-extra-args
 C ObjC C++ ObjC++ Var(warn_format_extra_args)
@@ -237,11 +239,11 @@
 Warn about format strings that are not literals
 
 ; APPLE LOCAL begin default to Wformat-security 5764921
-; LLVM LOCAL begin don't initialize this
+; LLVM LOCAL begin keep "Var(warn_format_security)"
 Wformat-security
-C ObjC C++ ObjC++
+C ObjC C++ ObjC++ Var(warn_format_security)
 Warn about possible security problems with format functions
-; LLVM LOCAL end don't initialize this
+; LLVM LOCAL endkeep "Var(warn_format_security)"
 ; APPLE LOCAL end default to Wformat-security 5764921
 
 Wformat-y2k

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=62595&r1=62594&r2=62595&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/darwin.h Tue Jan 20 12:52:09 2009
@@ -100,6 +100,9 @@
   "/* APPLE LOCAL ARM 5683689 */"\
   %{!mmacosx-version-min=*: %{!miphoneos-version-min=*: %(darwin_cc1_minversion)}} \
   "/* APPLE LOCAL ignore -mcpu=G4 -mcpu=G5 */"\
+  "/* LLVM LOCAL enable format security warnings */"    \
+  %{!Wno-format:-Wformat}                               \
+  %{!Wno-format-security:-Wformat-security}                             \
   %<faltivec %<mno-fused-madd %<mlong-branch %<mlongcall %<mcpu=G4 %<mcpu=G5 \
   %{g: %{!fno-eliminate-unused-debug-symbols: -feliminate-unused-debug-symbols }}"
 

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=62595&r1=62594&r2=62595&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/rs6000/darwin.h Tue Jan 20 12:52:09 2009
@@ -113,7 +113,11 @@
   %{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 -fast or -fastf or -fastcp */"\
+  "/* APPLE LOCAL -fast or -fastf or -fastcp */"                        \
+  "/* LLVM LOCAL enable format security warnings */"                    \
+  %{!Wno-format:-Wformat}                                               \
+  %{!Wno-format-security:-Wformat-security}                             \
+  "/* APPLE LOCAL -fast or -fastf or -fastcp */"                        \
   %{!mkernel:%{!static:%{!fast:%{!fastf:%{!fastcp:%{!mdynamic-no-pic:-fPIC}}}}}}"
 
 #define DARWIN_ARCH_SPEC "%{m64:ppc64;:ppc}"