Fixes from Chris Demetriou

diff --git a/magic/Magdir/elf b/magic/Magdir/elf
index 7772a77d2ec1399b124a8b7c9a2f05e81f1fef25..12f1edb8a0cf5c6719928f05bf2772cf60bd46d1 100644 (file)
--- a/magic/Magdir/elf
+++ b/magic/Magdir/elf
@@ -34,6 +34,7 @@
 >>18   leshort         7               Intel 80860,
 >>18   leshort         8               MIPS RS3000,
 >>18   leshort         9               Amdahl,
+>>18   leshort         0x9026          Alpha,
 >>20   lelong          0               invalid version
 >>20   lelong          1               version 1
 >>36   lelong          1               MathCoPro/FPU/MAU Required
@@ -55,7 +56,8 @@
 >>18   beshort         6               Intel 80486 - invalid byte order,
 >>18   beshort         7               Intel 80860,
 >>18   beshort         8               MIPS RS3000,
->>18   leshort         9               Amdahl,
+>>18   beshort         9               Amdahl,
+>>18   beshort         0x9026          Alpha,
 >>20   belong          0               invalid version
 >>20   belong          1               version 1
 >>36   belong          1               MathCoPro/FPU/MAU Required

diff --git a/magic/Magdir/netbsd b/magic/Magdir/netbsd
index 9855b7dab842fc27888b8c773c23d284d767942d..2c8bb9a803765a377e5cb1715c824442a529ed20 100644 (file)
--- a/magic/Magdir/netbsd
+++ b/magic/Magdir/netbsd
@@ -170,6 +170,15 @@
 0      belong&0377777777       043000507       NetBSD/vax core
 >12    string                  >\0             from '%s'
 
+# NetBSD/alpha does not support (and has never supported) a.out objects,
+# so no rules are provided for them.  NetBSD/alpha ELF objects are 
+# dealt with in "elf".
+0      leshort         0x00070185              ECOFF NetBSD/alpha binary
+>10    leshort         0x0001                  not stripped
+>10    leshort         0x0000                  stripped
+0      belong&0377777777       043200507       NetBSD/alpha core
+>12    string                  >\0             from '%s'
+
 0      belong&0377777777       043400413       NetBSD/mips demand paged
 >0     byte                    &0x80           
 >>20   belong                  <8192           shared library