[PATCH xserver 2/3] config: allow each makefile to decide on strict alias optimization

Gaetan Nadon memsize at videotron.ca
Tue Feb 23 10:37:19 PST 2010 

In a prior patch, -fno-strict-aliasing has been moved from
XORG_CWARNFLAGS to configure.ac. This patch moves it to
each makefile such that it can be removed if there is no
need to suppress optimization based on strict aliasing rules.

Warning options have been added in CWARNFLAGS to aid in that
determination.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Xext/Makefile.am                          |    2 +-
 Xi/Makefile.am                            |    2 +-
 composite/Makefile.am                     |    2 +-
 config/Makefile.am                        |    2 +-
 configure.ac                              |    1 -
 damageext/Makefile.am                     |    2 +-
 dbe/Makefile.am                           |    2 +-
 dix/Makefile.am                           |    2 +-
 exa/Makefile.am                           |    2 +-
 fb/Makefile.am                            |    2 +-
 glx/Makefile.am                           |    1 +
 hw/dmx/Makefile.am                        |    1 +
 hw/dmx/config/Makefile.am                 |    1 +
 hw/dmx/glxProxy/Makefile.am               |    1 +
 hw/dmx/input/Makefile.am                  |    1 +
 hw/vfb/Makefile.am                        |    3 ++-
 hw/xfree86/Makefile.am                    |    2 +-
 hw/xfree86/common/Makefile.am             |    2 +-
 hw/xfree86/ddc/Makefile.am                |    2 +-
 hw/xfree86/dixmods/Makefile.am            |    2 +-
 hw/xfree86/dixmods/extmod/Makefile.am     |    2 +-
 hw/xfree86/dri/Makefile.am                |    2 +-
 hw/xfree86/dri2/Makefile.am               |    2 +-
 hw/xfree86/exa/Makefile.am                |    2 +-
 hw/xfree86/fbdevhw/Makefile.am            |    2 +-
 hw/xfree86/i2c/Makefile.am                |    2 +-
 hw/xfree86/int10/Makefile.am              |    6 +++---
 hw/xfree86/loader/Makefile.am             |    2 +-
 hw/xfree86/modes/Makefile.am              |    2 +-
 hw/xfree86/os-support/Makefile.am         |    2 +-
 hw/xfree86/os-support/bsd/Makefile.am     |    2 +-
 hw/xfree86/os-support/bus/Makefile.am     |    2 +-
 hw/xfree86/os-support/hurd/Makefile.am    |    2 +-
 hw/xfree86/os-support/linux/Makefile.am   |    2 +-
 hw/xfree86/os-support/misc/Makefile.am    |    2 +-
 hw/xfree86/os-support/solaris/Makefile.am |    2 +-
 hw/xfree86/parser/Makefile.am             |    2 +-
 hw/xfree86/ramdac/Makefile.am             |    2 +-
 hw/xfree86/shadowfb/Makefile.am           |    2 +-
 hw/xfree86/utils/cvt/Makefile.am          |    2 +-
 hw/xfree86/vbe/Makefile.am                |    2 +-
 hw/xfree86/vgahw/Makefile.am              |    2 +-
 hw/xfree86/x86emu/Makefile.am             |    2 +-
 hw/xfree86/xaa/Makefile.am                |    2 +-
 hw/xfree86/xf8_16bpp/Makefile.am          |    2 +-
 hw/xnest/Makefile.am                      |    1 +
 hw/xwin/Makefile.am                       |    4 +++-
 include/Makefile.am                       |    3 ++-
 mi/Makefile.am                            |    2 +-
 miext/cw/Makefile.am                      |    2 +-
 miext/damage/Makefile.am                  |    2 +-
 miext/rootless/Makefile.am                |    2 +-
 miext/shadow/Makefile.am                  |    2 +-
 os/Makefile.am                            |    2 +-
 randr/Makefile.am                         |    2 +-
 record/Makefile.am                        |    2 +-
 render/Makefile.am                        |    2 +-
 test/Makefile.am                          |    2 +-
 test/xi2/Makefile.am                      |    2 +-
 xfixes/Makefile.am                        |    2 +-
 xkb/Makefile.am                           |    2 +-
 61 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 7287c4a..38b3e29 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -12,7 +12,7 @@ endif
 
 INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 if XORG
 sdk_HEADERS = xvdix.h xvmcext.h geext.h geint.h shmint.h
diff --git a/Xi/Makefile.am b/Xi/Makefile.am
index 69c7886..a3c883b 100644
--- a/Xi/Makefile.am
+++ b/Xi/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libXi.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 libXi_la_SOURCES =	\
 	allowev.c \
diff --git a/composite/Makefile.am b/composite/Makefile.am
index c2f5123..6eaab14 100644
--- a/composite/Makefile.am
+++ b/composite/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libcomposite.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 if XORG
 sdk_HEADERS = compositeext.h
diff --git a/config/Makefile.am b/config/Makefile.am
index 27f251b..3191700 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 noinst_LTLIBRARIES = libconfig.la
 libconfig_la_SOURCES = config.c config-backends.h
diff --git a/configure.ac b/configure.ac
index 2360cde..ad80eae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,6 @@ if test "x$GCC" = xyes; then
     ALIASING_CFLAGS=-fno-strict-aliasing
 fi
 AC_SUBST([ALIASING_CFLAGS])
-CWARNFLAGS="$CWARNFLAGS $ALIASING_CFLAGS"
 
 # Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow
 # easier overrides at build time.
diff --git a/damageext/Makefile.am b/damageext/Makefile.am
index 35f7620..0d9b96a 100644
--- a/damageext/Makefile.am
+++ b/damageext/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libdamageext.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 libdamageext_la_SOURCES = 	\
 	damageext.c		\
diff --git a/dbe/Makefile.am b/dbe/Makefile.am
index 043555b..2abcbc3 100644
--- a/dbe/Makefile.am
+++ b/dbe/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libdbe.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 if XORG
 sdk_HEADERS = dbestruct.h
diff --git a/dix/Makefile.am b/dix/Makefile.am
index 42b5121..0383334 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libdix.la libmain.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 libmain_la_SOURCES =    \
 	main.c
diff --git a/exa/Makefile.am b/exa/Makefile.am
index 8b759cd..c9b24f4 100644
--- a/exa/Makefile.am
+++ b/exa/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES = \
 	$(XORG_INCS) \
 	-I$(srcdir)/../miext/cw
 
-AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 libexa_la_SOURCES = \
 	exa.c \
diff --git a/fb/Makefile.am b/fb/Makefile.am
index 64e49f3..fa9d6cf 100644
--- a/fb/Makefile.am
+++ b/fb/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
 	-I$(top_srcdir)/hw/xfree86/os-support \
 	-I$(top_srcdir)/hw/xfree86/os-support/bus \
 	-I$(top_srcdir)/hw/xfree86/common
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 if XORG
 sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h fbpict.h
diff --git a/glx/Makefile.am b/glx/Makefile.am
index 9d9fa3c..a082bc2 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -6,6 +6,7 @@ noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY)
 
 AM_CFLAGS = \
 	@DIX_CFLAGS@ \
+	$(ALIASING_CFLAGS) \
 	@GL_CFLAGS@ \
 	@DRI_CFLAGS@ \
 	@XLIB_CFLAGS@ \
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 3c59320..2d24ce4 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -22,6 +22,7 @@ endif
 AM_CFLAGS = \
       -DHAVE_DMX_CONFIG_H \
       $(DIX_CFLAGS) \
+      $(ALIASING_CFLAGS) \
       $(GLX_INCS) \
       $(GLX_DEFS) \
       $(DMX_CFLAGS) \
diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am
index 9fa7113..2c74666 100644
--- a/hw/dmx/config/Makefile.am
+++ b/hw/dmx/config/Makefile.am
@@ -27,6 +27,7 @@ endif
 AM_YFLAGS = -d
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
+	$(ALIASING_CFLAGS) \
 	-I$(top_srcdir)/hw/dmx \
 	-DHAVE_DMX_CONFIG_H \
 	-DDMX_LOG_STANDALONE \
diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am
index 8516048..62d7214 100644
--- a/hw/dmx/glxProxy/Makefile.am
+++ b/hw/dmx/glxProxy/Makefile.am
@@ -34,6 +34,7 @@ libglxproxy_a_SOURCES = compsize.c \
 AM_CFLAGS = \
             @GLX_ARCH_DEFINES@ \
             $(DIX_CFLAGS) \
+            $(ALIASING_CFLAGS) \
             -I$(top_srcdir)/hw/dmx \
             -I$(top_srcdir)/include \
             -DHAVE_DMX_CONFIG_H \
diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am
index 185aaf8..5fb76b5 100644
--- a/hw/dmx/input/Makefile.am
+++ b/hw/dmx/input/Makefile.am
@@ -59,6 +59,7 @@ GLX_DEFS = @GL_CFLAGS@
 endif	    
 
 AM_CFLAGS = $(DIX_CFLAGS) \
+            $(ALIASING_CFLAGS) \
             -I$(top_srcdir)/hw/dmx \
             -DHAVE_DMX_CONFIG_H \
             $(GLX_DEFS) \
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index c5b49a3..e36b964 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -5,7 +5,8 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
             -DNO_HW_ONLY_EXTS \
             -DNO_MODULE_EXTS \
             $(XVFBMODULES_CFLAGS) \
-	    $(DIX_CFLAGS)
+	    $(DIX_CFLAGS) \
+	    $(ALIASING_CFLAGS)
 
 SRCS =	InitInput.c \
 	InitOutput.c \
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 914e11f..03103fa 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -43,7 +43,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
 bin_PROGRAMS = Xorg
 Xorg_SOURCES = xorg.c
 
-AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) @XORG_CFLAGS@
 INCLUDES = @XORG_INCS@ 
 
 noinst_LTLIBRARIES = libxorg.la
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index ad27210..ae55786 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -91,4 +91,4 @@ if LNXACPI
 XORG_CFLAGS += -DHAVE_ACPI
 endif
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am
index 93ea4a2..392a929 100644
--- a/hw/xfree86/ddc/Makefile.am
+++ b/hw/xfree86/ddc/Makefile.am
@@ -6,6 +6,6 @@ libddc_la_SOURCES = ddc.c interpret_edid.c print_edid.c ddcProperty.c
 
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 
 EXTRA_DIST = DDC.HOWTO
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index 365f006..062f2ea 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -23,7 +23,7 @@ extsmodule_LTLIBRARIES = $(RECORDMOD) \
 			 $(DBEMOD) \
                          $(GLXMODS)
 
-AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ $(ALIASING_CFLAGS)
 INCLUDES = @XORG_INCS@ \
            -I$(top_srcdir)/dbe \
            -I$(top_srcdir)/hw/xfree86/loader \
diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
index d93e63a..58c94c0 100644
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/hw/xfree86/dixmods/extmod/Makefile.am
@@ -15,7 +15,7 @@ if XF86VIDMODE
 XF86VMODE_SRCS = xf86vmode.c
 endif
 
-AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@
+AM_CFLAGS = @DIX_CFLAGS@ $(ALIASING_CFLAGS) @XORG_CFLAGS@
 INCLUDES = @XORG_INCS@ \
            -I$(top_srcdir)/dbe \
            -I$(top_srcdir)/hw/xfree86/loader \
diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am
index a7b491c..b89940a 100644
--- a/hw/xfree86/dri/Makefile.am
+++ b/hw/xfree86/dri/Makefile.am
@@ -9,7 +9,7 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
                    -I$(top_srcdir)/hw/xfree86/os-support/bus \
                    -I$(top_srcdir)/glx \
                    -DHAVE_XORG_CONFIG_H \
-                   @DIX_CFLAGS@ @XORG_CFLAGS@ @DRIPROTO_CFLAGS@ \
+                   @DIX_CFLAGS@ $(ALIASING_CFLAGS) @XORG_CFLAGS@ @DRIPROTO_CFLAGS@ \
                    @LIBDRM_CFLAGS@ \
                    @DRI_CFLAGS@
 libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@
diff --git a/hw/xfree86/dri2/Makefile.am b/hw/xfree86/dri2/Makefile.am
index c9fdde2..f6e3804 100644
--- a/hw/xfree86/dri2/Makefile.am
+++ b/hw/xfree86/dri2/Makefile.am
@@ -2,7 +2,7 @@ libdri2_la_LTLIBRARIES = libdri2.la
 libdri2_la_CFLAGS = \
 	-DHAVE_XORG_CONFIG_H \
 	@DRI_CFLAGS@ \
-	@DIX_CFLAGS@ @XORG_CFLAGS@ @DRI2PROTO_CFLAGS@ @LIBDRM_CFLAGS@ \
+	@DIX_CFLAGS@ $(ALIASING_CFLAGS) @XORG_CFLAGS@ @DRI2PROTO_CFLAGS@ @LIBDRM_CFLAGS@ \
 	-I$(top_srcdir)/hw/xfree86/common \
 	-I$(top_srcdir)/hw/xfree86/os-support/bus
 
diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am
index 9eb2e17..5b48a4b 100644
--- a/hw/xfree86/exa/Makefile.am
+++ b/hw/xfree86/exa/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = \
 	-I$(srcdir)/../../../exa \
 	-I$(srcdir)/../../../miext/cw
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 
 libexa_la_SOURCES = \
 	examodule.c
diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am
index 6a4a6e4..8d73192 100644
--- a/hw/xfree86/fbdevhw/Makefile.am
+++ b/hw/xfree86/fbdevhw/Makefile.am
@@ -11,7 +11,7 @@ endif
 
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 
 sdk_HEADERS = fbdevhw.h
 
diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am
index 0b80cc8..647cfbf 100644
--- a/hw/xfree86/i2c/Makefile.am
+++ b/hw/xfree86/i2c/Makefile.am
@@ -14,7 +14,7 @@ libi2c_la_SOURCES = xf86i2c.c
 
 INCLUDES = $(XORG_INCS)
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 
 sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h
 
diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am
index 36d2ad0..bbc771a 100644
--- a/hw/xfree86/int10/Makefile.am
+++ b/hw/xfree86/int10/Makefile.am
@@ -17,7 +17,7 @@ I386_VIDEO_CFLAGS = -D_PC
 endif
 
 if INT10_VM86
-AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
+AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
 INCLUDES = $(XORG_INCS)
 libint10_la_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -27,7 +27,7 @@ endif
 
 if INT10_X86EMU
 AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
-           $(XORG_CFLAGS) $(EXTRA_CFLAGS) $(DIX_CFLAGS)
+           $(XORG_CFLAGS) $(EXTRA_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
 libint10_la_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -37,7 +37,7 @@ libint10_la_SOURCES = \
 endif
 
 if INT10_STUB
-AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
+AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
 INCLUDES = $(XORG_INCS)
 libint10_la_SOURCES = stub.c xf86int10module.c
 endif
diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am
index d3c17d1..abf58b9 100644
--- a/hw/xfree86/loader/Makefile.am
+++ b/hw/xfree86/loader/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(top_srcdir)/miext/cw \
 	   -I$(srcdir)/../ramdac
 
 #AM_LDFLAGS = -r
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 
 EXTRA_DIST = \
 	dlloader.h \
diff --git a/hw/xfree86/modes/Makefile.am b/hw/xfree86/modes/Makefile.am
index 9236426..5641027 100644
--- a/hw/xfree86/modes/Makefile.am
+++ b/hw/xfree86/modes/Makefile.am
@@ -32,4 +32,4 @@ sdk_HEADERS = \
 	xf86RandR12.h \
 	xf86Rename.h
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am
index 04997a6..9dcfa27 100644
--- a/hw/xfree86/os-support/Makefile.am
+++ b/hw/xfree86/os-support/Makefile.am
@@ -14,7 +14,7 @@ libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib at XORG_OS_SUBDIR@.la \
                       bus/libbus.la \
                       misc/libmisc.la
 
-AM_CFLAGS = $(DIX_CFLAGS) 
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 xorgos.c:
 	touch $@
diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am
index b6ecdf1..fe04c4b 100644
--- a/hw/xfree86/os-support/bsd/Makefile.am
+++ b/hw/xfree86/os-support/bsd/Makefile.am
@@ -52,7 +52,7 @@ ARCH_SOURCES = \
 endif
 
 # FIXME: NetBSD Aperture defines (configure.ac)
-AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 INCLUDES = $(XORG_INCS)
 
diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am
index 92a519b..73918a7 100644
--- a/hw/xfree86/os-support/bus/Makefile.am
+++ b/hw/xfree86/os-support/bus/Makefile.am
@@ -21,6 +21,6 @@ libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
 
 INCLUDES = $(XORG_INCS)
 
-AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 EXTRA_DIST = $(sdk_HEADERS)
diff --git a/hw/xfree86/os-support/hurd/Makefile.am b/hw/xfree86/os-support/hurd/Makefile.am
index 3e82247..a28a0c6 100644
--- a/hw/xfree86/os-support/hurd/Makefile.am
+++ b/hw/xfree86/os-support/hurd/Makefile.am
@@ -10,6 +10,6 @@ libhurd_la_SOURCES = hurd_bell.c hurd_init.c hurd_mmap.c \
 		$(srcdir)/../shared/kmod_noop.c \
 		$(srcdir)/../shared/agp_noop.c
 
-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 INCLUDES = $(XORG_INCS)
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index 7a82627..bff898b 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -36,7 +36,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c \
                      $(APM_SRCS) \
                      $(PLATFORM_PCI_SUPPORT)
 
-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
 
 INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
 
diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am
index 4bd3fc3..47449a7 100644
--- a/hw/xfree86/os-support/misc/Makefile.am
+++ b/hw/xfree86/os-support/misc/Makefile.am
@@ -7,6 +7,6 @@ libmisc_la_SOURCES = SlowBcopy.c
 
 INCLUDES = $(XORG_INCS)
 
-AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS)
diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
index 5163f44..995257c 100644
--- a/hw/xfree86/os-support/solaris/Makefile.am
+++ b/hw/xfree86/os-support/solaris/Makefile.am
@@ -29,7 +29,7 @@ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
 sdk_HEADERS =
 nodist_sdk_HEADERS = solaris- at SOLARIS_INOUT_ARCH@.il
 
-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 INCLUDES = $(XORG_INCS) 
 
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 49c191f..401a76f 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -34,7 +34,7 @@ libxf86config_a_SOURCES = \
 	$(INTERNAL_SOURCES)
 libxf86config_a_CFLAGS = $(AM_CFLAGS)
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 
 EXTRA_DIST = \
 	Configint.h \
diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am
index 98e367c..d8f87e2 100644
--- a/hw/xfree86/ramdac/Makefile.am
+++ b/hw/xfree86/ramdac/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \
 	CURSOR.NOTES
 
 AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \
-            $(DIX_CFLAGS) $(XORG_CFLAGS)
+            $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 INCLUDES = $(XORG_INCS)
 
 xf86BitOrder.c:
diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am
index 02d2dd4..6dbcde3 100644
--- a/hw/xfree86/shadowfb/Makefile.am
+++ b/hw/xfree86/shadowfb/Makefile.am
@@ -6,4 +6,4 @@ sdk_HEADERS = shadowfb.h
 
 INCLUDES = $(XORG_INCS)
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
diff --git a/hw/xfree86/utils/cvt/Makefile.am b/hw/xfree86/utils/cvt/Makefile.am
index 6b99cbd..3930e33 100644
--- a/hw/xfree86/utils/cvt/Makefile.am
+++ b/hw/xfree86/utils/cvt/Makefile.am
@@ -28,7 +28,7 @@ INCLUDES = $(XORG_INCS) \
 
 # gah
 cvt_SOURCES = cvt.c $(top_srcdir)/hw/xfree86/modes/xf86cvt.c
-cvt_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+cvt_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 
 man1_MANS = cvt.man
 
diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am
index 85c6fd8..2b680b0 100644
--- a/hw/xfree86/vbe/Makefile.am
+++ b/hw/xfree86/vbe/Makefile.am
@@ -4,7 +4,7 @@ libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c
 
 sdk_HEADERS = vbe.h vbeModes.h
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
            -I$(srcdir)/../int10
diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am
index f48e46a..d7154ec 100644
--- a/hw/xfree86/vgahw/Makefile.am
+++ b/hw/xfree86/vgahw/Makefile.am
@@ -2,7 +2,7 @@ module_LTLIBRARIES = libvgahw.la
 libvgahw_la_LDFLAGS = -avoid-version
 libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 
 sdk_HEADERS = vgaHW.h
 
diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am
index df96977..0dd0794 100644
--- a/hw/xfree86/x86emu/Makefile.am
+++ b/hw/xfree86/x86emu/Makefile.am
@@ -13,7 +13,7 @@ libx86emu_la_SOURCES = debug.c \
 
 INCLUDES = 
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 
 EXTRA_DIST = validate.c \
              x86emu/debug.h \
diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am
index e9f5e68..e8b56ac 100644
--- a/hw/xfree86/xaa/Makefile.am
+++ b/hw/xfree86/xaa/Makefile.am
@@ -71,4 +71,4 @@ EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \
 
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../../../miext/cw
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
diff --git a/hw/xfree86/xf8_16bpp/Makefile.am b/hw/xfree86/xf8_16bpp/Makefile.am
index 3c5b8c9..f0667c8 100644
--- a/hw/xfree86/xf8_16bpp/Makefile.am
+++ b/hw/xfree86/xf8_16bpp/Makefile.am
@@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_16.h
 
 INCLUDES = $(XORG_INCS) -I$(top_srcdir)/fb
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XORG_CFLAGS)
 
 libxf8_16bpp_la_LDFLAGS = -avoid-version
 
diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am
index f95aab1..5eb9f09 100644
--- a/hw/xnest/Makefile.am
+++ b/hw/xnest/Makefile.am
@@ -4,6 +4,7 @@ noinst_LIBRARIES = libfbcmap.a
 AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \
             -DNO_HW_ONLY_EXTS \
             $(DIX_CFLAGS) \
+            $(ALIASING_CFLAGS) \
             $(XNESTMODULES_CFLAGS)
 
 SRCS =	Args.c \
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 8b18972..2ce19e5 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -163,7 +163,9 @@ CLEANFILES = $(BUILT_SOURCES) $(appman_DATA) $(fileman_DATA) XWin.man XWinrc.man
 
 AM_YFLAGS = -d
 AM_LFLAGS = -i
-AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
+AM_CFLAGS = -DHAVE_XWIN_CONFIG_H \
+            $(DIX_CFLAGS) \
+            $(ALIASING_CFLAGS) \
             $(XWINMODULES_CFLAGS) \
             -DXFree86Server
 
diff --git a/include/Makefile.am b/include/Makefile.am
index d684f9c..adb5f5c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -61,7 +61,8 @@ sdk_HEADERS =		\
 nodist_sdk_HEADERS = xorg-server.h
 endif
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) \
+	$(ALIASING_CFLAGS)
 
 EXTRA_DIST = 	\
 	dix-config-apple-verbatim.h \
diff --git a/mi/Makefile.am b/mi/Makefile.am
index 9714a21..9e76d53 100644
--- a/mi/Makefile.am
+++ b/mi/Makefile.am
@@ -6,7 +6,7 @@ sdk_HEADERS = mibank.h micmap.h miline.h mipointer.h mi.h mibstore.h \
               mispans.h miwideline.h mistruct.h mifpoly.h mioverlay.h
 endif
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 libmi_la_SOURCES = 	\
 	mi.h		\
diff --git a/miext/cw/Makefile.am b/miext/cw/Makefile.am
index e056f42..c8e8c29 100644
--- a/miext/cw/Makefile.am
+++ b/miext/cw/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libcw.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
 
diff --git a/miext/damage/Makefile.am b/miext/damage/Makefile.am
index 5958357..4c05c4b 100644
--- a/miext/damage/Makefile.am
+++ b/miext/damage/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libdamage.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 INCLUDES = -I$(srcdir)/../cw -I$(top_srcdir)/hw/xfree86/os-support
 
diff --git a/miext/rootless/Makefile.am b/miext/rootless/Makefile.am
index f09300d..37e613f 100644
--- a/miext/rootless/Makefile.am
+++ b/miext/rootless/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(XSERVER_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/hw/xfree86/os-support
 
 noinst_LTLIBRARIES = librootless.la
diff --git a/miext/shadow/Makefile.am b/miext/shadow/Makefile.am
index a73d0ec..3770849 100644
--- a/miext/shadow/Makefile.am
+++ b/miext/shadow/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libshadow.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
 
diff --git a/os/Makefile.am b/os/Makefile.am
index 66a4a0f..34f14aa 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libos.la
 
-AM_CFLAGS = $(DIX_CFLAGS) $(SHA1_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(SHA1_CFLAGS)
 
 SECURERPC_SRCS = rpcauth.c
 XDMCP_SRCS = xdmcp.c
diff --git a/randr/Makefile.am b/randr/Makefile.am
index 1f1bea0..8fef004 100644
--- a/randr/Makefile.am
+++ b/randr/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = librandr.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 XINERAMA_SRCS = rrxinerama.c
 
diff --git a/record/Makefile.am b/record/Makefile.am
index 2a64f31..9e7178f 100644
--- a/record/Makefile.am
+++ b/record/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = librecord.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 librecord_la_SOURCES = record.c set.c
 
diff --git a/render/Makefile.am b/render/Makefile.am
index 216c613..d9b4773 100644
--- a/render/Makefile.am
+++ b/render/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = librender.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 librender_la_SOURCES =	\
 	animcur.c	\
diff --git a/test/Makefile.am b/test/Makefile.am
index 7c44671..291ef27 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,7 +5,7 @@ check_LTLIBRARIES = libxservertest.la
 
 TESTS=$(check_PROGRAMS)
 
-AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
 INCLUDES = @XORG_INCS@
 TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)
 
diff --git a/test/xi2/Makefile.am b/test/xi2/Makefile.am
index 0e2de6b..c62a4a6 100644
--- a/test/xi2/Makefile.am
+++ b/test/xi2/Makefile.am
@@ -12,7 +12,7 @@ check_PROGRAMS =  \
 
 TESTS=$(check_PROGRAMS)
 
-AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
 INCLUDES = @XORG_INCS@
 TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)
 COMMON_SOURCES=protocol-common.h protocol-common.c
diff --git a/xfixes/Makefile.am b/xfixes/Makefile.am
index a8425e8..8bd83e7 100644
--- a/xfixes/Makefile.am
+++ b/xfixes/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libxfixes.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 if XORG
 sdk_HEADERS = xfixes.h
diff --git a/xkb/Makefile.am b/xkb/Makefile.am
index e54ce59..f53251f 100644
--- a/xkb/Makefile.am
+++ b/xkb/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(ALIASING_CFLAGS)
 
 DDX_SRCS = \
         ddxBeep.c \
-- 
1.6.0.4

More information about the xorg-devel mailing list