From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:52730)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1RNiWe-00030m-Sc
	for qemu-devel@nongnu.org; Tue, 08 Nov 2011 05:03:32 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1RNiWa-0003MZ-Pk
	for qemu-devel@nongnu.org; Tue, 08 Nov 2011 05:03:28 -0500
Received: from cantor2.suse.de ([195.135.220.15]:45744 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1RNiWa-0003MM-Ki
	for qemu-devel@nongnu.org; Tue, 08 Nov 2011 05:03:24 -0500
Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx2.suse.de (Postfix) with ESMTP id 54DC98980B
	for <qemu-devel@nongnu.org>; Tue,  8 Nov 2011 11:03:23 +0100 (CET)
Message-ID: <4EB8FE65.8020503@suse.de>
Date: Tue, 08 Nov 2011 11:03:17 +0100
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: [Qemu-devel] [TestDay] s390x build broken
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel Developers <qemu-devel@nongnu.org>
Cc: Alexander Graf <agraf@suse.de>

Hi everyone,

Got this with v1.0-rc1 tarball:

  CC    i386-softmmu/tcg/tcg.o
In file included from /suse/afaerber/QEMU/qemu-1.0rc1/tcg/tcg.c:176:
/suse/afaerber/QEMU/qemu-1.0rc1/tcg/s390/tcg-target.c:677: error:
conflicting types for =E2=80=98tcg_out_mov=E2=80=99
/suse/afaerber/QEMU/qemu-1.0rc1/tcg/tcg.c:76: error: previous
declaration of =E2=80=98tcg_out_mov=E2=80=99 was here
/suse/afaerber/QEMU/qemu-1.0rc1/tcg/s390/tcg-target.c:689: error:
conflicting types for =E2=80=98tcg_out_movi=E2=80=99
/suse/afaerber/QEMU/qemu-1.0rc1/tcg/tcg.c:77: error: previous
declaration of =E2=80=98tcg_out_movi=E2=80=99 was here
/suse/afaerber/QEMU/qemu-1.0rc1/tcg/s390/tcg-target.c:829: error:
conflicting types for =E2=80=98tcg_out_ld=E2=80=99
/suse/afaerber/QEMU/qemu-1.0rc1/tcg/tcg.c:74: error: previous
declaration of =E2=80=98tcg_out_ld=E2=80=99 was here
/suse/afaerber/QEMU/qemu-1.0rc1/tcg/s390/tcg-target.c:839: error:
conflicting types for =E2=80=98tcg_out_st=E2=80=99
/suse/afaerber/QEMU/qemu-1.0rc1/tcg/tcg.c:81: error: previous
declaration of =E2=80=98tcg_out_st=E2=80=99 was here
make[1]: *** [tcg/tcg.o] Fehler 1
make: *** [subdir-i386-softmmu] Fehler 2

The difference is TCGReg vs. int.

tcg/tcg.c:
static void tcg_out_mov(TCGContext *s, TCGType type, int ret, int arg);

tcg/s390/tcg-target.c:
static void tcg_out_mov(TCGContext *s, TCGType type, TCGReg dst, TCGReg s=
rc)

tcg/s390/tcg-target.h:
typedef enum TCGReg {
    TCG_REG_R0 =3D 0,
    TCG_REG_R1,
    TCG_REG_R2,
    TCG_REG_R3,
    TCG_REG_R4,
    TCG_REG_R5,
    TCG_REG_R6,
    TCG_REG_R7,
    TCG_REG_R8,
    TCG_REG_R9,
    TCG_REG_R10,
    TCG_REG_R11,
    TCG_REG_R12,
    TCG_REG_R13,
    TCG_REG_R14,
    TCG_REG_R15
} TCGReg;


Alex, wasn't this already discussed a few weeks ago?

Regards,
Andreas

--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC=
rnberg