From patchwork Wed Nov 8 01:10:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10047501 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EB8AD6032D for ; Wed, 8 Nov 2017 01:15:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCB732A306 for ; Wed, 8 Nov 2017 01:15:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE9DB2A32A; Wed, 8 Nov 2017 01:15:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 518D52A306 for ; Wed, 8 Nov 2017 01:15:38 +0000 (UTC) Received: from localhost ([::1]:56500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCExt-0008PB-9Y for patchwork-qemu-devel@patchwork.kernel.org; Tue, 07 Nov 2017 20:15:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCExI-0008Oq-V5 for qemu-devel@nongnu.org; Tue, 07 Nov 2017 20:15:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCExD-0004co-WC for qemu-devel@nongnu.org; Tue, 07 Nov 2017 20:15:00 -0500 Received: from mail-by2nam01on0089.outbound.protection.outlook.com ([104.47.34.89]:39809 helo=NAM01-BY2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eCExD-0004cM-IX for qemu-devel@nongnu.org; Tue, 07 Nov 2017 20:14:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=N8Rf7ZSdFxYpXqkLpl1LEbRlpxkuilbGEgMwFHawaLw=; b=wszPWmdETuNJhXDUaAH5Q+zpL/e+amr7uaTU/lRVZrp4m3+jBSmcPqP64WlQh6WLQpdgLbyjn4tix4jac4TeOXl5eBqI1bT+mAsHgRJNJGtsyOVewE8AHXrq0KHxVSS2ALxbIdk+5N+LUSGOTb4O+sdr6OAAx+B8UgOKNL6L5qo= Received: from SN4PR0201CA0063.namprd02.prod.outlook.com (10.171.31.153) by MWHPR02MB3391.namprd02.prod.outlook.com (10.164.192.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 01:14:51 +0000 Received: from CY1NAM02FT048.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::200) by SN4PR0201CA0063.outlook.office365.com (2603:10b6:803:20::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 01:14:51 +0000 Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by CY1NAM02FT048.mail.protection.outlook.com (10.152.74.227) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 01:14:50 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36361 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCEx8-0001Yr-B2; Tue, 07 Nov 2017 17:14:50 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCEx8-0005vu-7i; Tue, 07 Nov 2017 17:14:50 -0800 Received: from xsj-pvapsmtp01 (maildrop.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA81EiXX019934; Tue, 7 Nov 2017 17:14:44 -0800 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCEx2-0005vh-LI; Tue, 07 Nov 2017 17:14:44 -0800 From: Alistair Francis To: , Date: Tue, 7 Nov 2017 17:10:46 -0800 Message-ID: X-Mailer: git-send-email 2.11.0 X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23446.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(346002)(376002)(2980300002)(438002)(189002)(199003)(189998001)(47776003)(50466002)(48376002)(63266004)(2906002)(50986999)(8936002)(110136005)(4326008)(356003)(16586007)(478600001)(50226002)(106466001)(54906003)(39060400002)(81156014)(5003940100001)(316002)(118296001)(33646002)(106002)(36386004)(36756003)(5660300001)(77096006)(9786002)(8676002)(305945005)(81166006)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3391; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT048; 1:Y/YpCkYhIZvFarbC3/MSgPMezpQ88YE+i7YCiZFAO0BBgHUo/4Ap62B4adJcmwLZVbOARxS/HZZVLNDwD4tl6zAien0Zi13qbpdS7KDpvU30HYfJlHPDIr5eEWIiZ+10 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1f08bd0-11d0-445e-1c9d-08d526461c94 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:MWHPR02MB3391; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 3:3Erl7rNKEzl9hN5DbPK0MjZFrKlUi3Ue11syTKaafuTAE0ogk9QO7nhuECrA4vozrh9aFTYFss2eFgcmE+PBFGaO4Xql7mvvKVEAgJNwwUcxRBcqtcueE3FW6LpDbP2pTHKpBTdXX4P0PSMiK/17WDZZ6Xn5ecRMgmIfeyn/PFBPch+sLJeumNQjjGKGqDxCMinwNUTCecwxR/LqgNV5xpp6QoGxmripvjx/P1LlC4m6eQzdG+9j5m0CGUTCXhUkNQrd3bMUGq/YzdkoNCUxZ/j0fLMw2mrM2nYSU0gr1xkxCl6WscSqGlZXJM4KYcTb+vP1iQDGYZFz6hVeVXEvmbnpZUktsuhUGU18sk4dmzE=; 25:C8q4ovMx8KXZp/IOeNJarPdAWL/qeaaMmUzPzJuM6Kr5wxytMBprNQQO2H55AokJipZ+FCOJ67ZozDINSZ2W7bJhRF64dmQ58HzN+70cPCDaIj0YDubNR1gyfyvhr59E0y6lJYhU0wuRIqqp1X6eYBzLRTnojIm7i+3B64hKZCIEFXIcqA3jYyJhTu828gjIKqLOu0n+LHNBNxjF3QliIvuQHuKV4relQEKopRMxNn4zsZICd0UyYnvTUm47CwReBQnlFNWIrJQ/v/qz6+SoY9h6sCgBez9a+0h+TQBZY/1m/vEmCESnXhV6lMXvZG7u0nNt9opQwSUbC/sN6idn2g== X-MS-TrafficTypeDiagnostic: MWHPR02MB3391: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 31:dFBebBvGSSYtoX/SQMark5mHUWRjp60XAIBVkWp6j2zNN/eXpXNH7Lj6L2Pogcut42lAeSYZau3OQP/80OHE/ggWDMfgaXWrqhmAf+OexWb9+BOoBDyEF3FRIWWJzIha1N/9e8Q5MHYsyVa9dkSOrHVrgQvKKHgn9zU35KtPj//oVlkVrajOg0Gs938qmWLeNTFeN6wlyanMF9AgqGG4FMP6kJrsfrNEAFOb8x/H1IU=; 20:KMGybI7G8CgcKH/zEVeyKlrGyGwt49EgcouEe3n3f1fs5tCGgiweQiiCwY1miZhbqfJtSpATDy/5fEQS+fV6jEzxskJmGVDxzdF8uhNtBhZWLW+ZCfdbi8fFFw9s/5Me7Mtz7M5kJSo62uRbx/XYUXJsr1vKreRbR6kFObC8G89RUAHGE7EpAozU4VWKIHpsQOmzYL51ZFZuaTaowzcHUv/RxFLffWEcVt4TO0XjopZo4rjh2k+O5lFxE92XS9zTKzO5WfCTdx/ygHpIwhy5XnJ0hCEYajfS4WiVJTGQh3IeKKbG8E5xXyNtF2o8jF/ymQUpGdt+HIYHDP1/jpD/r5+foydvnYvpril0+m6G68EV7wnQKuHJJQaEzwA0iZxEFZVm8x4JtPH0ZHNXRTukhA6dlUV0Cz/FwSmHB1d6ozpvwgzA9KEJdAiV3/vOJm6/TZ1QsEDi7jc0Uffsyyis9JbBdr5b92MCUkr8oIAqWUFmtIG/s76/EZDk2UMvRcvI X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93004095)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123555025)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR02MB3391; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR02MB3391; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 4:e2DSiEDJDcwUzTPsKkfvI4S/pOHXVYdQzSNsrfq4dcNqniaHOcFHY5iC4rKKXmQxt0iD8riij7V7HeMEyP41VAaB/JLPzlmQ+qEqlqUzWsOMaC+Yu1nS0S72IIAsR4TEzZuQyx0fJHgqQpqXUe0fkjXwh3teq6qvOjCQamRRg+wMJhdIHJM/KRvJyLYp8oNz4kT3SlbaLZGEVhvl2bg5EqKIlkfV/o4Cw73NxcnANTOYDWwEFKjYXLxVD/I88suHHjVlH5HgG/pYqT53e3Yy9EDEq+Ivnl+id0i3gFVn6whlBSS+4rkHkkDehGe9Ks1P X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3391; 23:LWxMAatAusFjBRQectywJ7FRwk1V+sEw6eBzzh/ge?= =?us-ascii?Q?IZYZ73BfY/TDfhmLNPX3LHUWS2kF1UCrTdmVVEo/rdk1IRImbv2j0b79vvKb?= =?us-ascii?Q?OaZ4Ne48Gy8NOr0WD7Q6BJQtZEs4KSW8Y7tf+ASp7tw4Fn7+bKoeyt9U7ZB3?= =?us-ascii?Q?OP6fPARFvxhHf/dK9UnQS9UCmixbLqZnMn7Qr+TDDSznuMU4KWkPQwmXgjar?= =?us-ascii?Q?UeP9ddsw1Q3knS6PByOj0LCTC2zZPhuOeLeZaVRn0zPvMQIlZirMbQQu9M0f?= =?us-ascii?Q?S3ae+AnoGJ8GhqWDx1HOTwpWeQewW96Kslf5Vz/VZ3PPZ6uq+4Bn9Tc2xP6h?= =?us-ascii?Q?UAvHjFExd5tGQeYdjJvRe2qZR124b+H8CGU2CJKFfUWCz124gNdIu5/eUwKi?= =?us-ascii?Q?rDoelXa3ZVr9IoBCkPFZDqwiIvXz2iPKnmOXJ9BeKwiaSjGM7j2J4df3D23d?= =?us-ascii?Q?TugKDvJxcb9iIf5j+tjBh85TlU1wRaX4IUbQhamvYRzZXAPA31sK0rB5/iEw?= =?us-ascii?Q?0ZXlU+j71syQ1g+QIUMKl6xBYR7DdhtECgYUhScL4KfhtQzTnT6LxyFSEIeS?= =?us-ascii?Q?6xtrBJXnQtQqgvDMeDvgbGqqe3Amni/7MoKDoIMLDszljb4go5DfwPDkKuQo?= =?us-ascii?Q?6Yz3ASm4GEJe0FbvqBOFjTNkRwBONQnwOeOtyJn7T5Ixzsb/peW9NR5VgoNb?= =?us-ascii?Q?hm3vbcS9spxkfoDciadpyjw4wI54gN3Hg1EBIt74q6MAsQYYSYEwIhOtOr5y?= =?us-ascii?Q?yhONa8nSfh5qpuSmc5wgEysHPrUr+FQa0lL9WN94zUIcPDzgElViNP5NdcP/?= =?us-ascii?Q?9y2WIPpR2IPTWyAQd1LblZIjKH9oVa98nu81M1NGTwKhdPSoE81R6nIYSTt6?= =?us-ascii?Q?p1bbnuSFaEP/HPQGFwaVDkzNOZJcBf9V/7EHrd4pR+we67SG4SsFRKTeN1Kd?= =?us-ascii?Q?+aPJ9Vekk11z9rgqPb6f6anOaqHifuKKui7XJEl0w+lwuJwKW1Zu5POz889I?= =?us-ascii?Q?mb2XSdvUqMd+SbCEGAlEzRf?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 6:+FGzAmeN6AiD24jn5nQVh3qcsa8rd2KJqpXlP+ufGw0PCz08VENmQbI2EtaZFHeg4iBrJX7xxBWgznT6urL3pjQTtIzzxeEliQfj2uxCFubkocZtEgUoVpnaFRVmxIUmCcXhPDIKLy8QazvOMEv4k7/TwNBvUp1oswMvEFpajejQ5rYmplFci4EQOXqGgao6g1Saga1IsB+LCeLfjUvpxvevKq1q1tNbifgWMh2n5jtTZUDhXXhYCWwx209oakn6q9JfCpxdktvV+AE8PAADBZRXeJpiIB7Fsp1dUazt1Ukeo3fcVdEZdRsf2p/q8omsL10FX3CklV4u1SRN+tsFijLoYBKn5j+541UD5pDh/fg=; 5:FssWhbm1aicntkWHgBWiLsNw4qJ7Xn21wxwIoVUbpLULJzo2cGey/hKn5G4UGH8eBndZt++mbOF6hTBeHetnSGtWt6VjhpRLp4MFAtWS1FnA9U8MMFWbz9BJcSRemmiE6eR/dy3UcMHZWA+TmgBWVUFPTVrbvVUWL7dV2LH+r7g=; 24:yQhgFWXsIDAHcKhjbb69If6qkZUiQu9snx/FKkROwakS/F10kqJCxLUgS/iJqHP+yOAWkEVs43auMsVWs6SQdNcEzuiJycNS0bUWwwc0QEA=; 7:nQRWHiHr3lJp+1yUmpWD4w8PRiRDohVProR+XefElrIb/F6Kv+OkE4P0sfKmDJq7dBxEsaBaOhi4MlOZKarzkaQ03b2vO0JWq16C5iFeW4uZphxhKDaLduuadQTS/iDRQAQummrdU2OwlQ11SP46rSJVre5UNzIAnECjxP6JB8NVY2tJtp/31Pkikfc2zIdeYiv4q+vC50sgtRX7rkzYlMPnT94a30Fzo/SrRPt7dLXY7XZDLq2XqYQUPhxanDPv SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 01:14:50.9015 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e1f08bd0-11d0-445e-1c9d-08d526461c94 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR02MB3391 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.89 Subject: [Qemu-devel] [PATCH v1 1/1] Makefile: Capstone: Add support for cross compile ranlib X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, kraxel@redhat.com, dgilbert@redhat.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP When cross compiling QEMU for Windows we need to specify the cross version of ranlib to avoid build errors when buildling capstone. This patch ensures we use the same cross prefix on ranlib as other toolchain components. Signed-off-by: Alistair Francis Suggested-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrange --- Makefile | 2 +- configure | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0496c5057a..814f6820d9 100644 --- a/Makefile +++ b/Makefile @@ -405,7 +405,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_POWERPC CAP_CFLAGS += -DCAPSTONE_HAS_X86 subdir-capstone: .git-submodule-status - $(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone CAPSTONE_SHARED=no BUILDDIR="$(BUILD_DIR)/capstone" CC="$(CC)" AR="$(AR)" LD="$(LD)" CFLAGS="$(CAP_CFLAGS)" $(SUBDIR_MAKEFLAGS) $(BUILD_DIR)/capstone/$(LIBCAPSTONE)) + $(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone CAPSTONE_SHARED=no BUILDDIR="$(BUILD_DIR)/capstone" CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" CFLAGS="$(CAP_CFLAGS)" $(SUBDIR_MAKEFLAGS) $(BUILD_DIR)/capstone/$(LIBCAPSTONE)) $(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(chardev-obj-y) \ $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) diff --git a/configure b/configure index a6055c0710..0e856bbc04 100755 --- a/configure +++ b/configure @@ -482,6 +482,7 @@ ccas="${CCAS-$cc}" cpp="${CPP-$cc -E}" objcopy="${OBJCOPY-${cross_prefix}objcopy}" ld="${LD-${cross_prefix}ld}" +ranlib="${RANLIB-${cross_prefix}ranlib}" nm="${NM-${cross_prefix}nm}" strip="${STRIP-${cross_prefix}strip}" windres="${WINDRES-${cross_prefix}windres}" @@ -6288,6 +6289,7 @@ echo "CCAS=$ccas" >> $config_host_mak echo "CPP=$cpp" >> $config_host_mak echo "OBJCOPY=$objcopy" >> $config_host_mak echo "LD=$ld" >> $config_host_mak +echo "RANLIB=$ranlib" >> $config_host_mak echo "NM=$nm" >> $config_host_mak echo "WINDRES=$windres" >> $config_host_mak echo "CFLAGS=$CFLAGS" >> $config_host_mak @@ -6782,6 +6784,7 @@ for rom in seabios vgabios ; do echo "OBJCOPY=objcopy" >> $config_mak echo "IASL=$iasl" >> $config_mak echo "LD=$ld" >> $config_mak + echo "RANLIB=$ranlib" >> $config_mak done # set up tests data directory