Changeset 29986 in webkit

Timestamp:

Feb 4, 2008 7:25:59 PM (16 years ago)

Author:

mrowe@apple.com

Message:

Fix ​http://bugs.webkit.org/show_bug.cgi?id=17175 (Bug 17175: Use of C++ compiler flags in CFLAGS).

Reviewed by Alp Toker and Mark Rowe.

Add global_cxxflags definition for inclusion in CXXFLAGS variables.
Only use -fno-rtti and $(SYMBOL_VISIBILITY_INLINES) with global_cxxflags as gcc complains they aren't valid for C.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (4 diffs)
• JavaScriptCore/ChangeLog (modified) (2 diffs)
• JavaScriptCore/GNUmakefile.am (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/GNUmakefile.am (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2008-02-04  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Reviewed by Alp Toker and Mark Rowe.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=17175.
+        Bug 17175: Use of C++ compiler flags in CFLAGS
+
+        Add global_cxxflags definition for inclusion in CXXFLAGS variables.
+        Only use -fno-rtti and $(SYMBOL_VISIBILITY_INLINES) with global_cxxflags as gcc complains they aren't valid for C.
+
+        * GNUmakefile.am:
+
 2008-02-04  Alp Toker  <alp@atoker.com>
 

trunk/GNUmakefile.am

@@ -22 +22 @@
 # global_cppflags   = CPPFLAGS that apply to JSC, WebCore, and to any
 #                     specific port
-# global_cflags     = CFLAGS and CXXFLAGS that apply to JSC, WebCore, and to
+# global_cflags     = CFLAGS that apply to JSC, WebCore, and to
 #                     any specific port
+# global_cxxflags   = CXXFLAGS that apply to JSC, WebCore, and to any
+#                     specific port
 
 srcdir = @srcdir@
@@ -62 +64 @@
         -Wformat -Wformat-security -Wno-format-y2k -Wundef \
         -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
-        -Wno-unused-parameter $(SYMBOL_VISIBILITY_INLINES)
+        -Wno-unused-parameter
+
+global_cxxflags := \
+        $(SYMBOL_VISIBILITY_INLINES)
 
 if !ENABLE_DEBUG
 global_cflags += \
-        -fno-rtti -fno-exceptions \
+        -fno-exceptions \
         $(SYMBOL_VISIBILITY)
+
+global_cxxflags += \
+        -fno-rtti
 endif
 
@@ -97 +105 @@
 libJavaScriptCore_la_LDFLAGS = $(ICU_LIBS) -lpthread
 
-libJavaScriptCore_la_CXXFLAGS = $(global_cflags) -fstrict-aliasing
+libJavaScriptCore_la_CXXFLAGS = $(global_cxxflags) $(global_cflags) -fstrict-aliasing
 
 libJavaScriptCore_la_CFLAGS = $(global_cflags) -fstrict-aliasing
@@ -140 +148 @@
 libWebKitGtk_la_CXXFLAGS = \
         -fno-strict-aliasing \
+        $(global_cxxflags) \
         $(global_cflags) \
         $(DEPENDENCIES_CFLAGS) \

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-02-04  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Reviewed by Alp Toker and Mark Rowe.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=17175.
+        Bug 17175: Use of C++ compiler flags in CFLAGS
+
+        * GNUmakefile.am: Use global_cxxflags as well as global_cflags in CXXFLAGS.
+
 2008-02-04  Alp Toker  <alp@atoker.com>
 
@@ -18 +27 @@
         putting things into the back/forward cache. If that's true, then this
         should fix the problem.
-        
+
         (According to Geoff's measurements, in a PLT that exaggerates the
         importance of symbol table saving during cached page creation, this

trunk/JavaScriptCore/GNUmakefile.am

@@ -150 +150 @@
         JavaScriptCore/API/minidom.c
 Programs_minidom_CPPFLAGS = $(global_cppflags)
-Programs_minidom_CXXFLAGS = $(global_cflags)
+Programs_minidom_CXXFLAGS = $(global_cxxflags) $(global_cflags)
 Programs_minidom_LDADD = libJavaScriptCore.la
 Programs_minidom_LDFLAGS = -rpath $(CURDIR)/.libs
@@ -157 +157 @@
 Programs_testkjs_SOURCES = JavaScriptCore/kjs/testkjs.cpp
 Programs_testkjs_CPPFLAGS = $(global_cppflags)
-Programs_testkjs_CXXFLAGS = $(global_cflags)
+Programs_testkjs_CXXFLAGS = $(global_cxxflags) $(global_cflags)
 Programs_testkjs_LDADD = libJavaScriptCore.la
 Programs_testkjs_LDFLAGS = -rpath $(CURDIR)/.libs

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2008-02-04  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Reviewed by Alp Toker and Mark Rowe.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=17175.
+        Bug 17175: Use of C++ compiler flags in CFLAGS
+
+        * GNUmakefile.am: Use global_cxxflags as well as global_cflags in CXXFLAGS.
+
 2008-02-04  Darin Adler  <darin@apple.com>
 

trunk/WebKitTools/GNUmakefile.am

@@ -40 +40 @@
 Programs_DumpRenderTree_CXXFLAGS = \
         $(DEPENDENCIES_CFLAGS) \
+        $(global_cxxflags) \
         $(global_cflags)