From 89e1457d1cd84ac77d80043c4bc86fed7fe712ff Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 29 Oct 2016 14:23:25 +0200 Subject: Xserver/fb/Imakefile: Introduce NULL variable. --- nx-X11/programs/Xserver/fb/Imakefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nx-X11/programs/Xserver/fb/Imakefile') diff --git a/nx-X11/programs/Xserver/fb/Imakefile b/nx-X11/programs/Xserver/fb/Imakefile index eb61db95a..2a0e5c8d9 100644 --- a/nx-X11/programs/Xserver/fb/Imakefile +++ b/nx-X11/programs/Xserver/fb/Imakefile @@ -17,6 +17,7 @@ SpecialCObjectRule(fbcopy,fbcopy.c,$(USEMMXOPTIONS)) #endif */ +NULL = #include @@ -74,6 +75,7 @@ SRCS = $(XFMODSRC) \ fb24_32.c \ fbpict.c \ fbmmx.c \ + $(NULL) OBJS = $(XFMODOBJ) \ fbarc.o \ @@ -110,6 +112,7 @@ OBJS = $(XFMODOBJ) \ fb24_32.o \ fbpict.o \ fbmmx.o \ + $(NULL) INCLUDES = -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ -I$(XINCLUDESRC) \ -- cgit v1.2.3 From f5c5cb10f9f855cfe26af49b8a93b8f4b3e40371 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 29 Oct 2016 14:23:58 +0200 Subject: Xserver/fb: Drop fbmmx.[ch] files and code passages wrapped-in by USE_MMX macro. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 78179ae827bb5d19abb1340084362bc51ad5c1e5 Author: Søren Sandmann Pedersen Date: Mon Jun 11 22:46:42 2007 -0400 Remove fbmmx.[ch] files Backported-to-NX-by: Mike Gabriel Other than X.org, we don't yet introduce using pixman_* function calls in the nxagent Xserver's fb code. Fixes ArcticaProject/nx-libs#252. --- nx-X11/programs/Xserver/fb/Imakefile | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'nx-X11/programs/Xserver/fb/Imakefile') diff --git a/nx-X11/programs/Xserver/fb/Imakefile b/nx-X11/programs/Xserver/fb/Imakefile index 2a0e5c8d9..e1dadfdf3 100644 --- a/nx-X11/programs/Xserver/fb/Imakefile +++ b/nx-X11/programs/Xserver/fb/Imakefile @@ -1,22 +1,3 @@ -/* - * The X.org 6.8.99.16 snapshot fails to compile with GCC 4. - * Temporarily disable the MMX features until the bug is - * fixed. - * -#if defined(HasGcc34) && HasGcc34 -MMXOPTIONS= -mmmx -msse -Winline --param inline-unit-growth=10000 \ - --param large-function-growth=10000 -DUSE_MMX -USEMMXOPTIONS= -DUSE_MMX -#if defined(i386Architecture) || defined(AMD64Architecture) -SpecialCObjectRule(fbmmx,fbmmx.c,$(MMXOPTIONS)) -SpecialCObjectRule(fbpict,fbpict.c,$(USEMMXOPTIONS)) -SpecialCObjectRule(fbfill,fbfill.c,$(USEMMXOPTIONS)) -SpecialCObjectRule(fbcopy,fbcopy.c,$(USEMMXOPTIONS)) -#endif - -#endif - */ - NULL = #include @@ -74,7 +55,6 @@ SRCS = $(XFMODSRC) \ fbwindow.c \ fb24_32.c \ fbpict.c \ - fbmmx.c \ $(NULL) OBJS = $(XFMODOBJ) \ @@ -111,7 +91,6 @@ OBJS = $(XFMODOBJ) \ fbwindow.o \ fb24_32.o \ fbpict.o \ - fbmmx.o \ $(NULL) INCLUDES = -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ @@ -173,7 +152,6 @@ LinkSourceFile(fbtile.c,LinkDirectory) LinkSourceFile(fbtrap.c,LinkDirectory) LinkSourceFile(fbutil.c,LinkDirectory) LinkSourceFile(fbwindow.c,LinkDirectory) -LinkSourceFile(fbmmx.c,LinkDirectory) #endif InstallDriverSDKLibraryModule(fb,$(DRIVERSDKMODULEDIR),.) -- cgit v1.2.3