[src/trunk]: src/sys/sys Rename:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6fbb3724825e
branches:  trunk
changeset: 955765:6fbb3724825e
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Oct 10 21:25:51 2020 +0000

description:
Rename:
- EM_ALPHA (41) -> EM_OLD_ALPHA
- EM_ALPHA_EXP (36902) -> EM_ALPHA

36902 has been the value in common usage for a long time, and this naming
aligns with binutils, etc.

PR port-alpha/51926

diffstat:

 sys/arch/alpha/include/elf_machdep.h            |  6 +++---
 sys/arch/atari/stand/tostools/libtos/exec_elf.h |  7 ++++---
 sys/arch/epoc32/stand/e32boot/include/elf.h     |  6 +++---
 sys/sys/exec_elf.h                              |  6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diffs (106 lines):

diff -r 298303617143 -r 6fbb3724825e sys/arch/alpha/include/elf_machdep.h
--- a/sys/arch/alpha/include/elf_machdep.h      Sat Oct 10 20:27:54 2020 +0000
+++ b/sys/arch/alpha/include/elf_machdep.h      Sat Oct 10 21:25:51 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: elf_machdep.h,v 1.14 2019/04/08 14:08:16 thorpej Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.15 2020/10/10 21:25:51 thorpej Exp $ */
 
 #ifndef        _ALPHA_ELF_MACHDEP_H_
 #define        _ALPHA_ELF_MACHDEP_H_
@@ -15,11 +15,11 @@
 
 #define        ELF64_MACHDEP_ENDIANNESS        ELFDATA2LSB
 #define        ELF64_MACHDEP_ID_CASES                                          \
+               case EM_OLD_ALPHA:                                      \
                case EM_ALPHA:                                          \
-               case EM_ALPHA_EXP:                                      \
                        break;
 
-#define        ELF64_MACHDEP_ID        EM_ALPHA_EXP    /* XXX */
+#define        ELF64_MACHDEP_ID        EM_ALPHA
 
 #define        KERN_ELFSIZE            64
 #define ARCH_ELFSIZE           64      /* MD native binary size */
diff -r 298303617143 -r 6fbb3724825e sys/arch/atari/stand/tostools/libtos/exec_elf.h
--- a/sys/arch/atari/stand/tostools/libtos/exec_elf.h   Sat Oct 10 20:27:54 2020 +0000
+++ b/sys/arch/atari/stand/tostools/libtos/exec_elf.h   Sat Oct 10 21:25:51 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_elf.h,v 1.7 2014/01/03 16:40:58 dsl Exp $ */
+/*     $NetBSD: exec_elf.h,v 1.8 2020/10/10 21:25:51 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -212,7 +212,7 @@
 #define        EM_RH32         38      /* TRW RH-32 */
 #define        EM_RCE          39      /* Motorola RCE */
 #define        EM_ARM          40      /* Advanced RISC Machines ARM */
-#define        EM_ALPHA        41      /* DIGITAL Alpha */
+#define        EM_OLD_ALPHA    41      /* DIGITAL Alpha (obsolete) */
 #define        EM_SH           42      /* Hitachi Super-H */
 #define        EM_SPARCV9      43      /* SPARC Version 9 */
 #define        EM_TRICORE      44      /* Siemens Tricore */
@@ -265,8 +265,9 @@
 #define        EM_OPENRISC     92      /* OpenRISC 32-bit embedded processor */
 #define        EM_ARC_A5       93      /* ARC Cores Tangent-A5 */
 #define        EM_XTENSA       94      /* Tensilica Xtensa Architecture */
+
 /* Unofficial machine types follow */
-#define        EM_ALPHA_EXP    36902   /* used by NetBSD/alpha; obsolete */
+#define        EM_ALPHA        36902   /* DIGITAL Alpha */
 #define        EM_NUM          36903
 
 /*
diff -r 298303617143 -r 6fbb3724825e sys/arch/epoc32/stand/e32boot/include/elf.h
--- a/sys/arch/epoc32/stand/e32boot/include/elf.h       Sat Oct 10 20:27:54 2020 +0000
+++ b/sys/arch/epoc32/stand/e32boot/include/elf.h       Sat Oct 10 21:25:51 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elf.h,v 1.4 2018/05/24 17:07:51 christos Exp $ */
+/*     $NetBSD: elf.h,v 1.5 2020/10/10 21:25:51 thorpej Exp $  */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -231,7 +231,7 @@
 #define EM_RH32                38      /* TRW RH-32 */
 #define EM_RCE         39      /* Motorola RCE */
 #define EM_ARM         40      /* Advanced RISC Machines ARM */
-#define EM_ALPHA       41      /* DIGITAL Alpha */
+#define EM_OLD_ALPHA   41      /* DIGITAL Alpha (obsolete) */
 #define EM_SH          42      /* Hitachi Super-H */
 #define EM_SPARCV9     43      /* SPARC Version 9 */
 #define EM_TRICORE     44      /* Siemens Tricore */
@@ -313,7 +313,7 @@
 #define EM_RISCV       243     /* RISC-V */
 
 /* Unofficial machine types follow */
-#define EM_ALPHA_EXP   36902   /* used by NetBSD/alpha; obsolete */
+#define EM_ALPHA       36902   /* DIGITAL Alpha */
 #define EM_NUM         36903
 
 /*
diff -r 298303617143 -r 6fbb3724825e sys/sys/exec_elf.h
--- a/sys/sys/exec_elf.h        Sat Oct 10 20:27:54 2020 +0000
+++ b/sys/sys/exec_elf.h        Sat Oct 10 21:25:51 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec_elf.h,v 1.166 2020/02/29 22:09:29 kamil Exp $     */
+/*     $NetBSD: exec_elf.h,v 1.167 2020/10/10 21:25:51 thorpej Exp $   */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -238,7 +238,7 @@
 #define EM_RH32                38      /* TRW RH-32 */
 #define EM_RCE         39      /* Motorola RCE */
 #define EM_ARM         40      /* Advanced RISC Machines ARM */
-#define EM_ALPHA       41      /* DIGITAL Alpha */
+#define EM_OLD_ALPHA   41      /* DIGITAL Alpha (obsolete) */
 #define EM_SH          42      /* Hitachi Super-H */
 #define EM_SPARCV9     43      /* SPARC Version 9 */
 #define EM_TRICORE     44      /* Siemens Tricore */
@@ -404,7 +404,7 @@
 #define EM_RISCV       243     /* RISC-V */
 
 /* Unofficial machine types follow */
-#define EM_ALPHA_EXP   36902   /* used by NetBSD/alpha; obsolete */
+#define EM_ALPHA       36902   /* DIGITAL Alpha */
 #define EM_NUM         36903
 
 /*