From owner-svn-ports-head@freebsd.org Fri Jul 7 09:10:13 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E23A6D9E63A; Fri, 7 Jul 2017 09:10:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB9997273D; Fri, 7 Jul 2017 09:10:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v679ACJm007898; Fri, 7 Jul 2017 09:10:12 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v679ACXC007896; Fri, 7 Jul 2017 09:10:12 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201707070910.v679ACXC007896@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 7 Jul 2017 09:10:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445225 - head/www/qt4-webkit/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/www/qt4-webkit/files X-SVN-Commit-Revision: 445225 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Jul 2017 09:10:14 -0000 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(ptr); +#else u.asBits.payload = reinterpret_cast(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(const_cast(ptr)); +#else u.asBits.payload = reinterpret_cast(const_cast(ptr));