fixes from the netbsd tree.

diff --git a/magic/Magdir/elf b/magic/Magdir/elf
index 1165c268a7a9a0c2494883c11ac89cccc52e0a0d..d228d9f527699fe57a531a98ba2c3dd28dd95f5d 100644 (file)
--- a/magic/Magdir/elf
+++ b/magic/Magdir/elf
@@ -71,7 +71,7 @@
 >>18   leshort         37              Fujitsu FR20,
 >>18   leshort         38              TRW RH-32,
 >>18   leshort         39              Motorola RCE,
->>18   leshort         40              Advanced RISC Machines ARM,
+>>18   leshort         40              ARM,
 >>18   leshort         41              Alpha,
 >>18   leshort         42              Hitachi SH,
 >>18   leshort         43              SPARC V9 - invalid byte order,
@@ -164,7 +164,7 @@
 >>18   beshort         37              Fujitsu FR20,
 >>18   beshort         38              TRW RH-32,
 >>18   beshort         39              Motorola RCE,
->>18   beshort         40              Advanced RISC Machines ARM,
+>>18   beshort         40              ARM,
 >>18   beshort         41              Alpha,
 >>18   beshort         42              Hitachi SH,
 >>18   beshort         43              SPARC V9,

diff --git a/magic/Magdir/netbsd b/magic/Magdir/netbsd
index 89da052e6501274ed8942a73ba53150743861003..c48d903d9be613063e6d385727eb7883517732d3 100644 (file)
--- a/magic/Magdir/netbsd
+++ b/magic/Magdir/netbsd
@@ -239,6 +239,8 @@
 >>20   lelong                  !0              executable
 >>20   lelong                  =0              object file
 >16    lelong                  >0              not stripped
-0      belong&0377777777       043600507       NetBSD/arm32 core
+# NetBSD/arm26 has always used ELF objects, but it shares a core file
+# format with NetBSD/arm32.
+0      belong&0377777777       043600507       NetBSD/arm core
 >12    string                  >\0             from '%s'
 >32    lelong                  !0              (signal %d)