[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit bbe606b0b2b83d3ec8cdb0d9be60684a258a46d2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 21:46:14 2011 +0000

    2011-01-18  Dimitry Andric  <dim at freebsd.org>
    
            Reviewed by Andreas Kling.
    
            Fix linking JavaScriptCore on FreeBSD/amd64
            https://bugs.webkit.org/show_bug.cgi?id=52591
    
            Linking of JavaScriptCore on FreeBSD/amd64 fails, for the same reason as
            in bug 28422: cti_vm_throw needs a "@plt" suffix, otherwise the linker
            complains about the relocation type.
    
            * jit/JITStubs.cpp: use @plt suffix on x86_64 platforms, for both Linux
            and FreeBSD.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 30d9333..56715e1 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-18  Dimitry Andric  <dim at freebsd.org>
+
+        Reviewed by Andreas Kling.
+
+        Fix linking JavaScriptCore on FreeBSD/amd64
+        https://bugs.webkit.org/show_bug.cgi?id=52591
+
+        Linking of JavaScriptCore on FreeBSD/amd64 fails, for the same reason as
+        in bug 28422: cti_vm_throw needs a "@plt" suffix, otherwise the linker
+        complains about the relocation type.
+
+        * jit/JITStubs.cpp: use @plt suffix on x86_64 platforms, for both Linux
+        and FreeBSD.
+
 2011-01-18  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Antti Koivisto.
diff --git a/Source/JavaScriptCore/jit/JITStubs.cpp b/Source/JavaScriptCore/jit/JITStubs.cpp
index ded3428..57d17ac 100644
--- a/Source/JavaScriptCore/jit/JITStubs.cpp
+++ b/Source/JavaScriptCore/jit/JITStubs.cpp
@@ -79,7 +79,7 @@ namespace JSC {
 #define THUMB_FUNC_PARAM(name)
 #endif
 
-#if OS(LINUX) && CPU(X86_64)
+#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
 #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
 #elif OS(DARWIN)
 #define SYMBOL_STRING_RELOCATION(name) "_" #name

-- 
WebKit Debian packaging