Module Name:    src
Committed By:   skrll
Date:           Wed Dec 14 18:59:04 UTC 2022

Modified Files:
        src/external/gpl3/binutils/lib/libbfd: Makefile
        src/external/gpl3/gdb/lib/libbfd: Makefile

Log Message:
Sprinkle some sorting. NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/lib/libbfd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.23 src/external/gpl3/binutils/lib/libbfd/Makefile:1.24
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.23	Tue Apr 13 04:58:59 2021
+++ src/external/gpl3/binutils/lib/libbfd/Makefile	Wed Dec 14 18:59:04 2022
@@ -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 @@ GSRCS=		${G_libbfd_la_OBJECTS:libbfd.lo=
 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,27 +92,27 @@ elf64-target.h: elfxx-target.h
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
 
-elf32-ia64.c: elfnn-ia64.c
+elf32-aarch64.c: elfnn-aarch64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/32/g < $> > $@
 
-elf64-ia64.c: elfnn-ia64.c
+elf64-aarch64.c: elfnn-aarch64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
 
-elf32-riscv.c: elfnn-riscv.c
+elf32-ia64.c: elfnn-ia64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/32/g < $> > $@
 
-elf64-riscv.c: elfnn-riscv.c
+elf64-ia64.c: elfnn-ia64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
 
-elf32-aarch64.c: elfnn-aarch64.c
+elf32-riscv.c: elfnn-riscv.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/32/g < $> > $@
 
-elf64-aarch64.c: elfnn-aarch64.c
+elf64-riscv.c: elfnn-riscv.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
 

Index: src/external/gpl3/gdb/lib/libbfd/Makefile
diff -u src/external/gpl3/gdb/lib/libbfd/Makefile:1.12 src/external/gpl3/gdb/lib/libbfd/Makefile:1.13
--- src/external/gpl3/gdb/lib/libbfd/Makefile:1.12	Mon Dec  7 08:24:09 2020
+++ src/external/gpl3/gdb/lib/libbfd/Makefile	Wed Dec 14 18:59:03 2022
@@ -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 @@ GSRCS=		${G_libbfd_la_OBJECTS:libbfd.lo=
 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,14 +49,6 @@ elf64-target.h: elfxx-target.h
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
 
-elf32-ia64.c: elfxx-ia64.c
-	${_MKTARGET_CREATE}
-	${TOOL_SED} -e s/NN/32/g < $> > $@
-
-elf64-ia64.c: elfxx-ia64.c
-	${_MKTARGET_CREATE}
-	${TOOL_SED} -e s/NN/64/g < $> > $@
-
 elf64-aarch64.c: elfnn-aarch64.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/NN/64/g < $> > $@
@@ -63,6 +57,14 @@ 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 < $> > $@
+
+elf64-ia64.c: elfxx-ia64.c
+	${_MKTARGET_CREATE}
+	${TOOL_SED} -e s/NN/64/g < $> > $@
+
 peigen.c: peXXigen.c
 	${_MKTARGET_CREATE}
 	${TOOL_SED} -e s/XX/pe/g < $> > $@

Reply via email to