From owner-svn-ports-all@freebsd.org Sat Oct 24 18:01:12 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 80FB5450511; Sat, 24 Oct 2020 18:01:12 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CJTRr2st7z3dMp; Sat, 24 Oct 2020 18:01:12 +0000 (UTC) (envelope-from pkubaj@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 44E121CA80; Sat, 24 Oct 2020 18:01:12 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09OI1CaS057578; Sat, 24 Oct 2020 18:01:12 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09OI1Cfv057577; Sat, 24 Oct 2020 18:01:12 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202010241801.09OI1Cfv057577@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sat, 24 Oct 2020 18:01:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553210 - head/emulators/unicorn/files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/emulators/unicorn/files X-SVN-Commit-Revision: 553210 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.33 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: Sat, 24 Oct 2020 18:01:12 -0000 Author: pkubaj Date: Sat Oct 24 18:01:11 2020 New Revision: 553210 URL: https://svnweb.freebsd.org/changeset/ports/553210 Log: emulators/unicorn: fix build on powerpc64 elfv2 and powerpc64le As with other ports, conflicting symbols first need to be undefined before including altivec.h. Added: head/emulators/unicorn/files/patch-qemu_include_qemu-common.h (contents, props changed) Added: head/emulators/unicorn/files/patch-qemu_include_qemu-common.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/unicorn/files/patch-qemu_include_qemu-common.h Sat Oct 24 18:01:11 2020 (r553210) @@ -0,0 +1,18 @@ +--- qemu/include/qemu-common.h.orig 2020-10-24 17:16:21 UTC ++++ qemu/include/qemu-common.h +@@ -205,7 +205,6 @@ static inline uint64_t muldiv64(uint64_t a, uint32_t b + + /* vector definitions */ + #ifdef __ALTIVEC__ +-#include + /* The altivec.h header says we're allowed to undef these for + * C++ compatibility. Here we don't care about C++, but we + * undef them anyway to avoid namespace pollution. +@@ -213,6 +212,7 @@ static inline uint64_t muldiv64(uint64_t a, uint32_t b + #undef vector + #undef pixel + #undef bool ++#include + #define VECTYPE __vector unsigned char + #define SPLAT(p) vec_splat(vec_ld(0, p), 0) + #define ALL_EQ(v1, v2) vec_all_eq(v1, v2)