Changeset 106650 in webkit

Timestamp:

Feb 3, 2012 4:51:42 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Replace GNU linker script for exports with export macros in WTF/JSC
​https://bugs.webkit.org/show_bug.cgi?id=77723

Patch by Simon Hausmann <​simon.hausmann@nokia.com> on 2012-02-03
Reviewed by Tor Arne Vestbø.

.:

• Source/api.pri: Remove use of GNU linker script on Linux.
• Source/qtwebkit-export.map: Removed.

Source/JavaScriptCore:

• wtf/Platform.h: Enable use of export macros.

Tools:

• Tools.pro: Compile WTR again on all platforms with WK2.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/wtf/Platform.h (modified) (1 diff)
• Source/api.pri (modified) (1 diff)
• Source/qtwebkit-export.map (deleted)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Tools.pro (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2012-02-03  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Replace GNU linker script for exports with export macros in WTF/JSC
+        https://bugs.webkit.org/show_bug.cgi?id=77723
+
+        Reviewed by Tor Arne Vestbø.
+
+        * Source/api.pri: Remove use of GNU linker script on Linux.
+        * Source/qtwebkit-export.map: Removed.
+
 2012-02-03  Shinya Kawanaka  <shinyak@google.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-02-03  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Replace GNU linker script for exports with export macros in WTF/JSC
+        https://bugs.webkit.org/show_bug.cgi?id=77723
+
+        Reviewed by Tor Arne Vestbø.
+
+        * wtf/Platform.h: Enable use of export macros.
+
 2012-02-02  Hajime Morrita  <morrita@chromium.org>
 

trunk/Source/JavaScriptCore/wtf/Platform.h

@@ -1114 +1114 @@
    to WTF causes many ports to break, and so this way we can address the build
    breakages one port at a time. */
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(QT)
 #define WTF_USE_EXPORT_MACROS 1
 #else

trunk/Source/api.pri

@@ -222 +222 @@
 plugin_backend_xlib: PKGCONFIG += x11
 
-linux-g++*: {
-    PRE_TARGETDEPS += $$PWD/qtwebkit-export.map
-    QMAKE_LFLAGS += -Wl,--version-script=$$PWD/qtwebkit-export.map
-}

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-03  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Replace GNU linker script for exports with export macros in WTF/JSC
+        https://bugs.webkit.org/show_bug.cgi?id=77723
+
+        Reviewed by Tor Arne Vestbø.
+
+        * Tools.pro: Compile WTR again on all platforms with WK2.
+
 2012-02-03  Sriram Neelakandan  <sriram.neelakandan@gmail.com>
 

trunk/Tools/Tools.pro

@@ -15 +15 @@
 
 !no_webkit2 {
-    SUBDIRS += MiniBrowser/qt/MiniBrowser.pro
-    linux-g++*: SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
+    SUBDIRS += MiniBrowser/qt/MiniBrowser.pro \
+               WebKitTestRunner/WebKitTestRunner.pro
 }