From patchwork Mon Feb 7 06:05:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 82176 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 767B7B70CD for ; Tue, 8 Feb 2011 09:25:42 +1100 (EST) Received: from localhost ([127.0.0.1]:39863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmKPd-0006bj-24 for incoming@patchwork.ozlabs.org; Mon, 07 Feb 2011 01:17:25 -0500 Received: from [140.186.70.92] (port=34871 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmKEs-0002qh-CM for qemu-devel@nongnu.org; Mon, 07 Feb 2011 01:06:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PmKEq-0001WY-S6 for qemu-devel@nongnu.org; Mon, 07 Feb 2011 01:06:17 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:48150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PmKEq-0001WH-GZ for qemu-devel@nongnu.org; Mon, 07 Feb 2011 01:06:16 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 798D11B4135; Mon, 7 Feb 2011 06:05:55 +0000 (UTC) From: Mike Frysinger To: qemu-devel@nongnu.org, Riku Voipio Date: Mon, 7 Feb 2011 01:05:57 -0500 Message-Id: <1297058757-7611-9-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1297058757-7611-1-git-send-email-vapier@gentoo.org> References: <1297058757-7611-1-git-send-email-vapier@gentoo.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.211.166.183 Cc: Subject: [Qemu-devel] [PATCH 9/9] linux-user: fix build errors for mmap2-only ports X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The current print_mmap func is only enabled when the target supports the mmap syscall, but both mmap and mmap2 syscalls use it. This leads to a build failure when the target supports mmap2 but not mmap. Signed-off-by: Mike Frysinger --- linux-user/strace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index a8786bb..1836666 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -1203,7 +1203,7 @@ print_utimensat(const struct syscallname *name, } #endif -#ifdef TARGET_NR_mmap +#if defined(TARGET_NR_mmap) || defined(TARGET_NR_mmap2) static void print_mmap(const struct syscallname *name, abi_long arg0, abi_long arg1, abi_long arg2,