From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by sourceware.org (Postfix) with ESMTPS id 7E3F3385E005 for ; Mon, 7 Sep 2020 01:47:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7E3F3385E005 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-pf1-f195.google.com with SMTP id b124so7769142pfg.13 for ; Sun, 06 Sep 2020 18:47:36 -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:message-id:mime-version:subject:date :in-reply-to:cc:to:references; bh=J6HZwWLFsfuoNvio0ZPjeZDhZEgUz2HbRL/GVYdYfcY=; b=c9+gC7xXTT5kTFDhpXFXpKgGtINChzT6hXoPhlK2UaBvhyLUIwdN5vybrIXtbjF2dq VdwUk1qzUmJUQ56HfvvKGYttZC0HjxpnQasIEjGLEBo/fddxJDaU96nJ4p/cSGKHZvFs pMHxK8UGVmDS4jd8bBjk8uYjzXxrp5YsxDG9nzV/2+7rPtoPSSBUl9mNZjfHANLkaayE 6y8pnHBUL1xuOTsbj9TpDlwxKWgWFQETgCsWR1X5Z/15bffG/9sTJuWZrxXWAwHubcj3 AQAkY7EyyRB3mlNglKMoSl3k/4XWKmJ+iIamrFowBHJZ//FDoDFlNLuzGUEGn2UtG43G F3pw== X-Gm-Message-State: AOAM533x3gz0xtVDV/TN5c/oB9P+cX5L1YKNQThObEFvczPhZCrPwr/P KYH16ydIlETNw1OXfFOwINAhQrboGsI= X-Google-Smtp-Source: ABdhPJy+SgDBBcIT94+BIHDjyVcDho2gS7KGLWW07nG/ieWRQam/8eGcRt4XekqM+GpDOOSmH9d2nQ== X-Received: by 2002:a63:5363:: with SMTP id t35mr15027890pgl.443.1599443255621; Sun, 06 Sep 2020 18:47:35 -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 v26sm1489232pgo.83.2020.09.06.18.47.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Sep 2020 18:47:34 -0700 (PDT) From: Saagar Jha Message-Id: Content-Type: multipart/mixed; boundary="Apple-Mail=_3044BD65-B67D-4C3E-A693-A0324A42458E" Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.0.3.2.26\)) Subject: Re: [PATCH] Rename block.{h,c} to gdb-block.{h, c} Date: Sun, 6 Sep 2020 18:47:33 -0700 In-Reply-To: Cc: gdb-patches@sourceware.org To: Simon Marchi References: X-Mailer: Apple Mail (2.3654.0.3.2.26) X-Spam-Status: No, score=-1.3 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_H3, RCVD_IN_MSPIKE_WL, 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2020 01:47:40 -0000 --Apple-Mail=_3044BD65-B67D-4C3E-A693-A0324A42458E Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Thanks, here=E2=80=99s an updated patch. If you=E2=80=99re interested in = CI, I keep some personal mirrors of the bintutils-gdb repository so I = took the liberty to turn on Travis CI for one=E2=80=93you can find that = here: https://travis-ci.org/github/saagarjha/binutils-gdb. It=E2=80=99s = nothing official, of course, but you might still be able to find it = useful to consult (ideally, it should match the main repo by about 10 = minutes). As you can see, it=E2=80=99s already caught a new build error = ;) --Apple-Mail=_3044BD65-B67D-4C3E-A693-A0324A42458E 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=2019edb73260b6f7871e0da09ddf419442ad0aae98=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20Saagar=20Jha=20=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=20(as=20part=20of=20Xcode)=20at=20/usr/include/Block.h.=0A= =20from=20Xcode=2012's=20SDK=20for=20macOS=2011=20includes=20= this=20file=20but=0Adue=20to=20GDB's=20compilation=20flags=20ends=20up=20= including=20gdb/block.h.=20The=0Asimplest=20solution=20to=20fix=20the=20= resulting=20build=20errors=20is=20to=20just=20rename=20it=0Ato=20= something=20that=20doesn't=20conflict.=0A=0Agdb/ChangeLog:=0A=0A=09*=20= Makefile.in:=20Replace=20block.c=20with=20gdb-block.c.=0A=09*=20= ada-exp.y:=0A=09*=20ada-lang.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20alpha-mdebug-tdep.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20alpha-tdep.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20amd64-tdep.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20ax-gdb.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20blockframe.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20breakpoint.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20buildsym.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20c-exp.y:=20Replace=20block.h=20with=20gdb-block.h.=0A= =09*=20cli/cli-cmds.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= coffread.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= compile/compile-c-symbols.c:=20Replace=20block.h=20with=20gdb-block.h.=0A= =09*=20compile/compile-cplus-symbols.c:=20Replace=20block.h=20with=0A=09= gdb-block.h.=0A=09*=20compile/compile-cplus-types.c:=20Replace=20block.h=20= with=0A=09gdb-block.h.=0A=09*=20compile/compile-loc2c.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A=09*=20compile/compile-object-load.c:=20= Replace=20block.h=20with=0A=09gdb-block.h.=0A=09*=20= compile/compile-object-run.c:=20Replace=20block.h=20with=20gdb-block.h.=0A= =09*=20compile/compile.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09= *=20cp-namespace.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= cp-support.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= csky-tdep.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= ctfread.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20d-exp.y:=20= Replace=20block.h=20with=20gdb-block.h.=0A=09*=20d-namespace.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A=09*=20dbxread.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A=09*=20dwarf2/frame-tailcall.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A=09*=20dwarf2/loc.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A=09*=20dwarf2/read.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A=09*=20eval.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A=09*=20expprint.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20f-exp.y:=20Replace=20block.h=20with=20gdb-block.h.=0A= =09*=20f-valprint.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= findvar.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20frame.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A=09*=20block.c:=20Moved=20= to...=0A=09*=20gdb-block.c:=20...here.=0A=09*=20block.h:=20Moved=20to...=0A= =09*=20gdb-block.h:=20...here.=0A=09*=20go-exp.y:=20Replace=20block.h=20= with=20gdb-block.h.=0A=09*=20go-lang.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20guile/scm-block.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20guile/scm-frame.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20guile/scm-symbol.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20guile/scm-symtab.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20infcall.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20infcmd.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20infrun.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20inline-frame.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20jit.c:=20Replace=20block.h=20with=20gdb-block.h.=0A= =09*=20linespec.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= m2-exp.y:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20maint.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A=09*=20mdebugread.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A=09*=20mi/mi-cmd-stack.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A=09*=20mips-sde-tdep.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A=09*=20mips-tdep.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A=09*=20objc-lang.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20objfiles.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20or1k-tdep.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A=09*=20p-exp.y:=20Replace=20block.h=20with=20gdb-block.h.=0A= =09*=20parse.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= printcmd.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= psymtab.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= python/py-block.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= python/py-finishbreakpoint.c:=20Replace=20block.h=20with=20gdb-block.h.=0A= =09*=20python/py-frame.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09= *=20python/py-progspace.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09= *=20python/py-symbol.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= python/py-symtab.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= riscv-tdep.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= rust-exp.y:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20= rust-lang.c:=20Replace=20block.h=20with=20gdb-block.h.=0A=09*=20stack.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A=09*=20symfile.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A=09*=20symmisc.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A=09*=20symtab.c=20(eq_symbol_entry):=20Replace=20= block.{c,h}=20with=0A=09gdb-block.{c,h}.=0A=09*=20tracepoint.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A=09*=20valops.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A=09*=20value.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A=09*=20varobj.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|=2089=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,=20172=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=2065fc9550dd..3eac355d8e=20100644=0A---=20= a/gdb/ChangeLog=0A+++=20b/gdb/ChangeLog=0A@@=20-1,3=20+1,92=20@@=0A= +2020-09-06=20=20Saagar=20Jha=20=0A+=0A+=09*=20= Makefile.in:=20Replace=20block.c=20with=20gdb-block.c.=0A+=09*=20= ada-exp.y:=20=0A+=09*=20ada-lang.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20alpha-mdebug-tdep.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20alpha-tdep.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20amd64-tdep.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20ax-gdb.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20blockframe.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20breakpoint.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20buildsym.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20c-exp.y:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20cli/cli-cmds.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20coffread.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20compile/compile-c-symbols.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A+=09*=20compile/compile-cplus-symbols.c:=20Replace=20= block.h=20with=0A+=09gdb-block.h.=0A+=09*=20= compile/compile-cplus-types.c:=20Replace=20block.h=20with=0A+=09= gdb-block.h.=0A+=09*=20compile/compile-loc2c.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A+=09*=20compile/compile-object-load.c:=20Replace=20= block.h=20with=0A+=09gdb-block.h.=0A+=09*=20= compile/compile-object-run.c:=20Replace=20block.h=20with=20gdb-block.h.=0A= +=09*=20compile/compile.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09= *=20cp-namespace.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20= cp-support.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20= csky-tdep.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20= ctfread.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20d-exp.y:=20= Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20d-namespace.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20dbxread.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A+=09*=20dwarf2/frame-tailcall.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20dwarf2/loc.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20dwarf2/read.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20eval.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A+=09*=20expprint.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A+=09*=20f-exp.y:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20f-valprint.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20findvar.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20frame.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20block.c:=20Moved=20to...=0A+=09*=20gdb-block.c:=20= ...here.=0A+=09*=20block.h:=20Moved=20to...=0A+=09*=20gdb-block.h:=20= ...here.=0A+=09*=20go-exp.y:=20Replace=20block.h=20with=20gdb-block.h.=0A= +=09*=20go-lang.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20= guile/scm-block.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20= guile/scm-frame.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20= guile/scm-symbol.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20= guile/scm-symtab.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20= infcall.c:=20Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20infcmd.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20infrun.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A+=09*=20inline-frame.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A+=09*=20jit.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A+=09*=20linespec.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20m2-exp.y:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20maint.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20mdebugread.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20mi/mi-cmd-stack.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20mips-sde-tdep.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20mips-tdep.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20objc-lang.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20objfiles.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20or1k-tdep.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20p-exp.y:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20parse.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20printcmd.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20psymtab.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20python/py-block.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20python/py-finishbreakpoint.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A+=09*=20python/py-frame.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A+=09*=20python/py-progspace.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A+=09*=20python/py-symbol.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A+=09*=20python/py-symtab.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A+=09*=20riscv-tdep.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20rust-exp.y:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20rust-lang.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20stack.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20symfile.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20symmisc.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=09*=20symtab.c=20(eq_symbol_entry):=20Replace=20= block.{c,h}=20with=0A+=09gdb-block.{c,h}.=0A+=09*=20tracepoint.c:=20= Replace=20block.h=20with=20gdb-block.h.=0A+=09*=20valops.c:=20Replace=20= block.h=20with=20gdb-block.h.=0A+=09*=20value.c:=20Replace=20block.h=20= with=20gdb-block.h.=0A+=09*=20varobj.c:=20Replace=20block.h=20with=20= gdb-block.h.=0A+=0A=202020-09-06=20=20Tom=20Tromey=20=20=0A= =20=0A=20=09*=20symfile.h=20(dwarf2_free_objfile):=20Don't=20declare.=0A= diff=20--git=20a/gdb/Makefile.in=20b/gdb/Makefile.in=0Aindex=20= 4808357e65..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=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=0A=20= #include=20=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.=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= .=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=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= =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=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=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.=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= .=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= =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=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= =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=_3044BD65-B67D-4C3E-A693-A0324A42458E Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Sep 6, 2020, at 04:52, Simon Marchi wrote: >=20 > On 2020-09-05 10:21 p.m., Saagar Jha wrote: >> 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. >>=20 >=20 > Hi, >=20 > Can you include in the commit message: >=20 > - which SDK are we talking about (for the non-initiated to macOS) > - the relevant versions (macOS, SDK) >=20 > Renaming our file is a little bit annoying, but I don't see a better = solution. We could > change our includes to be "./block.h" or "gdb/block.h", but sooner or = later someone will > add back a "block.h" include. It will silently break macOS because we = don't have CI for > that, and it will take somebody building GDB on macOS to notice and = fix it. >=20 > In your ChangeLog entry, drop the "gdb" part of the filenames, so that = they are relative > to the ChangeLog file itself (Makefile.in instead of gdb/Makefile.in). >=20 > Simon --Apple-Mail=_3044BD65-B67D-4C3E-A693-A0324A42458E--