From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4524 invoked by alias); 13 Jun 2005 17:32:07 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 4514 invoked by uid 22791); 13 Jun 2005 17:32:01 -0000 Received: from fmr21.intel.com (HELO scsfmr001.sc.intel.com) (143.183.121.13) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Mon, 13 Jun 2005 17:32:01 +0000 Received: from scsfmr101.sc.intel.com (scsfmr101.sc.intel.com [10.3.253.10]) by scsfmr001.sc.intel.com (8.12.10/8.12.10/d: major-outer.mc,v 1.1 2004/09/17 17:50:56 root Exp $) with ESMTP id j5DHVxJr025955 for ; Mon, 13 Jun 2005 17:31:59 GMT Received: from gnu.sc.intel.com (gnu.sc.intel.com [172.25.70.120]) by scsfmr101.sc.intel.com (8.12.10/8.12.10/d: major-inner.mc,v 1.2 2004/09/17 18:05:01 root Exp $) with ESMTP id j5DHPfuS007536 for ; Mon, 13 Jun 2005 17:25:41 GMT Received: by gnu.sc.intel.com (Postfix, from userid 500) id 10FA780593; Mon, 13 Jun 2005 10:31:59 -0700 (PDT) Date: Mon, 13 Jun 2005 17:32:00 -0000 From: "H. J. Lu" To: GDB Subject: PATCH: Fix gdb 6.3 for the current binutils Message-ID: <20050613173158.GA5286@lucon.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i X-SW-Source: 2005-06/txt/msg00157.txt.bz2 Hi, The current binutils will error on duplicated macros. This patch will undefine gdbasm_datavar before redefining it. H.J. --- 2005-06-13 H.J. Lu * gdb.asm/alpha.inc (gdbasm_datavar): Undefine it before redefining it. * gdb.asm/frv.inc (gdbasm_datavar): Likewise. * gdb.asm/i386.inc (gdbasm_datavar): Likewise. * gdb.asm/ia64.inc (gdbasm_datavar): Likewise. * gdb.asm/m68hc11.inc (gdbasm_datavar): Likewise. * gdb.asm/m68k.inc (gdbasm_datavar): Likewise. * gdb.asm/s390.inc (gdbasm_datavar): Likewise. * gdb.asm/s390x.inc (gdbasm_datavar): Likewise. * gdb.asm/sh.inc (gdbasm_datavar): Likewise. * gdb.asm/pa.inc (gdbasm_datavar): Likewise. * gdb.asm/powerpc.inc (gdbasm_datavar): Likewise. * gdb.asm/x86_64.inc (gdbasm_datavar): Likewise. --- gdb/testsuite/gdb.asm/alpha.inc.dup 2003-06-01 00:16:05.000000000 -0700 +++ gdb/testsuite/gdb.asm/alpha.inc 2005-06-13 10:18:31.000000000 -0700 @@ -55,6 +55,7 @@ .endm comment "Declare a data variable" + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data \name: --- gdb/testsuite/gdb.asm/frv.inc.dup 2003-12-12 17:01:08.000000000 -0800 +++ gdb/testsuite/gdb.asm/frv.inc 2005-06-13 10:18:49.000000000 -0700 @@ -47,6 +47,7 @@ .endm comment "Declare a data variable" + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data \name: --- gdb/testsuite/gdb.asm/i386.inc.dup 2001-12-04 11:45:57.000000000 -0800 +++ gdb/testsuite/gdb.asm/i386.inc 2005-06-13 10:17:23.000000000 -0700 @@ -32,6 +32,7 @@ .endm comment "Declare a data variable" + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data \name: --- gdb/testsuite/gdb.asm/ia64.inc.dup 2004-03-23 15:14:33.000000000 -0800 +++ gdb/testsuite/gdb.asm/ia64.inc 2005-06-13 10:18:40.000000000 -0700 @@ -43,6 +43,7 @@ .endm comment "Declare a data variable" + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data \name: --- gdb/testsuite/gdb.asm/m68hc11.inc.dup 2003-03-21 12:34:38.000000000 -0800 +++ gdb/testsuite/gdb.asm/m68hc11.inc 2005-06-13 10:18:23.000000000 -0700 @@ -42,6 +42,7 @@ _.frame: .word 0 .endm comment "Declare a data variable" + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data \name: --- gdb/testsuite/gdb.asm/m68k.inc.dup 2003-07-07 07:48:50.000000000 -0700 +++ gdb/testsuite/gdb.asm/m68k.inc 2005-06-13 10:18:37.000000000 -0700 @@ -31,6 +31,7 @@ .endm comment "Declare a data variable" + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data \name: --- gdb/testsuite/gdb.asm/pa.inc.dup 2004-05-24 21:07:05.000000000 -0700 +++ gdb/testsuite/gdb.asm/pa.inc 2005-06-13 10:18:54.000000000 -0700 @@ -37,6 +37,7 @@ .endm comment "Declare a data variable" + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data \name: --- gdb/testsuite/gdb.asm/powerpc.inc.dup 2003-07-30 09:43:57.000000000 -0700 +++ gdb/testsuite/gdb.asm/powerpc.inc 2005-06-13 10:17:30.000000000 -0700 @@ -40,6 +40,7 @@ .endm comment "Declare a data variable" + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data \name: --- gdb/testsuite/gdb.asm/s390.inc.dup 2001-12-03 13:53:16.000000000 -0800 +++ gdb/testsuite/gdb.asm/s390.inc 2005-06-13 10:18:12.000000000 -0700 @@ -68,6 +68,7 @@ .endm ### Declare an `int' variable. + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data \name: --- gdb/testsuite/gdb.asm/s390x.inc.dup 2003-05-07 14:52:53.000000000 -0700 +++ gdb/testsuite/gdb.asm/s390x.inc 2005-06-13 10:18:27.000000000 -0700 @@ -61,6 +61,7 @@ .endm ### Declare an `int' variable. + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data \name: --- gdb/testsuite/gdb.asm/sh.inc.dup 2003-09-15 02:52:56.000000000 -0700 +++ gdb/testsuite/gdb.asm/sh.inc 2005-06-13 10:18:46.000000000 -0700 @@ -75,6 +75,7 @@ .endm comment "Declare a data variable" + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data .align 2 --- gdb/testsuite/gdb.asm/x86_64.inc.dup 2002-06-06 08:19:17.000000000 -0700 +++ gdb/testsuite/gdb.asm/x86_64.inc 2005-06-13 10:18:19.000000000 -0700 @@ -32,6 +32,7 @@ .endm comment "Declare a data variable" + .purgem gdbasm_datavar .macro gdbasm_datavar name value .data \name: