Module Name: src
Committed By: tsutsui
Date: Sun Nov 16 13:47:52 UTC 2014
Modified Files:
src/sys/arch/atari/stand/installboot: installboot.c
Log Message:
Appease gcc48 -Werror=strict-aliasing warning by filling cksum via union.
Discussed in source-changes-d@ thread and tested on TT030.
Should be pulled up to netbsd-7 (if NetBSD/m68k 7.0 will switch to gcc48).
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/atari/stand/installboot/installboot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/atari/stand/installboot/installboot.c
diff -u src/sys/arch/atari/stand/installboot/installboot.c:1.31 src/sys/arch/atari/stand/installboot/installboot.c:1.32
--- src/sys/arch/atari/stand/installboot/installboot.c:1.31 Sun Nov 16 13:38:39 2014
+++ src/sys/arch/atari/stand/installboot/installboot.c Sun Nov 16 13:47:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.c,v 1.31 2014/11/16 13:38:39 tsutsui Exp $ */
+/* $NetBSD: installboot.c,v 1.32 2014/11/16 13:47:52 tsutsui Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -467,6 +467,10 @@ mkbootblock(struct bootblock *bb, char *
struct disklabel *label, u_int magic)
{
int fd;
+ union {
+ struct bootblock *bbp;
+ uint16_t *word; /* to fill cksum word */
+ } bbsec;
memset(bb, 0, sizeof(*bb));
@@ -498,8 +502,9 @@ mkbootblock(struct bootblock *bb, char *
setIDEpar(bb->bb_xxboot, sizeof(bb->bb_xxboot));
/* set AHDI checksum */
- *((u_int16_t *)bb->bb_xxboot + 255) = 0;
- *((u_int16_t *)bb->bb_xxboot + 255) = 0x1234 - abcksum(bb->bb_xxboot);
+ bbsec.bbp = bb;
+ bbsec.word[255] = 0;
+ bbsec.word[255] = 0x1234 - abcksum(bb->bb_xxboot);
if (verbose) {
printf("Primary boot loader: %s\n", xxb);
