From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <saagarjha28@gmail.com>
Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com
 [209.85.215.172])
 by sourceware.org (Postfix) with ESMTPS id 81F673857C6E
 for <gdb-patches@sourceware.org>; Sun,  6 Sep 2020 02:21:12 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 81F673857C6E
Authentication-Results: sourceware.org;
 dmarc=none (p=none dis=none) header.from=saagarjha.com
Authentication-Results: sourceware.org;
 spf=pass smtp.mailfrom=saagarjha28@gmail.com
Received: by mail-pg1-f172.google.com with SMTP id g29so6323716pgl.2
 for <gdb-patches@sourceware.org>; Sat, 05 Sep 2020 19:21:12 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:mime-version:subject:message-id:date:to;
 bh=icKHKT77YkijUB6jxuS4GV1xqjOwbLuDKBmM8Y8REmA=;
 b=cyEVc//qzefxBnwQVcVzVVQQRjbyNrMT2qP8oqBBHshXWuVEiaD4/G0T+3NkKjhFCS
 zHJOWRVDsv4C0oSHrECa2z9kYscCPqtIEQqdge0M//La+5+AcbmuBEgKP+/0FtCFcArE
 LgGfRPsbwYhuGr1ZcQcymbZQFiewHTnbJJfy4ZAsdqjAdMqmQopwcMryJE9hbmrc/xPh
 yWh1553WbXo0KuI1g/YVVNQWtJvEl1kiZGxfgvycahqlxLUCPtruneMZU5hJmOZb+hiS
 2XR6Tbgfg1Fyhpest5MuaQv2svAOD8wjrMf4OooW+Fs5ZFQ8BbEDXkWhyUmz5cjLRhqf
 m77w==
X-Gm-Message-State: AOAM533LTsxI7WBtyGEKYR+stO9Wx3b57YU6vGynxs7PFCokBc2179jp
 V0tCWW7T7iqQ8R8+5HH5rluZZVL3aLQ=
X-Google-Smtp-Source: ABdhPJyDnVLy5SmXgo7WtfnCRi3dbrm5kU9lcTmbvWXno/Z9m7LhD8obgQmolZAGUWbT1Vpn02ykaQ==
X-Received: by 2002:a63:ba18:: with SMTP id k24mr12719066pgf.335.1599358871239; 
 Sat, 05 Sep 2020 19:21:11 -0700 (PDT)
Received: from localhost.localdomain (c-73-92-124-25.hsd1.ca.comcast.net.
 [73.92.124.25])
 by smtp.gmail.com with ESMTPSA id n68sm10807652pfn.145.2020.09.05.19.21.09
 for <gdb-patches@sourceware.org>
 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
 Sat, 05 Sep 2020 19:21:10 -0700 (PDT)
From: Saagar Jha <saagar@saagarjha.com>
Content-Type: multipart/mixed;
 boundary="Apple-Mail=_FD924307-A342-4C54-998A-3C5C0793B402"
Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.0.3.2.26\))
Subject: [PATCH] Rename block.{h,c} to gdb-block.{h, c}
Message-Id: <D53E5DA4-5504-4A78-B592-DADA8025BEE7@saagarjha.com>
Date: Sat, 5 Sep 2020 19:21:09 -0700
To: gdb-patches@sourceware.org
X-Mailer: Apple Mail (2.3654.0.3.2.26)
X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,
 FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,
 HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE,
 RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS,
 TXREP autolearn=no autolearn_force=no version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
 server2.sourceware.org
X-BeenThere: gdb-patches@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gdb-patches mailing list <gdb-patches.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/gdb-patches>,
 <mailto:gdb-patches-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/gdb-patches>,
 <mailto:gdb-patches-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Sep 2020 02:21:31 -0000


--Apple-Mail=_FD924307-A342-4C54-998A-3C5C0793B402
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=utf-8

GDB doesn=E2=80=99t build with newer SDKs because its block.h conflicts =
with macOS=E2=80=99s Block.h. This patch resolves the issue by renaming =
GDB=E2=80=99s files.


--Apple-Mail=_FD924307-A342-4C54-998A-3C5C0793B402
Content-Disposition: attachment;
	filename=Rename-block.-h-c-to-gdb-block.-h-c.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="Rename-block.-h-c-to-gdb-block.-h-c.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=2062352e69631a1add0108c7f71a6f924144d46123=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Saagar=20Jha=20<saagar@saagarjha.com>=0ADate:=20=
Tue,=2011=20Aug=202020=2017:16:53=20-0700=0ASubject:=20[PATCH]=20Rename=20=
block.{h,c}=20to=20gdb-block.{h,=20c}=0A=0AmacOS,=20by=20default,=20uses=20=
a=20case-insensitive=20filesystem=20and=20ships=20with=20a=0Aheader=20in=20=
its=20SDK=20at=20/usr/include/Block.h.=20<functional>=20includes=20this=0A=
file=20but=20due=20to=20GDB's=20compilation=20flags=20ends=20up=20=
including=20gdb/block.h.=0AThe=20simplest=20solution=20to=20fix=20the=20=
resulting=20build=20errors=20is=20to=20just=0Arename=20it=20to=20=
something=20that=20doesn't=20conflict.=0A=0Agdb/ChangeLog:=0A=0A=09*=20=
gdb/Makefile.in:=20Replace=20block.c=20with=20gdb-block.c.=0A=09*=20=
gdb/ada-exp.y:=0A=09*=20gdb/ada-lang.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/alpha-mdebug-tdep.c:=20Replace=20block.h=20=
with=20gdb-block.h.=0A=09*=20gdb/alpha-tdep.c:=20Replace=20block.h=20=
with=20gdb-block.h.=0A=09*=20gdb/amd64-tdep.c:=20Replace=20block.h=20=
with=20gdb-block.h.=0A=09*=20gdb/ax-gdb.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/blockframe.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/breakpoint.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/buildsym.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/c-exp.y:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/cli/cli-cmds.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/coffread.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/compile/compile-c-symbols.c:=20Replace=20=
block.h=20with=0A=09gdb-block.h.=0A=09*=20=
gdb/compile/compile-cplus-symbols.c:=20Replace=20block.h=20with=0A=09=
gdb-block.h.=0A=09*=20gdb/compile/compile-cplus-types.c:=20Replace=20=
block.h=20with=0A=09gdb-block.h.=0A=09*=20gdb/compile/compile-loc2c.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A=09*=20=
gdb/compile/compile-object-load.c:=20Replace=20block.h=20with=0A=09=
gdb-block.h.=0A=09*=20gdb/compile/compile-object-run.c:=20Replace=20=
block.h=20with=0A=09gdb-block.h.=0A=09*=20gdb/compile/compile.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A=09*=20gdb/cp-namespace.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A=09*=20gdb/cp-support.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A=09*=20gdb/csky-tdep.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A=09*=20gdb/ctfread.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A=09*=20gdb/d-exp.y:=20Replace=20=
block.h=20with=20gdb-block.h.=0A=09*=20gdb/d-namespace.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A=09*=20gdb/dbxread.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A=09*=20gdb/dwarf2/frame-tailcall.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A=09*=20gdb/dwarf2/loc.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A=09*=20gdb/dwarf2/read.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A=09*=20gdb/eval.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A=09*=20gdb/expprint.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A=09*=20gdb/f-exp.y:=20Replace=20block.h=20=
with=20gdb-block.h.=0A=09*=20gdb/f-valprint.c:=20Replace=20block.h=20=
with=20gdb-block.h.=0A=09*=20gdb/findvar.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/frame.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/block.c:=20Moved=20to...=0A=09*=20=
gdb/gdb-block.c:=20...here.=0A=09*=20gdb/block.h:=20Moved=20to...=0A=09*=20=
gdb/gdb-block.h:=20...here.=0A=09*=20gdb/go-exp.y:=20Replace=20block.h=20=
with=20gdb-block.h.=0A=09*=20gdb/go-lang.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/guile/scm-block.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/guile/scm-frame.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/guile/scm-symbol.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/guile/scm-symtab.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/infcall.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/infcmd.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/infrun.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/inline-frame.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/jit.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/linespec.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/m2-exp.y:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/maint.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/mdebugread.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/mi/mi-cmd-stack.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/mips-sde-tdep.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/mips-tdep.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/objc-lang.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/objfiles.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/or1k-tdep.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/p-exp.y:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/parse.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/printcmd.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/psymtab.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/python/py-block.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/python/py-finishbreakpoint.c:=20Replace=20=
block.h=20with=0A=09gdb-block.h.=0A=09*=20gdb/python/py-frame.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A=09*=20=
gdb/python/py-progspace.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09=
*=20gdb/python/py-symbol.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09=
*=20gdb/python/py-symtab.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09=
*=20gdb/riscv-tdep.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20=
gdb/rust-exp.y:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20=
gdb/rust-lang.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20=
gdb/stack.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20=
gdb/symfile.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20=
gdb/symmisc.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20=
gdb/symtab.c=20(eq_symbol_entry):=20Replace=20block.{c,h}=20with=0A=09=
gdb-block.{c,h}.=0A=09*=20gdb/tracepoint.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/valops.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/value.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A=09*=20gdb/varobj.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A---=0A=20gdb/ChangeLog=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20|=2092=20+++++++++++++++++++++++++++++=0A=
=20gdb/Makefile.in=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20|=20=202=20+-=0A=20gdb/ada-exp.y=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/ada-lang.c=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=
=20gdb/alpha-mdebug-tdep.c=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=20=
2=20+-=0A=20gdb/alpha-tdep.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20|=20=202=20+-=0A=20gdb/amd64-tdep.c=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/ax-gdb.c=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=20=
2=20+-=0A=20gdb/blockframe.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20|=20=202=20+-=0A=20gdb/breakpoint.c=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/buildsym.c=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20=
+-=0A=20gdb/c-exp.y=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/cli/cli-cmds.c=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/coffread.c=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20=
+-=0A=20gdb/compile/compile-c-symbols.c=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/compile/compile-cplus-symbols.c=20|=20=202=20+-=0A=20=
gdb/compile/compile-cplus-types.c=20=20=20|=20=202=20+-=0A=20=
gdb/compile/compile-loc2c.c=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/compile/compile-object-load.c=20=20=20|=20=202=20+-=0A=20=
gdb/compile/compile-object-run.c=20=20=20=20|=20=202=20+-=0A=20=
gdb/compile/compile.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=20=
2=20+-=0A=20gdb/cp-namespace.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20|=20=202=20+-=0A=20gdb/cp-support.c=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/csky-tdep.c=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/ctfread.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20|=20=202=20+-=0A=20gdb/d-exp.y=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/d-namespace.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
|=20=202=20+-=0A=20gdb/dbxread.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/dwarf2/frame-tailcall.c=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/dwarf2/loc.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20|=20=202=20+-=0A=20gdb/dwarf2/read.c=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/eval.c=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/expprint.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20|=20=202=20+-=0A=20gdb/f-exp.y=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/f-valprint.c=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=
=20gdb/findvar.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20|=20=202=20+-=0A=20gdb/frame.c=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/{block.c=20=3D>=20gdb-block.c}=20=20=20=20=20=20=20=20|=20=202=20+-=0A=
=20gdb/{block.h=20=3D>=20gdb-block.h}=20=20=20=20=20=20=20=20|=20=206=20=
+-=0A=20gdb/go-exp.y=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/go-lang.c=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/guile/scm-block.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=20=
2=20+-=0A=20gdb/guile/scm-frame.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20|=20=202=20+-=0A=20gdb/guile/scm-symbol.c=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20|=20=202=20+-=0A=20gdb/guile/scm-symtab.c=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/infcall.c=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/infcmd.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20|=20=202=20+-=0A=20gdb/infrun.c=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/inline-frame.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
|=20=202=20+-=0A=20gdb/jit.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/linespec.c=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20=
+-=0A=20gdb/m2-exp.y=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/maint.c=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/mdebugread.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20|=20=202=20+-=0A=20gdb/mi/mi-cmd-stack.c=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20|=20=202=20+-=0A=20gdb/mips-sde-tdep.c=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/mips-tdep.c=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/objc-lang.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20|=20=202=20+-=0A=20gdb/objfiles.c=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/or1k-tdep.c=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/p-exp.y=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20|=20=202=20+-=0A=20gdb/parse.c=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/printcmd.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20|=20=202=20+-=0A=20gdb/psymtab.c=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/python/py-block.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=20=
2=20+-=0A=20gdb/python/py-finishbreakpoint.c=20=20=20=20|=20=202=20+-=0A=20=
gdb/python/py-frame.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=20=
2=20+-=0A=20gdb/python/py-progspace.c=20=20=20=20=20=20=20=20=20=20=20|=20=
=202=20+-=0A=20gdb/python/py-symbol.c=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20|=20=202=20+-=0A=20gdb/python/py-symtab.c=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20|=20=202=20+-=0A=20gdb/riscv-tdep.c=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/rust-exp.y=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20=
+-=0A=20gdb/rust-lang.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20|=20=202=20+-=0A=20gdb/stack.c=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/symfile.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20|=20=202=20+-=0A=20gdb/symmisc.c=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20gdb/symtab.c=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=20=
4=20+-=0A=20gdb/tracepoint.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20|=20=202=20+-=0A=20gdb/valops.c=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=20=
gdb/value.c=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20|=20=202=20+-=0A=20gdb/varobj.c=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20|=20=202=20+-=0A=2081=20files=20=
changed,=20175=20insertions(+),=2083=20deletions(-)=0A=20rename=20=
gdb/{block.c=20=3D>=20gdb-block.c}=20(99%)=0A=20rename=20gdb/{block.h=20=
=3D>=20gdb-block.h}=20(99%)=0A=0Adiff=20--git=20a/gdb/ChangeLog=20=
b/gdb/ChangeLog=0Aindex=20faa3a61254..d7c930aa63=20100644=0A---=20=
a/gdb/ChangeLog=0A+++=20b/gdb/ChangeLog=0A@@=20-1,3=20+1,95=20@@=0A=
+2020-09-05=20=20Saagar=20Jha=20<saagar@saagarjha.com>=0A+=0A+=09*=20=
gdb/Makefile.in:=20Replace=20block.c=20with=20gdb-block.c.=0A+=09*=20=
gdb/ada-exp.y:=20=0A+=09*=20gdb/ada-lang.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A+=09*=20gdb/alpha-mdebug-tdep.c:=20Replace=20block.h=20=
with=20gdb-block.h.=0A+=09*=20gdb/alpha-tdep.c:=20Replace=20block.h=20=
with=20gdb-block.h.=0A+=09*=20gdb/amd64-tdep.c:=20Replace=20block.h=20=
with=20gdb-block.h.=0A+=09*=20gdb/ax-gdb.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A+=09*=20gdb/blockframe.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A+=09*=20gdb/breakpoint.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A+=09*=20gdb/buildsym.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A+=09*=20gdb/c-exp.y:=20Replace=20block.h=20with=20=
gdb-block.h.=0A+=09*=20gdb/cli/cli-cmds.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A+=09*=20gdb/coffread.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A+=09*=20gdb/compile/compile-c-symbols.c:=20Replace=20=
block.h=20with=0A+=09gdb-block.h.=0A+=09*=20=
gdb/compile/compile-cplus-symbols.c:=20Replace=20block.h=20with=0A+=09=
gdb-block.h.=0A+=09*=20gdb/compile/compile-cplus-types.c:=20Replace=20=
block.h=20with=0A+=09gdb-block.h.=0A+=09*=20gdb/compile/compile-loc2c.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/compile/compile-object-load.c:=20Replace=20block.h=20with=0A+=09=
gdb-block.h.=0A+=09*=20gdb/compile/compile-object-run.c:=20Replace=20=
block.h=20with=0A+=09gdb-block.h.=0A+=09*=20gdb/compile/compile.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/cp-namespace.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/cp-support.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/csky-tdep.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/ctfread.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/d-exp.y:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/d-namespace.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/dbxread.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/dwarf2/frame-tailcall.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/dwarf2/loc.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/dwarf2/read.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/eval.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/expprint.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/f-exp.y:=20Replace=20block.h=20=
with=20gdb-block.h.=0A+=09*=20gdb/f-valprint.c:=20Replace=20block.h=20=
with=20gdb-block.h.=0A+=09*=20gdb/findvar.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A+=09*=20gdb/frame.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A+=09*=20gdb/block.c:=20Moved=20to...=0A+=09*=20=
gdb/gdb-block.c:=20...here.=0A+=09*=20gdb/block.h:=20Moved=20to...=0A+=09=
*=20gdb/gdb-block.h:=20...here.=0A+=09*=20gdb/go-exp.y:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/go-lang.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/guile/scm-block.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/guile/scm-frame.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/guile/scm-symbol.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/guile/scm-symtab.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09=
*=20gdb/infcall.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/infcmd.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/infrun.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/inline-frame.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/jit.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/linespec.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/m2-exp.y:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/maint.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/mdebugread.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/mi/mi-cmd-stack.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/mips-sde-tdep.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/mips-tdep.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/objc-lang.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/objfiles.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/or1k-tdep.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/p-exp.y:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/parse.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/printcmd.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/psymtab.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/python/py-block.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/python/py-finishbreakpoint.c:=20Replace=20block.h=20with=0A+=09=
gdb-block.h.=0A+=09*=20gdb/python/py-frame.c:=20Replace=20block.h=20with=20=
gdb-block.h.=0A+=09*=20gdb/python/py-progspace.c:=20Replace=20block.h=20=
with=20gdb-block.h.=0A+=09*=20gdb/python/py-symbol.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/python/py-symtab.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/riscv-tdep.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/rust-exp.y:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/rust-lang.c:=20=
Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20gdb/stack.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/symfile.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/symmisc.c:=20Replace=20=
block.h=20with=20gdb-block.h.=0A+=09*=20gdb/symtab.c=20=
(eq_symbol_entry):=20Replace=20block.{c,h}=20with=0A+=09gdb-block.{c,h}.=0A=
+=09*=20gdb/tracepoint.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09=
*=20gdb/valops.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/value.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20=
gdb/varobj.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=0A=20=
2020-09-03=20=20Alok=20Kumar=20Sharma=20=20<AlokKumar.Sharma@amd.com>=0A=20=
=0A=20=09*=20gdb/i386-tdep.c=20(i386_floatformat_for_type):=20Added=20=
conditions=0Adiff=20--git=20a/gdb/Makefile.in=20b/gdb/Makefile.in=0A=
index=204808357e65..feefaad25a=20100644=0A---=20a/gdb/Makefile.in=0A+++=20=
b/gdb/Makefile.in=0A@@=20-971,7=20+971,6=20@@=20COMMON_SFILES=20=3D=20\=0A=
=20=09ax-general.c=20\=0A=20=09bcache.c=20\=0A=20=09bfd-target.c=20\=0A-=09=
block.c=20\=0A=20=09blockframe.c=20\=0A=20=09break-catch-sig.c=20\=0A=20=09=
break-catch-syscall.c=20\=0A@@=20-1044,6=20+1043,7=20@@=20COMMON_SFILES=20=
=3D=20\=0A=20=09frame-base.c=20\=0A=20=09frame-unwind.c=20\=0A=20=09=
gcore.c=20\=0A+=09gdb-block.c=20\=0A=20=09gdb-demangle.c=20\=0A=20=09=
gdb_bfd.c=20\=0A=20=09gdb_obstack.c=20\=0Adiff=20--git=20a/gdb/ada-exp.y=20=
b/gdb/ada-exp.y=0Aindex=2057d89b01fe..3dfe7e232d=20100644=0A---=20=
a/gdb/ada-exp.y=0A+++=20b/gdb/ada-exp.y=0A@@=20-46,7=20+46,7=20@@=0A=20=
#include=20"symfile.h"=20/*=20Required=20by=20objfiles.h.=20=20*/=0A=20=
#include=20"objfiles.h"=20/*=20For=20have_full_symbols=20and=20=
have_partial_symbols=20*/=0A=20#include=20"frame.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20=0A=20#define=20=
parse_type(ps)=20builtin_type=20(ps->gdbarch=20())=0A=20=0Adiff=20--git=20=
a/gdb/ada-lang.c=20b/gdb/ada-lang.c=0Aindex=20e405cd23d2..2951a9c32f=20=
100644=0A---=20a/gdb/ada-lang.c=0A+++=20b/gdb/ada-lang.c=0A@@=20-39,7=20=
+39,7=20@@=0A=20#include=20"ada-lang.h"=0A=20#include=20"completer.h"=0A=20=
#include=20"ui-out.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"infcall.h"=0A=20#include=20"annotate.h"=0A=
=20#include=20"valprint.h"=0Adiff=20--git=20a/gdb/alpha-mdebug-tdep.c=20=
b/gdb/alpha-mdebug-tdep.c=0Aindex=202fa27c4013..021f6db7e9=20100644=0A=
---=20a/gdb/alpha-mdebug-tdep.c=0A+++=20b/gdb/alpha-mdebug-tdep.c=0A@@=20=
-22,7=20+22,7=20@@=0A=20#include=20"frame-base.h"=0A=20#include=20=
"symtab.h"=0A=20#include=20"gdbcore.h"=0A-#include=20"block.h"=0A=
+#include=20"gdb-block.h"=0A=20#include=20"trad-frame.h"=0A=20=0A=20=
#include=20"alpha-tdep.h"=0Adiff=20--git=20a/gdb/alpha-tdep.c=20=
b/gdb/alpha-tdep.c=0Aindex=20377d7b1ac1..dce56eeeb7=20100644=0A---=20=
a/gdb/alpha-tdep.c=0A+++=20b/gdb/alpha-tdep.c=0A@@=20-35,7=20+35,7=20@@=0A=
=20#include=20"reggroups.h"=0A=20#include=20"arch-utils.h"=0A=20#include=20=
"osabi.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"infcall.h"=0A=20#include=20"trad-frame.h"=0A=20=0Adiff=20=
--git=20a/gdb/amd64-tdep.c=20b/gdb/amd64-tdep.c=0Aindex=20=
59f7c9f885..855f9848c9=20100644=0A---=20a/gdb/amd64-tdep.c=0A+++=20=
b/gdb/amd64-tdep.c=0A@@=20-23,7=20+23,7=20@@=0A=20#include=20=
"opcode/i386.h"=0A=20#include=20"dis-asm.h"=0A=20#include=20=
"arch-utils.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"dummy-frame.h"=0A=20#include=20"frame.h"=0A=20#include=20=
"frame-base.h"=0Adiff=20--git=20a/gdb/ax-gdb.c=20b/gdb/ax-gdb.c=0Aindex=20=
34e22b289e..b33048530e=20100644=0A---=20a/gdb/ax-gdb.c=0A+++=20=
b/gdb/ax-gdb.c=0A@@=20-30,7=20+30,7=20@@=0A=20#include=20"target.h"=0A=20=
#include=20"ax.h"=0A=20#include=20"ax-gdb.h"=0A-#include=20"block.h"=0A=
+#include=20"gdb-block.h"=0A=20#include=20"regcache.h"=0A=20#include=20=
"user-regs.h"=0A=20#include=20"dictionary.h"=0Adiff=20--git=20=
a/gdb/blockframe.c=20b/gdb/blockframe.c=0Aindex=2080b769514e..712ba0d3d5=20=
100644=0A---=20a/gdb/blockframe.c=0A+++=20b/gdb/blockframe.c=0A@@=20=
-32,7=20+32,7=20@@=0A=20#include=20"dummy-frame.h"=0A=20#include=20=
"command.h"=0A=20#include=20"gdbcmd.h"=0A-#include=20"block.h"=0A=
+#include=20"gdb-block.h"=0A=20#include=20"inline-frame.h"=0A=20=0A=20/*=20=
Return=20the=20innermost=20lexical=20block=20in=20execution=20in=20a=20=
specified=0Adiff=20--git=20a/gdb/breakpoint.c=20b/gdb/breakpoint.c=0A=
index=20670cba0057..5aa44d3bb6=20100644=0A---=20a/gdb/breakpoint.c=0A+++=20=
b/gdb/breakpoint.c=0A@@=20-46,7=20+46,7=20@@=0A=20#include=20=
"completer.h"=0A=20#include=20"ui-out.h"=0A=20#include=20=
"cli/cli-script.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=
=20#include=20"solib.h"=0A=20#include=20"solist.h"=0A=20#include=20=
"observable.h"=0Adiff=20--git=20a/gdb/buildsym.c=20b/gdb/buildsym.c=0A=
index=20bd0ca49140..7b77703d1b=20100644=0A---=20a/gdb/buildsym.c=0A+++=20=
b/gdb/buildsym.c=0A@@=20-29,7=20+29,7=20@@=0A=20#include=20"filenames.h"=09=
=09/*=20For=20DOSish=20file=20names.=20=20*/=0A=20#include=20=
"macrotab.h"=0A=20#include=20"demangle.h"=09=09/*=20Needed=20by=20=
SYMBOL_INIT_DEMANGLED_NAME.=20=20*/=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"cp-support.h"=0A=20#include=20=
"dictionary.h"=0A=20#include=20"addrmap.h"=0Adiff=20--git=20=
a/gdb/c-exp.y=20b/gdb/c-exp.y=0Aindex=207fc23c4c8d..da8923c996=20100644=0A=
---=20a/gdb/c-exp.y=0A+++=20b/gdb/c-exp.y=0A@@=20-47,7=20+47,7=20@@=0A=20=
#include=20"symfile.h"=20/*=20Required=20by=20objfiles.h.=20=20*/=0A=20=
#include=20"objfiles.h"=20/*=20For=20have_full_symbols=20and=20=
have_partial_symbols=20*/=0A=20#include=20"charset.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"cp-support.h"=0A=20=
#include=20"macroscope.h"=0A=20#include=20"objc-lang.h"=0Adiff=20--git=20=
a/gdb/cli/cli-cmds.c=20b/gdb/cli/cli-cmds.c=0Aindex=20=
e3965fea07..6e4a6ab696=20100644=0A---=20a/gdb/cli/cli-cmds.c=0A+++=20=
b/gdb/cli/cli-cmds.c=0A@@=20-38,7=20+38,7=20@@=0A=20#include=20=
"tracepoint.h"=0A=20#include=20"gdbsupport/filestuff.h"=0A=20#include=20=
"location.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=0A=
=20#include=20"ui-out.h"=0A=20#include=20"interps.h"=0Adiff=20--git=20=
a/gdb/coffread.c=20b/gdb/coffread.c=0Aindex=201592dc645c..0ba80d4d6c=20=
100644=0A---=20a/gdb/coffread.c=0A+++=20b/gdb/coffread.c=0A@@=20-34,7=20=
+34,7=20@@=0A=20#include=20"stabsread.h"=0A=20#include=20"complaints.h"=0A=
=20#include=20"target.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"dictionary.h"=0A=20=0A=20#include=20=
"coff-pe-read.h"=0Adiff=20--git=20a/gdb/compile/compile-c-symbols.c=20=
b/gdb/compile/compile-c-symbols.c=0Aindex=20f4e0783d4b..a214833bc9=20=
100644=0A---=20a/gdb/compile/compile-c-symbols.c=0A+++=20=
b/gdb/compile/compile-c-symbols.c=0A@@=20-23,7=20+23,7=20@@=0A=20=
#include=20"compile-c.h"=0A=20#include=20"symtab.h"=0A=20#include=20=
"parser-defs.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"objfiles.h"=0A=20#include=20"compile.h"=0A=20#include=20=
"value.h"=0Adiff=20--git=20a/gdb/compile/compile-cplus-symbols.c=20=
b/gdb/compile/compile-cplus-symbols.c=0Aindex=2011a2d32345..22bfc22543=20=
100644=0A---=20a/gdb/compile/compile-cplus-symbols.c=0A+++=20=
b/gdb/compile/compile-cplus-symbols.c=0A@@=20-24,7=20+24,7=20@@=0A=20=
#include=20"gdbsupport/gdb_assert.h"=0A=20#include=20"symtab.h"=0A=20=
#include=20"parser-defs.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"objfiles.h"=0A=20#include=20"compile.h"=0A=
=20#include=20"value.h"=0Adiff=20--git=20=
a/gdb/compile/compile-cplus-types.c=20=
b/gdb/compile/compile-cplus-types.c=0Aindex=2002df7ab90e..8e5e108ef6=20=
100644=0A---=20a/gdb/compile/compile-cplus-types.c=0A+++=20=
b/gdb/compile/compile-cplus-types.c=0A@@=20-29,7=20+29,7=20@@=0A=20=
#include=20"cp-support.h"=0A=20#include=20"cp-abi.h"=0A=20#include=20=
"objfiles.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"gdbcmd.h"=0A=20#include=20"c-lang.h"=0A=20#include=20=
"compile-c.h"=0Adiff=20--git=20a/gdb/compile/compile-loc2c.c=20=
b/gdb/compile/compile-loc2c.c=0Aindex=202fd1810759..af4a07eb45=20100644=0A=
---=20a/gdb/compile/compile-loc2c.c=0A+++=20=
b/gdb/compile/compile-loc2c.c=0A@@=20-27,7=20+27,7=20@@=0A=20#include=20=
"compile-internal.h"=0A=20#include=20"compile-c.h"=0A=20#include=20=
"compile.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"dwarf2/frame.h"=0A=20#include=20"gdbsupport/gdb_vecs.h"=0A=20=
#include=20"value.h"=0Adiff=20--git=20=
a/gdb/compile/compile-object-load.c=20=
b/gdb/compile/compile-object-load.c=0Aindex=202f41607902..80a5009a3c=20=
100644=0A---=20a/gdb/compile/compile-object-load.c=0A+++=20=
b/gdb/compile/compile-object-load.c=0A@@=20-30,7=20+30,7=20@@=0A=20=
#include=20"inferior.h"=0A=20#include=20"gdbthread.h"=0A=20#include=20=
"compile.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"arch-utils.h"=0A=20#include=20<algorithm>=0A=20=0Adiff=20=
--git=20a/gdb/compile/compile-object-run.c=20=
b/gdb/compile/compile-object-run.c=0Aindex=20a2f3990005..9e45edfaec=20=
100644=0A---=20a/gdb/compile/compile-object-run.c=0A+++=20=
b/gdb/compile/compile-object-run.c=0A@@=20-24,7=20+24,7=20@@=0A=20=
#include=20"objfiles.h"=0A=20#include=20"compile-internal.h"=0A=20=
#include=20"dummy-frame.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"valprint.h"=0A=20#include=20"compile.h"=0A=
=20=0Adiff=20--git=20a/gdb/compile/compile.c=20b/gdb/compile/compile.c=0A=
index=200c29a0476e..7416861fd8=20100644=0A---=20a/gdb/compile/compile.c=0A=
+++=20b/gdb/compile/compile.c=0A@@=20-33,7=20+33,7=20@@=0A=20#include=20=
"language.h"=0A=20#include=20"frame.h"=0A=20#include=20"source.h"=0A=
-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20=
"arch-utils.h"=0A=20#include=20"gdbsupport/filestuff.h"=0A=20#include=20=
"target.h"=0Adiff=20--git=20a/gdb/cp-namespace.c=20b/gdb/cp-namespace.c=0A=
index=20bf57e703d4..33abf2a523=20100644=0A---=20a/gdb/cp-namespace.c=0A=
+++=20b/gdb/cp-namespace.c=0A@@=20-23,7=20+23,7=20@@=0A=20#include=20=
"gdb_obstack.h"=0A=20#include=20"symtab.h"=0A=20#include=20"symfile.h"=0A=
-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20=
"objfiles.h"=0A=20#include=20"gdbtypes.h"=0A=20#include=20"dictionary.h"=0A=
diff=20--git=20a/gdb/cp-support.c=20b/gdb/cp-support.c=0Aindex=20=
3c3ede26a6..5d6d1c8ba8=20100644=0A---=20a/gdb/cp-support.c=0A+++=20=
b/gdb/cp-support.c=0A@@=20-26,7=20+26,7=20@@=0A=20#include=20=
"objfiles.h"=0A=20#include=20"frame.h"=0A=20#include=20"symtab.h"=0A=
-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20=
"complaints.h"=0A=20#include=20"gdbtypes.h"=0A=20#include=20=
"expression.h"=0Adiff=20--git=20a/gdb/csky-tdep.c=20b/gdb/csky-tdep.c=0A=
index=207e5b71eece..ec2a1fef07=20100644=0A---=20a/gdb/csky-tdep.c=0A+++=20=
b/gdb/csky-tdep.c=0A@@=20-35,7=20+35,7=20@@=0A=20#include=20=
"arch-utils.h"=0A=20#include=20"regcache.h"=0A=20#include=20"osabi.h"=0A=
-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20=
"reggroups.h"=0A=20#include=20"elf/csky.h"=0A=20#include=20"elf-bfd.h"=0A=
diff=20--git=20a/gdb/ctfread.c=20b/gdb/ctfread.c=0Aindex=20=
5b6d731479..7fcc1e2f35=20100644=0A---=20a/gdb/ctfread.c=0A+++=20=
b/gdb/ctfread.c=0A@@=20-78,7=20+78,7=20@@=0A=20#include=20"defs.h"=0A=20=
#include=20"buildsym.h"=0A=20#include=20"complaints.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"ctfread.h"=0A=20=
#include=20"psympriv.h"=0A=20=0Adiff=20--git=20a/gdb/d-exp.y=20=
b/gdb/d-exp.y=0Aindex=20fdd68a51db..8f517d482f=20100644=0A---=20=
a/gdb/d-exp.y=0A+++=20b/gdb/d-exp.y=0A@@=20-50,7=20+50,7=20@@=0A=20=
#include=20"symfile.h"=20/*=20Required=20by=20objfiles.h.=20=20*/=0A=20=
#include=20"objfiles.h"=20/*=20For=20have_full_symbols=20and=20=
have_partial_symbols=20*/=0A=20#include=20"charset.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"type-stack.h"=0A=20=
=0A=20#define=20parse_type(ps)=20builtin_type=20(ps->gdbarch=20())=0A=
diff=20--git=20a/gdb/d-namespace.c=20b/gdb/d-namespace.c=0Aindex=20=
f3053d6a73..72d4b99894=20100644=0A---=20a/gdb/d-namespace.c=0A+++=20=
b/gdb/d-namespace.c=0A@@=20-19,7=20+19,7=20@@=0A=20=0A=20#include=20=
"defs.h"=0A=20#include=20"symtab.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"language.h"=0A=20#include=20"namespace.h"=0A=
=20#include=20"d-lang.h"=0Adiff=20--git=20a/gdb/dbxread.c=20=
b/gdb/dbxread.c=0Aindex=20e76bf702b3..9f62818d68=20100644=0A---=20=
a/gdb/dbxread.c=0A+++=20b/gdb/dbxread.c=0A@@=20-53,7=20+53,7=20@@=0A=20=
#include=20"cp-abi.h"=0A=20#include=20"cp-support.h"=0A=20#include=20=
"psympriv.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"aout/aout64.h"=0A=20#include=20"aout/stab_gnu.h"=09/*=20We=20=
always=20use=20GNU=20stabs,=20not=0A=20=09=09=09=09=20=20=20native,=20=
now.=20=20*/=0Adiff=20--git=20a/gdb/dwarf2/frame-tailcall.c=20=
b/gdb/dwarf2/frame-tailcall.c=0Aindex=20a90056808d..98419ab0b6=20100644=0A=
---=20a/gdb/dwarf2/frame-tailcall.c=0A+++=20=
b/gdb/dwarf2/frame-tailcall.c=0A@@=20-22,7=20+22,7=20@@=0A=20#include=20=
"dwarf2/frame-tailcall.h"=0A=20#include=20"dwarf2/loc.h"=0A=20#include=20=
"frame-unwind.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"hashtab.h"=0A=20#include=20"gdbtypes.h"=0A=20#include=20=
"regcache.h"=0Adiff=20--git=20a/gdb/dwarf2/loc.c=20b/gdb/dwarf2/loc.c=0A=
index=20a2bed9d4a9..5df984f421=20100644=0A---=20a/gdb/dwarf2/loc.c=0A+++=20=
b/gdb/dwarf2/loc.c=0A@@=20-30,7=20+30,7=20@@=0A=20#include=20"ax-gdb.h"=0A=
=20#include=20"regcache.h"=0A=20#include=20"objfiles.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"gdbcmd.h"=0A=20=
#include=20"complaints.h"=0A=20#include=20"dwarf2.h"=0Adiff=20--git=20=
a/gdb/dwarf2/read.c=20b/gdb/dwarf2/read.c=0Aindex=20=
865f9e2118..2a07a907bd=20100644=0A---=20a/gdb/dwarf2/read.c=0A+++=20=
b/gdb/dwarf2/read.c=0A@@=20-59,7=20+59,7=20@@=0A=20#include=20=
"hashtab.h"=0A=20#include=20"command.h"=0A=20#include=20"gdbcmd.h"=0A=
-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20=
"addrmap.h"=0A=20#include=20"typeprint.h"=0A=20#include=20"psympriv.h"=0A=
diff=20--git=20a/gdb/eval.c=20b/gdb/eval.c=0Aindex=20=
51b51865f4..067c7d25f6=20100644=0A---=20a/gdb/eval.c=0A+++=20=
b/gdb/eval.c=0A@@=20-30,7=20+30,7=20@@=0A=20#include=20"cp-abi.h"=0A=20=
#include=20"infcall.h"=0A=20#include=20"objc-lang.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"parser-defs.h"=0A=20=
#include=20"cp-support.h"=0A=20#include=20"ui-out.h"=0Adiff=20--git=20=
a/gdb/expprint.c=20b/gdb/expprint.c=0Aindex=205427a56f6a..19a7fd4668=20=
100644=0A---=20a/gdb/expprint.c=0A+++=20b/gdb/expprint.c=0A@@=20-26,7=20=
+26,7=20@@=0A=20#include=20"parser-defs.h"=0A=20#include=20"user-regs.h"=09=
=09/*=20For=20user_reg_map_regnum_to_name.=20=20*/=0A=20#include=20=
"target.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"objfiles.h"=0A=20#include=20"valprint.h"=0A=20#include=20=
"cli/cli-style.h"=0Adiff=20--git=20a/gdb/f-exp.y=20b/gdb/f-exp.y=0Aindex=20=
0fa18dd186..8ada6e1b14=20100644=0A---=20a/gdb/f-exp.y=0A+++=20=
b/gdb/f-exp.y=0A@@=20-51,7=20+51,7=20@@=0A=20#include=20"bfd.h"=20/*=20=
Required=20by=20objfiles.h.=20=20*/=0A=20#include=20"symfile.h"=20/*=20=
Required=20by=20objfiles.h.=20=20*/=0A=20#include=20"objfiles.h"=20/*=20=
For=20have_full_symbols=20and=20have_partial_symbols=20*/=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20<ctype.h>=0A=20=
#include=20<algorithm>=0A=20#include=20"type-stack.h"=0Adiff=20--git=20=
a/gdb/f-valprint.c=20b/gdb/f-valprint.c=0Aindex=20fabdf45861..961ab1de35=20=
100644=0A---=20a/gdb/f-valprint.c=0A+++=20b/gdb/f-valprint.c=0A@@=20=
-31,7=20+31,7=20@@=0A=20#include=20"frame.h"=0A=20#include=20"gdbcore.h"=0A=
=20#include=20"command.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"dictionary.h"=0A=20#include=20=
"cli/cli-style.h"=0A=20#include=20"gdbarch.h"=0Adiff=20--git=20=
a/gdb/findvar.c=20b/gdb/findvar.c=0Aindex=207e9dab567f..ab3f4bd165=20=
100644=0A---=20a/gdb/findvar.c=0A+++=20b/gdb/findvar.c=0A@@=20-28,7=20=
+28,7=20@@=0A=20#include=20"symfile.h"=09=09/*=20for=20overlay=20=
functions=20*/=0A=20#include=20"regcache.h"=0A=20#include=20=
"user-regs.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"objfiles.h"=0A=20#include=20"language.h"=0A=20#include=20=
"dwarf2/loc.h"=0Adiff=20--git=20a/gdb/frame.c=20b/gdb/frame.c=0Aindex=20=
0b708e6682..89c96da373=20100644=0A---=20a/gdb/frame.c=0A+++=20=
b/gdb/frame.c=0A@@=20-37,7=20+37,7=20@@=0A=20#include=20"observable.h"=0A=
=20#include=20"objfiles.h"=0A=20#include=20"gdbthread.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"inline-frame.h"=0A=
=20#include=20"tracepoint.h"=0A=20#include=20"hashtab.h"=0Adiff=20--git=20=
a/gdb/block.c=20b/gdb/gdb-block.c=0Asimilarity=20index=2099%=0Arename=20=
from=20gdb/block.c=0Arename=20to=20gdb/gdb-block.c=0Aindex=20=
597d6d5d87..5d07d908e2=20100644=0A---=20a/gdb/block.c=0A+++=20=
b/gdb/gdb-block.c=0A@@=20-18,7=20+18,7=20@@=0A=20=20=20=20along=20with=20=
this=20program.=20=20If=20not,=20see=20<http://www.gnu.org/licenses/>.=20=
=20*/=0A=20=0A=20#include=20"defs.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"symtab.h"=0A=20#include=20"symfile.h"=0A=20=
#include=20"gdb_obstack.h"=0Adiff=20--git=20a/gdb/block.h=20=
b/gdb/gdb-block.h=0Asimilarity=20index=2099%=0Arename=20from=20=
gdb/block.h=0Arename=20to=20gdb/gdb-block.h=0Aindex=20=
50ab049f8e..28f9bf0492=20100644=0A---=20a/gdb/block.h=0A+++=20=
b/gdb/gdb-block.h=0A@@=20-17,8=20+17,8=20@@=0A=20=20=20=20You=20should=20=
have=20received=20a=20copy=20of=20the=20GNU=20General=20Public=20License=0A=
=20=20=20=20along=20with=20this=20program.=20=20If=20not,=20see=20=
<http://www.gnu.org/licenses/>.=20=20*/=0A=20=0A-#ifndef=20BLOCK_H=0A=
-#define=20BLOCK_H=0A+#ifndef=20GDB_BLOCK_H=0A+#define=20GDB_BLOCK_H=0A=20=
=0A=20#include=20"dictionary.h"=0A=20=0A@@=20-425,4=20+425,4=20@@=20=
extern=20int=20block_find_non_opaque_type_preferred=20(struct=20symbol=20=
*sym,=0A=20struct=20blockranges=20*make_blockranges=20(struct=20objfile=20=
*objfile,=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20const=20=
std::vector<blockrange>=20&rangevec);=0A=20=0A-#endif=20/*=20BLOCK_H=20=
*/=0A+#endif=20/*=20GDB_BLOCK_H=20*/=0Adiff=20--git=20a/gdb/go-exp.y=20=
b/gdb/go-exp.y=0Aindex=2017c76ac02a..78d073ace9=20100644=0A---=20=
a/gdb/go-exp.y=0A+++=20b/gdb/go-exp.y=0A@@=20-63,7=20+63,7=20@@=0A=20=
#include=20"symfile.h"=20/*=20Required=20by=20objfiles.h.=20=20*/=0A=20=
#include=20"objfiles.h"=20/*=20For=20have_full_symbols=20and=20=
have_partial_symbols=20*/=0A=20#include=20"charset.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20=0A=20#define=20=
parse_type(ps)=20builtin_type=20(ps->gdbarch=20())=0A=20=0Adiff=20--git=20=
a/gdb/go-lang.c=20b/gdb/go-lang.c=0Aindex=20cb42ef1b7c..aec311c8a6=20=
100644=0A---=20a/gdb/go-lang.c=0A+++=20b/gdb/go-lang.c=0A@@=20-33,7=20=
+33,7=20@@=0A=20=0A=20#include=20"defs.h"=0A=20#include=20=
"gdb_obstack.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"symtab.h"=0A=20#include=20"language.h"=0A=20#include=20=
"varobj.h"=0Adiff=20--git=20a/gdb/guile/scm-block.c=20=
b/gdb/guile/scm-block.c=0Aindex=20813c6c1022..3235f9a8fa=20100644=0A---=20=
a/gdb/guile/scm-block.c=0A+++=20b/gdb/guile/scm-block.c=0A@@=20-21,7=20=
+21,7=20@@=0A=20=20=20=20conventions,=20et.al.=20=20*/=0A=20=0A=20=
#include=20"defs.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=
=20#include=20"dictionary.h"=0A=20#include=20"objfiles.h"=0A=20#include=20=
"source.h"=0Adiff=20--git=20a/gdb/guile/scm-frame.c=20=
b/gdb/guile/scm-frame.c=0Aindex=203617eb77de..a56eb10bae=20100644=0A---=20=
a/gdb/guile/scm-frame.c=0A+++=20b/gdb/guile/scm-frame.c=0A@@=20-21,7=20=
+21,7=20@@=0A=20=20=20=20conventions,=20et.al.=20=20*/=0A=20=0A=20=
#include=20"defs.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=
=20#include=20"frame.h"=0A=20#include=20"inferior.h"=0A=20#include=20=
"objfiles.h"=0Adiff=20--git=20a/gdb/guile/scm-symbol.c=20=
b/gdb/guile/scm-symbol.c=0Aindex=208bad7e6c5a..84f63a95b0=20100644=0A---=20=
a/gdb/guile/scm-symbol.c=0A+++=20b/gdb/guile/scm-symbol.c=0A@@=20-21,7=20=
+21,7=20@@=0A=20=20=20=20conventions,=20et.al.=20=20*/=0A=20=0A=20=
#include=20"defs.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=
=20#include=20"frame.h"=0A=20#include=20"symtab.h"=0A=20#include=20=
"objfiles.h"=0Adiff=20--git=20a/gdb/guile/scm-symtab.c=20=
b/gdb/guile/scm-symtab.c=0Aindex=200efd0aafac..2f5d650e0f=20100644=0A---=20=
a/gdb/guile/scm-symtab.c=0A+++=20b/gdb/guile/scm-symtab.c=0A@@=20-24,7=20=
+24,7=20@@=0A=20#include=20"symtab.h"=0A=20#include=20"source.h"=0A=20=
#include=20"objfiles.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"guile-internal.h"=0A=20=0A=20/*=20A=20=
<gdb:symtab>=20smob.=20=20*/=0Adiff=20--git=20a/gdb/infcall.c=20=
b/gdb/infcall.c=0Aindex=20cdb30137c3..0f86d5633c=20100644=0A---=20=
a/gdb/infcall.c=0A+++=20b/gdb/infcall.c=0A@@=20-25,7=20+25,7=20@@=0A=20=
#include=20"regcache.h"=0A=20#include=20"inferior.h"=0A=20#include=20=
"infrun.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"gdbcore.h"=0A=20#include=20"language.h"=0A=20#include=20=
"objfiles.h"=0Adiff=20--git=20a/gdb/infcmd.c=20b/gdb/infcmd.c=0Aindex=20=
cfc3169992..52d1a2937a=20100644=0A---=20a/gdb/infcmd.c=0A+++=20=
b/gdb/infcmd.c=0A@@=20-36,7=20+36,7=20@@=0A=20#include=20"ui-out.h"=0A=20=
#include=20"regcache.h"=0A=20#include=20"reggroups.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"solib.h"=0A=20=
#include=20<ctype.h>=0A=20#include=20"observable.h"=0Adiff=20--git=20=
a/gdb/infrun.c=20b/gdb/infrun.c=0Aindex=20938bc081a1..d4217d0a89=20=
100644=0A---=20a/gdb/infrun.c=0A+++=20b/gdb/infrun.c=0A@@=20-40,7=20=
+40,7=20@@=0A=20#include=20"language.h"=0A=20#include=20"solib.h"=0A=20=
#include=20"main.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=
=20#include=20"mi/mi-common.h"=0A=20#include=20"event-top.h"=0A=20=
#include=20"record.h"=0Adiff=20--git=20a/gdb/inline-frame.c=20=
b/gdb/inline-frame.c=0Aindex=20300b1224db..e0caec3a51=20100644=0A---=20=
a/gdb/inline-frame.c=0A+++=20b/gdb/inline-frame.c=0A@@=20-21,7=20+21,7=20=
@@=0A=20#include=20"breakpoint.h"=0A=20#include=20"inline-frame.h"=0A=20=
#include=20"addrmap.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"frame-unwind.h"=0A=20#include=20=
"inferior.h"=0A=20#include=20"gdbthread.h"=0Adiff=20--git=20a/gdb/jit.c=20=
b/gdb/jit.c=0Aindex=20024c66e7ad..03a45b0414=20100644=0A---=20=
a/gdb/jit.c=0A+++=20b/gdb/jit.c=0A@@=20-21,7=20+21,7=20@@=0A=20=0A=20=
#include=20"jit.h"=0A=20#include=20"jit-reader.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"breakpoint.h"=0A=20=
#include=20"command.h"=0A=20#include=20"dictionary.h"=0Adiff=20--git=20=
a/gdb/linespec.c=20b/gdb/linespec.c=0Aindex=20e8f3d594c3..3d9b04eb1d=20=
100644=0A---=20a/gdb/linespec.c=0A+++=20b/gdb/linespec.c=0A@@=20-30,7=20=
+30,7=20@@=0A=20#include=20"cp-abi.h"=0A=20#include=20"cp-support.h"=0A=20=
#include=20"parser-defs.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"objc-lang.h"=0A=20#include=20"linespec.h"=0A=
=20#include=20"language.h"=0Adiff=20--git=20a/gdb/m2-exp.y=20=
b/gdb/m2-exp.y=0Aindex=20c79c1f2582..43c405afc0=20100644=0A---=20=
a/gdb/m2-exp.y=0A+++=20b/gdb/m2-exp.y=0A@@=20-46,7=20+46,7=20@@=0A=20=
#include=20"bfd.h"=20/*=20Required=20by=20objfiles.h.=20=20*/=0A=20=
#include=20"symfile.h"=20/*=20Required=20by=20objfiles.h.=20=20*/=0A=20=
#include=20"objfiles.h"=20/*=20For=20have_full_symbols=20and=20=
have_partial_symbols=20*/=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20=0A=20#define=20parse_type(ps)=20builtin_type=20=
(ps->gdbarch=20())=0A=20#define=20parse_m2_type(ps)=20builtin_m2_type=20=
(ps->gdbarch=20())=0Adiff=20--git=20a/gdb/maint.c=20b/gdb/maint.c=0A=
index=2046dd99f6cc..7c746e80d2=20100644=0A---=20a/gdb/maint.c=0A+++=20=
b/gdb/maint.c=0A@@=20-28,7=20+28,7=20@@=0A=20#include=20"command.h"=0A=20=
#include=20"gdbcmd.h"=0A=20#include=20"symtab.h"=0A-#include=20"block.h"=0A=
+#include=20"gdb-block.h"=0A=20#include=20"gdbtypes.h"=0A=20#include=20=
"demangle.h"=0A=20#include=20"gdbcore.h"=0Adiff=20--git=20=
a/gdb/mdebugread.c=20b/gdb/mdebugread.c=0Aindex=20d38372041d..3f041b91cc=20=
100644=0A---=20a/gdb/mdebugread.c=0A+++=20b/gdb/mdebugread.c=0A@@=20=
-51,7=20+51,7=20@@=0A=20#include=20"complaints.h"=0A=20#include=20=
"demangle.h"=0A=20#include=20"gdb-demangle.h"=0A-#include=20"block.h"=0A=
+#include=20"gdb-block.h"=0A=20#include=20"dictionary.h"=0A=20#include=20=
"mdebugread.h"=0A=20#include=20<sys/stat.h>=0Adiff=20--git=20=
a/gdb/mi/mi-cmd-stack.c=20b/gdb/mi/mi-cmd-stack.c=0Aindex=20=
a8ef46df60..e4abd47717=20100644=0A---=20a/gdb/mi/mi-cmd-stack.c=0A+++=20=
b/gdb/mi/mi-cmd-stack.c=0A@@=20-24,7=20+24,7=20@@=0A=20#include=20=
"mi-cmds.h"=0A=20#include=20"ui-out.h"=0A=20#include=20"symtab.h"=0A=
-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20=
"stack.h"=0A=20#include=20"dictionary.h"=0A=20#include=20"language.h"=0A=
diff=20--git=20a/gdb/mips-sde-tdep.c=20b/gdb/mips-sde-tdep.c=0Aindex=20=
685c3c7263..1ceb8e2182=20100644=0A---=20a/gdb/mips-sde-tdep.c=0A+++=20=
b/gdb/mips-sde-tdep.c=0A@@=20-20,7=20+20,7=20@@=0A=20#include=20"defs.h"=0A=
=20#include=20"osabi.h"=0A=20#include=20"elf-bfd.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"symtab.h"=0A=20=0A=
=20#include=20"frame.h"=0Adiff=20--git=20a/gdb/mips-tdep.c=20=
b/gdb/mips-tdep.c=0Aindex=20e0f0488880..3be4446461=20100644=0A---=20=
a/gdb/mips-tdep.c=0A+++=20b/gdb/mips-tdep.c=0A@@=20-36,7=20+36,7=20@@=0A=20=
#include=20"regcache.h"=0A=20#include=20"osabi.h"=0A=20#include=20=
"mips-tdep.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"reggroups.h"=0A=20#include=20"opcode/mips.h"=0A=20#include=20=
"elf/mips.h"=0Adiff=20--git=20a/gdb/objc-lang.c=20b/gdb/objc-lang.c=0A=
index=2063cdac1b03..236e5e8c93=20100644=0A---=20a/gdb/objc-lang.c=0A+++=20=
b/gdb/objc-lang.c=0A@@=20-39,7=20+39,7=20@@=0A=20#include=20"frame.h"=0A=20=
#include=20"gdb_regex.h"=0A=20#include=20"regcache.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"infcall.h"=0A=20=
#include=20"valprint.h"=0A=20#include=20"cli/cli-utils.h"=0Adiff=20--git=20=
a/gdb/objfiles.c=20b/gdb/objfiles.c=0Aindex=203aa7973e0d..7895ac0560=20=
100644=0A---=20a/gdb/objfiles.c=0A+++=20b/gdb/objfiles.c=0A@@=20-40,7=20=
+40,7=20@@=0A=20#include=20"hashtab.h"=0A=20=0A=20#include=20=
"breakpoint.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"dictionary.h"=0A=20#include=20"source.h"=0A=20#include=20=
"addrmap.h"=0Adiff=20--git=20a/gdb/or1k-tdep.c=20b/gdb/or1k-tdep.c=0A=
index=2075df206a2b..ce74475896=20100644=0A---=20a/gdb/or1k-tdep.c=0A+++=20=
b/gdb/or1k-tdep.c=0A@@=20-30,7=20+30,7=20@@=0A=20#include=20"target.h"=0A=
=20#include=20"regcache.h"=0A=20#include=20"safe-ctype.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"reggroups.h"=0A=20=
#include=20"arch-utils.h"=0A=20#include=20"frame-unwind.h"=0Adiff=20=
--git=20a/gdb/p-exp.y=20b/gdb/p-exp.y=0Aindex=2085ef4bd385..66cbec804f=20=
100644=0A---=20a/gdb/p-exp.y=0A+++=20b/gdb/p-exp.y=0A@@=20-53,7=20+53,7=20=
@@=0A=20#include=20"bfd.h"=20/*=20Required=20by=20objfiles.h.=20=20*/=0A=20=
#include=20"symfile.h"=20/*=20Required=20by=20objfiles.h.=20=20*/=0A=20=
#include=20"objfiles.h"=20/*=20For=20have_full_symbols=20and=20=
have_partial_symbols.=20=20*/=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"completer.h"=0A=20=0A=20#define=20=
parse_type(ps)=20builtin_type=20(ps->gdbarch=20())=0Adiff=20--git=20=
a/gdb/parse.c=20b/gdb/parse.c=0Aindex=202fb474e27f..bbe668ec50=20100644=0A=
---=20a/gdb/parse.c=0A+++=20b/gdb/parse.c=0A@@=20-45,7=20+45,7=20@@=0A=20=
#include=20"symfile.h"=09=09/*=20for=20overlay=20functions=20*/=0A=20=
#include=20"inferior.h"=0A=20#include=20"target-float.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"source.h"=0A=20=
#include=20"objfiles.h"=0A=20#include=20"user-regs.h"=0Adiff=20--git=20=
a/gdb/printcmd.c=20b/gdb/printcmd.c=0Aindex=20309d2cabff..e9eb91a87b=20=
100644=0A---=20a/gdb/printcmd.c=0A+++=20b/gdb/printcmd.c=0A@@=20-37,7=20=
+37,7=20@@=0A=20#include=20"objfiles.h"=09=09/*=20ditto=20*/=0A=20=
#include=20"completer.h"=09=09/*=20for=20completion=20functions=20*/=0A=20=
#include=20"ui-out.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"disasm.h"=0A=20#include=20=
"target-float.h"=0A=20#include=20"observable.h"=0Adiff=20--git=20=
a/gdb/psymtab.c=20b/gdb/psymtab.c=0Aindex=2059db469e55..5b96c98648=20=
100644=0A---=20a/gdb/psymtab.c=0A+++=20b/gdb/psymtab.c=0A@@=20-21,7=20=
+21,7=20@@=0A=20#include=20"symtab.h"=0A=20#include=20"objfiles.h"=0A=20=
#include=20"psympriv.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"filenames.h"=0A=20#include=20"source.h"=0A=
=20#include=20"addrmap.h"=0Adiff=20--git=20a/gdb/python/py-block.c=20=
b/gdb/python/py-block.c=0Aindex=2026d59e102a..41c7e7f9c8=20100644=0A---=20=
a/gdb/python/py-block.c=0A+++=20b/gdb/python/py-block.c=0A@@=20-18,7=20=
+18,7=20@@=0A=20=20=20=20along=20with=20this=20program.=20=20If=20not,=20=
see=20<http://www.gnu.org/licenses/>.=20=20*/=0A=20=0A=20#include=20=
"defs.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"dictionary.h"=0A=20#include=20"symtab.h"=0A=20#include=20=
"python-internal.h"=0Adiff=20--git=20a/gdb/python/py-finishbreakpoint.c=20=
b/gdb/python/py-finishbreakpoint.c=0Aindex=2092ac5557d7..32fe6ae747=20=
100644=0A---=20a/gdb/python/py-finishbreakpoint.c=0A+++=20=
b/gdb/python/py-finishbreakpoint.c=0A@@=20-28,7=20+28,7=20@@=0A=20=
#include=20"language.h"=0A=20#include=20"observable.h"=0A=20#include=20=
"inferior.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"location.h"=0A=20=0A=20/*=20Function=20that=20is=20called=20=
when=20a=20Python=20finish=20bp=20is=20found=20out=20of=20scope.=20=20*/=0A=
diff=20--git=20a/gdb/python/py-frame.c=20b/gdb/python/py-frame.c=0Aindex=20=
e121afb222..254ee555cc=20100644=0A---=20a/gdb/python/py-frame.c=0A+++=20=
b/gdb/python/py-frame.c=0A@@=20-19,7=20+19,7=20@@=0A=20=0A=20#include=20=
"defs.h"=0A=20#include=20"charset.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"frame.h"=0A=20#include=20"symtab.h"=0A=20=
#include=20"stack.h"=0Adiff=20--git=20a/gdb/python/py-progspace.c=20=
b/gdb/python/py-progspace.c=0Aindex=2034baa87502..cc35b20b50=20100644=0A=
---=20a/gdb/python/py-progspace.c=0A+++=20b/gdb/python/py-progspace.c=0A=
@@=20-25,7=20+25,7=20@@=0A=20#include=20"language.h"=0A=20#include=20=
"arch-utils.h"=0A=20#include=20"solib.h"=0A-#include=20"block.h"=0A=
+#include=20"gdb-block.h"=0A=20=0A=20typedef=20struct=0A=20{=0Adiff=20=
--git=20a/gdb/python/py-symbol.c=20b/gdb/python/py-symbol.c=0Aindex=20=
d683505c8e..4601d0de11=20100644=0A---=20a/gdb/python/py-symbol.c=0A+++=20=
b/gdb/python/py-symbol.c=0A@@=20-18,7=20+18,7=20@@=0A=20=20=20=20along=20=
with=20this=20program.=20=20If=20not,=20see=20=
<http://www.gnu.org/licenses/>.=20=20*/=0A=20=0A=20#include=20"defs.h"=0A=
-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20=
"frame.h"=0A=20#include=20"symtab.h"=0A=20#include=20"python-internal.h"=0A=
diff=20--git=20a/gdb/python/py-symtab.c=20b/gdb/python/py-symtab.c=0A=
index=206229bc5123..e6475b89fb=20100644=0A---=20a/gdb/python/py-symtab.c=0A=
+++=20b/gdb/python/py-symtab.c=0A@@=20-23,7=20+23,7=20@@=0A=20#include=20=
"source.h"=0A=20#include=20"python-internal.h"=0A=20#include=20=
"objfiles.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=0A=
=20typedef=20struct=20stpy_symtab_object=20{=0A=20=20=20PyObject_HEAD=0A=
diff=20--git=20a/gdb/riscv-tdep.c=20b/gdb/riscv-tdep.c=0Aindex=20=
b86ba63054..1e4067cb1d=20100644=0A---=20a/gdb/riscv-tdep.c=0A+++=20=
b/gdb/riscv-tdep.c=0A@@=20-33,7=20+33,7=20@@=0A=20#include=20=
"regcache.h"=0A=20#include=20"osabi.h"=0A=20#include=20"riscv-tdep.h"=0A=
-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20=
"reggroups.h"=0A=20#include=20"opcode/riscv.h"=0A=20#include=20=
"elf/riscv.h"=0Adiff=20--git=20a/gdb/rust-exp.y=20b/gdb/rust-exp.y=0A=
index=204e7878f67e..88c670cdb3=20100644=0A---=20a/gdb/rust-exp.y=0A+++=20=
b/gdb/rust-exp.y=0A@@=20-31,7=20+31,7=20@@=0A=20=0A=20#include=20=
"defs.h"=0A=20=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"charset.h"=0A=20#include=20"cp-support.h"=0A=20#include=20=
"gdb_obstack.h"=0Adiff=20--git=20a/gdb/rust-lang.c=20b/gdb/rust-lang.c=0A=
index=20a590f9d6b4..23def1598f=20100644=0A---=20a/gdb/rust-lang.c=0A+++=20=
b/gdb/rust-lang.c=0A@@=20-21,7=20+21,7=20@@=0A=20=0A=20#include=20=
<ctype.h>=0A=20=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"c-lang.h"=0A=20#include=20"charset.h"=0A=20#include=20=
"cp-support.h"=0Adiff=20--git=20a/gdb/stack.c=20b/gdb/stack.c=0Aindex=20=
616b629e20..05cbe26961=20100644=0A---=20a/gdb/stack.c=0A+++=20=
b/gdb/stack.c=0A@@=20-33,7=20+33,7=20@@=0A=20#include=20"inferior.h"=0A=20=
#include=20"annotate.h"=0A=20#include=20"ui-out.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"stack.h"=0A=20=
#include=20"dictionary.h"=0A=20#include=20"reggroups.h"=0Adiff=20--git=20=
a/gdb/symfile.c=20b/gdb/symfile.c=0Aindex=202c38ce4431..2f1178bd7a=20=
100644=0A---=20a/gdb/symfile.c=0A+++=20b/gdb/symfile.c=0A@@=20-45,7=20=
+45,7=20@@=0A=20#include=20"bcache.h"=0A=20#include=20"hashtab.h"=0A=20=
#include=20"readline/tilde.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"observable.h"=0A=20#include=20"exec.h"=0A=20=
#include=20"parser-defs.h"=0Adiff=20--git=20a/gdb/symmisc.c=20=
b/gdb/symmisc.c=0Aindex=20fc56cfa938..3772951afa=20100644=0A---=20=
a/gdb/symmisc.c=0A+++=20b/gdb/symmisc.c=0A@@=20-29,7=20+29,7=20@@=0A=20=
#include=20"gdb_obstack.h"=0A=20#include=20"language.h"=0A=20#include=20=
"bcache.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"gdb_regex.h"=0A=20#include=20<sys/stat.h>=0A=20#include=20=
"dictionary.h"=0Adiff=20--git=20a/gdb/symtab.c=20b/gdb/symtab.c=0Aindex=20=
f96ad9554d..3e34998d37=20100644=0A---=20a/gdb/symtab.c=0A+++=20=
b/gdb/symtab.c=0A@@=20-47,7=20+47,7=20@@=0A=20#include=20"typeprint.h"=0A=
=20=0A=20#include=20"gdb_obstack.h"=0A-#include=20"block.h"=0A+#include=20=
"gdb-block.h"=0A=20#include=20"dictionary.h"=0A=20=0A=20#include=20=
<sys/types.h>=0A@@=20-1176,7=20+1176,7=20@@=20eq_symbol_entry=20(const=20=
struct=20symbol_cache_slot=20*slot,=0A=20=09=20then=20this=20means=20=
using=20the=20symbol=20name=20comparison=20function=20of=0A=20=09=20the=20=
symbol's=20language=20with=20symbol->search_name=20().=20=20See=0A=20=09=20=
dictionary.c.=20=20It=20also=20means=20using=20symbol_matches_domain=20=
for=0A-=09=20found=20symbols.=20=20See=20block.c.=0A+=09=20found=20=
symbols.=20=20See=20gdb-block.c.=0A=20=0A=20=09=20If=20the=20slot=20=
records=20a=20not-found=20symbol,=20then=20require=20a=20precise=20=
match.=0A=20=09=20We=20could=20still=20be=20lax=20with=20whitespace=20=
like=20strcmp_iw=20though.=20=20*/=0Adiff=20--git=20a/gdb/tracepoint.c=20=
b/gdb/tracepoint.c=0Aindex=2000b7059be5..caa63ef172=20100644=0A---=20=
a/gdb/tracepoint.c=0A+++=20b/gdb/tracepoint.c=0A@@=20-34,7=20+34,7=20@@=0A=
=20#include=20"linespec.h"=0A=20#include=20"regcache.h"=0A=20#include=20=
"completer.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"dictionary.h"=0A=20#include=20"observable.h"=0A=20#include=20=
"user-regs.h"=0Adiff=20--git=20a/gdb/valops.c=20b/gdb/valops.c=0Aindex=20=
0eb2b09621..ad94e4a3f2=20100644=0A---=20a/gdb/valops.c=0A+++=20=
b/gdb/valops.c=0A@@=20-30,7=20+30,7=20@@=0A=20#include=20"gdbcmd.h"=0A=20=
#include=20"regcache.h"=0A=20#include=20"cp-abi.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"infcall.h"=0A=20=
#include=20"dictionary.h"=0A=20#include=20"cp-support.h"=0Adiff=20--git=20=
a/gdb/value.c=20b/gdb/value.c=0Aindex=20a6e21309f8..f261316874=20100644=0A=
---=20a/gdb/value.c=0A+++=20b/gdb/value.c=0A@@=20-29,7=20+29,7=20@@=0A=20=
#include=20"language.h"=0A=20#include=20"demangle.h"=0A=20#include=20=
"regcache.h"=0A-#include=20"block.h"=0A+#include=20"gdb-block.h"=0A=20=
#include=20"target-float.h"=0A=20#include=20"objfiles.h"=0A=20#include=20=
"valprint.h"=0Adiff=20--git=20a/gdb/varobj.c=20b/gdb/varobj.c=0Aindex=20=
3358be4e77..20a7b2a622=20100644=0A---=20a/gdb/varobj.c=0A+++=20=
b/gdb/varobj.c=0A@@=20-21,7=20+21,7=20@@=0A=20#include=20"frame.h"=0A=20=
#include=20"language.h"=0A=20#include=20"gdbcmd.h"=0A-#include=20=
"block.h"=0A+#include=20"gdb-block.h"=0A=20#include=20"valprint.h"=0A=20=
#include=20"gdb_regex.h"=0A=20=0A--=20=0A2.28.0=0A=0A=

--Apple-Mail=_FD924307-A342-4C54-998A-3C5C0793B402--