[src/trunk]: src/sys Split elf32 vs. elf64 handling in loadfile(), including ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys Split elf32 vs. elf64 handling in loadfile(), including ...
From: thorpej <thorpej%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 09:56:17 +0000
details:   https://anonhg.NetBSD.org/src/rev/9b0985cf7a88
branches:  trunk
changeset: 516830:9b0985cf7a88
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Oct 31 17:20:45 2001 +0000

description:
Split elf32 vs. elf64 handling in loadfile(), including support for
each separately and explicitly.  BOOT_ELF is now BOOT_ELF32 and
BOOT_ELF64, and ELFSIZE should no longer be defined in loadfile_machdep.h.

diffstat:

 sys/arch/alpha/include/loadfile_machdep.h     |   4 +--
 sys/arch/alpha/stand/Makefile.bootprogs       |   4 +-
 sys/arch/amiga/include/loadfile_machdep.h     |   5 +--
 sys/arch/bebox/include/loadfile_machdep.h     |   5 +--
 sys/arch/hp300/include/loadfile_machdep.h     |   5 +--
 sys/arch/i386/include/loadfile_machdep.h      |   5 +--
 sys/arch/macppc/include/loadfile_machdep.h    |   5 +--
 sys/arch/mipsco/include/loadfile_machdep.h    |   5 +--
 sys/arch/mmeye/include/loadfile_machdep.h     |   5 +--
 sys/arch/mvme68k/include/loadfile_machdep.h   |   5 +--
 sys/arch/news68k/include/loadfile_machdep.h   |   5 +--
 sys/arch/newsmips/include/loadfile_machdep.h  |   5 +--
 sys/arch/next68k/include/loadfile_machdep.h   |   5 +--
 sys/arch/ofppc/include/loadfile_machdep.h     |   5 +--
 sys/arch/pmax/include/loadfile_machdep.h      |   5 +--
 sys/arch/prep/include/loadfile_machdep.h      |   5 +--
 sys/arch/sandpoint/include/loadfile_machdep.h |   5 +--
 sys/arch/sgimips/include/loadfile_machdep.h   |   5 +--
 sys/arch/sparc/include/loadfile_machdep.h     |   7 ++--
 sys/arch/sun3/include/loadfile_machdep.h      |   5 +--
 sys/arch/sun68k/include/loadfile_machdep.h    |   5 +--
 sys/arch/vax/include/loadfile_machdep.h       |   5 +--
 sys/arch/walnut/include/loadfile_machdep.h    |   5 +--
 sys/arch/x68k/include/loadfile_machdep.h      |   5 +--
 sys/arch/x86_64/include/loadfile_machdep.h    |   5 +--
 sys/lib/libsa/Makefile                        |   5 ++-
 sys/lib/libsa/loadfile.c                      |  24 ++++++++++-----
 sys/lib/libsa/loadfile.h                      |  11 +++++--
 sys/lib/libsa/loadfile_elf32.c                |  23 ++++++++++-----
 sys/lib/libsa/loadfile_elf64.c                |  40 +++++++++++++++++++++++++++
 30 files changed, 132 insertions(+), 96 deletions(-)

diffs (truncated from 687 to 300 lines):

diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/alpha/include/loadfile_machdep.h
--- a/sys/arch/alpha/include/loadfile_machdep.h Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/alpha/include/loadfile_machdep.h Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.2 2000/06/08 03:10:06 thorpej Exp $      */
+/*     $NetBSD: loadfile_machdep.h,v 1.3 2001/10/31 17:20:45 thorpej Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,8 +36,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define ELFSIZE 64
-
 #define LOAD_KERNEL    (LOAD_ALL & ~LOAD_TEXTA)
 #define COUNT_KERNEL   (COUNT_ALL & ~COUNT_TEXTA)
 
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/alpha/stand/Makefile.bootprogs
--- a/sys/arch/alpha/stand/Makefile.bootprogs   Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/alpha/stand/Makefile.bootprogs   Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.18 2000/07/21 21:25:18 jdolecek Exp $
+# $NetBSD: Makefile.bootprogs,v 1.19 2001/10/31 17:20:45 thorpej Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -98,7 +98,7 @@
 STANDPROG_LOAD_ADDRESS=        0xfffffc0000300000
 
 
-FILE_FORMAT_CPPFLAGS=  -DBOOT_ECOFF -DBOOT_ELF
+FILE_FORMAT_CPPFLAGS=  -DBOOT_ECOFF -DBOOT_ELF64
 
 UNIFIED_CPPFLAGS=      -DUNIFIED_BOOTBLOCK \
                        -DHEAP_LIMIT="${UNIFIED_HEAP_LIMIT}" \
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/amiga/include/loadfile_machdep.h
--- a/sys/arch/amiga/include/loadfile_machdep.h Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/amiga/include/loadfile_machdep.h Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.1 2001/08/15 01:18:09 mhitch Exp $      */
+/*     $NetBSD: loadfile_machdep.h,v 1.2 2001/10/31 17:20:45 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -40,8 +40,7 @@
 #define        _AMIGA_LOADFILE_MACHDEP_H_
 
 #define        BOOT_AOUT
-#define        BOOT_ELF
-#define ELFSIZE 32
+#define        BOOT_ELF32
 
 #define        LOAD_KERNEL             LOAD_ALL
 #define        COUNT_KERNEL            COUNT_ALL
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/bebox/include/loadfile_machdep.h
--- a/sys/arch/bebox/include/loadfile_machdep.h Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/bebox/include/loadfile_machdep.h Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.1 1999/07/02 15:36:51 sakamoto Exp $    */
+/*     $NetBSD: loadfile_machdep.h,v 1.2 2001/10/31 17:20:46 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,8 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
 
 #define LOAD_KERNEL    (LOAD_ALL & ~LOAD_TEXTA)
 #define COUNT_KERNEL   (COUNT_ALL & ~COUNT_TEXTA)
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/hp300/include/loadfile_machdep.h
--- a/sys/arch/hp300/include/loadfile_machdep.h Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/hp300/include/loadfile_machdep.h Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.2 2001/01/02 04:14:33 simonb Exp $      */
+/*     $NetBSD: loadfile_machdep.h,v 1.3 2001/10/31 17:20:46 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -40,8 +40,7 @@
 #define        _HP300_LOADFILE_MACHDEP_H_
 
 #define        BOOT_AOUT
-#define        BOOT_ELF
-#define        ELFSIZE 32
+#define        BOOT_ELF32
 
 #define        LOAD_KERNEL     LOAD_ALL
 #define        COUNT_KERNEL    COUNT_ALL
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/i386/include/loadfile_machdep.h
--- a/sys/arch/i386/include/loadfile_machdep.h  Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/i386/include/loadfile_machdep.h  Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.3 1999/11/30 12:02:13 drochner Exp $     */
+/*     $NetBSD: loadfile_machdep.h,v 1.4 2001/10/31 17:20:46 thorpej Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,8 +37,7 @@
  */
 
 #define BOOT_AOUT
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
 
 #define LOAD_KERNEL    (LOAD_ALL & ~LOAD_TEXTA)
 #define COUNT_KERNEL   (COUNT_ALL & ~COUNT_TEXTA)
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/macppc/include/loadfile_machdep.h
--- a/sys/arch/macppc/include/loadfile_machdep.h        Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/macppc/include/loadfile_machdep.h        Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $      */
+/*     $NetBSD: loadfile_machdep.h,v 1.2 2001/10/31 17:20:46 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,8 +37,7 @@
  */
 
 #define BOOT_AOUT
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
 
 #define LOAD_KERNEL    (LOAD_ALL & ~LOAD_TEXTA)
 #define COUNT_KERNEL   (COUNT_ALL & ~COUNT_TEXTA)
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/mipsco/include/loadfile_machdep.h
--- a/sys/arch/mipsco/include/loadfile_machdep.h        Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/mipsco/include/loadfile_machdep.h        Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.1 2000/09/19 07:50:50 wdk Exp $  */
+/*     $NetBSD: loadfile_machdep.h,v 1.2 2001/10/31 17:20:46 thorpej Exp $      */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -40,8 +40,7 @@
 #define _MIPSCO_LOADFILE_MACHDEP_H_
 
 #define BOOT_ECOFF
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
 
 #define LOAD_KERNEL    (LOAD_ALL & ~LOAD_TEXTA)
 #define COUNT_KERNEL   (COUNT_ALL & ~COUNT_TEXTA)
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/mmeye/include/loadfile_machdep.h
--- a/sys/arch/mmeye/include/loadfile_machdep.h Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/mmeye/include/loadfile_machdep.h Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.1 1999/09/13 10:30:57 itojun Exp $      */
+/*     $NetBSD: loadfile_machdep.h,v 1.2 2001/10/31 17:20:47 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,8 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
 
 #define LOAD_KERNEL    (LOAD_ALL & ~LOAD_TEXTA)
 #define COUNT_KERNEL   (COUNT_ALL & ~COUNT_TEXTA)
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/mvme68k/include/loadfile_machdep.h
--- a/sys/arch/mvme68k/include/loadfile_machdep.h       Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/mvme68k/include/loadfile_machdep.h       Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.2 2000/12/04 18:41:51 scw Exp $ */
+/*     $NetBSD: loadfile_machdep.h,v 1.3 2001/10/31 17:20:47 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -40,8 +40,7 @@
 #define __MACHINE_LOADFILE_MACHDEP_H
 
 #define BOOT_AOUT
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
 
 #define LOAD_KERNEL    LOAD_ALL
 #define COUNT_KERNEL   COUNT_ALL
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/news68k/include/loadfile_machdep.h
--- a/sys/arch/news68k/include/loadfile_machdep.h       Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/news68k/include/loadfile_machdep.h       Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.3 2001/01/23 11:30:54 tsutsui Exp $     */
+/*     $NetBSD: loadfile_machdep.h,v 1.4 2001/10/31 17:20:47 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,8 +37,7 @@
  */
 
 #define BOOT_AOUT
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
 
 #define LOAD_KERNEL            LOAD_ALL
 #define COUNT_KERNEL           COUNT_ALL
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/newsmips/include/loadfile_machdep.h
--- a/sys/arch/newsmips/include/loadfile_machdep.h      Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/newsmips/include/loadfile_machdep.h      Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.1 1999/07/08 12:13:18 tsubai Exp $      */
+/*     $NetBSD: loadfile_machdep.h,v 1.2 2001/10/31 17:20:47 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,8 +37,7 @@
  */
 
 #define BOOT_ECOFF
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
 
 #define LOAD_KERNEL    (LOAD_ALL & ~LOAD_TEXTA)
 #define COUNT_KERNEL   (COUNT_ALL & ~COUNT_TEXTA)
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/next68k/include/loadfile_machdep.h
--- a/sys/arch/next68k/include/loadfile_machdep.h       Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/next68k/include/loadfile_machdep.h       Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.1 2001/05/12 22:35:30 chs Exp $ */
+/*     $NetBSD: loadfile_machdep.h,v 1.2 2001/10/31 17:20:48 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -40,8 +40,7 @@
 #define __MACHINE_LOADFILE_MACHDEP_H
 
 #define BOOT_AOUT
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
 
 #define LOAD_KERNEL    LOAD_ALL
 #define COUNT_KERNEL   COUNT_ALL
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/ofppc/include/loadfile_machdep.h
--- a/sys/arch/ofppc/include/loadfile_machdep.h Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/ofppc/include/loadfile_machdep.h Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.1 2001/10/23 03:02:03 thorpej Exp $     */
+/*     $NetBSD: loadfile_machdep.h,v 1.2 2001/10/31 17:20:48 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,8 +37,7 @@
  */
 
 #define BOOT_AOUT
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
 
 #define LOAD_KERNEL    (LOAD_ALL & ~LOAD_TEXTA)
 #define COUNT_KERNEL   (COUNT_ALL & ~COUNT_TEXTA)
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/pmax/include/loadfile_machdep.h
--- a/sys/arch/pmax/include/loadfile_machdep.h  Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/pmax/include/loadfile_machdep.h  Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.2 2000/01/09 15:34:43 ad Exp $   */
+/*     $NetBSD: loadfile_machdep.h,v 1.3 2001/10/31 17:20:48 thorpej Exp $      */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,8 +41,7 @@
 
 #define BOOT_AOUT
 #define BOOT_ECOFF
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
 
 #define LOAD_KERNEL    (LOAD_ALL & ~LOAD_TEXTA)
 #define COUNT_KERNEL   (COUNT_ALL & ~COUNT_TEXTA)
diff -r cdf9519ba431 -r 9b0985cf7a88 sys/arch/prep/include/loadfile_machdep.h
--- a/sys/arch/prep/include/loadfile_machdep.h  Wed Oct 31 16:27:31 2001 +0000
+++ b/sys/arch/prep/include/loadfile_machdep.h  Wed Oct 31 17:20:45 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: loadfile_machdep.h,v 1.1 2000/02/29 15:21:26 nonaka Exp $      */
+/*     $NetBSD: loadfile_machdep.h,v 1.2 2001/10/31 17:20:48 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,8 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define BOOT_ELF
-#define ELFSIZE 32
+#define BOOT_ELF32
Prev by Date: [src/trunk]: src/sbin/mount_ntfs Couple changes, mainly to address stuff rais...
Next by Date: [src/trunk]: src Add -b option. Bootstrap only. i.e. build and install nbmake...
Previous by Thread: [src/trunk]: src/sbin/mount_ntfs Couple changes, mainly to address stuff rais...
Next by Thread: [src/trunk]: src Add -b option. Bootstrap only. i.e. build and install nbmake...
Indexes:
Home | Main Index | Thread Index | Old Index