Title: [288329] releases/WebKitGTK/webkit-2.34/Source/_javascript_Core
Revision
288329
Author
[email protected]
Date
2022-01-20 15:41:46 -0800 (Thu, 20 Jan 2022)

Log Message

Merge r288305 - [JSC] Add section directive in MacroAssemblerX86Common asm blocks
https://bugs.webkit.org/show_bug.cgi?id=235406

Patch by Joseph Griego <[email protected]> on 2022-01-20
Reviewed by Yusuke Suzuki.

These asm blocks aren't in a function body so they need a .text
directive to prevent them from being included in some arbitrary section
(say, an inline function's section) by happenstance, which was happening
in the WPE build without UnifiedSources.

* assembler/MacroAssemblerX86Common.cpp:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.34/Source/_javascript_Core/ChangeLog (288328 => 288329)


--- releases/WebKitGTK/webkit-2.34/Source/_javascript_Core/ChangeLog	2022-01-20 23:41:41 UTC (rev 288328)
+++ releases/WebKitGTK/webkit-2.34/Source/_javascript_Core/ChangeLog	2022-01-20 23:41:46 UTC (rev 288329)
@@ -1,3 +1,17 @@
+2022-01-20  Joseph Griego  <[email protected]>
+
+        [JSC] Add section directive in MacroAssemblerX86Common asm blocks
+        https://bugs.webkit.org/show_bug.cgi?id=235406
+
+        Reviewed by Yusuke Suzuki.
+
+        These asm blocks aren't in a function body so they need a .text
+        directive to prevent them from being included in some arbitrary section
+        (say, an inline function's section) by happenstance, which was happening
+        in the WPE build without UnifiedSources.
+
+        * assembler/MacroAssemblerX86Common.cpp:
+
 2022-01-20  Pablo Saavedra  <[email protected]>
 
         Non-unified build fails due to forward declaration in _javascript_Core/jit/JITStubRoutine.h

Modified: releases/WebKitGTK/webkit-2.34/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp (288328 => 288329)


--- releases/WebKitGTK/webkit-2.34/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp	2022-01-20 23:41:41 UTC (rev 288328)
+++ releases/WebKitGTK/webkit-2.34/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp	2022-01-20 23:41:46 UTC (rev 288329)
@@ -176,6 +176,7 @@
 #if CPU(X86)
 #if COMPILER(GCC_COMPATIBLE)
 asm (
+    ".text" "\n"
     ".globl " SYMBOL_STRING(ctiMasmProbeTrampoline) "\n"
     HIDE_SYMBOL(ctiMasmProbeTrampoline) "\n"
     SYMBOL_STRING(ctiMasmProbeTrampoline) ":" "\n"
@@ -516,6 +517,7 @@
 #if CPU(X86_64)
 #if COMPILER(GCC_COMPATIBLE)
 asm (
+    ".text" "\n"
     ".globl " SYMBOL_STRING(ctiMasmProbeTrampoline) "\n"
     HIDE_SYMBOL(ctiMasmProbeTrampoline) "\n"
     SYMBOL_STRING(ctiMasmProbeTrampoline) ":" "\n"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to