Module Name: src
Committed By: mrg
Date: Mon Aug 13 09:25:23 UTC 2018
Modified Files:
src/distrib/sets/lists/base: ad.arm
src/sys/arch/acorn32/stand: Makefile
Log Message:
include the boot32 and nbfs boot programs for eabi, as acorn32
with eabi still wants them.
not tested. someone, please test. this fixes the acorn32 build
since it was switched to eabi.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/acorn32/stand/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.79 src/distrib/sets/lists/base/ad.arm:1.80
--- src/distrib/sets/lists/base/ad.arm:1.79 Thu Jul 12 06:52:48 2018
+++ src/distrib/sets/lists/base/ad.arm Mon Aug 13 09:25:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.79 2018/07/12 06:52:48 maxv Exp $
+# $NetBSD: ad.arm,v 1.80 2018/08/13 09:25:22 mrg Exp $
./libexec/ld.elf_so-oabi base-sysutil-bin compat,pic
./sbin/ldconfig base-sysutil-root pic,endian=1234
./usr/bin/fdformat base-util-bin
@@ -15,8 +15,8 @@
./usr/mdec/BBBB base-obsolete obsolete
./usr/mdec/boot26 base-obsolete obsolete
./usr/mdec/boot26,ffa base-obsolete obsolete
-./usr/mdec/boot32 base-sysutil-bin endian=1234,!eabi
-./usr/mdec/boot32,ffa base-sysutil-bin endian=1234,!eabi
+./usr/mdec/boot32 base-sysutil-bin endian=1234
+./usr/mdec/boot32,ffa base-sysutil-bin endian=1234
./usr/mdec/bootimx23 base-sysutil-bin endian=1234
./usr/mdec/bootmini2440 base-sysutil-bin
./usr/mdec/gzboot_ADI_BRH_0x00140000.bin base-sysutil-bin
@@ -27,8 +27,8 @@
./usr/mdec/gzboot_SMDK2800_0x00000000.bin base-sysutil-bin endian=1234
./usr/mdec/gzboot_SMDK2800_0x00100000.bin base-sysutil-bin endian=1234
./usr/mdec/gzboot_TS7200_0x60660000.bin base-sysutil-bin endian=1234
-./usr/mdec/nbfs base-sysutil-bin endian=1234,!eabi
-./usr/mdec/nbfs,ffa base-sysutil-bin endian=1234,!eabi
+./usr/mdec/nbfs base-sysutil-bin endian=1234
+./usr/mdec/nbfs,ffa base-sysutil-bin endian=1234
./usr/mdec/zboot base-sysutil-bin endian=1234
./usr/mdec/zbsdmod.o base-sysutil-bin endian=1234
./usr/sbin/apm base-sysutil-bin
Index: src/sys/arch/acorn32/stand/Makefile
diff -u src/sys/arch/acorn32/stand/Makefile:1.3 src/sys/arch/acorn32/stand/Makefile:1.4
--- src/sys/arch/acorn32/stand/Makefile:1.3 Wed May 1 22:30:39 2013
+++ src/sys/arch/acorn32/stand/Makefile Mon Aug 13 09:25:22 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2013/05/01 22:30:39 matt Exp $
+# $NetBSD: Makefile,v 1.4 2018/08/13 09:25:22 mrg Exp $
.include <bsd.endian.mk>
-.if empty(MACHINE_ARCH:Mearm*) && ${TARGET_ENDIANNESS} == "1234"
+.if ${TARGET_ENDIANNESS} == "1234"
SUBDIR= boot32 nbfs
