Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 7 Jul 2017 09:10:12 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r445225 - head/www/qt4-webkit/files
Message-ID:  <201707070910.v679ACXC007896@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tcberner
Date: Fri Jul  7 09:10:12 2017
New Revision: 445225
URL: https://svnweb.freebsd.org/changeset/ports/445225

Log:
  www/qt4-webkit: unbreak build on aarch64
  
  PR:		220396
  Submitted by:	phk (original version)

Added:
  head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSGlobalData.cpp   (contents, props changed)
Modified:
  head/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h

Added: head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSGlobalData.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/qt4-webkit/files/patch-src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSGlobalData.cpp	Fri Jul  7 09:10:12 2017	(r445225)
@@ -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);

Modified: head/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h
==============================================================================
--- head/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h	Fri Jul  7 09:00:19 2017	(r445224)
+++ head/www/qt4-webkit/files/patch-src__3rdparty__webkit__Source__JavaScriptCore__runtime__JSValueInlineMethods.h	Fri Jul  7 09:10:12 2017	(r445225)
@@ -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));

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707070910.v679ACXC007896>