Mesa (master): build: Change HAVE_X86_ASM to mean x86 or x86-64 asm.
Matt Turner
mattst88 at kemper.freedesktop.org
Thu Nov 7 18:07:23 UTC 2013
Module: Mesa
Branch: master
Commit: d8abd6710ea41545ae2fb9b8e718d29a69574b1a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8abd6710ea41545ae2fb9b8e718d29a69574b1a
Author: Matt Turner <mattst88 at gmail.com>
Date: Tue Nov 5 13:53:45 2013 -0800
build: Change HAVE_X86_ASM to mean x86 or x86-64 asm.
I want a conditional that says generally "we have x86 assembly" in the
next patch.
Reviewed-by: Eric Anholt <eric at anholt.net>
---
configure.ac | 2 +-
src/mapi/glapi/Makefile.am | 5 +++--
src/mapi/glapi/gen/Makefile.am | 6 +++---
src/mesa/Makefile.am | 7 ++++---
src/mesa/x86/Makefile.am | 2 ++
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6590583..0896d85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1938,7 +1938,7 @@ AM_CONDITIONAL(HAVE_X11_DRIVER, test "x$enable_xlib_glx" = xyes)
AM_CONDITIONAL(HAVE_OSMESA, test "x$enable_osmesa" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_OSMESA, test "x$enable_gallium_osmesa" = xyes)
-AM_CONDITIONAL(HAVE_X86_ASM, test "x$asm_arch" = xx86)
+AM_CONDITIONAL(HAVE_X86_ASM, test "x$asm_arch" = xx86 -o "x$asm_arch" = xx86_64)
AM_CONDITIONAL(HAVE_X86_64_ASM, test "x$asm_arch" = xx86_64)
AM_CONDITIONAL(HAVE_SPARC_ASM, test "x$asm_arch" = xsparc)
diff --git a/src/mapi/glapi/Makefile.am b/src/mapi/glapi/Makefile.am
index 05c67a6..bf653a3 100644
--- a/src/mapi/glapi/Makefile.am
+++ b/src/mapi/glapi/Makefile.am
@@ -33,10 +33,11 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/mesa
if HAVE_X86_ASM
-GLAPI_ASM_SOURCES = $(X86_API)
-endif
if HAVE_X86_64_ASM
GLAPI_ASM_SOURCES = $(X86_64_API)
+else
+GLAPI_ASM_SOURCES = $(X86_API)
+endif
endif
if HAVE_SPARC_ASM
GLAPI_ASM_SOURCES = $(SPARC_API)
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index 9c25387..476d943 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -32,11 +32,11 @@ MESA_GLAPI_OUTPUTS = \
MESA_GLAPI_ASM_OUTPUTS =
if HAVE_X86_ASM
-MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86.S
-endif
-
if HAVE_X86_64_ASM
MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86-64.S
+else
+MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86.S
+endif
endif
if HAVE_SPARC_ASM
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index a54b8ac..5f9bae2 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -98,12 +98,13 @@ AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS)
MESA_ASM_FILES_FOR_ARCH =
if HAVE_X86_ASM
-MESA_ASM_FILES_FOR_ARCH += $(X86_FILES)
-AM_CPPFLAGS += -I$(builddir)/x86 -I$(srcdir)/x86
-endif
if HAVE_X86_64_ASM
MESA_ASM_FILES_FOR_ARCH += $(X86_64_FILES)
AM_CPPFLAGS += -I$(builddir)/x86-64 -I$(srcdir)/x86-64
+else
+MESA_ASM_FILES_FOR_ARCH += $(X86_FILES)
+AM_CPPFLAGS += -I$(builddir)/x86 -I$(srcdir)/x86
+endif
endif
if HAVE_SPARC_ASM
MESA_ASM_FILES_FOR_ARCH += $(SPARC_FILES)
diff --git a/src/mesa/x86/Makefile.am b/src/mesa/x86/Makefile.am
index 1678576..9b4a2dd 100644
--- a/src/mesa/x86/Makefile.am
+++ b/src/mesa/x86/Makefile.am
@@ -20,6 +20,7 @@
# IN THE SOFTWARE.
if HAVE_X86_ASM
+if !HAVE_X86_64_ASM
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
@@ -47,3 +48,4 @@ matypes.h: gen_matypes
endif
endif
+endif
More information about the mesa-commit
mailing list