Skip to content

Commit 9c6226d

Browse files
committed
merge conflicts
1 parent 037c955 commit 9c6226d

138 files changed

Lines changed: 16541 additions & 13882 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

external/gpl3/binutils/dist/binutils/BRANCHES

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ binutils-2_42-branch
6161
binutils-2_43-branch
6262
binutils-2_44-branch
6363
binutils-2_45-branch
64+
binutils-2_46-branch
6465

65-
Copyright (C) 2012-2025 Free Software Foundation, Inc.
66+
Copyright (C) 2012-2026 Free Software Foundation, Inc.
6667

6768
Copying and distribution of this file, with or without modification,
6869
are permitted in any medium without royalty provided the copyright

external/gpl3/binutils/dist/binutils/ChangeLog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2374,7 +2374,7 @@
23742374

23752375
For older changes see ChangeLog-2020
23762376

2377-
Copyright (C) 2021-2025 Free Software Foundation, Inc.
2377+
Copyright (C) 2021-2026 Free Software Foundation, Inc.
23782378

23792379
Copying and distribution of this file, with or without modification,
23802380
are permitted in any medium without royalty provided the copyright

external/gpl3/binutils/dist/binutils/MAINTAINERS

Lines changed: 71 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ responsibility among the other maintainers.
7171
AVR Denis Chertykov <chertykov@gmail.com>
7272
AVR Marek Michalkiewicz <marekm@amelek.gda.pl>
7373
BFIN Jie Zhang <jzhang918@gmail.com>
74-
BFIN Mike Frysinger <vapier@gentoo.org>
7574
BPF Jose E. Marchesi <jose.marchesi@oracle.com>
7675
CRIS Hans-Peter Nilsson <hp@axis.com>
7776
CTF Nick Alcock <nick.alcock@oracle.com>
@@ -87,15 +86,14 @@ responsibility among the other maintainers.
8786
FRV Alexandre Oliva <aoliva@sourceware.org>
8887
GOLD Ian Lance Taylor <iant@google.com>
8988
GOLD Cary Coutant <ccoutant@gmail.com>
90-
gprofng Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
89+
gprofng Claudiu Zissulescu <claziss@gmail.com>
90+
gprofng Jose E. Marchesi <jemarch@gnu.org>
9191
HPPA Dave Anglin <dave.anglin@bell.net>
9292
HPPA elf64 Jeff Law <law@redhat.com> [Basic maintainance only]
93-
IA-64 Jim Wilson <wilson@tuliptree.org>
9493
ix86 H.J. Lu <hjl.tools@gmail.com>
9594
ix86 COFF DJ Delorie <dj@redhat.com>
9695
ix86 PE/COFF Dave Korn <dave.korn.cygwin@gmail.com>
9796
ix86 INTEL MODE Jan Beulich <jbeulich@suse.com>
98-
KVX Paul Iannetta <piannetta@kalrayinc.com>
9997
libsframe Indu Bhagat <indu.bhagat@oracle.com>
10098
LM32 Jon Beniston <jon@beniston.com>
10199
LoongArch Chenghua Xu <xuchenghua@loongson.cn>
@@ -123,7 +121,7 @@ responsibility among the other maintainers.
123121
RISC-V Palmer Dabbelt <palmer@dabbelt.com>
124122
RISC-V Andrew Waterman <andrew@sifive.com>
125123
RISC-V Jim Wilson <jim.wilson.gcc@gmail.com>
126-
RISC-V Nelson Chu <nelson@rivosinc.com>
124+
RISC-V Nelson Chu <nelson.chu1990@gmail.com>
127125
RX Nick Clifton <nickc@redhat.com>
128126
S12Z John Darrington <john@darrington.wattle.id.au>
129127
s390, s390x Andreas Krebbel <krebbel@linux.ibm.com>
@@ -140,7 +138,6 @@ responsibility among the other maintainers.
140138
x86_64 Jan Hubicka <jh@suse.cz>
141139
x86_64 Andreas Jaeger <aj@suse.de>
142140
x86_64 H.J. Lu <hjl.tools@gmail.com>
143-
XCOFF Richard Sandiford <r.sandiford@uk.ibm.com>
144141
XGATE Sean Keys <skeys@ipdatasys.com>
145142
Xtensa Max Filippov <jcmvbkbc@gmail.com>
146143
Xtensa Sterling Augustine <augustine.sterling@gmail.com>
@@ -155,17 +152,22 @@ goes with them.
155152
Paul Brook
156153
Eric Christopher
157154
Jason Eckhardt
155+
Mike Frysinger
156+
Paul Iannetta
158157
Geoff Keating
159158
Mark Kettenis
160159
Walter Lee
161160
Mei Ligang
162161
Arnold Metselaar
162+
Vladimir Mezentsev
163163
Mark Mitchell
164+
Richard Sandiford
164165
Bernd Schmidt
165166
Svein Seldal
166-
M R Swami Reddy
167167
Martin Schwidefsky
168+
M R Swami Reddy
168169
Matt Thomas
170+
Jim Wilson
169171

170172
--------- CGEN Maintainers -------------
171173

@@ -233,6 +235,67 @@ The details of the Developer's Certificate or Origin can be found here:
233235

234236
https://developercertificate.org/
235237

238+
--------- LLM Generated Patches ---------
239+
240+
The GNU Binutils project is currently *NOT* accepting LLM generated patches.
241+
242+
This is because the copyright status of code generated by a LLM (Large
243+
Language Model [1]) is currently unclear. The policy applies to all
244+
parts of the GNU Binutils including, but not limited to, source code,
245+
documentation and the testsuites.
246+
247+
There are however some exceptions to the policy:
248+
249+
* Using LLMs to assist in writing code is fine providing that the
250+
LLM does not actually generate code. So for example using an
251+
LLM to provide text to speech services or to search for published
252+
information is OK.
253+
254+
* LLM generated code that is not "legally significant"[2] is OK.
255+
As a rule of thumb, this means that trivial changes, such as
256+
spelling corrections, or small code formatting cleanups are fine.
257+
258+
Using an LLM to inspire or help create a patch might be OK. It is a
259+
question of whether LLM generated output eventually makes it into the
260+
patch. If it does, then the patch is unacceptable. (Unless it can
261+
be considered legally insignificant).
262+
263+
In addition all patch submissions must involve a human. Fully
264+
automated patch submission, whether by a bot, a script, or some other
265+
means is not acceptable. This is because only humans can sign a
266+
Developer Certificate of Origin or complete a FSF Copyright Assignment
267+
and one of these needs to be in place for every submission.
268+
269+
The copyright assignment or DCO allows the GNU Binutils project to
270+
trust that the submitter is legally able to make the contribution
271+
and that the submission can be used under the terms of the GNU General
272+
Public License (see the COPYING3 file).
273+
274+
Footnotes:
275+
276+
This policy is not set in stone. It may well be reviewed and changed
277+
in the future.
278+
279+
The policy uses the term "LLM generated" rather than "A.I. generated"
280+
as the latter could be misunderstood. See [3] for more details.
281+
Nevertheless the policy applies to any kind of machine generated
282+
contribution where the copyright status is unclear.
283+
284+
When submitting a non-legally-significant LLM generated change, it is
285+
encouraged to clearly indicate the use of the LLM. The identification
286+
could take the form of a line starting with the Generated-By: prefix
287+
which identifies the LLM used. For example:
288+
289+
Generated-By: GNU-LLM version 1.0
290+
291+
The reason for asking for this is to set a precedent. So in the
292+
future, if non-trivial LLM generated patches do become acceptable,
293+
the process of labeling them will already be a standard action.
294+
295+
[1]: https://en.wikipedia.org/wiki/Large_language_model
296+
[2]: https://www.gnu.org/prep/maintain/maintain.html#Legally-Significant
297+
[3]: https://www.gnu.org/philosophy/words-to-avoid.en.html#ArtificialIntelligence
298+
236299
--------- Branch Checkins ---------
237300

238301
If a patch is approved for check in to the mainline sources, it can
@@ -331,7 +394,7 @@ Having selected the branch name, create the branch as follows:
331394
Please do not commit any patches to a branch you did not create
332395
without the explicit permission of the person who created the branch.
333396

334-
Copyright (C) 2012-2025 Free Software Foundation, Inc.
397+
Copyright (C) 2012-2026 Free Software Foundation, Inc.
335398

336399
Copying and distribution of this file, with or without modification,
337400
are permitted in any medium without royalty provided the copyright

external/gpl3/binutils/dist/binutils/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Process this file with automake to generate Makefile.in
22
#
3-
# Copyright (C) 2012-2025 Free Software Foundation, Inc.
3+
# Copyright (C) 2012-2026 Free Software Foundation, Inc.
44
#
55
# This file is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License as published by
@@ -110,7 +110,7 @@ noinst_PROGRAMS = $(RENAMED_PROGS) $(TEST_PROGS) @BUILD_MISC@
110110
EXTRA_PROGRAMS = srconv sysdump coffdump $(DLLTOOL_PROG) $(WINDRES_PROG) $(WINDMC_PROG) $(DLLWRAP_PROG)
111111

112112
# Stuff that goes in tooldir/ if appropriate.
113-
TOOL_PROGS = nm-new strip-new ar ranlib dlltool objdump objcopy readelf
113+
TOOL_PROGS = nm-new strip-new ar ranlib dlltool windres objdump objcopy readelf
114114

115115
BASEDIR = $(srcdir)/..
116116
BFDDIR = $(BASEDIR)/bfd

external/gpl3/binutils/dist/binutils/Makefile.in

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@SET_MAKE@
1616

1717
#
18-
# Copyright (C) 2012-2025 Free Software Foundation, Inc.
18+
# Copyright (C) 2012-2026 Free Software Foundation, Inc.
1919
#
2020
# This file is free software; you can redistribute it and/or modify
2121
# it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
3333
#
3434

3535
#
36-
# Copyright (C) 2012-2025 Free Software Foundation, Inc.
36+
# Copyright (C) 2012-2026 Free Software Foundation, Inc.
3737
#
3838
# This file is free software; you can redistribute it and/or modify
3939
# it under the terms of the GNU General Public License as published by
@@ -139,8 +139,10 @@ subdir = .
139139
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
140140
am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \
141141
$(top_srcdir)/../bfd/warning.m4 \
142+
$(top_srcdir)/../config/clang-plugin.m4 \
142143
$(top_srcdir)/../config/depstand.m4 \
143144
$(top_srcdir)/../config/enable.m4 \
145+
$(top_srcdir)/../config/gcc-plugin.m4 \
144146
$(top_srcdir)/../config/gettext-sister.m4 \
145147
$(top_srcdir)/../config/gettext.m4 \
146148
$(top_srcdir)/../config/iconv.m4 \
@@ -533,6 +535,7 @@ LIBOBJS = @LIBOBJS@
533535
LIBS = @LIBS@
534536
LIBTOOL = @LIBTOOL@
535537
LIPO = @LIPO@
538+
LLVM_CONFIG = @LLVM_CONFIG@
536539
LN_S = @LN_S@
537540
LTLIBICONV = @LTLIBICONV@
538541
LTLIBINTL = @LTLIBINTL@
@@ -693,7 +696,7 @@ TEST_PROGS = $(BFDTEST1_PROG) $(BFDTEST2_PROG) $(GENTESTDLLS_PROG)
693696
RENAMED_PROGS = $(NM_PROG) $(STRIP_PROG) $(DEMANGLER_PROG)
694697

695698
# Stuff that goes in tooldir/ if appropriate.
696-
TOOL_PROGS = nm-new strip-new ar ranlib dlltool objdump objcopy readelf
699+
TOOL_PROGS = nm-new strip-new ar ranlib dlltool windres objdump objcopy readelf
697700
BASEDIR = $(srcdir)/..
698701
BFDDIR = $(BASEDIR)/bfd
699702
INCDIR = $(BASEDIR)/include

external/gpl3/binutils/dist/binutils/NEWS

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
-*- text -*-
22

3+
Changes in 2.46:
4+
5+
* SFrame stack trace format now represents an undefined return address as
6+
an SFrame FRE without any offsets. libsframe provides a new API to test
7+
for RA undefined, which is used when dumping SFrame information (e.g. using
8+
objdump and readelf) to show such FREs as "RA undefined".
9+
10+
* Add --got-contents option to readelf to display the contents of
11+
Global Offset Table (GOT) sections.
12+
13+
* Internal changes to plugin support, and stricter target checking may result
14+
in some errors being exposed in user options passed to the various binutils.
15+
For example objcopy --target=TARGET now will only work if the input file is
16+
for TARGET whereas prior versions of objcopy accepted other target input
17+
files and produced a TARGET output. If you do in fact want the old
18+
behaviour the correct usage is objcopy --output-target=TARGET.
19+
20+
* NaCl target support is removed.
21+
22+
* New versioned release of libsframe: libsframe.so.3. This release introduces
23+
versioned symbols with version node name LIBSFRAME_3.0.
24+
25+
* objdump and readelf now support displaying SFrame Version 3 information.
26+
The existing --sframe option can be used to display sections in the the new
27+
V3 format. Display of SFrame Version 2 information continues to be supported
28+
(NB: Emission and linking of SFrame Version 2 is discontinued).
29+
330
Changes in 2.45:
431

532
* New versioned release of libsframe: libsframe.so.2. This release introduces
@@ -1033,7 +1060,7 @@ Changes in binutils 2.1:
10331060
and/or local symbols only. They now also support long options.
10341061

10351062

1036-
Copyright (C) 2012-2025 Free Software Foundation, Inc.
1063+
Copyright (C) 2012-2026 Free Software Foundation, Inc.
10371064

10381065
Copying and distribution of this file, with or without modification,
10391066
are permitted in any medium without royalty provided the copyright

external/gpl3/binutils/dist/binutils/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ unneeded objects and libraries:
307307
If you have any problems or questions about the binutils on VMS, feel
308308
free to mail me at kkaempf@rmi.de.
309309

310-
Copyright (C) 2012-2025 Free Software Foundation, Inc.
310+
Copyright (C) 2012-2026 Free Software Foundation, Inc.
311311

312312
Copying and distribution of this file, with or without modification,
313313
are permitted in any medium without royalty provided the copyright

0 commit comments

Comments
 (0)