Attachment 183979 Details for Bug 220396 – use aarch64

[patch] use aarch64

qt4-webkit-aarch64.v1.diff (text/plain), 3.12 KB, created by Tobias C. Berner on 2017-07-01 07:57:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias C. Berner

Created: 2017-07-01 07:57:27 UTC

Size: 3.12 KB

patch

obsolete

>Index: www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSGlobalData.cpp
>===================================================================
>--- www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSGlobalData.cpp	(nonexistent)
>+++ www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSGlobalData.cpp	(working copy)
>@@ -0,0 +1,14 @@
>+--- src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSGlobalData.cpp.orig	2017-07-01 07:49:26 UTC
>++++ src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSGlobalData.cpp
>+@@ -121,7 +121,11 @@ void JSGlobalData::storeVPtrs()
>+ {
>+     // Enough storage to fit a JSArray, JSByteArray, JSString, or JSFunction.
>+     // COMPILE_ASSERTS below check that this is true.
>++#if defined(__aarch64__)
>++    char storage[128];
>++#else
>+     char storage[64];
>++#endif
>+ 
>+     COMPILE_ASSERT(sizeof(JSArray) <= sizeof(storage), sizeof_JSArray_must_be_less_than_storage);
>+     JSCell* jsArray = new (storage) JSArray(JSArray::VPtrStealingHack);
>
>Property changes on: www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSGlobalData.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h
>===================================================================
>--- www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h	(revision 444811)
>+++ www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h	(working copy)
>@@ -1,10 +1,10 @@
>---- ./src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValueInlineMethods.h.orig	2011-12-08 06:06:02.000000000 +0100
>-+++ ./src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValueInlineMethods.h	2012-01-08 17:18:52.511348683 +0100
>-@@ -227,7 +227,11 @@
>+--- src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValueInlineMethods.h.orig	2015-05-07 14:14:45 UTC
>++++ src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSValueInlineMethods.h
>+@@ -227,7 +227,11 @@ namespace JSC {
>              u.asBits.tag = CellTag;
>          else
>              u.asBits.tag = EmptyValueTag;
>-+#if defined(__sparc64__)
>++#if defined(__sparc64__) || defined(__aarch64__)
> +        u.asBits.payload = reinterpret_cast<int64_t>(ptr);
> +#else
>          u.asBits.payload = reinterpret_cast<int32_t>(ptr);
>@@ -12,11 +12,11 @@
>  #if ENABLE(JSC_ZOMBIES)
>          ASSERT(!isZombie());
>  #endif
>-@@ -239,7 +243,11 @@
>+@@ -239,7 +243,11 @@ namespace JSC {
>              u.asBits.tag = CellTag;
>          else
>              u.asBits.tag = EmptyValueTag;
>-+#if defined(__sparc64__)
>++#if defined(__sparc64__) || defined(__aarch64__)
> +        u.asBits.payload = reinterpret_cast<int64_t>(const_cast<JSCell*>(ptr));
> +#else
>          u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));

Actions: View | Diff

Attachments on bug 220396: 183964 | 183965 | 183979