Module Name:    src
Committed By:   christos
Date:           Mon Dec 31 13:30:17 UTC 2018

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

Log Message:
Switch to elf2aout for new binutils


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cats/conf/Makefile.cats.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.35 src/sys/arch/cats/conf/Makefile.cats.inc:1.36
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.35	Mon Aug 24 10:04:24 2015
+++ src/sys/arch/cats/conf/Makefile.cats.inc	Mon Dec 31 08:30:17 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.cats.inc,v 1.35 2015/08/24 14:04:24 uebayasi Exp $
+#	$NetBSD: Makefile.cats.inc,v 1.36 2018/12/31 13:30:17 christos Exp $
 
 MACHINE_ARCH?=	arm
 CPPFLAGS+=	-D${MACHINE}
@@ -27,9 +27,14 @@ ${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
 

Reply via email to