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

[Bill Wendling]

Author: void
Date: Mon Jan 19 14:59:19 2009
New Revision: 62525

URL: http://llvm.org/viewvc/llvm-project?rev=62525&view=rev
Log:
Treat warn_format_security like warn_format. They are linked in special ways.

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/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=62525&r1=62524&r2=62525&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-common.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-common.c Mon Jan 19 14:59:19 2009
@@ -297,13 +297,18 @@
 /* Warn about format/argument anomalies in calls to formatted I/O functions
    (*printf, *scanf, strftime, strfmon, etc.).  */
 
-/* APPLE LOCAL default to Wformat-security 5764921 */
+/* 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 */
 
 /* 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=62525&r1=62524&r2=62525&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-common.h (original)
+++ llvm-gcc-4.2/trunk/gcc/c-common.h Mon Jan 19 14:59:19 2009
@@ -466,6 +466,12 @@
 
 extern int warn_format;
 
+/* LLVM LOCAL begin */
+/* Warn about possible security problems with format functions  */
+
+extern int warn_format_security;
+/* LLVM LOCAL end */
+
 /* APPLE LOCAL begin disable_typechecking_for_spec_flag */
 /* This makes type conflicts a warning, instead of an error,
    to work around some problems with SPEC.  */

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=62525&r1=62524&r2=62525&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c.opt (original)
+++ llvm-gcc-4.2/trunk/gcc/c.opt Mon Jan 19 14:59:19 2009
@@ -237,9 +237,11 @@
 Warn about format strings that are not literals
 
 ; APPLE LOCAL begin default to Wformat-security 5764921
+; LLVM LOCAL begin don't initialize this
 Wformat-security
-C ObjC C++ ObjC++ Var(warn_format_security) Init(1)
+C ObjC C++ ObjC++
 Warn about possible security problems with format functions
+; LLVM LOCAL end don't initialize this
 ; APPLE LOCAL end default to Wformat-security 5764921
 
 Wformat-y2k

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Mon Jan 19 14:59:19 2009
@@ -1604,8 +1604,12 @@
 #ifdef WARN_FORMAT_INIT
 #undef WARN_FORMAT_INIT
 #endif
-
 #define WARN_FORMAT_INIT 1
+
+#ifdef WARN_FORMAT_SECURITY_INIT
+#undef WARN_FORMAT_SECURITY_INIT
+#endif
+#define WARN_FORMAT_SECURITY_INIT 1
 /* LLVM LOCAL end */
 
 #endif /* CONFIG_DARWIN_H */