[src/trunk]: src/sys/arch/atari/stand Unifdef ELF.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/atari/stand Unifdef __ELF__.
From: tsutsui <tsutsui%NetBSD.org@localhost>
Date: Sun, 26 Jun 2022 16:43:43 +0000

details:   https://anonhg.NetBSD.org/src/rev/b69d6f43a12d
branches:  trunk
changeset: 368164:b69d6f43a12d
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Jun 26 14:14:46 2022 +0000

description:
Unifdef __ELF__.

diffstat:

 sys/arch/atari/stand/bootxxx/bootxxx.c                |   8 ++------
 sys/arch/atari/stand/xxboot/ahdi-sdb00t/sdb00t.ahdi.S |  10 +---------
 sys/arch/atari/stand/xxboot/ahdi-wdb00t/wdb00t.ahdi.S |  10 +---------
 sys/arch/atari/stand/xxboot/ahdi-xxboot/xxboot.ahdi.S |  10 +---------
 sys/arch/atari/stand/xxboot/fdboot/fdboot.S           |  10 +---------
 sys/arch/atari/stand/xxboot/sdboot/sdboot.S           |   9 +--------
 sys/arch/atari/stand/xxboot/wdboot/wdboot.S           |   9 +--------
 7 files changed, 8 insertions(+), 58 deletions(-)

diffs (200 lines):

diff -r 042a98cc870c -r b69d6f43a12d sys/arch/atari/stand/bootxxx/bootxxx.c
--- a/sys/arch/atari/stand/bootxxx/bootxxx.c    Sun Jun 26 14:08:15 2022 +0000
+++ b/sys/arch/atari/stand/bootxxx/bootxxx.c    Sun Jun 26 14:14:46 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootxxx.c,v 1.9 2022/06/26 14:08:15 tsutsui Exp $      */
+/*     $NetBSD: bootxxx.c,v 1.10 2022/06/26 14:14:46 tsutsui Exp $     */
 
 /*
  * Copyright (c) 2001 Leo Weppelman.
@@ -58,7 +58,7 @@
        /* XXX: Limit should be 16MB */
        setheap(end, (void*)0x1000000);
        printf("\033v\nNetBSD/atari tertiary bootloader "
-                                       "($Revision: 1.9 $)\n\n");
+                                       "($Revision: 1.10 $)\n\n");
 
        if (init_dskio(readsector, disklabel, od->rootfs))
                return -1;
@@ -74,11 +74,7 @@
                return -3;
        }
 
-#ifndef __ELF__                /* a.out */
-       if (aout_load(fd, od, &errmsg, 1) != 0)
-#else
        if (elf_load(fd, od, &errmsg, 1) != 0)
-#endif
                return -4;
 
        boot_BSD(&od->kp);
diff -r 042a98cc870c -r b69d6f43a12d sys/arch/atari/stand/xxboot/ahdi-sdb00t/sdb00t.ahdi.S
--- a/sys/arch/atari/stand/xxboot/ahdi-sdb00t/sdb00t.ahdi.S     Sun Jun 26 14:08:15 2022 +0000
+++ b/sys/arch/atari/stand/xxboot/ahdi-sdb00t/sdb00t.ahdi.S     Sun Jun 26 14:14:46 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdb00t.ahdi.S,v 1.2 2005/12/11 12:17:02 christos Exp $ */
+/*     $NetBSD: sdb00t.ahdi.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $  */
 
 /*
  * Copyright (c) 1995 Waldi Ravens
@@ -32,19 +32,11 @@
 
 #include "xxboot.h"
 
-#ifdef __ELF__
        .globl  _start, main, fill
 
        .text
 
 _start:        bras    main
-#else
-       .globl  start, main, fill
-
-       .text
-
-start: bras    main
-#endif
        bra     rds0
 
 main:  bclr    #2,(_drvbits+3):w
diff -r 042a98cc870c -r b69d6f43a12d sys/arch/atari/stand/xxboot/ahdi-wdb00t/wdb00t.ahdi.S
--- a/sys/arch/atari/stand/xxboot/ahdi-wdb00t/wdb00t.ahdi.S     Sun Jun 26 14:08:15 2022 +0000
+++ b/sys/arch/atari/stand/xxboot/ahdi-wdb00t/wdb00t.ahdi.S     Sun Jun 26 14:14:46 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdb00t.ahdi.S,v 1.2 2005/12/11 12:17:02 christos Exp $ */
+/*     $NetBSD: wdb00t.ahdi.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $  */
 
 /*
  * Copyright (c) 1995 Waldi Ravens
@@ -32,19 +32,11 @@
 
 #include "xxboot.h"
 
-#ifdef __ELF__
        .globl  _start, main, fill
 
        .text
 
 _start:        bras    main
-#else
-       .globl  start, main, fill
-
-       .text
-
-start: bras    main
-#endif
        bra     rds0
 
 main:  bclr    #2,(_drvbits+3):w
diff -r 042a98cc870c -r b69d6f43a12d sys/arch/atari/stand/xxboot/ahdi-xxboot/xxboot.ahdi.S
--- a/sys/arch/atari/stand/xxboot/ahdi-xxboot/xxboot.ahdi.S     Sun Jun 26 14:08:15 2022 +0000
+++ b/sys/arch/atari/stand/xxboot/ahdi-xxboot/xxboot.ahdi.S     Sun Jun 26 14:14:46 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xxboot.ahdi.S,v 1.2 2005/12/11 12:17:02 christos Exp $ */
+/*     $NetBSD: xxboot.ahdi.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $  */
 
 /*
  * Copyright (c) 1995 Waldi Ravens.
@@ -32,19 +32,11 @@
 
 #include "xxboot.h"
 
-#ifdef __ELF__
        .globl  _start, main, fill
 
        .text
 
 _start:        bras    main
-#else
-       .globl  start, main, fill
-
-       .text
-
-start: bras    main
-#endif
 /*
  * Fake gemdos-fs bootsector, to keep TOS away.
  */
diff -r 042a98cc870c -r b69d6f43a12d sys/arch/atari/stand/xxboot/fdboot/fdboot.S
--- a/sys/arch/atari/stand/xxboot/fdboot/fdboot.S       Sun Jun 26 14:08:15 2022 +0000
+++ b/sys/arch/atari/stand/xxboot/fdboot/fdboot.S       Sun Jun 26 14:14:46 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fdboot.S,v 1.2 2005/12/11 12:17:02 christos Exp $      */
+/*     $NetBSD: fdboot.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $       */
 
 /*
  * Copyright (c) 1995 Waldi Ravens.
@@ -32,19 +32,11 @@
 
 #include "xxboot.h"
 
-#ifdef __ELF__
        .globl  _start, main, fill
 
        .text
 
 _start:        bras    main
-#else
-       .globl  start, main, fill
-
-       .text
-
-start: bras    main
-#endif
 /*
  * Fake gemdos-fs bootsector, to keep TOS away.
  */
diff -r 042a98cc870c -r b69d6f43a12d sys/arch/atari/stand/xxboot/sdboot/sdboot.S
--- a/sys/arch/atari/stand/xxboot/sdboot/sdboot.S       Sun Jun 26 14:08:15 2022 +0000
+++ b/sys/arch/atari/stand/xxboot/sdboot/sdboot.S       Sun Jun 26 14:14:46 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdboot.S,v 1.2 2005/12/11 12:17:02 christos Exp $      */
+/*     $NetBSD: sdboot.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $       */
 
 /*
  * Copyright (c) 1995 Waldi Ravens
@@ -32,17 +32,10 @@
 
 #include "xxboot.h"
 
-#ifdef __ELF__
        .globl  _start, main, fill
 
        .text
 _start:
-#else
-       .globl  start, main, fill
-
-       .text
-start:
-#endif
 /*
  * in: d3 ('DMAr' flag), d4 (SCSI target), d5 (boot pref), d7 (ACSI target)
  */
diff -r 042a98cc870c -r b69d6f43a12d sys/arch/atari/stand/xxboot/wdboot/wdboot.S
--- a/sys/arch/atari/stand/xxboot/wdboot/wdboot.S       Sun Jun 26 14:08:15 2022 +0000
+++ b/sys/arch/atari/stand/xxboot/wdboot/wdboot.S       Sun Jun 26 14:14:46 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdboot.S,v 1.2 2005/12/11 12:17:02 christos Exp $      */
+/*     $NetBSD: wdboot.S,v 1.3 2022/06/26 14:14:46 tsutsui Exp $       */
 
 /*
  * Copyright (c) 1995 Waldi Ravens
@@ -32,17 +32,10 @@
 
 #include "xxboot.h"
 
-#ifdef __ELF__
        .globl  _start, main, fill
 
        .text
 _start:
-#else
-       .globl  start, main, fill
-
-       .text
-start:
-#endif
 /*
  * in: d3 ('DMAr' flag), d4 (SCSI target), d5 (boot pref), d7 (ACSI target)
  */

Prev by Date: [src/trunk]: src/sys/arch/atari/stand/bootxxx Consistently use "NetBSD/atari"...
Next by Date: [src/trunk]: src/sys/lib/libunwind Teach the LLVM-derived unwinder about the ...
Previous by Thread: [src/trunk]: src/sys/arch/atari/stand/bootxxx Consistently use "NetBSD/atari"...
Next by Thread: [src/trunk]: src/sys/lib/libunwind Teach the LLVM-derived unwinder about the ...
Indexes:

Home | Main Index | Thread Index | Old Index

[src/trunk]: src/sys/arch/atari/stand Unifdef __ELF__.

[src/trunk]: src/sys/arch/atari/stand Unifdef ELF.