[src/trunk]: src/external/gpl3 Sprinkle some sorting. NFCI.

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6020cc41dd48
branches:  trunk
changeset: 372641:6020cc41dd48
user:      skrll <skrll%NetBSD.org@localhost>
date:      Wed Dec 14 18:59:03 2022 +0000

description:
Sprinkle some sorting. NFCI.

diffstat:

 external/gpl3/binutils/lib/libbfd/Makefile |  30 +++++++++++++++++-------------
 external/gpl3/gdb/lib/libbfd/Makefile      |  24 +++++++++++++-----------
 2 files changed, 30 insertions(+), 24 deletions(-)

diffs (114 lines):

diff -r e3954cdf6356 -r 6020cc41dd48 external/gpl3/binutils/lib/libbfd/Makefile
--- a/external/gpl3/binutils/lib/libbfd/Makefile        Wed Dec 14 13:19:04 2022 +0000
+++ b/external/gpl3/binutils/lib/libbfd/Makefile        Wed Dec 14 18:59:03 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.23 2021/04/13 04:58:59 mrg Exp $
+#      $NetBSD: Makefile,v 1.24 2022/12/14 18:59:04 skrll Exp $
 
 NOLINKLIB=     # defined
 NOLINT=                # defined
@@ -54,12 +54,16 @@
 SRCS=          ${GSRCS:.lo=.c}
 
 DPSRCS+=       elf32-target.h elf64-target.h targmatch.h \
-               elf32-ia64.c elf64-ia64.c peigen.c pepigen.c \
-               elf32-riscv.c elf64-riscv.c elf32-aarch64.c elf64-aarch64.c \
+               elf32-aarch64.c elf64-aarch64.c \
+               elf32-ia64.c elf64-ia64.c \
+               elf32-riscv.c elf64-riscv.c \
+               peigen.c pepigen.c \
                pex64igen.c
 CLEANFILES+=   elf32-target.h elf64-target.h targmatch.h \
-               elf32-ia64.c elf64-ia64.c peigen.c pepigen.c \
-               elf32-riscv.c elf64-riscv.c elf32-aarch64.c elf64-aarch64.c \
+               elf32-aarch64.c elf64-aarch64.c \
+               elf32-ia64.c elf64-ia64.c \
+               elf32-riscv.c elf64-riscv.c \
+               peigen.c pepigen.c \
                pex64igen.c
 
 TEXINFO=       bfd.texinfo
@@ -88,6 +92,14 @@
        ${_MKTARGET_CREATE}
        ${TOOL_SED} -e s/NN/64/g < $> > $@
 
+elf32-aarch64.c: elfnn-aarch64.c
+       ${_MKTARGET_CREATE}
+       ${TOOL_SED} -e s/NN/32/g < $> > $@
+
+elf64-aarch64.c: elfnn-aarch64.c
+       ${_MKTARGET_CREATE}
+       ${TOOL_SED} -e s/NN/64/g < $> > $@
+
 elf32-ia64.c: elfnn-ia64.c
        ${_MKTARGET_CREATE}
        ${TOOL_SED} -e s/NN/32/g < $> > $@
@@ -104,14 +116,6 @@
        ${_MKTARGET_CREATE}
        ${TOOL_SED} -e s/NN/64/g < $> > $@
 
-elf32-aarch64.c: elfnn-aarch64.c
-       ${_MKTARGET_CREATE}
-       ${TOOL_SED} -e s/NN/32/g < $> > $@
-
-elf64-aarch64.c: elfnn-aarch64.c
-       ${_MKTARGET_CREATE}
-       ${TOOL_SED} -e s/NN/64/g < $> > $@
-
 peigen.c: peXXigen.c
        ${_MKTARGET_CREATE}
        ${TOOL_SED} -e s/XX/pe/g < $> > $@
diff -r e3954cdf6356 -r 6020cc41dd48 external/gpl3/gdb/lib/libbfd/Makefile
--- a/external/gpl3/gdb/lib/libbfd/Makefile     Wed Dec 14 13:19:04 2022 +0000
+++ b/external/gpl3/gdb/lib/libbfd/Makefile     Wed Dec 14 18:59:03 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2020/12/07 08:24:09 rin Exp $
+#      $NetBSD: Makefile,v 1.13 2022/12/14 18:59:03 skrll Exp $
 
 .include <bsd.own.mk>
 .include "../Makefile.inc"
@@ -20,10 +20,12 @@
 SRCS=          ${GSRCS:.lo=.c}
 
 DPSRCS+=       elf32-target.h elf64-target.h targmatch.h \
-               elf32-ia64.c elf64-ia64.c elf64-aarch64.c elf32-aarch64.c \
+               elf32-aarch64.c elf64-aarch64.c \
+               elf32-ia64.c elf64-ia64.c \
                peigen.c pex64igen.c
 CLEANFILES+=   elf32-target.h elf64-target.h targmatch.h \
-               elf32-ia64.c elf64-ia64.c elf64-aarch64.c elf32-aarch64.c \
+               elf32-aarch64.c elf64-aarch64.c \
+               elf32-ia64.c elf64-ia64.c \
                peigen.c pex64igen.c
 
 .PATH: ${DIST}/bfd
@@ -47,6 +49,14 @@
        ${_MKTARGET_CREATE}
        ${TOOL_SED} -e s/NN/64/g < $> > $@
 
+elf64-aarch64.c: elfnn-aarch64.c
+       ${_MKTARGET_CREATE}
+       ${TOOL_SED} -e s/NN/64/g < $> > $@
+
+elf32-aarch64.c: elfnn-aarch64.c
+       ${_MKTARGET_CREATE}
+       ${TOOL_SED} -e s/NN/32/g < $> > $@
+
 elf32-ia64.c: elfxx-ia64.c
        ${_MKTARGET_CREATE}
        ${TOOL_SED} -e s/NN/32/g < $> > $@
@@ -55,14 +65,6 @@
        ${_MKTARGET_CREATE}
        ${TOOL_SED} -e s/NN/64/g < $> > $@
 
-elf64-aarch64.c: elfnn-aarch64.c
-       ${_MKTARGET_CREATE}
-       ${TOOL_SED} -e s/NN/64/g < $> > $@
-
-elf32-aarch64.c: elfnn-aarch64.c
-       ${_MKTARGET_CREATE}
-       ${TOOL_SED} -e s/NN/32/g < $> > $@
-
 peigen.c: peXXigen.c
        ${_MKTARGET_CREATE}
        ${TOOL_SED} -e s/XX/pe/g < $> > $@