svn commit: r431958 - in head/www: webkit-gtk2/files webkit-gtk3/files webkit2-gtk3/files

[Jan Beich]

Author: jbeich
Date: Fri Jan 20 14:15:50 2017
New Revision: 431958
URL: https://svnweb.freebsd.org/changeset/ports/431958

Log:
  www/webkit2-gtk3: attempt to unbreak on aarch64
  
  ./Source/JavaScriptCore/assembler/ARM64Assembler.h:2760:2: error: "The cacheFlush support is missing on this platform."
   #error "The cacheFlush support is missing on this platform."
    ^
  
  ./Source/JavaScriptCore/assembler/MacroAssemblerARM64.h:133:17: error: class member cannot be redeclared
      static bool shouldBlindForSpecificArch(uintptr_t value) { return value >= 0x00ffffff; }
                  ^
  ./Source/JavaScriptCore/assembler/MacroAssemblerARM64.h:132:17: note: previous declaration is here
      static bool shouldBlindForSpecificArch(uint64_t value) { return value >= 0x00ffffff; }
                  ^
  
  Reported by:	pkg-fallout

Added:
  head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h   (contents, props changed)
  head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h   (contents, props changed)
  head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h   (contents, props changed)
  head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h   (contents, props changed)
  head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h   (contents, props changed)

Added: head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h	Fri Jan 20 14:15:50 2017	(r431958)
@@ -0,0 +1,11 @@
+--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig	2016-04-10 06:48:36 UTC
++++ Source/JavaScriptCore/assembler/ARM64Assembler.h
+@@ -2756,6 +2756,8 @@ public:
+     {
+ #if OS(IOS)
+         sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
++#elif OS(FREEBSD) || OS(NETBSD)
++        __clear_cache(code, reinterpret_cast<char*>(code) + size);
+ #else
+ #error "The cacheFlush support is missing on this platform."
+ #endif

Added: head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h	Fri Jan 20 14:15:50 2017	(r431958)
@@ -0,0 +1,19 @@
+------------------------------------------------------------------------
+r165961 | rgabor at webkit.org | 2014-03-20 18:03:43 +0400 (Thu, 20 Mar 2014) | 15 lines
+
+[...]
+https://bugs.webkit.org/show_bug.cgi?id=130502
+[...]
+Delete shouldBlindForSpecificArch(uintptr_t) because on ARM64 uint64_t
+and uintptr_t is the same with GCC and Clang as well.
+
+--- Source/JavaScriptCore/assembler/MacroAssemblerARM64.h.orig	2016-04-10 06:48:36 UTC
++++ Source/JavaScriptCore/assembler/MacroAssemblerARM64.h
+@@ -130,7 +130,6 @@ public:
+     // FIXME: Get reasonable implementations for these
+     static bool shouldBlindForSpecificArch(uint32_t value) { return value >= 0x00ffffff; }
+     static bool shouldBlindForSpecificArch(uint64_t value) { return value >= 0x00ffffff; }
+-    static bool shouldBlindForSpecificArch(uintptr_t value) { return value >= 0x00ffffff; }
+ 
+     // Integer operations:
+ 

Added: head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h	Fri Jan 20 14:15:50 2017	(r431958)
@@ -0,0 +1,11 @@
+--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig	2016-04-10 06:48:36 UTC
++++ Source/JavaScriptCore/assembler/ARM64Assembler.h
+@@ -2756,6 +2756,8 @@ public:
+     {
+ #if OS(IOS)
+         sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
++#elif OS(FREEBSD) || OS(NETBSD)
++        __clear_cache(code, reinterpret_cast<char*>(code) + size);
+ #else
+ #error "The cacheFlush support is missing on this platform."
+ #endif

Added: head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h	Fri Jan 20 14:15:50 2017	(r431958)
@@ -0,0 +1,19 @@
+------------------------------------------------------------------------
+r165961 | rgabor at webkit.org | 2014-03-20 18:03:43 +0400 (Thu, 20 Mar 2014) | 15 lines
+
+[...]
+https://bugs.webkit.org/show_bug.cgi?id=130502
+[...]
+Delete shouldBlindForSpecificArch(uintptr_t) because on ARM64 uint64_t
+and uintptr_t is the same with GCC and Clang as well.
+
+--- Source/JavaScriptCore/assembler/MacroAssemblerARM64.h.orig	2016-04-10 06:48:36 UTC
++++ Source/JavaScriptCore/assembler/MacroAssemblerARM64.h
+@@ -130,7 +130,6 @@ public:
+     // FIXME: Get reasonable implementations for these
+     static bool shouldBlindForSpecificArch(uint32_t value) { return value >= 0x00ffffff; }
+     static bool shouldBlindForSpecificArch(uint64_t value) { return value >= 0x00ffffff; }
+-    static bool shouldBlindForSpecificArch(uintptr_t value) { return value >= 0x00ffffff; }
+ 
+     // Integer operations:
+ 

Added: head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h	Fri Jan 20 14:15:50 2017	(r431958)
@@ -0,0 +1,11 @@
+--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig	2015-08-06 08:21:27 UTC
++++ Source/JavaScriptCore/assembler/ARM64Assembler.h
+@@ -2862,6 +2862,8 @@ public:
+     {
+ #if OS(IOS)
+         sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
++#elif OS(FREEBSD) || OS(NETBSD)
++        __clear_cache(code, reinterpret_cast<char*>(code) + size);
+ #elif OS(LINUX)
+         size_t page = pageSize();
+         uintptr_t current = reinterpret_cast<uintptr_t>(code);