CVS commit: src/sys/arch

[Rin Okuyama]

Module Name:    src
Committed By:   rin
Date:           Wed Jul 26 02:31:27 UTC 2023

Modified Files:
        src/sys/arch/cats/conf: Makefile.cats.inc
        src/sys/arch/shark/conf: Makefile.shark.inc

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


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/cats/conf/Makefile.cats.inc
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/shark/conf/Makefile.shark.inc

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


Modified files:

Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.36 src/sys/arch/cats/conf/Makefile.cats.inc:1.37
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.36	Mon Dec 31 13:30:17 2018
+++ src/sys/arch/cats/conf/Makefile.cats.inc	Wed Jul 26 02:31:27 2023
@@ -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 @@ ${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
 

Index: src/sys/arch/shark/conf/Makefile.shark.inc
diff -u src/sys/arch/shark/conf/Makefile.shark.inc:1.27 src/sys/arch/shark/conf/Makefile.shark.inc:1.28
--- src/sys/arch/shark/conf/Makefile.shark.inc:1.27	Mon Dec 31 13:37:07 2018
+++ src/sys/arch/shark/conf/Makefile.shark.inc	Wed Jul 26 02:31:27 2023
@@ -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