[PATCH] Add gcc.gnu.org account names to MAINTAINERS

Richard Sandiford richard.sandiford@arm.com
Wed Jul 10 11:36:15 GMT 2024


As discussed in the thread starting at:

  https://gcc.gnu.org/pipermail/gcc/2024-June/244199.html

it would be useful to have the @gcc.gnu.org bugzilla account names
in MAINTAINERS.  This is because:

(a) Not every non-@gcc.gnu.org email listed in MAINTAINERS is registered
    as a bugzilla user.

(b) Only @gcc.gnu.org accounts tend to have full rights to modify tickets.

(c) A maintainer's name and email address aren't always enough to guess
    the bugzilla account name.

(d) The users list on bugzilla has many blank entries for "real name".

However, including @gcc.gnu.org to the account name might encourage
people to use it for ordinary email, rather than just for bugzilla.
This patch goes for the compromise of using the unqualified account
name, with some text near the top of the file to explain its usage.

There isn't room in the area maintainer sections for a new column,
so it seemed better to have the account name only in the Write
After Approval section.  It's then necessary to list all maintainers
there, even if they have more specific roles as well.

Also, there were some entries that didn't line up with the
prevailing columns (they had one tab too many or one tab too few).
It seemed easier to check for and report this, and other things,
if the file used spaces rather than tabs.

There was one instance of an email address without the trailing ">".
The updates to check-MAINTAINERS.py includes a test for that.

The account names in the file were taken from a trawl of the
gcc-cvs archives, with a very small number of manual edits for
ambiguities.  There are a handful of names that I couldn't find;
the new column has "-" for those.

The version inlined below is the -b version.  I've attached the full patch.

Tested on aarch64-linux-gnu.  OK to install?

Richard


ChangeLog:
	* MAINTAINERS: Replace tabs with spaces.  Add a bugzilla account
	name column to the Write After Approval section.  Line up the
	email column and fix an entry that was missing the trailing ">".

contrib/ChangeLog:
	* check-MAINTAINERS.py (sort_by_surname): Replace with...
	(get_surname): ...this.
	(has_tab, is_empty): Delete.
	(check_group): Take a list of column positions as argument.
	Check that lines conform to these column numbers.  Check that the
	final column is an email in angle brackets.  Record surnames on
	the fly.
	(top level): Reject tabs.  Use paragraph counts to identify which
	groups of lines should be checked.  Report missing sections.
---
 MAINTAINERS                  | 1638 +++++++++++++++++++---------------
 contrib/check-MAINTAINERS.py |  120 ++-
 2 files changed, 968 insertions(+), 790 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 762b91256c4..2df6a97f9b9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15,8 +15,13 @@ To report problems in GCC, please visit:
 
   http://gcc.gnu.org/bugs/
 
-Note: when adding someone to a more specific section please remove any
-corresponding entry from the Write After Approval list.
+If you'd like to CC a maintainer in bugzilla, please add @gcc.gnu.org
+to the account name given in the Write After Approval section below.
+Please use the email address given in <...> for direct email communication.
+
+Note: when adding someone who has commit access to a more specific section,
+please also ensure that there is a corresponding entry in the Write After
+Approval list, since that list contains the gcc.gnu.org account name.
 
 Note: please verify that sorting is correct with:
 ./contrib/check-MAINTAINERS.py MAINTAINERS
@@ -318,434 +323,579 @@ from other maintainers or reviewers.
 
                         Write After Approval    (last name alphabetical order)
 
-Mark G. Adams					<mark.g.adams@sympatico.ca>
-Ajit Kumar Agarwal				<aagarwa1@linux.ibm.com>
-Pedro Alves					<palves@redhat.com>
-Paul-Antoine Arras				<parras@baylibre.com>
-Arsen Arsenović		      	    		<arsen@aarsen.me>
-Raksit Ashok					<raksit@google.com>
-Matt Austern					<austern@google.com>
-David Ayers					<ayers@fsfe.org>
-Prakhar Bahuguna				<prakhar.bahuguna@arm.com>
-Giovanni Bajo					<giovannibajo@gcc.gnu.org>
-Simon Baldwin					<simonb@google.com>
-Richard Ball					<richard.ball@arm.com>
-Scott Bambrough					<scottb@netwinder.org>
-Wolfgang Bangerth				<bangerth@dealii.org>
-Gergö Barany					<gergo@codesourcery.com>
-Charles Baylis					<charles.baylis@linaro.org>
-Tejas Belagod					<tejas.belagod@arm.com>
-Matthew Beliveau				<mbelivea@redhat.com>
-Serge Belyshev					<belyshev@depni.sinp.msu.ru>
-Jon Beniston					<jon@beniston.com>
-Andrew Bennett					<andrew.bennett@imgtec.com>
-Andrew Benson					<abensonca@gmail.com>
-Daniel Berlin					<dberlin@dberlin.org>
-Pat Bernardi					<bernardi@adacore.com>
-Jan Beulich					<jbeulich@suse.com>
-David Billinghurst				<David.Billinghurst@riotinto.com>
-Tomas Bily					<tbily@suse.cz>
-Laurynas Biveinis				<laurynas.biveinis@gmail.com>
-Eric Blake					<ericb@gcc.gnu.org>
-Phil Blundell					<pb@futuretv.com>
-Hans Boehm					<hboehm@gcc.gnu.org>
-Lynn Boger					<laboger@linux.vnet.ibm.com>
-Ian Bolton					<ian.bolton@arm.com>
-Andrea Bona					<andrea.bona@st.com>
-Neil Booth					<neil@daikokuya.co.uk>
-Antoni Boucher					<bouanto@zoho.com>
-Robert Bowdidge					<bowdidge@apple.com>
-Joel Brobecker					<brobecker@gnat.com>
-Dave Brolley					<brolley@redhat.com>
-Christian Bruel					<christian.bruel@st.com>
-Kevin Buettner					<kevinb@redhat.com>
-Andrew Burgess					<aburgess@redhat.com>
-Adam Butcher					<adam@jessamine.co.uk>
-Andrew Cagney					<cagney@gnu.org>
-Andrew Carlotti					<andrew.carlotti@arm.com>
-Daniel Carrera					<dcarrera@gmail.com>
-Stephane Carrez					<stcarrez@nerim.fr>
-Gabriel Charette				<gchare@google.com>
-Chandra Chavva					<cchavva@redhat.com>
-Dehao Chen					<dehao@google.com>
-Fabien Chêne					<fabien@gcc.gnu.org>
-Monk Chiang					<monkchiang@gmail.com>
-Clément Chigot					<chigot@adacore.com>
-Harshit Chopra					<harshit@google.com>
-Juergen Christ					<jchrist@linux.ibm.com>
-Tamar Christina					<tamar.christina@arm.com>
-Eric Christopher				<echristo@gmail.com>
-Paul Clarke					<pc@us.ibm.com>
-William Cohen					<wcohen@redhat.com>
-Michael Collison				<michael.collison@arm.com>
-Josh Conner					<joshconner@google.com>
-R. Kelley Cook					<kcook@gcc.gnu.org>
-Alex Coplan					<alex.coplan@arm.com>
-Andrea Corallo					<andrea.corallo@arm.com>
-Christian Cornelssen				<ccorn@cs.tu-berlin.de>
-Ludovic Courtès					<ludo@gnu.org>
-Lawrence Crowl					<crowl@google.com>
-Lili Cui					<lili.cui@intel.com>
-Ian Dall					<ian@beware.dropbear.id.au>
-David Daney					<david.daney@caviumnetworks.com>
-Simon Dardis					<simon.dardis@gmail.com>
-Sudakshina Das					<sudi.das@arm.com>
-Bud Davis					<jmdavis@link.com>
-Chris Demetriou					<cgd@google.com>
-Sameera Deshpande				<sameera.deshpande@linaro.org>
-Wilco Dijkstra					<wdijkstr@arm.com>
-Benoit Dupont de Dinechin			<benoit.dupont-de-dinechin@st.com>
-Lehua Ding					<lehua.ding@rivai.ai>
-Jason Eckhardt					<jle@rice.edu>
-Bernd Edlinger					<bernd.edlinger@hotmail.de>
-Phil Edwards					<pme@gcc.gnu.org>
-Mark Eggleston					<mark.eggleston@codethink.co.uk>
-Steve Ellcey					<sellcey@caviumnetworks.com>
-Mohan Embar					<gnustuff@thisiscool.com>
-Revital Eres					<eres@il.ibm.com>
-Marc Espie					<espie@cvs.openbsd.org>
-Ansgar Esztermann				<ansgar@thphy.uni-duesseldorf.de>
-Doug Evans					<dje@google.com>
-Chris Fairles					<cfairles@gcc.gnu.org>
-Alessandro Fanfarillo				<fanfarillo.gcc@gmail.com>
-Changpeng Fang					<changpeng.fang@amd.com>
-Sam Feifer					<sfeifer@redhat.com>
-Eric Feng						<ef2648@columbia.edu>
-Li Feng						<nemokingdom@gmail.com>
-Thomas Fitzsimmons				<fitzsim@redhat.com>
-Alexander Fomin					<afomin.mailbox@gmail.com>
-Brian Ford					<ford@vss.fsi.com>
-Matthew Fortune					<mfortune@gmail.com>
-John Freeman					<jfreeman08@gmail.com>
-Nathan Froyd					<froydnj@gcc.gnu.org>
-Chao-ying Fu					<fu@mips.com>
-Gary Funck					<gary@intrepid.com>
-Pompapathi V Gadad				<Pompapathi.V.Gadad@nsc.com>
-Eric Gallager					<egall@gwmail.gwu.edu>
-Gopalasubramanian Ganesh			<Ganesh.Gopalasubramanian@amd.com>
-Fei Gao						<gaofei@eswincomputing.com>
-Kaveh Ghazi					<ghazi@gcc.gnu.org>
-Doug Gilmore					<Doug.Gilmore@imgtec.com>
-Matthew Gingell					<gingell@gnat.com>
-Jan-Benedict Glaw				<jbglaw@lug-owl.de>
-Marc Glisse					<marc.glisse@inria.fr>
-Prachi Godbole					<prachi.godbole@imgtec.com>
-Torbjorn Granlund				<tege@swox.com>
-James Greenhalgh				<james.greenhalgh@arm.com>
-Doug Gregor					<doug.gregor@gmail.com>
-Matthew Gretton-Dann				<matthew.gretton-dann@arm.com>
-Yury Gribov					<tetra2005@gmail.com>
-Jon Grimm					<jgrimm2@us.ibm.com>
-Laurent Guerby					<laurent@guerby.net>
-Haochen Gui					<guihaoc@gcc.gnu.org>
-Jiufu Guo					<guojiufu@linux.ibm.com>
-Xuepeng Guo					<terry.xpguo@gmail.com>
-Wei Guozhi					<carrot@google.com>
-Vineet Gupta					<vineetg@rivosinc.com>
-Naveen H.S					<naveenh@marvell.com>
-Mostafa Hagog					<hagog@gcc.gnu.org>
-Jivan Hakobyan					<jivanhakobyan9@gmail.com>
-Andrew Haley					<aph@redhat.com>
-Demin Han					<demin.han@starfivetech.com>
-Frederik Harwath				<frederik@harwath.name>
-Stuart Hastings					<stuart@apple.com>
-Michael Haubenwallner				<michael.haubenwallner@ssi-schaefer.com>
-Pat Haugen					<pthaugen@us.ibm.com>
-Michael Hayes					<m.hayes@elec.canterbury.ac.nz>
-Alan Hayward					<alan.hayward@arm.com>
-Li Jia He					<helijia@gcc.gnu.org>
-Mark Heffernan					<meheff@google.com>
-George Helffrich				<george@gcc.gnu.org>
-Daniel Hellstrom				<daniel@gaisler.com>
-Fergus Henderson				<fjh@cs.mu.oz.au>
-Stuart Henderson				<shenders@gcc.gnu.org>
-Marius Hillenbrand				<mhillen@linux.ibm.com>
-Matthew Hiller					<hiller@redhat.com>
-Kazu Hirata					<kazu@codesourcery.com>
-Manfred Hollstein				<mh@suse.com>
-Cong Hou					<congh@google.com>
-Levy Hsu					<admin@levyhsu.com>
-Lin Hu						<lin1.hu@intel.com>
-Falk Hueffner					<falk@debian.org>
-Andrew John Hughes				<gnu_andrew@member.fsf.org>
-Dominique d'Humieres				<dhumieres.dominique@free.fr>
-Andy Hutchinson					<hutchinsonandy@aim.com>
-Joel Hutton					<joel.hutton@arm.com>
-Lewis Hyatt					<lhyatt@gmail.com>
-Paul Iannetta					<piannetta@kalrayinc.com>
-Roland Illig					<roland.illig@gmx.de>
-Meador Inge					<meadori@codesourcery.com>
-Bernardo Innocenti				<bernie@develer.com>
-Mihail Ionescu					<mihail.ionescu@arm.com>
-Vladislav Ivanishin				<vlad@ispras.ru>
-Alexander Ivchenko				<aivchenk@gmail.com>
-Balaji V. Iyer					<bviyer@gmail.com>
-Pekka Jääskeläinen				<pekka.jaaskelainen@parmance.com>
-Daniel Jacobowitz				<drow@false.org>
-Andreas Jaeger					<aj@suse.de>
-Harsha Jagasia					<harsha.jagasia@amd.com>
-Fariborz Jahanian				<fjahanian@apple.com>
-Surya Kumari Jangala				<jskumari@linux.ibm.com>
-Haochen Jiang					<haochen.jiang@intel.com>
-Qian Jianhua					<qianjh@fujitsu.com>
-Michal Jires					<mjires@suse.cz>
-Janis Johnson					<janis.marie.johnson@gmail.com>
-Teresa Johnson					<tejohnson@google.com>
-Kean Johnston					<jkj@sco.com>
-Phillip Jordan					<phillip.m.jordan@gmail.com>
-Tim Josling					<tej@melbpc.org.au>
-Victor Kaplansky				<victork@il.ibm.com>
-Filip Kastl					<fkastl@suse.cz>
-Geoffrey Keating				<geoffk@geoffk.org>
-Brendan Kehoe					<brendan@zen.org>
-Andi Kleen					<andi@firstfloor.org>
-Matthias Klose					<doko@debian.org>
-Jeff Knaggs					<jknaggs@redhat.com>
-Michael Koch					<konqueror@gmx.de>
-Nicolas Koenig					<koenigni@student.ethz.ch>
-Boris Kolpackov					<boris@codesynthesis.com>
-Lingling Kong					<lingling.kong@intel.com>
-Dave Korn					<dave.korn.cygwin@gmail.com>
-Julia Koval					<julia.koval@intel.com>
-Matt Kraai					<kraai@ftbfs.org>
-Jan Kratochvil					<jan.kratochvil@redhat.com>
-Matthias Kretz					<m.kretz@gsi.de>
-Louis Krupp					<louis.krupp@zoho.com>
-Prathamesh Kulkarni				<prathameshk@nvidia.com>
-Venkataramanan Kumar				<venkataramanan.kumar@amd.com>
-Doug Kwan					<dougkwan@google.com>
-Aaron W. LaFramboise				<aaronavay62@aaronwl.com>
-Scott Robert Ladd				<scott.ladd@coyotegulch.com>
-Razya Ladelsky					<razya@gcc.gnu.org>
-Thierry Lafage					<thierry.lafage@inria.fr>
-Rask Ingemann Lambertsen			<ccc94453@vip.cybercity.dk>
-Jerome Lambourg					<lambourg@adacore.com>
-Tim Lange					<mail@tim-lange.me>
-Asher Langton					<langton2@llnl.gov>
-Chris Lattner					<sabre@nondot.org>
-Terry Laurenzo					<tlaurenzo@gmail.com>
-Alan Lawrence					<alan.lawrence@arm.com>
-Jozef Lawrynowicz				<jozef.l@mittosystems.com>
-Georg-Johann Lay				<avr@gjlay.de>
-Vlad Lazar					<vlad.lazar@arm.com>
-Marc Lehmann					<pcg@goof.com>
-James Lemke					<jim@lemke.org>
-Ilya Leoshkevich				<iii@linux.ibm.com>
-Kriang Lerdsuwanakij				<lerdsuwa@users.sourceforge.net>
-Pan Li						<pan2.li@intel.com>
-Renlin Li					<renlin.li@arm.com>
-Xinliang David Li				<davidxl@google.com>
-Chen Liqin					<liqin.gcc@gmail.com>
-Martin Liska					<mliska@suse.cz>
-Hao Liu					<hliu@os.amperecomputing.com>
-Jiangning Liu					<jiangning.liu@arm.com>
-Sa Liu						<saliu@de.ibm.com>
-Ralph Loader					<rcl@ihug.co.nz>
-Sheldon Lobo					<sheldon.lobo@oracle.com
-Gabor Loki					<loki@inf.u-szeged.hu>
-Manuel López-Ibáñez				<manu@gcc.gnu.org>
-Carl Love					<cel@linux.ibm.com>
-Martin v. Löwis					<loewis@informatik.hu-berlin.de>
-Edwin Lu						<ewlu@rivosinc.com>
-H.J. Lu						<hjl.tools@gmail.com>
-Xiong Hu Luo					<luoxhu@gcc.gnu.org>
-Bin Bin Lv					<shlb@linux.ibm.com>
-Christophe Lyon					<christophe.lyon@arm.com>
-Jun Ma						<junma@linux.alibaba.com>
-Luis Machado					<luisgpm@br.ibm.com>
-Ziga Mahkovec					<ziga.mahkovec@klika.si>
-Matthew Malcomson				<matthew.malcomson@arm.com>
-Mikhail Maltsev					<maltsevm@gmail.com>
-Stamatis Markianos-Wright			<stam.markianos-wright@arm.com>
-Patrick Marlier					<patrick.marlier@gmail.com>
-Simon Martin					<simartin@users.sourceforge.net>
-Alejandro Martinez				<alejandro.martinezvicente@arm.com>
-Ranjit Mathew					<rmathew@hotmail.com>
-Paulo Matos					<pmatos@linki.tools>
-Ken Matsui					<kmatsui@gcc.gnu.org>
-Michael Matz					<matz@suse.de>
-Greg McGary					<gkm@gnu.org>
-Roland McGrath					<roland@hack.frob.com>
-Bryce McKinlay					<mckinlay@redhat.com>
-Adam Megacz					<adam@xwt.org>
-Bingfeng Mei					<bmei@broadcom.com>
-Jim Meyering					<jim@meyering.net>
-Martin Michlmayr				<tbm@cyrius.com>
-Lee Millward					<lee.millward@gmail.com>
-Immad Mir					<mir@sourceware.org>
-Cupertino Miranda				<cupertino.miranda@oracle.com>
-Dragan Mladjenovic				<Dragan.Mladjenovic@syrmia.com>
-Alan Modra					<amodra@gmail.com>
-Catherine Moore					<clm@codesourcery.com>
-James A. Morrison				<phython@gcc.gnu.org>
-Brooks Moses					<bmoses@google.com>
-Dirk Mueller					<dmueller@suse.de>
-Phil Muldoon					<pmuldoon@redhat.com>
-Gaius Mulley					<gaiusmod2@gmail.com>
-Christoph Müllner				<christoph.muellner@vrull.eu>
-Steven Munroe					<munroesj52@gmail.com>
-Szabolcs Nagy					<szabolcs.nagy@arm.com>
-Victor Do Nascimento				<victor.donascimento@arm.com>
-Quentin Neill					<quentin.neill.gnu@gmail.com>
-Adam Nemet					<adambnemet@gmail.com>
-Thomas Neumann					<tneumann@users.sourceforge.net>
-Dan Nicolaescu					<dann@ics.uci.edu>
-Kelvin Nilsen					<kelvin.nilsen@gmail.com>
+Name                            BZ account      Email
+
+Mark G. Adams                   mgadams         <mark.g.adams@sympatico.ca>
+Ajit Kumar Agarwal              aagarwa         <aagarwa1@linux.ibm.com>
+Pedro Alves                     palves          <palves@redhat.com>
+John David Anglin               danglin         <dave.anglin@bell.net>
+Harald Anlauf                   anlauf          <anlauf@gmx.de>
+Paul-Antoine Arras              parras          <parras@baylibre.com>
+Arsen Arsenović                 arsen           <arsen@aarsen.me>
+Raksit Ashok                    raksit          <raksit@google.com>
+Sterling Augustine              sterling        <augustine.sterling@gmail.com>
+Matt Austern                    austern         <austern@google.com>
+David Ayers                     ayers           <ayers@fsfe.org>
+Prakhar Bahuguna                prakhar         <prakhar.bahuguna@arm.com>
+Giovanni Bajo                   giovannibajo    <giovannibajo@gcc.gnu.org>
+Simon Baldwin                   simonb          <simonb@google.com>
+Richard Ball                    ricbal02        <richard.ball@arm.com>
+Scott Bambrough                 scottb          <scottb@netwinder.org>
+Wolfgang Bangerth               bangerth        <bangerth@dealii.org>
+Gergö Barany                    gergo           <gergo@codesourcery.com>
+Charles Baylis                  cbaylis         <charles.baylis@linaro.org>
+Tejas Belagod                   belagod         <tejas.belagod@arm.com>
+Andrey Belevantsev              abel            <abel@ispras.ru>
+Matthew Beliveau                mbelivea        <mbelivea@redhat.com>
+Serge Belyshev                  ssb             <belyshev@depni.sinp.msu.ru>
+Jon Beniston                    jbeniston       <jon@beniston.com>
+Andrew Bennett                  abennett        <andrew.bennett@imgtec.com>
+Andrew Benson                   abensonca       <abensonca@gmail.com>
+Peter Bergner                   bergner         <bergner@linux.ibm.com>
+Daniel Berlin                   dberlin         <dberlin@dberlin.org>
+Pat Bernardi                    pbernardi       <bernardi@adacore.com>
+Jan Beulich                     jbeulich        <jbeulich@suse.com>
+Indu Bhagat                     ibhagat         <indu.bhagat@oracle.com>
+Richard Biener                  rguenth         <rguenther@suse.de>
+David Billinghurst              billingd        <David.Billinghurst@riotinto.com>
+Tomas Bily                      tomby           <tbily@suse.cz>
+Laurynas Biveinis               lauras          <laurynas.biveinis@gmail.com>
+Uros Bizjak                     uros            <ubizjak@gmail.com>
+Eric Blake                      ericb           <ericb@gcc.gnu.org>
+Janne Blomqvist                 jb              <jb@gcc.gnu.org>
+Phil Blundell                   pb              <pb@futuretv.com>
+Hans Boehm                      hboehm          <hboehm@gcc.gnu.org>
+Segher Boessenkool              segher          <segher@kernel.crashing.org>
+Lynn Boger                      boger           <laboger@linux.vnet.ibm.com>
+Ian Bolton                      ibolton         <ian.bolton@arm.com>
+Andrea Bona                     andreabo        <andrea.bona@st.com>
+Paolo Bonzini                   bonzini         <bonzini@gnu.org>
+Neil Booth                      neil            <neil@daikokuya.co.uk>
+Steven Bosscher                 steven          <steven@gcc.gnu.org>
+Eric Botcazou                   ebotcazou       <ebotcazou@libertysurf.fr>
+Per Bothner                     bothner         <per@bothner.com>
+Antoni Boucher                  antoyo          <bouanto@zoho.com>
+Sebastien Bourdeauducq          lekernel        <sebastien@milkymist.org>
+Robert Bowdidge                 bowdidge        <bowdidge@apple.com>
+James Bowman                    jamesbowman     <james.bowman@ftdichip.com>
+Joel Brobecker                  brobecke        <brobecker@gnat.com>
+Dave Brolley                    brolley         <brolley@redhat.com>
+Julian Brown                    jules           <julian@codesourcery.com>
+Christian Bruel                 chrbr           <christian.bruel@st.com>
+Iain Buclaw                     ibuclaw         <ibuclaw@gdcproject.org>
+Kevin Buettner                  kevinb          <kevinb@redhat.com>
+Andrew Burgess                  aburgess        <aburgess@redhat.com>
+Tobias Burnus                   burnus          <tburnus@baylibre.com>
+Adam Butcher                    abutcher        <adam@jessamine.co.uk>
+Andrew Cagney                   cagney          <cagney@gnu.org>
+Paolo Carlini                   paolo           <paolo.carlini@oracle.com>
+Andrew Carlotti                 acarlotti       <andrew.carlotti@arm.com>
+Daniel Carrera                  dcarrera        <dcarrera@gmail.com>
+Stephane Carrez                 ciceron         <stcarrez@nerim.fr>
+Gabriel Charette                gchare          <gchare@google.com>
+Arnaud Charlet                  charlet         <charlet@adacore.com>
+Chandra Chavva                  cchavva         <cchavva@redhat.com>
+Dehao Chen                      dehao           <dehao@google.com>
+Fabien Chêne                    fabien          <fabien@gcc.gnu.org>
+Bin Cheng                       amker           <bin.cheng@linux.alibaba.com>
+Kito Cheng                      kito            <kito.cheng@gmail.com>
+Lulu Cheng                      chenglulu       <chenglulu@loongson.cn>
+Denis Chertykov                 denisc          <chertykov@gmail.com>
+Monk Chiang                     monkc           <monkchiang@gmail.com>
+Clément Chigot                  helflym         <chigot@adacore.com>
+Harshit Chopra                  harshit         <harshit@google.com>
+Juergen Christ                  jchrist         <jchrist@linux.ibm.com>
+Tamar Christina                 tnfchris        <tamar.christina@arm.com>
+Eric Christopher                echristo        <echristo@gmail.com>
+Paul Clarke                     pc              <pc@us.ibm.com>
+Nick Clifton                    nickc           <nickc@redhat.com>
+Arthur Cohen                    cohenarthur     <arthur.cohen@embecosm.com>
+William Cohen                   wcohen          <wcohen@redhat.com>
+Michael Collison                collison        <michael.collison@arm.com>
+Josh Conner                     jconner         <joshconner@google.com>
+R. Kelley Cook                  kcook           <kcook@gcc.gnu.org>
+Alex Coplan                     acoplan         <alex.coplan@arm.com>
+Andrea Corallo                  akrl            <andrea.corallo@arm.com>
+Christian Cornelssen            ccorn           <ccorn@cs.tu-berlin.de>
+Ralf Corsepius                  corsepiu        <ralf.corsepius@rtems.org>
+François-Xavier Coudert         fxcoudert       <fxcoudert@gcc.gnu.org>
+Ludovic Courtès                 ludo            <ludo@gnu.org>
+Cary Coutant                    ccoutant        <ccoutant@gmail.com>
+Lawrence Crowl                  crowl           <crowl@google.com>
+Lili Cui                        cuilili         <lili.cui@intel.com>
+Palmer Dabbelt                  palmer          <palmer@dabbelt.com>
+Ian Dall                        iandall         <ian@beware.dropbear.id.au>
+David Daney                     daney           <david.daney@caviumnetworks.com>
+Robin Dapp                      rdapp           <rdapp.gcc@gmail.com>
+Simon Dardis                    dardiss         <simon.dardis@gmail.com>
+Sudakshina Das                  sudi            <sudi.das@arm.com>
+Bud Davis                       bdavis          <jmdavis@link.com>
+Jerry DeLisle                   jvdelisle       <jvdelisle@gcc.gnu.org>
+DJ Delorie                      dj              <dj@delorie.com>
+Chris Demetriou                 cgd             <cgd@google.com>
+Sameera Deshpande               sameerad        <sameera.deshpande@linaro.org>
+Wilco Dijkstra                  wilco           <wdijkstr@arm.com>
+Dimitar Dimitrov                dimitar         <dimitar@dinux.eu>
+Benoit Dupont de Dinechin       bd3             <benoit.dupont-de-dinechin@st.com>
+Lehua Ding                      lhtin           <lehua.ding@rivai.ai>
+Ulrich Drepper                  drepper         <drepper@gmail.com>
+François Dumont                 fdumont         <fdumont@gcc.gnu.org>
+Zdenek Dvorak                   rakdver         <ook@ucw.cz>
+Michael Eager                   eager           <eager@eagercon.com>
+Richard Earnshaw                rearnsha        <richard.earnshaw@arm.com>
+Jason Eckhardt                  jle             <jle@rice.edu>
+Erik Edelmann                   eedelman        <erik.edelmann@iki.fi>
+David Edelsohn                  dje             <dje.gcc@gmail.com>
+Bernd Edlinger                  edlinger        <bernd.edlinger@hotmail.de>
+Phil Edwards                    pme             <pme@gcc.gnu.org>
+Mark Eggleston                  markeggleston   <mark.eggleston@codethink.co.uk>
+Steve Ellcey                    sje             <sellcey@caviumnetworks.com>
+Ben Elliston                    bje             <config-patches@gnu.org>
+Mohan Embar                     membar          <gnustuff@thisiscool.com>
+Oleg Endo                       olegendo        <olegendo@gcc.gnu.org>
+Revital Eres                    revitale        <eres@il.ibm.com>
+Marc Espie                      espie           <espie@cvs.openbsd.org>
+Ansgar Esztermann               ansgar          <ansgar@thphy.uni-duesseldorf.de>
+Doug Evans                      devans          <dje@google.com>
+Chris Fairles                   cfairles        <cfairles@gcc.gnu.org>
+Alessandro Fanfarillo           afanfa          <fanfarillo.gcc@gmail.com>
+Changpeng Fang                  cfang           <changpeng.fang@amd.com>
+David Faust                     dfaust          <david.faust@oracle.com>
+Sam Feifer                      sfeifer         <sfeifer@redhat.com>
+Eric Feng                       efric           <ef2648@columbia.edu>
+Li Feng                         lifeng          <nemokingdom@gmail.com>
+Max Filippov                    jcmvbkbc        <jcmvbkbc@gmail.com>
+Thomas Fitzsimmons              fitzsim         <fitzsim@redhat.com>
+Alexander Fomin                 afomin          <afomin.mailbox@gmail.com>
+Brian Ford                      ford            <ford@vss.fsi.com>
+Matthew Fortune                 mpf             <mfortune@gmail.com>
+Daniel Franke                   dfranke         <franke.daniel@gmail.com>
+John Freeman                    -               <jfreeman08@gmail.com>
+Nathan Froyd                    froydnj         <froydnj@gcc.gnu.org>
+Chao-ying Fu                    chaoyingfu      <fu@mips.com>
+Gary Funck                      gfunck          <gary@intrepid.com>
+Pompapathi V Gadad              pompa           <Pompapathi.V.Gadad@nsc.com>
+Eric Gallager                   egallager       <egall@gwmail.gwu.edu>
+Gopalasubramanian Ganesh        -               <Ganesh.Gopalasubramanian@amd.com>
+Fei Gao                         feigao          <gaofei@eswincomputing.com>
+Kaveh Ghazi                     ghazi           <ghazi@gcc.gnu.org>
+Doug Gilmore                    dgilmore        <Doug.Gilmore@imgtec.com>
+Matthew Gingell                 gingell         <gingell@gnat.com>
+Tristan Gingold                 gingold         <tgingold@free.fr>
+Jan-Benedict Glaw               jbglaw          <jbglaw@lug-owl.de>
+Marc Glisse                     glisse          <marc.glisse@inria.fr>
+Prachi Godbole                  prachigodbole   <prachi.godbole@imgtec.com>
+Torbjorn Granlund               -               <tege@swox.com>
+Anthony Green                   green           <green@moxielogic.com>
+James Greenhalgh                jgreenhalgh     <james.greenhalgh@arm.com>
+Doug Gregor                     dgregor         <doug.gregor@gmail.com>
+Matthew Gretton-Dann            mgretton        <matthew.gretton-dann@arm.com>
+Yury Gribov                     ygribov         <tetra2005@gmail.com>
+Jon Grimm                       jgrimm          <jgrimm2@us.ibm.com>
+Tobias Grosser                  grosser         <grosser@fim.uni-passau.de>
+Laurent Guerby                  guerby          <laurent@guerby.net>
+Haochen Gui                     guihaoc         <guihaoc@gcc.gnu.org>
+Jiufu Guo                       guojiufu        <guojiufu@linux.ibm.com>
+Xuepeng Guo                     xguo            <terry.xpguo@gmail.com>
+Wei Guozhi                      carrot          <carrot@google.com>
+Vineet Gupta                    vineetg         <vineetg@rivosinc.com>
+Naveen H.S                      naveenh         <naveenh@marvell.com>
+Mostafa Hagog                   hagog           <hagog@gcc.gnu.org>
+Olivier Hainque                 hainque         <hainque@adacore.com>
+Jivan Hakobyan                  jivan           <jivanhakobyan9@gmail.com>
+Andrew Haley                    aph             <aph@redhat.com>
+Demin Han                       deminhan        <demin.han@starfivetech.com>
+Frederik Harwath                frederik        <frederik@harwath.name>
+Stuart Hastings                 stuart          <stuart@apple.com>
+Michael Haubenwallner           haubi           <michael.haubenwallner@ssi-schaefer.com>
+Pat Haugen                      pthaugen        <pthaugen@us.ibm.com>
+Michael Hayes                   m.hayes         <m.hayes@elec.canterbury.ac.nz>
+Alan Hayward                    alahay01        <alan.hayward@arm.com>
+Li Jia He                       helijia         <helijia@gcc.gnu.org>
+Mark Heffernan                  meheff          <meheff@google.com>
+George Helffrich                george          <george@gcc.gnu.org>
+Daniel Hellstrom                danielh         <daniel@gaisler.com>
+Fergus Henderson                fjh             <fjh@cs.mu.oz.au>
+Richard Henderson               rth             <rth@gcc.gnu.org>
+Stuart Henderson                shenders        <shenders@gcc.gnu.org>
+Aldy Hernandez                  aldyh           <aldyh@redhat.com>
+Philip Herron                   redbrain        <herron.philip@googlemail.com>
+Marius Hillenbrand              mhillen         <mhillen@linux.ibm.com>
+Matthew Hiller                  hiller          <hiller@redhat.com>
+Kazu Hirata                     kazu            <kazu@codesourcery.com>
+Manfred Hollstein               manfred         <mh@suse.com>
+Stafford Horne                  shorne          <shorne@gmail.com>
+Cong Hou                        congh           <congh@google.com>
+Levy Hsu                        xlwxlw7969      <admin@levyhsu.com>
+Lin Hu                          hulin           <lin1.hu@intel.com>
+Sebastian Huber                 sh              <sebastian.huber@embedded-brains.de>
+Jan Hubicka                     hubicka         <hubicka@ucw.cz>
+Falk Hueffner                   falk            <falk@debian.org>
+Andrew John Hughes              gandalf         <gnu_andrew@member.fsf.org>
+Dominique d'Humieres            dominiq         <dhumieres.dominique@free.fr>
+Andy Hutchinson                 hutchinsonandy  <hutchinsonandy@aim.com>
+Joel Hutton                     joelh           <joel.hutton@arm.com>
+Lewis Hyatt                     lhyatt          <lhyatt@gmail.com>
+Paul Iannetta                   piannetta       <piannetta@kalrayinc.com>
+Roland Illig                    rillig          <roland.illig@gmx.de>
+Meador Inge                     meadori         <meadori@codesourcery.com>
+Bernardo Innocenti              bernie          <bernie@develer.com>
+Mihail Ionescu                  mionescu        <mihail.ionescu@arm.com>
+Vladislav Ivanishin             vlad            <vlad@ispras.ru>
+Alexander Ivchenko              aivchenk        <aivchenk@gmail.com>
+Balaji V. Iyer                  bviyer          <bviyer@gmail.com>
+Pekka Jääskeläinen              visit0r         <pekka.jaaskelainen@parmance.com>
+Daniel Jacobowitz               drow            <drow@false.org>
+Andreas Jaeger                  aj              <aj@suse.de>
+Harsha Jagasia                  hjagasia        <harsha.jagasia@amd.com>
+Fariborz Jahanian               fjahanian       <fjahanian@apple.com>
+Martin Jambor                   jamborm         <mjambor@suse.cz>
+Surya Kumari Jangala            jskumari        <jskumari@linux.ibm.com>
+Jakub Jelinek                   jakub           <jakub@redhat.com>
+Andrew Jenner                   andrewjenner    <andrew@codesourcery.com>
+Haochen Jiang                   jianghc         <haochen.jiang@intel.com>
+Qian Jianhua                    qianjh          <qianjh@fujitsu.com>
+Michal Jires                    mjires          <mjires@suse.cz>
+Janis Johnson                   janis           <janis.marie.johnson@gmail.com>
+Teresa Johnson                  tejohnson       <tejohnson@google.com>
+Kean Johnston                   jkj             <jkj@sco.com>
+Phillip Jordan                  pmj             <phillip.m.jordan@gmail.com>
+Tim Josling                     timjosling      <tej@melbpc.org.au>
+Victor Kaplansky                victork         <victork@il.ibm.com>
+Filip Kastl                     pheeck          <fkastl@suse.cz>
+Geoffrey Keating                geoffk          <geoffk@geoffk.org>
+Brendan Kehoe                   brendan         <brendan@zen.org>
+Richard Kenner                  kenner          <kenner@nyu.edu>
+Andi Kleen                      ak              <andi@firstfloor.org>
+Matthias Klose                  doko            <doko@debian.org>
+Jeff Knaggs                     jknaggs         <jknaggs@redhat.com>
+Michael Koch                    mkoch           <konqueror@gmx.de>
+Nicolas Koenig                  koenigni        <koenigni@student.ethz.ch>
+Kaz Kojima                      kkojima         <kkojima@gcc.gnu.org>
+Boris Kolpackov                 boris           <boris@codesynthesis.com>
+Lingling Kong                   konglin1        <lingling.kong@intel.com>
+Thomas König                    tkoenig         <tkoenig@gcc.gnu.org>
+Paul Koning                     pkoning         <ni1d@arrl.net>
+Bruce Korb                      korbb           <bkorb@gnu.org>
+Dave Korn                       davek           <dave.korn.cygwin@gmail.com>
+Julia Koval                     jkoval          <julia.koval@intel.com>
+Matt Kraai                      kraai           <kraai@ftbfs.org>
+Daniel Kraft                    domob           <d@domob.eu>
+Jan Kratochvil                  jkratoch        <jan.kratochvil@redhat.com>
+Andreas Krebbel                 krebbel         <krebbel@linux.ibm.com>
+Matthias Kretz                  mkretz          <m.kretz@gsi.de>
+Louis Krupp                     lkrupp          <louis.krupp@zoho.com>
+Prathamesh Kulkarni             prathamesh3492  <prathameshk@nvidia.com>
+Venkataramanan Kumar            vekumar         <venkataramanan.kumar@amd.com>
+Maxim Kuvyrkov                  mkuvyrkov       <maxim.kuvyrkov@linaro.org>
+Doug Kwan                       dougkwan        <dougkwan@google.com>
+Aaron W. LaFramboise            aaronwl         <aaronavay62@aaronwl.com>
+Scott Robert Ladd               srladd          <scott.ladd@coyotegulch.com>
+Razya Ladelsky                  razya           <razya@gcc.gnu.org>
+Thierry Lafage                  tlafage         <thierry.lafage@inria.fr>
+Rask Ingemann Lambertsen        rask            <ccc94453@vip.cybercity.dk>
+Jerome Lambourg                 lambourg        <lambourg@adacore.com>
+Tim Lange                       tlange          <mail@tim-lange.me>
+Asher Langton                   langton         <langton2@llnl.gov>
+Chris Lattner                   sabre           <sabre@nondot.org>
+Terry Laurenzo                  tlaurenzo       <tlaurenzo@gmail.com>
+Jeff Law                        law             <jeffreyalaw@gmail.com>
+Alan Lawrence                   alalaw01        <alan.lawrence@arm.com>
+Jozef Lawrynowicz               jozefl          <jozef.l@mittosystems.com>
+Georg-Johann Lay                gjl             <avr@gjlay.de>
+Vlad Lazar                      vladlazar       <vlad.lazar@arm.com>
+Marc Lehmann                    pcg             <pcg@goof.com>
+James Lemke                     jwlemke         <jim@lemke.org>
+Ilya Leoshkevich                iii             <iii@linux.ibm.com>
+Kriang Lerdsuwanakij            lerdsuwa        <lerdsuwa@users.sourceforge.net>
+Pan Li                          panli           <pan2.li@intel.com>
+Renlin Li                       renlin          <renlin.li@arm.com>
+Xinliang David Li               davidxl         <davidxl@google.com>
+Kewen Lin                       linkw           <linkw@gcc.gnu.org>
+Chen Liqin                      liqin           <liqin.gcc@gmail.com>
+Martin Liska                    marxin          <mliska@suse.cz>
+Hao Liu                         hliu            <hliu@os.amperecomputing.com>
+Hongtao Liu                     liuhongt        <hongtao.liu@intel.com>
+Jiangning Liu                   liujiangning    <jiangning.liu@arm.com>
+Sa Liu                          saliu           <saliu@de.ibm.com>
+Ralph Loader                    ralph           <rcl@ihug.co.nz>
+Sheldon Lobo                    smlobo          <sheldon.lobo@oracle.com>
+Gabor Loki                      loki            <loki@inf.u-szeged.hu>
+Sandra Loosemore                sandra          <sloosemore@baylibre.com>
+Manuel López-Ibáñez             manu            <manu@gcc.gnu.org>
+Carl Love                       carll           <cel@linux.ibm.com>
+Martin v. Löwis                 loewis          <loewis@informatik.hu-berlin.de>
+Edwin Lu                        ewlu            <ewlu@rivosinc.com>
+H.J. Lu                         hjl             <hjl.tools@gmail.com>
+Xiong Hu Luo                    luoxhu          <luoxhu@gcc.gnu.org>
+Bin Bin Lv                      shlb            <shlb@linux.ibm.com>
+Christophe Lyon                 clyon           <christophe.lyon@arm.com>
+Jun Ma                          junma           <junma@linux.alibaba.com>
+Andrew MacLeod                  amacleod        <amacleod@redhat.com>
+Luis Machado                    luisgpm         <luisgpm@br.ibm.com>
+Ziga Mahkovec                   ziga            <ziga.mahkovec@klika.si>
+Vladimir Makarov                vmakarov        <vmakarov@redhat.com>
+David Malcolm                   dmalcolm        <dmalcolm@redhat.com>
+Matthew Malcomson               matmal01        <matthew.malcomson@arm.com>
+Mikhail Maltsev                 miyuki          <maltsevm@gmail.com>
+Jose E. Marchesi                jemarch         <jose.marchesi@oracle.com>
+Stamatis Markianos-Wright       stammark        <stam.markianos-wright@arm.com>
+Patrick Marlier                 pmarlier        <patrick.marlier@gmail.com>
+Simon Martin                    simartin        <simartin@users.sourceforge.net>
+Alejandro Martinez              alejandro       <alejandro.martinezvicente@arm.com>
+Ranjit Mathew                   rmathew         <rmathew@hotmail.com>
+Paulo Matos                     pmatos          <pmatos@linki.tools>
+Ken Matsui                      kmatsui         <kmatsui@gcc.gnu.org>
+Michael Matz                    matz            <matz@suse.de>
+Greg McGary                     gkm             <gkm@gnu.org>
+Roland McGrath                  roland          <roland@hack.frob.com>
+Bryce McKinlay                  bryce           <mckinlay@redhat.com>
+Adam Megacz                     megacz          <adam@xwt.org>
+Bingfeng Mei                    meibf           <bmei@broadcom.com>
+Michael Meissner                meissner        <gnu@the-meissners.org>
+Jason Merrill                   jason           <jason@redhat.com>
+Jim Meyering                    meyering        <jim@meyering.net>
+Martin Michlmayr                tbm             <tbm@cyrius.com>
+David S. Miller                 davem           <davem@redhat.com>
+Lee Millward                    lmillward       <lee.millward@gmail.com>
+Immad Mir                       mir             <mir@sourceware.org>
+Cupertino Miranda               cupermir        <cupertino.miranda@oracle.com>
+Dragan Mladjenovic              draganm         <Dragan.Mladjenovic@syrmia.com>
+Alan Modra                      amodra          <amodra@gmail.com>
+Toon Moene                      toon            <toon@moene.org>
+Alexander Monakov               amonakov        <amonakov@ispras.ru>
+Catherine Moore                 clm             <clm@codesourcery.com>
+Mikael Morin                    mikael          <mikael@gcc.gnu.org>
+James A. Morrison               phython         <phython@gcc.gnu.org>
+Brooks Moses                    brooks          <bmoses@google.com>
+Dirk Mueller                    mueller         <dmueller@suse.de>
+Phil Muldoon                    pmuldoon        <pmuldoon@redhat.com>
+Gaius Mulley                    gaius           <gaiusmod2@gmail.com>
+Christoph Müllner               cmuellner       <christoph.muellner@vrull.eu>
+Steven Munroe                   munroesj        <munroesj52@gmail.com>
+Philippe De Muyter              phdm            <phdm@macqel.be>
+Joseph Myers                    jsm28           <josmyers@redhat.com>
+Szabolcs Nagy                   nsz             <szabolcs.nagy@arm.com>
+Victor Do Nascimento            victorldn       <victor.donascimento@arm.com>
+Quentin Neill                   qneill          <quentin.neill.gnu@gmail.com>
+Adam Nemet                      nemet           <adambnemet@gmail.com>
+Nathanael Nerode                neroden         <neroden@gcc.gnu.org>
+Thomas Neumann                  tneumann        <tneumann@users.sourceforge.net>
+Dan Nicolaescu                  dann            <dann@ics.uci.edu>
+Kelvin Nilsen                   kelvin          <kelvin.nilsen@gmail.com>
+Hans-Peter Nilsson              hp              <hp@axis.com>
 James Norris
-Diego Novillo					<dnovillo@google.com>
-Dorit Nuzman					<dorit@il.ibm.com>
-David O'Brien					<obrien@FreeBSD.org>
-Carlos O'Donell					<carlos@redhat.com>
-Peter O'Gorman					<pogma@thewrittenword.com>
-Patrick O'Neill					<patrick@rivosinc.com>
-Braden Obrzut					<admin@maniacsvault.net>
-Tsukasa Oi					<research_trasio@irq.a4lg.com>
-Andrea Ornstein					<andrea.ornstein@st.com>
-Maxim Ostapenko					<m.ostapenko@samsung.com>
-Jeevitha Palanisamy				<jeevitha@linux.ibm.com>
-Patrick Palka					<ppalka@gcc.gnu.org>
-Srinath Parvathaneni				<srinath.parvathaneni@arm.com>
-Devang Patel					<dpatel@apple.com>
-Andris Pavenis					<andris.pavenis@iki.fi>
-Fernando Pereira				<pronesto@gmail.com>
-Sebastian Perta					<sebastian.perta@renesas.com>
-Sebastian Peryt					<sebastian.peryt@intel.com>
-Johannes Pfau					<johannespfau@gmail.com>
-Kaushik Phatak					<kaushik.phatak@kpitcummins.com>
-Nicolas Pitre					<nico@cam.org>
-Michael Ploujnikov				<michael.ploujnikov@oracle.com>
-Paul Pluzhnikov					<ppluzhnikov@google.com>
-Antoniu Pop					<antoniu.pop@gmail.com>
-Siddhesh Poyarekar				<siddhesh@gotplt.org>
-Vidya Praveen					<vidyapraveen@arm.com>
-Thomas Preud'homme				<thomas.preudhomme@celest.fr>
-Benjamin Priour					<priour.be@gmail.com>
-Vladimir Prus					<vladimir@codesourcery.com>
-Hafiz Abid Qadeer				<abidh@codesourcery.com>
-Yao Qi						<yao@codesourcery.com>
-Jerry Quinn					<jlquinn@optonline.net>
-Navid Rahimi					<navidrahimi@microsoft.com>
-Rishi Raj						<rishiraj45035@gmail.com>
-Easwaran Raman					<eraman@google.com>
-Joe Ramsay					<joe.ramsay@arm.com>
-Rolf Rasmussen					<rolfwr@gcc.gnu.org>
-Fritz Reese					<fritzoreese@gmail.com>
-Volker Reichelt					<v.reichelt@netcologne.de>
-Joern Rennecke					<gnu@amylaar.uk>
-Bernhard Reutner-Fischer			<rep.dot.nop@gmail.com>
-Tom Rix						<trix@redhat.com>
-Thomas Rodgers					<trodgers@redhat.com>
-Craig Rodrigues					<rodrigc@gcc.gnu.org>
-Erven Rohou					<erven.rohou@inria.fr>
-Ira Rosen					<irar@il.ibm.com>
-Yvan Roux					<yvan.roux@linaro.org>
-Silvius Rus					<rus@google.com>
-Matthew Sachs					<msachs@apple.com>
-Ankur Saini					<arsenic@sourceware.org>
-Hariharan Sandanagobalane			<hariharan.gcc@gmail.com>
-Duncan Sands					<baldrick@gcc.gnu.org>
-Sujoy Saraswati					<sujoy.saraswati@hpe.com>
-Trevor Saunders					<tbsaunde+gcc@tbsaunde.org>
-Aaron Sawdey					<acsawdey@linux.ibm.com>
-Roger Sayle					<roger@nextmovesoftware.com>
-Will Schmidt					<will_schmidt@vnet.ibm.com>
-Stefan Schulze Frielinghaus			<stefansf@linux.ibm.com>
-Tilo Schwarz					<tilo@tilo-schwarz.de>
-Martin Sebor					<msebor@gcc.gnu.org>
-Svein Seldal					<svein@dev.seldal.com>
-Senthil Kumar Selvaraj				<saaadhu@gcc.gnu.org>
-Thiemo Seufer					<ths@networkno.de>
-Bill Seurer					<seurer@linux.vnet.ibm.com>
-Nathaniel Shead					<nathanieloshead@gmail.com>
-Tim Shen					<timshen@google.com>
-David Sherwood					<david.sherwood@arm.com>
-Sharad Singhai					<singhai@google.com>
-Johannes Singler				<singler@kit.edu>
-Franz Sirl					<franz.sirl-kernel@lauterbach.com>
-Jan Sjodin					<jan.sjodin@amd.com>
-Trevor Smigiel					<trevor_smigiel@playstation.sony.com>
-Edward Smith-Rowland				<esmithrowland@gmail.com>
-Anatoly Sokolov					<aesok@dol.ru>
-Michael Sokolov					<msokolov@ivan.Harhan.ORG>
-Jayant Sonar					<rsonar.jayant@gmail.com>
-Fangrui Song	                                <maskray@gcc.gnu.org>
-Richard Stallman				<rms@gnu.org>
-Basile Starynkevitch				<basile@starynkevitch.net>
-Jakub Staszak					<kuba@et.pl>
-Graham Stott					<graham.stott@btinternet.com>
-Jeff Sturm					<jsturm@gcc.gnu.org>
-Robert Suchanek					<rsuchy84@gmail.com>
-Andrew Sutton					<andrew.n.sutton@gmail.com>
-Gabriele Svelto					<gabriele.svelto@st.com>
-Torbjörn Svensson				<torbjorn.svensson@foss.st.com>
-Toma Tabacu					<toma.tabacu@gmail.com>
-Omar Tahir					<omar.tahir@arm.com>
-Sriraman Tallam					<tmsriram@google.com>
-Samuel Tardieu					<sam@rfc1149.net>
-Sam Tebbs					<samuel.tebbs@gmail.com>
-Dinar Temirbulatov				<dtemirbulatov@gmail.com>
-Kresten Krab Thorup				<krab@gcc.gnu.org>
-Kai Tietz					<ktietz70@googlemail.com>
-Ilya Tocar					<tocarip@gmail.com>
-Petter Tomner					<tomner@bahnhof.se>
-Philipp Tomsich					<philipp.tomsich@vrull.eu>
-Daniel Towner					<dant@picochip.com>
-Konrad Trifunovic				<konrad.trifunovic@inria.fr>
-Markus Trippelsdorf				<markus@trippelsdorf.de>
-Sergei Trofimovich				<slyfox@gcc.gnu.org>
-Igor Tsimbalist					<igor.v.tsimbalist@intel.com>
-Martin Uecker					<uecker@gcc.gnu.org>
-David Ung					<davidu@mips.com>
-Neil Vachharajani				<nvachhar@gmail.com>
-Kris Van Hees					<kris.van.hees@oracle.com>
-Joost VandeVondele				<joost.vandevondele@mat.ethz.ch>
-Andre Vehreschild				<vehre@gmx.de>
-Alex Velenko					<alex.velenko@arm.com>
-Ilya Verbin					<iverbin@gmail.com>
-Andre Vieira					<andre.simoesdiasvieira@arm.com>
-Rasmus Villemoes				<rv@rasmusvillemoes.dk>
-Kugan Vivekanandarajah				<kuganv@linaro.org>
-Marcel Vollweiler				<marcel@codesourcery.com>
-Ville Voutilainen				<ville.voutilainen@gmail.com>
-Nenad Vukicevic					<nenad@intrepid.com>
-Feng Wang					<fengwang@nudt.edu.cn>
-Feng Wang					<wangfeng@eswincomputing.com>
-Hongyu Wang					<hongyu.wang@intel.com>
-Jiong Wang					<jiong.wang@arm.com>
-Stephen M. Webb					<stephen.webb@bregmasoft.com>
-John Wehle					<john@feith.com>
-Florian Weimer					<fweimer@redhat.com>
-Zack Weinberg					<zackw@panix.com>
-Alexander Westbrooks			<alexanderw@gcc.gnu.org>
-Mark Wielaard					<mark@gcc.gnu.org>
-Edmar Wienskoski				<edmar@freescale.com>
-Ollie Wild					<aaw@google.com>
-Kevin Williams					<kevin.williams@inria.fr>
-Przemyslaw Wirkus				<przemyslaw.wirkus@arm.com>
-Carlo Wood					<carlo@alinoe.com>
-Jackson Woodruff				<jackson.woodruff@arm.com>
-Jonathan Wright					<jonathan.wright@arm.com>
-Ruoyao Xi					<xry111@xry111.site>
-Mingjie Xing					<mingjie.xing@gmail.com>
-Chenghua Xu					<paul.hua.gm@gmail.com>
-Li Xu						<xuli1@eswincomputing.com>
-Canqun Yang					<canqun@nudt.edu.cn>
-Fei Yang					<felix.yang@huawei.com>
-Jeffrey Yasskin					<jyasskin@google.com>
-Joey Ye						<joey.ye@arm.com>
-Kwok Cheung Yeung				<kcyeung@baylibre.com>
-Greta Yorsh					<greta.yorsh@arm.com>
-David Yuste					<david.yuste@gmail.com>
-Adhemerval Zanella				<azanella@linux.vnet.ibm.com>
-Xiao Zeng					<zengxiao@eswincomputing.com>
-Dennis Zhang					<dennis.zhang@arm.com>
-Yufeng Zhang					<yufeng.zhang@arm.com>
-Qing Zhao					<qing.zhao@oracle.com>
-Shujing Zhao					<pearly.zhao@oracle.com>
-Pengxuan Zheng					<quic_pzheng@quicinc.com>
-Jon Ziegler					<jonz@apple.com>
-Roman Zippel					<zippel@linux-m68k.org>
-Josef Zlomek					<josef.zlomek@email.cz>
+Diego Novillo                   dnovillo        <dnovillo@google.com>
+Dorit Nuzman                    dorit           <dorit@il.ibm.com>
+David O'Brien                   obrien          <obrien@FreeBSD.org>
+Carlos O'Donell                 carlos          <carlos@redhat.com>
+Peter O'Gorman                  pogma           <pogma@thewrittenword.com>
+Patrick O'Neill                 poneill         <patrick@rivosinc.com>
+Braden Obrzut                   blzut3          <admin@maniacsvault.net>
+Tsukasa Oi                      a4lg            <research_trasio@irq.a4lg.com>
+Alexandre Oliva                 aoliva          <aoliva@gcc.gnu.org>
+Andrea Ornstein                 andreao         <andrea.ornstein@st.com>
+Rainer Orth                     ro              <ro@CeBiTec.Uni-Bielefeld.DE>
+Maxim Ostapenko                 chefmax         <m.ostapenko@samsung.com>
+Jeevitha Palanisamy             jeevitha        <jeevitha@linux.ibm.com>
+Patrick Palka                   ppalka          <ppalka@gcc.gnu.org>
+Seongbae Park                   spark           <seongbae.park@gmail.com>
+Srinath Parvathaneni            sripar01        <srinath.parvathaneni@arm.com>
+Devang Patel                    dpatel          <dpatel@apple.com>
+Andris Pavenis                  andris          <andris.pavenis@iki.fi>
+Fernando Pereira                pronesto        <pronesto@gmail.com>
+Nicola Pero                     nicola          <nicola.pero@meta-innovation.com>
+Sebastian Perta                 sebastianperta  <sebastian.perta@renesas.com>
+Sebastian Peryt                 speryt          <sebastian.peryt@intel.com>
+Johannes Pfau                   jpfau           <johannespfau@gmail.com>
+Gerald Pfeifer                  gerald          <gerald@pfeifer.com>
+Kaushik Phatak                  kaushikp        <kaushik.phatak@kpitcummins.com>
+Andrew Pinski                   pinskia         <pinskia@gmail.com>
+Nicolas Pitre                   nico            <nico@cam.org>
+Michael Ploujnikov              plouj           <michael.ploujnikov@oracle.com>
+Paul Pluzhnikov                 ppluzhnikov     <ppluzhnikov@google.com>
+Marek Polacek                   mpolacek        <polacek@redhat.com>
+Antoniu Pop                     apop            <antoniu.pop@gmail.com>
+Sebastian Pop                   spop            <sebpop@gmail.com>
+Marc Poulhiès                   dkm             <poulhies@adacore.com>
+Siddhesh Poyarekar              siddhesh        <siddhesh@gotplt.org>
+Vidya Praveen                   vp              <vidyapraveen@arm.com>
+Thomas Preud'homme              thopre01        <thomas.preudhomme@celest.fr>
+Benjamin Priour                 vultkayn        <priour.be@gmail.com>
+Vladimir Prus                   vprus           <vladimir@codesourcery.com>
+Hafiz Abid Qadeer               abidh           <abidh@codesourcery.com>
+Yao Qi                          qiyao           <yao@codesourcery.com>
+Xianmiao Qu                     xianmiao        <cooper.qu@linux.alibaba.com>
+Jerry Quinn                     jlquinn         <jlquinn@optonline.net>
+Ramana Radhakrishnan            ramana          <ramanara@nvidia.com>
+Navid Rahimi                    navidr          <navidrahimi@microsoft.com>
+Rishi Raj                       rshraj45035     <rishiraj45035@gmail.com>
+Easwaran Raman                  eraman          <eraman@google.com>
+Joe Ramsay                      joeramsay       <joe.ramsay@arm.com>
+Rolf Rasmussen                  rolfwr          <rolfwr@gcc.gnu.org>
+Fritz Reese                     foreese         <fritzoreese@gmail.com>
+Volker Reichelt                 reichelt        <v.reichelt@netcologne.de>
+Joern Rennecke                  amylaar         <gnu@amylaar.uk>
+Bernhard Reutner-Fischer        aldot           <rep.dot.nop@gmail.com>
+Torvald Riegel                  torvald         <triegel@redhat.com>
+Tom Rix                         trix            <trix@redhat.com>
+Pierre-Marie de Rodat           pmderodat       <derodat@adacore.com>
+Thomas Rodgers                  rodgertq        <trodgers@redhat.com>
+Craig Rodrigues                 rodrigc         <rodrigc@gcc.gnu.org>
+Erven Rohou                     erven           <erven.rohou@inria.fr>
+Ira Rosen                       irar            <irar@il.ibm.com>
+Yvan Roux                       yroux           <yvan.roux@linaro.org>
+Eugene Rozenfeld                erozen          <erozen@microsoft.com>
+Maciej W. Rozycki               macro           <macro@orcam.me.uk>
+Douglas Rupp                    rupp            <douglas.b.rupp@gmail.com>
+Silvius Rus                     rus             <rus@google.com>
+Matthew Sachs                   matthewg        <msachs@apple.com>
+Ankur Saini                     arsenic         <arsenic@sourceware.org>
+Hariharan Sandanagobalane       hariharans      <hariharan.gcc@gmail.com>
+Richard Sandiford               rsandifo        <rdsandiford@googlemail.com>
+Iain Sandoe                     iains           <iain@sandoe.co.uk>
+Duncan Sands                    baldrick        <baldrick@gcc.gnu.org>
+Sujoy Saraswati                 ssaraswati      <sujoy.saraswati@hpe.com>
+Trevor Saunders                 tbsaunde        <tbsaunde+gcc@tbsaunde.org>
+Aaron Sawdey                    acsawdey        <acsawdey@linux.ibm.com>
+Roger Sayle                     sayle           <roger@nextmovesoftware.com>
+Tobias Schlüter                 tobi            <tobias.schlueter@physik.uni-muenchen.de>
+Bernd Schmidt                   bernds          <bernds_cb1@t-online.de>
+Will Schmidt                    willschm        <will_schmidt@vnet.ibm.com>
+Stefan Schulze Frielinghaus     stefansf        <stefansf@linux.ibm.com>
+Andreas Schwab                  schwab          <schwab@linux-m68k.org>
+Tilo Schwarz                    tiloschwarz     <tilo@tilo-schwarz.de>
+Thomas Schwinge                 tschwinge       <thomas@schwinge.name>
+Martin Sebor                    msebor          <msebor@gcc.gnu.org>
+Dodji Seketeli                  dodji           <dodji@redhat.com>
+Svein Seldal                    sveinse         <svein@dev.seldal.com>
+Senthil Kumar Selvaraj          saaadhu         <saaadhu@gcc.gnu.org>
+Kostya Serebryany               kcc             <kcc@google.com>
+Thiemo Seufer                   ths             <ths@networkno.de>
+Bill Seurer                     seurer          <seurer@linux.vnet.ibm.com>
+Marcus Shawcroft                mshawcroft      <marcus.shawcroft@arm.com>
+Nathaniel Shead                 nshead          <nathanieloshead@gmail.com>
+Tim Shen                        timshen         <timshen@google.com>
+Joel Sherrill                   joel            <joel@oarcorp.com>
+David Sherwood                  davids          <david.sherwood@arm.com>
+Nathan Sidwell                  nathan          <nathan@acm.org>
+Sharad Singhai                  singhai         <singhai@google.com>
+Johannes Singler                singler         <singler@kit.edu>
+Franz Sirl                      sirl            <franz.sirl-kernel@lauterbach.com>
+Jan Sjodin                      jsjodin         <jan.sjodin@amd.com>
+Trevor Smigiel                  tsmigiel        <trevor_smigiel@playstation.sony.com>
+Edward Smith-Rowland            emsr            <esmithrowland@gmail.com>
+Anatoly Sokolov                 aesok           <aesok@dol.ru>
+Michael Sokolov                 msokolov        <msokolov@ivan.Harhan.ORG>
+Jayant Sonar                    jayants         <rsonar.jayant@gmail.com>
+Fangrui Song                    maskray         <maskray@gcc.gnu.org>
+Richard Stallman                rms             <rms@gnu.org>
+Basile Starynkevitch            bstarynk        <basile@starynkevitch.net>
+Jakub Staszak                   kuba            <kuba@et.pl>
+Graham Stott                    grahams         <graham.stott@btinternet.com>
+Andrew Stubbs                   ams             <ams@baylibre.com>
+Mike Stump                      mrs             <mikestump@comcast.net>
+Jeff Sturm                      jsturm          <jsturm@gcc.gnu.org>
+YunQiang Su                     syq             <syq@gcc.gnu.org>
+Robert Suchanek                 rts             <rsuchy84@gmail.com>
+Andrew Sutton                   asutton         <andrew.n.sutton@gmail.com>
+Gabriele Svelto                 gsvelto         <gabriele.svelto@st.com>
+Torbjörn Svensson               azoff           <torbjorn.svensson@foss.st.com>
+Toma Tabacu                     tomtab          <toma.tabacu@gmail.com>
+Omar Tahir                      omatah          <omar.tahir@arm.com>
+Sriraman Tallam                 tmsriram        <tmsriram@google.com>
+Chung-Lin Tang                  cltang          <cltang@baylibre.com>
+Samuel Tardieu                  sam             <sam@rfc1149.net>
+Ian Lance Taylor                ian             <ian@airs.com>
+Sam Tebbs                       samtebbs        <samuel.tebbs@gmail.com>
+Dinar Temirbulatov              dinar           <dtemirbulatov@gmail.com>
+Matt Thomas                     matt            <matt@3am-software.com>
+Paul Thomas                     pault           <pault@gcc.gnu.org>
+Philipp Thomas                  pthomas         <pth@suse.de>
+Jason Thorpe                    thorpej         <thorpej@netbsd.org>
+Kresten Krab Thorup             krab            <krab@gcc.gnu.org>
+Caroline Tice                   ctice           <cmtice@google.com>
+Kai Tietz                       ktietz          <ktietz70@googlemail.com>
+Kyrylo Tkachov                  ktkachov        <ktkachov@nvidia.com>
+Andreas Tobler                  andreast        <andreast@gcc.gnu.org>
+Ilya Tocar                      tocarip         <tocarip@gmail.com>
+Petter Tomner                   tomner          <tomner@bahnhof.se>
+Philipp Tomsich                 ptomsich        <philipp.tomsich@vrull.eu>
+Daniel Towner                   -               <dant@picochip.com>
+Konrad Trifunovic               trifunovic      <konrad.trifunovic@inria.fr>
+Markus Trippelsdorf             trippels        <markus@trippelsdorf.de>
+Sergei Trofimovich              slyfox          <slyfox@gcc.gnu.org>
+Tom Tromey                      tromey          <tromey@redhat.com>
+Igor Tsimbalist                 itsimbal        <igor.v.tsimbalist@intel.com>
+Martin Uecker                   uecker          <uecker@gcc.gnu.org>
+David Ung                       davidu          <davidu@mips.com>
+Neil Vachharajani               nvachhar        <nvachhar@gmail.com>
+Kris Van Hees                   kvanhees        <kris.van.hees@oracle.com>
+Joost VandeVondele              vondele         <joost.vandevondele@mat.ethz.ch>
+Andre Vehreschild               vehre           <vehre@gmx.de>
+Alex Velenko                    avelenko        <alex.velenko@arm.com>
+Ilya Verbin                     iverbin         <iverbin@gmail.com>
+Andre Vieira                    avieira         <andre.simoesdiasvieira@arm.com>
+Rasmus Villemoes                villemoes       <rv@rasmusvillemoes.dk>
+Kugan Vivekanandarajah          kugan           <kuganv@linaro.org>
+Marcel Vollweiler               marcel          <marcel@codesourcery.com>
+Ville Voutilainen               ville           <ville.voutilainen@gmail.com>
+Tom de Vries                    vries           <tdevries@suse.de>
+Nenad Vukicevic                 nenadv          <nenad@intrepid.com>
+Dmitry Vyukov                   dvyukov         <dvyukov@google.com>
+Jonathan Wakely                 redi            <jwakely@redhat.com>
+Krister Walfridsson             kristerw        <krister.walfridsson@gmail.com>
+Feng Wang                       fengwang        <fengwang@nudt.edu.cn>
+Feng Wang                       fengwang1792    <wangfeng@eswincomputing.com>
+Hongyu Wang                     hongyuw         <hongyu.wang@intel.com>
+Jiong Wang                      jiwang          <jiong.wang@arm.com>
+Stephen M. Webb                 smw             <stephen.webb@bregmasoft.com>
+John Wehle                      wehle           <john@feith.com>
+Ulrich Weigand                  uweigand        <uweigand@de.ibm.com>
+Janus Weil                      janus           <janus@gcc.gnu.org>
+Florian Weimer                  fw              <fweimer@redhat.com>
+Zack Weinberg                   zack            <zackw@panix.com>
+Alexander Westbrooks            alexanderw      <alexanderw@gcc.gnu.org>
+Mark Wielaard                   mark            <mark@gcc.gnu.org>
+Edmar Wienskoski                edmarwjr        <edmar@freescale.com>
+Ollie Wild                      aaw             <aaw@google.com>
+Ralf Wildenhues                 rwild           <Ralf.Wildenhues@gmx.de>
+Kevin Williams                  kwilliam        <kevin.williams@inria.fr>
+Jim Wilson                      wilson          <jim.wilson.gcc@gmail.com>
+Przemyslaw Wirkus               wirkus          <przemyslaw.wirkus@arm.com>
+Carlo Wood                      carlo           <carlo@alinoe.com>
+Jackson Woodruff                jcw             <jackson.woodruff@arm.com>
+Jonathan Wright                 jonwri01        <jonathan.wright@arm.com>
+Chung-Ju Wu                     jasonwucj       <jasonwucj@gmail.com>
+Le-Chun Wu                      lcwu            <lcwu@google.com>
+Ruoyao Xi                       xry111          <xry111@xry111.site>
+Mingjie Xing                    xmj             <mingjie.xing@gmail.com>
+Chenghua Xu                     paulhua         <paul.hua.gm@gmail.com>
+Li Xu                           xuli            <xuli1@eswincomputing.com>
+Canqun Yang                     canqun          <canqun@nudt.edu.cn>
+Fei Yang                        fyang           <felix.yang@huawei.com>
+Jeffrey Yasskin                 jyasskin        <jyasskin@google.com>
+Joey Ye                         jye2            <joey.ye@arm.com>
+Kwok Cheung Yeung               kcy             <kcyeung@baylibre.com>
+Jonathan Yong                   jyong           <10walls@gmail.com>
+Greta Yorsh                     gretay          <greta.yorsh@arm.com>
+Kirill Yukhin                   kyukhin         <kirill.yukhin@gmail.com>
+David Yuste                     dyuste          <david.yuste@gmail.com>
+Kenneth Zadeck                  zadeck          <zadeck@naturalbridge.com>
+Adhemerval Zanella              azanella        <azanella@linux.vnet.ibm.com>
+Xiao Zeng                       zeng            <zengxiao@eswincomputing.com>
+Dennis Zhang                    xczhang         <dennis.zhang@arm.com>
+Jie Zhang                       jiez            <jzhang918@gmail.com>
+Yufeng Zhang                    yufeng          <yufeng.zhang@arm.com>
+Qing Zhao                       qinzhao         <qing.zhao@oracle.com>
+Shujing Zhao                    pzhao           <pearly.zhao@oracle.com>
+Pengxuan Zheng                  pzheng          <quic_pzheng@quicinc.com>
+Juzhe Zhong                     juzhe           <juzhe.zhong@rivai.ai>
+Roman Zhuykov                   zhroma          <zhroma@ispras.ru>
+Jon Ziegler                     jonz            <jonz@apple.com>
+Roman Zippel                    zippel          <zippel@linux-m68k.org>
+Claudiu Zissulescu              claziss         <claziss@gmail.com>
+Josef Zlomek                    zlomek          <josef.zlomek@email.cz>
 
                         Bug database only accounts
 
diff --git a/contrib/check-MAINTAINERS.py b/contrib/check-MAINTAINERS.py
index 2bac67f0821..144d8815772 100755
--- a/contrib/check-MAINTAINERS.py
+++ b/contrib/check-MAINTAINERS.py
@@ -25,7 +25,7 @@
 import locale
 import sys
 from difflib import ndiff
-from itertools import dropwhile, takewhile
+from itertools import groupby
 
 import unidecode
 
@@ -38,8 +38,7 @@ if len(sys.argv) != 2:
     sys.exit(1)
 
 
-def sort_by_surname(line):
-    name = line.split('\t')[0]
+def get_surname(name):
     parts = name.split()
     surname = parts[-1]
 
@@ -52,35 +51,61 @@ def sort_by_surname(line):
         surname = 'Humieres'
 
     # Remove accents
-    return (unidecode.unidecode(surname), line)
+    return unidecode.unidecode(surname)
 
 
-def has_tab(line):
-    return '\t' in line
-
-
-def is_empty(line):
-    return line
-
-
-def check_group(name, lines):
+def check_group(name, lines, columns):
     global exit_code
 
+    named_lines = []
     for line in lines:
         if line.startswith(' '):
             print(f'Line should not start with space: "{line}"')
             exit_code = 2
+            continue
+
+        if line.endswith(' '):
+            print(f'Line should not end with space: "{line}"')
+            exit_code = 3
+            continue
 
         # Special-case some names
         if line == 'James Norris':
+            named_lines.append((get_surname(line), line + "\n"))
             continue
 
-        if '\t' not in line:
-            print(f'Name and email should be separated by tabs: "{line}"')
-            exit_code = 2
+        pieces = []
+        for i, column in enumerate(columns):
+            piece = ""
+            if len(line) <= column:
+                print(f'Line too short: "{line}"')
+                exit_code = 4
+            elif column > 0 and line[column - 1] != ' ':
+                print(f'Column {column - 1} should be empty: "{line}"')
+                exit_code = 5
+            elif line[column] == ' ':
+                print(f'Column {column} should be nonempty: "{line}"')
+                exit_code = 6
+            elif i == len(columns) - 1:
+                piece = line[column:].rstrip()
+            else:
+                piece = line[column:columns[i + 1]].rstrip()
+
+            if "  " in piece:
+                print(f'Malformed field at column {column}: "{line}"')
+                exit_code = 7
 
-    lines = [line + '\n' for line in lines]
-    sorted_lines = sorted(lines, key=sort_by_surname)
+            pieces.append(piece)
+
+        named_lines.append((get_surname(pieces[0]), line + "\n"))
+
+        email = pieces[-1]
+        if email and (not email.startswith('<') or not email.endswith('>')):
+            print(f'Malformed email address: "{line}"')
+            exit_code = 8
+
+    lines = [line + "\n" for line in lines]
+    sorted_lines = [line for _, line in sorted(named_lines)]
     if lines != sorted_lines:
         exit_code = 1
         diff = ndiff(lines, sorted_lines)
@@ -90,32 +115,35 @@ def check_group(name, lines):
         print(f'{name} are fine!')
 
 
-lines = open(sys.argv[1]).read().splitlines()
-
-needle = 'Global Reviewers'
-lines = list(dropwhile(lambda x: x.strip() != needle, lines))
-lines = lines[2:]
-
-chunk = list(takewhile(is_empty, lines))
-check_group(needle, chunk)
+text = open(sys.argv[1]).read()
+if '\t' in text:
+    print('The file should not contain tabs')
+    exit_code = 9
 
-needle = 'Write After Approval'
-lines = list(dropwhile(lambda x: needle not in x, lines))
-lines = lines[2:]
+sections = [
+    # heading, paragraph index, column numbers
+    ('Global Reviewers', 1, [0, 48]),
+    ('Write After Approval', 2, [0, 32, 48]),
+    ('Bug database only accounts', 1, [0, 48]),
+    ('Contributing under the DCO', 2, [0, 48])
+]
 
-chunk = list(takewhile(is_empty, lines))
-check_group(needle, chunk)
-
-needle = 'Bug database only accounts'
-lines = list(dropwhile(lambda x: needle not in x, lines))
-lines = lines[2:]
-
-chunk = list(takewhile(is_empty, lines))
-check_group(needle, chunk)
-
-needle = 'Contributing under the DCO'
-lines = list(dropwhile(lambda x: needle not in x, lines))[1:]
-lines = list(dropwhile(lambda x: not has_tab(x), lines))
-check_group(needle, lines)
+i = 0
+count = 0
+for is_empty, lines in groupby(text.splitlines(), lambda x: not x):
+    if is_empty:
+        continue
+    lines = list(lines)
+    if count > 0:
+        count -= 1
+        if count == 0:
+            check_group(sections[i][0], lines, sections[i][2])
+            i += 1
+    elif len(lines) == 1 and i < len(sections) and sections[i][0] in lines[0]:
+        count = sections[i][1]
+
+if i < len(sections):
+    print(f'Missing "{sections[i][0]}" section')
+    exit_code = 10
 
 sys.exit(exit_code)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Add-gcc.gnu.org-account-names-to-MAINTAINERS.patch
Type: text/x-diff
Size: 104962 bytes
Desc: not available
URL: <https://gcc.gnu.org/pipermail/gcc-patches/attachments/20240710/6a1bbfb1/attachment-0001.bin>


More information about the Gcc-patches mailing list