[src/trunk]: src/sys fix optimized compilation.

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

details:   https://anonhg.NetBSD.org/src/rev/8ab6f65252ff
branches:  trunk
changeset: 570056:8ab6f65252ff
user:      chs <chs%NetBSD.org@localhost>
date:      Sun Sep 19 23:00:29 2004 +0000

description:
fix optimized compilation.

diffstat:

 sys/arch/hp700/dev/sti_sgc.c |   5 +++--
 sys/dev/ic/sti.c             |  11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r 092778cc03ef -r 8ab6f65252ff sys/arch/hp700/dev/sti_sgc.c
--- a/sys/arch/hp700/dev/sti_sgc.c      Sun Sep 19 21:57:48 2004 +0000
+++ b/sys/arch/hp700/dev/sti_sgc.c      Sun Sep 19 23:00:29 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sti_sgc.c,v 1.7 2004/08/26 16:48:06 jkunz Exp $        */
+/*     $NetBSD: sti_sgc.c,v 1.8 2004/09/19 23:00:29 chs Exp $  */
 
 /*     $OpenBSD: sti_sgc.c,v 1.21 2003/12/22 23:39:06 mickey Exp $     */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.7 2004/08/26 16:48:06 jkunz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.8 2004/09/19 23:00:29 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -191,6 +191,7 @@
                printf("sti: unknown type (%x)\n", devtype);
 #endif
                rv = 0;
+               romend = 0;
        }
 
        if (rv &&
diff -r 092778cc03ef -r 8ab6f65252ff sys/dev/ic/sti.c
--- a/sys/dev/ic/sti.c  Sun Sep 19 21:57:48 2004 +0000
+++ b/sys/dev/ic/sti.c  Sun Sep 19 23:00:29 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sti.c,v 1.1 2004/08/26 16:48:06 jkunz Exp $ */
+/* $NetBSD: sti.c,v 1.2 2004/09/19 23:00:29 chs Exp $ */
 
 /*     $OpenBSD: sti.c,v 1.35 2003/12/16 06:07:13 mickey Exp $ */
 
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.1 2004/08/26 16:48:06 jkunz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.2 2004/09/19 23:00:29 chs Exp $");
 
 #include "wsdisplay.h"
 
@@ -132,6 +132,7 @@
        u_int32_t addr, eaddr;
        struct sti_region r;
        u_int32_t *q;
+       uint32_t tmp;
 
        dd = &sc->sc_dd;
        if (sc->sc_devtype == STI_DEVTYPE1) {
@@ -269,10 +270,10 @@
             q < &cc->regions[STI_REGION_MAX]; q++) {
 
                if (sc->sc_devtype == STI_DEVTYPE1)
-                       *(u_int *)&r = parseword(i), i += 16;
+                       tmp = parseword(i), i += 16;
                else
-                       *(u_int *)&r = bus_space_read_4(sc->memt, sc->romh, i),
-                           i += 4;
+                       tmp = bus_space_read_4(sc->memt, sc->romh, i), i += 4;
+               memcpy(&r, &tmp, sizeof (r));
 
                *q = (q == cc->regions ? sc->romh : sc->base) +
                    (r.offset << PGSHIFT);