summaryrefslogtreecommitdiff
path: root/src/mapi
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2013-11-05 13:53:45 -0800
committerMatt Turner <mattst88@gmail.com>2013-11-07 10:00:25 -0800
commitd8abd6710ea41545ae2fb9b8e718d29a69574b1a (patch)
tree6d001f0f881458b6dc129c17909a6af9f27f1ae0 /src/mapi
parent957c7570ea3f7d6ea4cf2cc49d85207136fb0470 (diff)
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@anholt.net>
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/glapi/Makefile.am5
-rw-r--r--src/mapi/glapi/gen/Makefile.am6
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mapi/glapi/Makefile.am b/src/mapi/glapi/Makefile.am
index 05c67a6d4b8..bf653a30543 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 9c253878325..476d943dd93 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