Date: Fri, 20 Jan 2017 14:19:34 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431959 - in branches/2017Q1/www: webkit-gtk2/files webkit-gtk3/files webkit2-gtk3/files Message-ID: <201701201419.v0KEJYrQ065052@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Jan 20 14:19:34 2017 New Revision: 431959 URL: https://svnweb.freebsd.org/changeset/ports/431959 Log: MFH: r431958 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 Approved by: ports-secteam blanket Added: branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h - copied unchanged from r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h - copied unchanged from r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h - copied unchanged from r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h - copied unchanged from r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h branches/2017Q1/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h - copied unchanged from r431958, head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h (from r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h Fri Jan 20 14:19:34 2017 (r431959, copy of r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) @@ -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 Copied: branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h (from r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h Fri Jan 20 14:19:34 2017 (r431959, copy of r431958, head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h) @@ -0,0 +1,19 @@ +------------------------------------------------------------------------ +r165961 | rgabor@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: + Copied: branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h (from r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h Fri Jan 20 14:19:34 2017 (r431959, copy of r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) @@ -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 Copied: branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h (from r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h Fri Jan 20 14:19:34 2017 (r431959, copy of r431958, head/www/webkit-gtk3/files/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM64.h) @@ -0,0 +1,19 @@ +------------------------------------------------------------------------ +r165961 | rgabor@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: + Copied: branches/2017Q1/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h (from r431958, head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h Fri Jan 20 14:19:34 2017 (r431959, copy of r431958, head/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701201419.v0KEJYrQ065052>