[Xen-changelog] [xen-unstable] Specify -fno-strict-aliasing in root build config file.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1183800675 -3600
# Node ID 8528da5be577d0eab1dfc8a8a85d07e041a1f758
# Parent  15fe623c3421f9e01c4e50c4594eb73a3b952e3f
Specify -fno-strict-aliasing in root build config file.

Fixes correctness issues with xenstored and gcc-4.2.

Original patch by Charles Coffing <ccoffing@xxxxxxxxxx>

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 Config.mk                     |    7 +++++--
 tools/blktap/drivers/Makefile |    1 -
 tools/blktap/lib/Makefile     |    2 +-
 tools/libxc/Makefile          |    1 -
 tools/xcutils/Makefile        |    2 +-
 xen/arch/ia64/Rules.mk        |    2 +-
 xen/arch/powerpc/Rules.mk     |    2 +-
 xen/arch/x86/Rules.mk         |    2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff -r 15fe623c3421 -r 8528da5be577 Config.mk
--- a/Config.mk Sat Jul 07 10:09:51 2007 +0100
+++ b/Config.mk Sat Jul 07 10:31:15 2007 +0100
@@ -17,8 +17,9 @@ SHELL     ?= /bin/sh
 SHELL     ?= /bin/sh
 
 # Tools to run on system hosting the build
-HOSTCC     = gcc
-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCC      = gcc
+HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS += -fno-strict-aliasing
 
 DISTDIR     ?= $(XEN_ROOT)/dist
 DESTDIR     ?= /
@@ -58,6 +59,8 @@ CFLAGS += -g
 CFLAGS += -g
 endif
 
+CFLAGS += -fno-strict-aliasing
+
 CFLAGS += -std=gnu99
 
 CFLAGS += -Wall -Wstrict-prototypes
diff -r 15fe623c3421 -r 8528da5be577 tools/blktap/drivers/Makefile
--- a/tools/blktap/drivers/Makefile     Sat Jul 07 10:09:51 2007 +0100
+++ b/tools/blktap/drivers/Makefile     Sat Jul 07 10:31:15 2007 +0100
@@ -10,7 +10,6 @@ LIBAIO_DIR   = ../../libaio/src
 
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
-CFLAGS   += -fno-strict-aliasing
 CFLAGS   += -I $(XEN_LIBXC) -I $(LIBAIO_DIR)
 CFLAGS   += $(INCLUDES) -I. -I../../xenstore 
 CFLAGS   += -D_GNU_SOURCE
diff -r 15fe623c3421 -r 8528da5be577 tools/blktap/lib/Makefile
--- a/tools/blktap/lib/Makefile Sat Jul 07 10:09:51 2007 +0100
+++ b/tools/blktap/lib/Makefile Sat Jul 07 10:31:15 2007 +0100
@@ -16,7 +16,7 @@ SRCS     += xenbus.c blkif.c xs_api.c
 
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
-CFLAGS   += -fno-strict-aliasing -fPIC
+CFLAGS   += -fPIC
 # get asprintf():
 CFLAGS   += -D _GNU_SOURCE
 
diff -r 15fe623c3421 -r 8528da5be577 tools/libxc/Makefile
--- a/tools/libxc/Makefile      Sat Jul 07 10:09:51 2007 +0100
+++ b/tools/libxc/Makefile      Sat Jul 07 10:31:15 2007 +0100
@@ -57,7 +57,6 @@ GUEST_SRCS-$(CONFIG_POWERPC) += xc_dom_p
 -include $(XEN_TARGET_ARCH)/Makefile
 
 CFLAGS   += -Werror -Wmissing-prototypes
-CFLAGS   += -fno-strict-aliasing
 CFLAGS   += $(INCLUDES) -I. -I../xenstore
 
 # Needed for posix_fadvise64() in xc_linux.c
diff -r 15fe623c3421 -r 8528da5be577 tools/xcutils/Makefile
--- a/tools/xcutils/Makefile    Sat Jul 07 10:09:51 2007 +0100
+++ b/tools/xcutils/Makefile    Sat Jul 07 10:31:15 2007 +0100
@@ -15,7 +15,7 @@ PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xe
 
 INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
 
-CFLAGS += -Werror -fno-strict-aliasing
+CFLAGS += -Werror
 CFLAGS += $(INCLUDES)
 
 # Make gcc generate dependencies.
diff -r 15fe623c3421 -r 8528da5be577 xen/arch/ia64/Rules.mk
--- a/xen/arch/ia64/Rules.mk    Sat Jul 07 10:09:51 2007 +0100
+++ b/xen/arch/ia64/Rules.mk    Sat Jul 07 10:31:15 2007 +0100
@@ -18,7 +18,7 @@ endif
 # Used only by linux/Makefile.
 AFLAGS_KERNEL  += -mconstant-gp -nostdinc $(CPPFLAGS)
 
-CFLAGS += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
+CFLAGS += -nostdinc -fno-builtin -fno-common
 CFLAGS += -mconstant-gp
 #CFLAGS  += -O3                # -O3 over-inlines making debugging tough!
 CFLAGS += -O2          # but no optimization causes compile errors!
diff -r 15fe623c3421 -r 8528da5be577 xen/arch/powerpc/Rules.mk
--- a/xen/arch/powerpc/Rules.mk Sat Jul 07 10:09:51 2007 +0100
+++ b/xen/arch/powerpc/Rules.mk Sat Jul 07 10:31:15 2007 +0100
@@ -9,7 +9,7 @@ C_WARNINGS := -Wredundant-decls
 # _no_ common code can have packed data structures or we are in touble.
 C_WARNINGS += -Wpacked
 
-CFLAGS := -m64 -ffreestanding -fno-builtin -fno-common -fno-strict-aliasing
+CFLAGS := -m64 -ffreestanding -fno-builtin -fno-common
 CFLAGS += -iwithprefix include -Wall -Werror -pipe
 CFLAGS += -I$(BASEDIR)/include
 CFLAGS += -I$(BASEDIR)/include/asm-powerpc/mach-generic
diff -r 15fe623c3421 -r 8528da5be577 xen/arch/x86/Rules.mk
--- a/xen/arch/x86/Rules.mk     Sat Jul 07 10:09:51 2007 +0100
+++ b/xen/arch/x86/Rules.mk     Sat Jul 07 10:31:15 2007 +0100
@@ -17,7 +17,7 @@ CFLAGS += -nostdinc
 CFLAGS += -nostdinc
 endif
 
-CFLAGS += -fno-builtin -fno-common -fno-strict-aliasing
+CFLAGS += -fno-builtin -fno-common
 CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
 CFLAGS += -I$(BASEDIR)/include 
 CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog