From owner-svn-ports-head@FreeBSD.ORG  Sat Feb 21 20:16:22 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4E0531DA;
 Sat, 21 Feb 2015 20:16:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 3869114E;
 Sat, 21 Feb 2015 20:16:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1LKGMDv047140;
 Sat, 21 Feb 2015 20:16:22 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1LKGMvF047139;
 Sat, 21 Feb 2015 20:16:22 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201502212016.t1LKGMvF047139@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sat, 21 Feb 2015 20:16:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r379547 - head/www/webkit-qt5/files
X-SVN-Group: ports-head
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Feb 2015 20:16:22 -0000

Author: rakuco
Date: Sat Feb 21 20:16:21 2015
New Revision: 379547
URL: https://svnweb.freebsd.org/changeset/ports/379547
QAT: https://qat.redports.org/buildarchive/r379547/

Log:
  Fix `make patch' after r379541.
  
  The new patch just didn't apply, and apparently nobody tested it before
  committing...
  
  PR:		197483

Modified:
  head/www/webkit-qt5/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h

Modified: head/www/webkit-qt5/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
==============================================================================
--- head/www/webkit-qt5/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h	Sat Feb 21 20:15:11 2015	(r379546)
+++ head/www/webkit-qt5/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h	Sat Feb 21 20:16:21 2015	(r379547)
@@ -1,11 +1,11 @@
---- Source/JavaScriptCore/assembler/ARMAssembler.h.orig	2015-01-19 21:25:28.000000000 +0000
-+++ Source/JavaScriptCore/assembler/ARMAssembler.h	2015-01-19 21:25:57.000000000 +0000
-@@ -1121,6 +1121,8 @@ namespace JSC {
+--- Source/JavaScriptCore/assembler/ARMAssembler.h
++++ Source/JavaScriptCore/assembler/ARMAssembler.h
+@@ -1064,6 +1064,8 @@
              linuxPageFlush(current, end);
  #elif OS(WINCE)
              CacheRangeFlush(code, size, CACHE_SYNC_ALL);
 +#elif CPU(ARM_TRADITIONAL) && OS(FREEBSD) && COMPILER(CLANG)
-+	__clear_cache(code, reinterpret_cast<char*>(code) + size);
- #else
- #error "The cacheFlush support is missing on this platform."
- #endif
++            __clear_cache(code, reinterpret_cast<char*>(code) + size);
+ #elif OS(QNX) && ENABLE(ASSEMBLER_WX_EXCLUSIVE)
+             UNUSED_PARAM(code);
+             UNUSED_PARAM(size);