[src/trunk]: src/sys/arch/sparc sprinkle some: libkern.h, some -ffreestanding...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/sparc sprinkle some: libkern.h, some -ffreestanding...
From: mrg <mrg%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 13:27:23 +0000
details:   https://anonhg.NetBSD.org/src/rev/f4e0b52af2ae
branches:  trunk
changeset: 550119:f4e0b52af2ae
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jul 30 15:58:36 2003 +0000

description:
sprinkle some: libkern.h, some -ffreestanding and some cast-y goodness,
all for the pleasure of the gcc 3 :-)

diffstat:

 sys/arch/sparc/sparc/openfirm.c         |   6 ++++--
 sys/arch/sparc/sparc/promlib.c          |  20 +++++++++++---------
 sys/arch/sparc/sparc/svr4_machdep.c     |  12 ++++++------
 sys/arch/sparc/stand/Makefile.buildboot |   4 ++--
 sys/arch/sparc/stand/Makefile.inc       |   4 ++--
 sys/arch/sparc/stand/boot/Makefile      |   3 ++-
 sys/arch/sparc/stand/boot/boot.c        |   3 ++-
 sys/arch/sparc/stand/boot/prompatch.c   |   3 ++-
 sys/arch/sparc/stand/bootblk/Makefile   |  14 +++-----------
 sys/arch/sparc/stand/common/promdev.c   |   4 ++--
 10 files changed, 36 insertions(+), 37 deletions(-)

diffs (300 lines):

diff -r 4e35e2840a09 -r f4e0b52af2ae sys/arch/sparc/sparc/openfirm.c
--- a/sys/arch/sparc/sparc/openfirm.c   Wed Jul 30 13:36:40 2003 +0000
+++ b/sys/arch/sparc/sparc/openfirm.c   Wed Jul 30 15:58:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: openfirm.c,v 1.7 2003/07/15 00:05:07 lukem Exp $       */
+/*     $NetBSD: openfirm.c,v 1.8 2003/07/30 15:58:36 mrg Exp $ */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.7 2003/07/15 00:05:07 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.8 2003/07/30 15:58:36 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,6 +41,8 @@
 
 #include <machine/openfirm.h>
 
+#include <lib/libkern/libkern.h>
+
 #define min(x,y)       ((x<y)?(x):(y))
 
 extern void    *romp;
diff -r 4e35e2840a09 -r f4e0b52af2ae sys/arch/sparc/sparc/promlib.c
--- a/sys/arch/sparc/sparc/promlib.c    Wed Jul 30 13:36:40 2003 +0000
+++ b/sys/arch/sparc/sparc/promlib.c    Wed Jul 30 15:58:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: promlib.c,v 1.19 2003/07/15 00:05:09 lukem Exp $ */
+/*     $NetBSD: promlib.c,v 1.20 2003/07/30 15:58:36 mrg Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.19 2003/07/15 00:05:09 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.20 2003/07/30 15:58:36 mrg Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_sparc_arch.h"
@@ -65,6 +65,8 @@
 #include <machine/ctlreg.h>
 #include <sparc/sparc/asm.h>
 
+#include <lib/libkern/libkern.h>
+
 #define obpvec ((struct promvec *)romp)
 
 static void    notimplemented __P((void));
@@ -256,7 +258,7 @@
 {
        int len = bufsize - 1;
 
-       if (PROM_getprop(node, name, 1, &len, (void **)&buf) != 0)
+       if (PROM_getprop(node, name, 1, &len, (void **)(void *)&buf) != 0)
                len = 0;
 
        buf[len] = '\0';        /* usually unnecessary */
@@ -276,7 +278,7 @@
        int intbuf, *ip = &intbuf;
        int len = 1;
 
-       if (PROM_getprop(node, name, sizeof(int), &len, (void **)&ip) != 0)
+       if (PROM_getprop(node, name, sizeof(int), &len, (void **)(void *)&ip) != 0)
                return (deflt);
 
        return (*ip);
@@ -756,7 +758,7 @@
        char *buf = NULL;
        int blen = 0;
 
-       if (PROM_getprop(node, "bootpath", 1, &blen, (void **)&buf) != 0)
+       if (PROM_getprop(node, "bootpath", 1, &blen, (void **)(void *)&buf) != 0)
                return ("");
 
        return (buf);
@@ -769,7 +771,7 @@
        char *buf = NULL;
        int blen = 0;
 
-       if (PROM_getprop(node, "bootargs", 1, &blen, (void **)&buf) != 0)
+       if (PROM_getprop(node, "bootargs", 1, &blen, (void **)(void *)&buf) != 0)
                return ("");
 
        return (parse_bootargs(buf));
@@ -782,7 +784,7 @@
        char *buf = NULL;
        int blen = 0;
 
-       if (PROM_getprop(node, "bootargs", 1, &blen, (void **)&buf) != 0)
+       if (PROM_getprop(node, "bootargs", 1, &blen, (void **)(void *)&buf) != 0)
                return ("");
 
        return (parse_bootfile(buf));
@@ -887,7 +889,7 @@
                } else {
                        n = max;
                        if (PROM_getprop(node, prop, sizeof(struct memarr),
-                                       &n, (void **)&ap) != 0)
+                                       &n, (void **)(void *)&ap) != 0)
                                panic("makememarr: cannot get property");
                }
                break;
@@ -938,7 +940,7 @@
                dst = (char *)&idprom;
                len = sizeof(struct idprom);
                node = prom_findroot();
-               if (PROM_getprop(node, "idprom", 1, &len, (void **)&dst) != 0) {
+               if (PROM_getprop(node, "idprom", 1, &len, (void **)(void *)&dst) != 0) {
                        printf("`idprom' property cannot be read: "
                                "cannot get ethernet address");
                }
diff -r 4e35e2840a09 -r f4e0b52af2ae sys/arch/sparc/sparc/svr4_machdep.c
--- a/sys/arch/sparc/sparc/svr4_machdep.c       Wed Jul 30 13:36:40 2003 +0000
+++ b/sys/arch/sparc/sparc/svr4_machdep.c       Wed Jul 30 15:58:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: svr4_machdep.c,v 1.48 2003/07/15 00:05:09 lukem Exp $   */
+/*     $NetBSD: svr4_machdep.c,v 1.49 2003/07/30 15:58:36 mrg Exp $     */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.48 2003/07/15 00:05:09 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.49 2003/07/30 15:58:36 mrg Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_kgdb.h"
@@ -589,8 +589,8 @@
 
                        tm = (u_quad_t) tv.tv_sec * 1000000000 +
                            (u_quad_t) tv.tv_usec * 1000;
-                       tf->tf_out[0] = ((u_int32_t *) &tm)[0];
-                       tf->tf_out[1] = ((u_int32_t *) &tm)[1];
+                       tf->tf_out[0] = ((u_int32_t *)(void *) &tm)[0];
+                       tf->tf_out[1] = ((u_int32_t *)(void *) &tm)[1];
                }
                break;
 
@@ -619,8 +619,8 @@
                                        tv.tv_usec -
                                            spc->spc_runtime.tv_usec)
                                        * 1000;
-                       tf->tf_out[0] = ((u_int32_t *) &tm)[0];
-                       tf->tf_out[1] = ((u_int32_t *) &tm)[1];
+                       tf->tf_out[0] = ((u_int32_t *)(void *) &tm)[0];
+                       tf->tf_out[1] = ((u_int32_t *)(void *) &tm)[1];
                }
                break;
 
diff -r 4e35e2840a09 -r f4e0b52af2ae sys/arch/sparc/stand/Makefile.buildboot
--- a/sys/arch/sparc/stand/Makefile.buildboot   Wed Jul 30 13:36:40 2003 +0000
+++ b/sys/arch/sparc/stand/Makefile.buildboot   Wed Jul 30 15:58:36 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.buildboot,v 1.20 2003/05/17 02:30:14 nakayama Exp $
+#      $NetBSD: Makefile.buildboot,v 1.21 2003/07/30 15:58:38 mrg Exp $
 #
 # This file is for the sparc `boot' and `bootxx' only; it does not
 # currently play well on a 64-bit system.
@@ -35,7 +35,7 @@
 
 CPPFLAGS+=     -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
 CFLAGS=                -O2
-CFLAGS+=       -Wall -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS+=       -Wall -Wstrict-prototypes -Wmissing-prototypes -ffreestanding
 
 ### find out what to use for libkern
 KERN_AS=       library
diff -r 4e35e2840a09 -r f4e0b52af2ae sys/arch/sparc/stand/Makefile.inc
--- a/sys/arch/sparc/stand/Makefile.inc Wed Jul 30 13:36:40 2003 +0000
+++ b/sys/arch/sparc/stand/Makefile.inc Wed Jul 30 15:58:36 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.7 2000/08/20 14:57:16 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.8 2003/07/30 15:58:38 mrg Exp $
 
 .ifndef __INCLUDED_STAND_MAKEFILE_INC
 __INCLUDED_STAND_MAKEFILE_INC=
@@ -9,7 +9,7 @@
 CPPFLAGS+=     -DSTANDALONE -DSUN4U
 CPPFLAGS+=     -I.
 
-CFLAGS+=       -msoft-float
+CFLAGS+=       -msoft-float -ffreestanding
 .endif
 
 .endif
diff -r 4e35e2840a09 -r f4e0b52af2ae sys/arch/sparc/stand/boot/Makefile
--- a/sys/arch/sparc/stand/boot/Makefile        Wed Jul 30 13:36:40 2003 +0000
+++ b/sys/arch/sparc/stand/boot/Makefile        Wed Jul 30 15:58:36 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.28 2003/03/01 13:01:56 pk Exp $
+#      $NetBSD: Makefile,v 1.29 2003/07/30 15:58:39 mrg Exp $
 
 STRIPFLAG=
 PROGSOURCE=    boot.c net.c netif_sun.c conf.c openfirm.c bootinfo.c \
@@ -9,6 +9,7 @@
 LINKS=         ${BINDIR}/boot.${RELOC_DEFAULT} ${BINDIR}/boot
 
 CPPFLAGS+=     -DBOOT_AOUT -DBOOT_ELF32
+CFLAGS+=       -freestanding
 
 INCLUDE_LIBZ=  yes
 SAMISCMAKEFLAGS= SA_USE_CREAD=yes
diff -r 4e35e2840a09 -r f4e0b52af2ae sys/arch/sparc/stand/boot/boot.c
--- a/sys/arch/sparc/stand/boot/boot.c  Wed Jul 30 13:36:40 2003 +0000
+++ b/sys/arch/sparc/stand/boot/boot.c  Wed Jul 30 15:58:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.16 2003/07/10 09:06:52 pk Exp $ */
+/*     $NetBSD: boot.c,v 1.17 2003/07/30 15:58:39 mrg Exp $ */
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -42,6 +42,7 @@
 
 #include <lib/libsa/stand.h>
 #include <lib/libsa/loadfile.h>
+#include <lib/libkern/libkern.h>
 
 #include <machine/promlib.h>
 #include <sparc/stand/common/promdev.h>
diff -r 4e35e2840a09 -r f4e0b52af2ae sys/arch/sparc/stand/boot/prompatch.c
--- a/sys/arch/sparc/stand/boot/prompatch.c     Wed Jul 30 13:36:40 2003 +0000
+++ b/sys/arch/sparc/stand/boot/prompatch.c     Wed Jul 30 15:58:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: prompatch.c,v 1.6 2002/12/16 13:01:01 jdc Exp $ */
+/*     $NetBSD: prompatch.c,v 1.7 2003/07/30 15:58:39 mrg Exp $ */
 
 /*
  * Copyright (c) 2001 Valeriy E. Ushakov
@@ -29,6 +29,7 @@
 
 #include <sys/param.h>
 #include <lib/libsa/stand.h>
+#include <lib/libkern/libkern.h>
 #include <machine/promlib.h>
 
 char *match_c5ip(void);
diff -r 4e35e2840a09 -r f4e0b52af2ae sys/arch/sparc/stand/bootblk/Makefile
--- a/sys/arch/sparc/stand/bootblk/Makefile     Wed Jul 30 13:36:40 2003 +0000
+++ b/sys/arch/sparc/stand/bootblk/Makefile     Wed Jul 30 15:58:36 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2003/07/10 10:34:41 lukem Exp $
+#      $NetBSD: Makefile,v 1.6 2003/07/30 15:58:40 mrg Exp $
 
 CURDIR=        ${.CURDIR}
 S=     ${CURDIR}/../../../..
@@ -16,18 +16,10 @@
 NOMAN=         # defined
 STRIPFLAG=
 
-# deal with Solaris vs. NetBSD build environments for now ..
-OS!=uname -s
-.if (${OS} == "NetBSD")
 USE_GENASSYM?= no
-SVR4=
-.else
-USE_GENASSYM?= yes
-SVR4=-U__SVR4 -U__svr4__ -D__NetBSD__
-.endif
 
 INCLUDES=      -I. -I$S/arch -I$S -nostdinc
-CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_LKM ${SVR4}
+CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_LKM
 
 #all:: bootblk.text bootblk
 
@@ -54,7 +46,7 @@
        ${TOOL_FGEN} -o bootblk ${.CURDIR}/bootblk.fth
 
 beforedepend:
-       @touch .depend
+       @touch .d
 
 #
 # The following are if you grab the fakeboot program from the Sun website
diff -r 4e35e2840a09 -r f4e0b52af2ae sys/arch/sparc/stand/common/promdev.c
--- a/sys/arch/sparc/stand/common/promdev.c     Wed Jul 30 13:36:40 2003 +0000
+++ b/sys/arch/sparc/stand/common/promdev.c     Wed Jul 30 15:58:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: promdev.c,v 1.14 2003/02/26 17:39:08 pk Exp $ */
+/*     $NetBSD: promdev.c,v 1.15 2003/07/30 15:58:40 mrg Exp $ */
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -45,7 +45,7 @@
 #include <machine/pte.h>
 
 #include <lib/libsa/stand.h>
-
+#include <lib/libkern/libkern.h>
 #include <sparc/stand/common/promdev.h>
 
 /* OBP V0-3 PROM vector */
Prev by Date: [src/trunk]: src/usr.bin/unifdef ANSI C support, from http://dotat.at/prog/misc/
Next by Date: [src/trunk]: src/usr.bin/ftp Invalidate remote directory completion cache if ...
Previous by Thread: [src/trunk]: src/usr.bin/unifdef ANSI C support, from http://dotat.at/prog/misc/
Next by Thread: [src/trunk]: src/usr.bin/ftp Invalidate remote directory completion cache if ...
Indexes:
Home | Main Index | Thread Index | Old Index