From owner-svn-ports-all@freebsd.org Thu May 31 02:53:37 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19E11EFA79B; Thu, 31 May 2018 02:53:37 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C31F86A4EE; Thu, 31 May 2018 02:53:36 +0000 (UTC) (envelope-from jbeich@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A428B14361; Thu, 31 May 2018 02:53:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4V2raqI073000; Thu, 31 May 2018 02:53:36 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4V2raj7072998; Thu, 31 May 2018 02:53:36 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805310253.w4V2raj7072998@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 31 May 2018 02:53:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471192 - head/emulators/citra/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/emulators/citra/files X-SVN-Commit-Revision: 471192 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 May 2018 02:53:37 -0000 Author: jbeich Date: Thu May 31 02:53:36 2018 New Revision: 471192 URL: https://svnweb.freebsd.org/changeset/ports/471192 Log: emulators/citra: unbreak on i386 with clang 5+ externals/cryptopp/cryptopp/sha.cpp:1005:5: error: invalid operand for instruction ASJ( jnz, 0, b) ^ externals/cryptopp/cryptopp/cpu.h:623:23: note: expanded from macro 'ASJ' #define ASJ(x, y, z) GNU_ASJ(x, y, z) ^ externals/cryptopp/cryptopp/cpu.h:617:27: note: expanded from macro 'GNU_ASJ' #define GNU_ASJ(x, y, z) #x " " #y #z ";" NEW_LINE ^ :34:2: note: expanded from here "jnz" ^ :80:1: note: instantiated into assembly here jnz 0b; ^ Reported by: pkg-fallout Obtained from: upstream (cryptopp 7.1.0) Added: head/emulators/citra/files/patch-externals_cryptopp_cryptopp_cpu.h (contents, props changed) Added: head/emulators/citra/files/patch-externals_cryptopp_cryptopp_cpu.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/citra/files/patch-externals_cryptopp_cryptopp_cpu.h Thu May 31 02:53:36 2018 (r471192) @@ -0,0 +1,17 @@ +https://github.com/citra-emu/citra/issues/3796 + +--- externals/cryptopp/cryptopp/cpu.h.orig 2018-02-22 14:26:16 UTC ++++ externals/cryptopp/cryptopp/cpu.h +@@ -614,7 +614,12 @@ inline int GetCacheLineSize() + #define GNU_AS2(x, y) #x ", " #y ";" NEW_LINE + #define GNU_AS3(x, y, z) #x ", " #y ", " #z ";" NEW_LINE + #define GNU_ASL(x) "\n" #x ":" NEW_LINE ++// clang 5.0.0 and apple clang 9.0.0 don't support numerical backward jumps ++#if (CRYPTOPP_LLVM_CLANG_VERSION >= 50000) || (CRYPTOPP_APPLE_CLANG_VERSION >= 90000) ++ #define GNU_ASJ(x, y, z) ATT_PREFIX ";" NEW_LINE #x " " #y #z ";" NEW_LINE INTEL_PREFIX ";" NEW_LINE ++#else + #define GNU_ASJ(x, y, z) #x " " #y #z ";" NEW_LINE ++#endif + #define AS1(x) GNU_AS1(x) + #define AS2(x, y) GNU_AS2(x, y) + #define AS3(x, y, z) GNU_AS3(x, y, z)