Be consistent in naming SSE2 related things SSE2

diff --git a/TODO b/TODO
index cb7d5a9..3bed70c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,3 @@
-  - Rename "SSE" to "MMX_EXTENSIONS"
-  - Be consistent about calling sse2 sse2
-
   - SSE 2 issues:
 
       - Use MM_HINT_NTA instead of MM_HINT_T0
@@ -172,6 +169,10 @@
 
 done:
 
+- Be consistent about calling sse2 sse2
+
+- Rename "SSE" to "MMX_EXTENSIONS". (Deleted mmx extensions).
+
 - Commented-out uses of fbCompositeCopyAreasse2()
 
 - Consider whether calling regions region16 is really such a great

diff --git a/configure.ac b/configure.ac
index 7d80145..9139f38 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -183,12 +183,12 @@ AM_CONDITIONAL(USE_MMX, test $have_mmx_intrinsics = yes)
 dnl ===========================================================================
 dnl Check for SSE2
 
-SSE_CFLAGS="-mmmx -msse2 -Winline"
+SSE2_CFLAGS="-mmmx -msse2 -Winline"
 
 have_sse2_intrinsics=no
 AC_MSG_CHECKING(whether to use SSE2 intrinsics)
 xserver_save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -msse2 $SSE_CFLAGS"
+CFLAGS="$CFLAGS -msse2 $SSE2_CFLAGS"
 
 AC_COMPILE_IFELSE([
 #if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
@@ -228,7 +228,7 @@ AM_CONDITIONAL(USE_SSE2, test $have_sse2_intrinsics = yes)
 
 dnl ========================================================
 AC_SUBST(MMX_CFLAGS)
-AC_SUBST(SSE_CFLAGS)
+AC_SUBST(SSE2_CFLAGS)
 
 dnl Check for VMX/Altivec
 if test -n "`$CC -v 2>&1 | grep version | grep Apple`"; then

diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 4f046f1..b9ce896 100644 (file)
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -68,12 +68,12 @@ endif
 
 # sse2 code
 if USE_SSE2
-noinst_LTLIBRARIES += libpixman-sse.la
-libpixman_sse_la_SOURCES = \
-       pixman-sse.c \
-       pixman-sse.h
-libpixman_sse_la_CFLAGS = $(DEP_CFLAGS) $(SSE_CFLAGS)
-libpixman_sse_la_LIBADD = $(DEP_LIBS)
-libpixman_1_la_LIBADD += libpixman-sse.la
+noinst_LTLIBRARIES += libpixman-sse2.la
+libpixman_sse2_la_SOURCES = \
+       pixman-sse2.c \
+       pixman-sse2.h
+libpixman_sse2_la_CFLAGS = $(DEP_CFLAGS) $(SSE2_CFLAGS)
+libpixman_sse2_la_LIBADD = $(DEP_LIBS)
+libpixman_1_la_LIBADD += libpixman-sse2.la
 endif
 

diff --git a/pixman/pixman-sse.c b/pixman/pixman-sse2.c
similarity index 100%
rename from pixman/pixman-sse.c
rename to pixman/pixman-sse2.c