1422N/A[Backported to xorg-server-1.14.5 from 1.15.0]

1422N/A

1422N/AFrom 0ba7fc8472f1227fd1cd51bd58048f164b8ea1ab Mon Sep 17 00:00:00 2001

1422N/AFrom: Alan Coopersmith <alan.coopersmith@oracle.com>

1422N/ADate: Tue, 12 Nov 2013 14:46:04 -0800

1422N/ASubject: [PATCH] Stop including inline assembly .il file for Solaris Studio

1422N/A builds

1422N/A

1422N/ASince all the inb/outb/etc. use in the X server itself (except for

1422N/Axf86SlowBcopy) has been replaced by calls to libpciaccess, we no

1422N/Alonger need to pass inline assembly files to replace the gcc inline

1422N/Aassembly from hw/xfree86/common/compiler.h when building Xorg itself.

1422N/A

1422N/AThe .il files are still generated and installed in the SDK for the

1422N/Abenefit of drivers who may use them.

1422N/A

1422N/ABinary diff of before and after showed that xf86SlowBcopy was the

1422N/Aonly function changed across the Xorg binary and all modules built

1422N/Ain the Xserver build, it just calls the outb() function now instead

1422N/Aof having the outb instructions inlined, making it a slightly slower

1422N/Abcopy.

1422N/A

1422N/ASigned-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1422N/AReviewed-by: Keith Packard <keithp@keithp.com>

1422N/ASigned-off-by: Keith Packard <keithp@keithp.com>

1422N/A---

1422N/A configure.ac | 9 ---------

1422N/A exa/Makefile.am | 4 ----

1422N/A hw/xfree86/Makefile.am | 11 -----------

1422N/A 3 files changed, 24 deletions(-)

1422N/A

1422N/Adiff --git a/configure.ac b/configure.ac

1422N/Aindex b06fb14..419fb85 100644

1422N/A--- a/configure.ac

1422N/A+++ b/configure.ac

1422N/A@@ -1740,9 +1740,6 @@ if test "x$XORG" = xyes; then

1422N/A if test "${OS_MINOR}" -lt 8 ; then

1422N/A AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.])

1422N/A fi

1422N/A- if test "x$SUNCC" = "xyes"; then

1422N/A- solaris_asm_inline="yes"

1422N/A- fi

1422N/A AC_CHECK_DECL([_LP64], [SOLARIS_64="yes"], [SOLARIS_64="no"])

1422N/A

1422N/A case $host_cpu in

1422N/A@@ -1763,11 +1760,6 @@ if test "x$XORG" = xyes; then

1422N/A xorg@lists.freedesktop.org.]) ;;

1422N/A esac

1422N/A AC_SUBST([SOLARIS_INOUT_ARCH])

1422N/A- if test x$solaris_asm_inline = xyes ; then

1422N/A- SOLARIS_ASM_CFLAGS='$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il'

1422N/A- XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)'

1422N/A- fi

1422N/A- AC_SUBST([SOLARIS_ASM_CFLAGS])

1422N/A ;;

1422N/A gnu*)

1422N/A XORG_OS_SUBDIR="hurd"

1422N/A@@ -1872,7 +1864,6 @@ AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])

1422N/A AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])

1422N/A AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])

1422N/A AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])

1422N/A-AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])

1422N/A AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])

1422N/A AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])

1422N/A AM_CONDITIONAL([XF86VIDMODE], [test "x$XF86VIDMODE" = xyes])

1422N/Adiff --git a/exa/Makefile.am b/exa/Makefile.am

1422N/Aindex 8b759cd..81affe2 100644

1422N/A--- a/exa/Makefile.am

1422N/A+++ b/exa/Makefile.am

1422N/A@@ -1,9 +1,5 @@

1422N/A noinst_LTLIBRARIES = libexa.la

1422N/A

1422N/A-# Override these since EXA doesn't need them and the needed files aren't

1422N/A-# built (in hw/xfree86/os-support/solaris) until after EXA is built

1422N/A-SOLARIS_ASM_CFLAGS=""

1422N/A-

1422N/A if XORG

1422N/A sdk_HEADERS = exa.h

1422N/A endif

1422N/Adiff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am

1422N/Aindex c3899b5..0fdb1f3 100644

1422N/A--- a/hw/xfree86/Makefile.am

1422N/A+++ b/hw/xfree86/Makefile.am

1422N/A@@ -73,17 +73,6 @@ BUILT_SOURCES = xorg.conf.example

1422N/A DISTCLEANFILES = xorg.conf.example

1422N/A EXTRA_DIST = xorgconf.cpp

1422N/A

1422N/A-if SOLARIS_ASM_INLINE

1422N/A-# Needs to be built before any files are compiled when using Sun compilers

1422N/A-# so in*/out* inline definitions are properly processed.

1422N/A-

1422N/A-BUILT_SOURCES += os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il

1422N/A-

1422N/A-os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il:

1422N/A- cd os-support/solaris ; \

1422N/A- $(MAKE) $(AM_MAKEFLAGS) solaris-@SOLARIS_INOUT_ARCH@.il

1422N/A-endif

1422N/A-

1422N/A # do not use $(mkdir_p) if you want automake 1.7 to work

1422N/A install-data-local:

1422N/A mkdir -p $(DESTDIR)$(logdir)