--- xorg-server-X11R7.1-1.1.0/hw/xfree86/int10/Makefile.am.orig	2006-10-06 11:37:40.000000000 -0600
+++ xorg-server-X11R7.1-1.1.0/hw/xfree86/int10/Makefile.am	2006-10-06 13:43:52.000000000 -0600
@@ -6,8 +6,12 @@
 
 libint10_la_LDFLAGS = -avoid-version
 
+if !LINUX_IA64
+ARCHDEFINES = -D_PC
+endif
+
 if INT10_VM86
-AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
+AM_CFLAGS = $(ARCHDEFINES) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
 INCLUDES = $(XORG_INCS)
 libint10_la_SOURCES = \
 	helper_exec.c \
@@ -20,14 +24,14 @@
 endif
 
 if INT10_X86EMU
-AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS)
+AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS $(ARCHDEFINES) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
 libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
 	xf86int10.c xf86x86emu.c generic.c x86emu.c
 endif
 
 if INT10_STUB
-AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
+AM_CFLAGS = $(ARCHDEFINES) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
 libint10_la_SOURCES = stub.c xf86int10module.c
 endif