summaryrefslogtreecommitdiff
path: root/usr.bin/file
diff options
context:
space:
mode:
authorPer Fogelstrom <pefo@cvs.openbsd.org>2004-10-27 15:59:17 +0000
committerPer Fogelstrom <pefo@cvs.openbsd.org>2004-10-27 15:59:17 +0000
commit6fce2f2437bf1887daea8bb0cd15d6a231f9240b (patch)
treec44bb45f8582cda6e6b3e4bd716e81831187e209 /usr.bin/file
parentfeb1adaed8d51229d2db0d9ad634f8fe9ec13a07 (diff)
Change how MIPS ISA level is output to be consistent with other arches.
ok deraadt, grange and ian
Diffstat (limited to 'usr.bin/file')
-rw-r--r--usr.bin/file/magdir/elf96
1 files changed, 48 insertions, 48 deletions
diff --git a/usr.bin/file/magdir/elf b/usr.bin/file/magdir/elf
index 4cae2c678cc..af8c04c8706 100644
--- a/usr.bin/file/magdir/elf
+++ b/usr.bin/file/magdir/elf
@@ -1,4 +1,4 @@
-# $OpenBSD: elf,v 1.12 2004/10/23 16:59:25 grange Exp $
+# $OpenBSD: elf,v 1.13 2004/10/27 15:59:16 pefo Exp $
#------------------------------------------------------------------------------
# elf: file(1) magic for ELF executables
@@ -16,34 +16,34 @@
>4 byte 2 64-bit
>5 byte 0 invalid byte order
>5 byte 1 LSB
+>>16 leshort 0 no file type,
+>>16 leshort 1 relocatable,
+>>16 leshort 2 executable,
+>>16 leshort 3 shared object,
# only for MIPS
>>18 leshort 8
# only for 32-bit
>>>4 byte 1
->>>>36 lelong&0xf0000000 0x00000000 MIPS-I
->>>>36 lelong&0xf0000000 0x10000000 MIPS-II
->>>>36 lelong&0xf0000000 0x20000000 MIPS-III
->>>>36 lelong&0xf0000000 0x30000000 MIPS-IV
->>>>36 lelong&0xf0000000 0x40000000 MIPS-V
->>>>36 lelong&0xf0000000 0x60000000 MIPS32
->>>>36 lelong&0xf0000000 0x70000000 MIPS64
->>>>36 lelong&0xf0000000 0x80000000 MIPS32 rel2
->>>>36 lelong&0xf0000000 0x90000000 MIPS64 rel2
+>>>>36 lelong&0xf0000000 0x00000000 MIPS-I,
+>>>>36 lelong&0xf0000000 0x10000000 MIPS-II,
+>>>>36 lelong&0xf0000000 0x20000000 MIPS-III,
+>>>>36 lelong&0xf0000000 0x30000000 MIPS-IV,
+>>>>36 lelong&0xf0000000 0x40000000 MIPS-V,
+>>>>36 lelong&0xf0000000 0x60000000 MIPS32,
+>>>>36 lelong&0xf0000000 0x70000000 MIPS64,
+>>>>36 lelong&0xf0000000 0x80000000 MIPS32 rel2,
+>>>>36 lelong&0xf0000000 0x90000000 MIPS64 rel2,
# only for 64-bit
>>>4 byte 2
->>>>48 lelong&0xf0000000 0x00000000 MIPS-I
->>>>48 lelong&0xf0000000 0x10000000 MIPS-II
->>>>48 lelong&0xf0000000 0x20000000 MIPS-III
->>>>48 lelong&0xf0000000 0x30000000 MIPS-IV
->>>>48 lelong&0xf0000000 0x40000000 MIPS-V
->>>>48 lelong&0xf0000000 0x60000000 MIPS32
->>>>48 lelong&0xf0000000 0x70000000 MIPS64
->>>>48 lelong&0xf0000000 0x80000000 MIPS32 rel2
->>>>48 lelong&0xf0000000 0x90000000 MIPS64 rel2
->>16 leshort 0 no file type,
->>16 leshort 1 relocatable,
->>16 leshort 2 executable,
->>16 leshort 3 shared object,
+>>>>48 lelong&0xf0000000 0x00000000 MIPS-I,
+>>>>48 lelong&0xf0000000 0x10000000 MIPS-II,
+>>>>48 lelong&0xf0000000 0x20000000 MIPS-III,
+>>>>48 lelong&0xf0000000 0x30000000 MIPS-IV,
+>>>>48 lelong&0xf0000000 0x40000000 MIPS-V,
+>>>>48 lelong&0xf0000000 0x60000000 MIPS32,
+>>>>48 lelong&0xf0000000 0x70000000 MIPS64 ,
+>>>>48 lelong&0xf0000000 0x80000000 MIPS32 rel2,
+>>>>48 lelong&0xf0000000 0x90000000 MIPS64 rel2,
# Core handling from Peter Tobias <tobias@server.et-inf.fho-emden.de>
>>16 leshort 4 core file
>>>400 lelong >0 (signal %d),
@@ -56,7 +56,7 @@
>>18 leshort 5 Motorola 88000 - invalid byte order,
>>18 leshort 6 Intel 80486,
>>18 leshort 7 Intel 80860,
->>18 leshort 8 MIPS,
+# >>18 leshort 8 MIPS,
>>18 leshort 9 Amdahl - invalid byte order,
>>18 leshort 10 MIPS (deprecated),
>>18 leshort 11 RS6000 - invalid byte order,
@@ -74,35 +74,35 @@
>>20 lelong 1 version 1
>>36 lelong 1 MathCoPro/FPU/MAU Required
>5 byte 2 MSB
+>>16 beshort 0 no file type,
+>>16 beshort 1 relocatable,
+>>16 beshort 2 executable,
+>>16 beshort 3 shared object,
+>>16 beshort 4 core file,
# only for MIPS
>>18 beshort 8
# only for 32-bit
>>>4 byte 1
->>>>36 belong&0xf0000000 0x00000000 MIPS-I
->>>>36 belong&0xf0000000 0x10000000 MIPS-II
->>>>36 belong&0xf0000000 0x20000000 MIPS-III
->>>>36 belong&0xf0000000 0x30000000 MIPS-IV
->>>>36 belong&0xf0000000 0x40000000 MIPS-V
->>>>36 belong&0xf0000000 0x60000000 MIPS32
->>>>36 belong&0xf0000000 0x70000000 MIPS64
->>>>36 belong&0xf0000000 0x80000000 MIPS32 rel2
->>>>36 belong&0xf0000000 0x90000000 MIPS64 rel2
+>>>>36 belong&0xf0000000 0x00000000 MIPS-I,
+>>>>36 belong&0xf0000000 0x10000000 MIPS-II,
+>>>>36 belong&0xf0000000 0x20000000 MIPS-III,
+>>>>36 belong&0xf0000000 0x30000000 MIPS-IV,
+>>>>36 belong&0xf0000000 0x40000000 MIPS-V,
+>>>>36 belong&0xf0000000 0x60000000 MIPS32,
+>>>>36 belong&0xf0000000 0x70000000 MIPS64,
+>>>>36 belong&0xf0000000 0x80000000 MIPS32 rel2,
+>>>>36 belong&0xf0000000 0x90000000 MIPS64 rel2,
# only for 64-bit
>>>4 byte 2
->>>>48 belong&0xf0000000 0x00000000 MIPS-I
->>>>48 belong&0xf0000000 0x10000000 MIPS-II
->>>>48 belong&0xf0000000 0x20000000 MIPS-III
->>>>48 belong&0xf0000000 0x30000000 MIPS-IV
->>>>48 belong&0xf0000000 0x40000000 MIPS-V
->>>>48 belong&0xf0000000 0x60000000 MIPS32
->>>>48 belong&0xf0000000 0x70000000 MIPS64
->>>>48 belong&0xf0000000 0x80000000 MIPS32 rel2
->>>>48 belong&0xf0000000 0x90000000 MIPS64 rel2
->>16 beshort 0 no file type,
->>16 beshort 1 relocatable,
->>16 beshort 2 executable,
->>16 beshort 3 shared object,
->>16 beshort 4 core file,
+>>>>48 belong&0xf0000000 0x00000000 MIPS-I,
+>>>>48 belong&0xf0000000 0x10000000 MIPS-II,
+>>>>48 belong&0xf0000000 0x20000000 MIPS-III,
+>>>>48 belong&0xf0000000 0x30000000 MIPS-IV,
+>>>>48 belong&0xf0000000 0x40000000 MIPS-V,
+>>>>48 belong&0xf0000000 0x60000000 MIPS32,
+>>>>48 belong&0xf0000000 0x70000000 MIPS64 ,
+>>>>48 belong&0xf0000000 0x80000000 MIPS32 rel2,
+>>>>48 belong&0xf0000000 0x90000000 MIPS64 rel2,
>>>400 lelong >0 (signal %d),
>>16 beshort &0xff00 processor-specific,
>>18 beshort 0 no machine,
@@ -113,7 +113,7 @@
>>18 beshort 5 Motorola 88000,
>>18 beshort 6 Intel 80486 - invalid byte order,
>>18 beshort 7 Intel 80860,
->>18 beshort 8 MIPS,
+# >>18 beshort 8 MIPS,
>>18 beshort 9 Amdahl,
>>18 beshort 10 MIPS (deprecated),
>>18 beshort 11 RS6000,