xserver: Branch 'master'

[Alan Hourihane]

 hw/xfree86/os-support/linux/Makefile.am |   11 ++++++++++-
 hw/xfree86/os-support/linux/lnx_ev56.c  |    2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
diff-tree 78f9592c112d4245f6119b98c244bbb4cae3e5aa (from 6a2fb2928714ce77ee342cdc23a1178e5e766cf2)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Wed Jan 10 16:04:20 2007 +0000

    lnx_ev56.c has to be built with -mcpu=ev56. Fix it.

diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index 9c4fa49..10f2440 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -6,9 +6,14 @@ PLATFORM_DEFINES = -DOS_PROBE_PCI_CHIPSE
 PLATFORM_INCLUDES = -I$(srcdir)/../shared
 endif
 if LINUX_ALPHA
-PLATFORM_PCI_SUPPORT = lnx_ev56.c \
+noinst_LTLIBRARIES += liblinuxev56.la
+PLATFORM_PCI_SUPPORT = \
        $(srcdir)/lnx_axp.c \
        $(srcdir)/../shared/xf86Axp.c
+
+liblinuxev56_la_CFLAGS = -mcpu=ev56
+
+liblinuxev56_la_SOURCES = lnx_ev56.c
 endif
 
 if LNXACPI
@@ -48,3 +53,7 @@ EXTRA_DIST = \
 	$(LNX_EXTRA_SRCS) \
 	lnx.h \
 	$(srcdir)/../shared/xf86Axp.h
+
+if LINUX_ALPHA
+liblinux_la_LIBADD = liblinuxev56.la
+endif
diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c
index 78756a6..11c45e5 100644
--- a/hw/xfree86/os-support/linux/lnx_ev56.c
+++ b/hw/xfree86/os-support/linux/lnx_ev56.c
@@ -1,4 +1,4 @@
-
+/* This file has to be built with -mcpu=ev56 */
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif