[src/trunk]: src/sys/arch Always use arm-elf2aout; no a.out support both for ...

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

details:   https://anonhg.NetBSD.org/src/rev/648f272638e9
branches:  trunk
changeset: 378194:648f272638e9
user:      rin <rin%NetBSD.org@localhost>
date:      Wed Jul 26 02:31:27 2023 +0000

description:
Always use arm-elf2aout; no a.out support both for binutils{,.old}

diffstat:

 sys/arch/cats/conf/Makefile.cats.inc   |  8 +-------
 sys/arch/shark/conf/Makefile.shark.inc |  8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diffs (48 lines):

diff -r c365aebf5e30 -r 648f272638e9 sys/arch/cats/conf/Makefile.cats.inc
--- a/sys/arch/cats/conf/Makefile.cats.inc      Wed Jul 26 02:26:11 2023 +0000
+++ b/sys/arch/cats/conf/Makefile.cats.inc      Wed Jul 26 02:31:27 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.cats.inc,v 1.36 2018/12/31 13:30:17 christos Exp $
+#      $NetBSD: Makefile.cats.inc,v 1.37 2023/07/26 02:31:27 rin Exp $
 
 MACHINE_ARCH?= arm
 CPPFLAGS+=     -D${MACHINE}
@@ -27,14 +27,8 @@ EXTRA_CLEAN+=        ${KERNLDSCRIPT}
          OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
                ${SYSTEM_OBJ} ; \
          cat ${ARM}/conf/kern.ldscript.tail ) > $@
-.if ${HAVE_BINUTILS} == 227
-SYSTEM_LD_TAIL_EXTRA+=; \
-       echo "${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout"; \
-       ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout
-.else
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo "${ARM_ELF2AOUT} $@ $@.aout"; \
        ${ARM_ELF2AOUT} $@ $@.aout
 .endif
-.endif
 
diff -r c365aebf5e30 -r 648f272638e9 sys/arch/shark/conf/Makefile.shark.inc
--- a/sys/arch/shark/conf/Makefile.shark.inc    Wed Jul 26 02:26:11 2023 +0000
+++ b/sys/arch/shark/conf/Makefile.shark.inc    Wed Jul 26 02:31:27 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.shark.inc,v 1.27 2018/12/31 13:37:07 christos Exp $
+#      $NetBSD: Makefile.shark.inc,v 1.28 2023/07/26 02:31:27 rin Exp $
 
 CPPFLAGS+=             -D${MACHINE}
 CFLAGS+=               -fno-unwind-tables
@@ -22,14 +22,8 @@ ldscript: \
                ${SYSTEM_OBJ} ; \
          cat ${ARM}/conf/kern.ldscript.tail ) > ldscript
 
-.if ${HAVE_BINUTILS} == 227
-SYSTEM_LD_TAIL_EXTRA+=; \
-       echo "${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout"; \
-       ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout
-.else
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo "${ARM_ELF2AOUT} $@ $@.aout"; \
        ${ARM_ELF2AOUT} $@ $@.aout
-.endif
 
 KERNIMAGES=    netbsd netbsd.aout