summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>2007-03-21 18:45:40 +0000
committermrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>2007-03-21 18:45:40 +0000
commitdad26ad976f54a96311e23803db9911c828c126c (patch)
treed7ba5e090485358e8a71832fc5c5eb726ccace11
parent2800ac1a18c0dff0ef43768959058f6ce5cb0b99 (diff)
downloadgcc-dad26ad976f54a96311e23803db9911c828c126c.tar.gz
* c.opt: Fixup for Objective-C/C++.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123114 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/c.opt8
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c6f76cca7b8..219b7131c5c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-21 Mike Stump <mrs@apple.com>
+
+ * c.opt: Fixup for Objective-C/C++.
+
2007-02-21 Steve Ellcey <sje@cup.hp.com>
* explow.c (convert_memory_address): Fold memory reference when
diff --git a/gcc/c.opt b/gcc/c.opt
index 928e8b2c59a..dd793b7fb83 100644
--- a/gcc/c.opt
+++ b/gcc/c.opt
@@ -133,7 +133,7 @@ C ObjC Var(warn_bad_function_cast) Warning
Warn about casting functions to incompatible types
Wc++-compat
-C Var(warn_cxx_compat) Warning
+C ObjC Var(warn_cxx_compat) Warning
Warn about C constructs that are not in the common subset of C and C++
Wc++0x-compat
@@ -177,7 +177,7 @@ C++ ObjC++ Var(warn_deprecated) Init(1) Warning
Warn about deprecated compiler features
Wdiv-by-zero
-C ObjC C++ Var(warn_div_by_zero) Init(1) Warning
+C ObjC C++ ObjC++ Var(warn_div_by_zero) Init(1) Warning
Warn about compile-time integer division by zero
Weffc++
@@ -559,7 +559,7 @@ ObjC ObjC++
Generate code for GNU runtime environment
fgnu89-inline
-C Var(flag_gnu89_inline) Init(-1)
+C ObjC Var(flag_gnu89_inline) Init(-1)
Use traditional GNU semantics for inline functions
fguiding-decls
@@ -592,7 +592,7 @@ C++ ObjC++
Emit implicit instantiations of templates
ffriend-injection
-C++ Var(flag_friend_injection)
+C++ ObjC++ Var(flag_friend_injection)
Inject friend functions into enclosing namespace
flabels-ok