Module Name: src
Committed By: jakllsch
Date: Wed Dec 22 20:46:43 UTC 2010
Modified Files:
src/sys/arch/i386/stand: Makefile.booters
src/sys/arch/i386/stand/pxeboot: pxe.h
Log Message:
It just so happens we don't need -Wno-attributes if we
place __packed in the right place.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/stand/pxeboot/pxe.h
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/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.80 src/sys/arch/i386/stand/Makefile.booters:1.81
--- src/sys/arch/i386/stand/Makefile.booters:1.80 Tue Jul 6 06:00:00 2010
+++ src/sys/arch/i386/stand/Makefile.booters Wed Dec 22 20:46:42 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.80 2010/07/06 06:00:00 mrg Exp $
+# $NetBSD: Makefile.booters,v 1.81 2010/12/22 20:46:42 jakllsch Exp $
.include <bsd.own.mk>
@@ -15,14 +15,11 @@
.if defined(HAVE_GCC)
.if ${MACHINE_ARCH} == "x86_64"
CPUFLAGS= -m32
-.if ${HAVE_GCC} != 3
-CPUFLAGS+= -Wno-attributes
-.endif
.else
.if ${HAVE_GCC} == 3
CPUFLAGS= -mcpu=i386
.else
-CPUFLAGS= -march=i386 -mtune=i386 -Wno-attributes
+CPUFLAGS= -march=i386 -mtune=i386
.endif
.endif
.endif
Index: src/sys/arch/i386/stand/pxeboot/pxe.h
diff -u src/sys/arch/i386/stand/pxeboot/pxe.h:1.5 src/sys/arch/i386/stand/pxeboot/pxe.h:1.6
--- src/sys/arch/i386/stand/pxeboot/pxe.h:1.5 Tue Dec 25 18:33:34 2007
+++ src/sys/arch/i386/stand/pxeboot/pxe.h Wed Dec 22 20:46:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pxe.h,v 1.5 2007/12/25 18:33:34 perry Exp $ */
+/* $NetBSD: pxe.h,v 1.6 2010/12/22 20:46:42 jakllsch Exp $ */
/*
* Copyright (c) 2000 Alfred Perlstein <alf...@freebsd.org>
@@ -49,13 +49,13 @@
typedef struct {
uint16_t offset;
uint16_t segment;
-} SEGOFF16_t __packed;
+} __packed SEGOFF16_t;
typedef struct {
uint16_t Seg_Addr;
uint32_t Phy_Addr;
uint16_t Seg_Size;
-} SEGDESC_t __packed;
+} __packed SEGDESC_t;
typedef uint16_t SEGSEL_t;
typedef uint16_t PXENV_STATUS_t;
