diff options
| author | Matt Turner <[email protected]> | 2013-11-05 13:53:45 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-11-07 10:00:25 -0800 |
| commit | d8abd6710ea41545ae2fb9b8e718d29a69574b1a (patch) | |
| tree | 6d001f0f881458b6dc129c17909a6af9f27f1ae0 /src | |
| parent | 957c7570ea3f7d6ea4cf2cc49d85207136fb0470 (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 <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/Makefile.am | 5 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 6 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 7 | ||||
| -rw-r--r-- | src/mesa/x86/Makefile.am | 2 |
4 files changed, 12 insertions, 8 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 diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index a54b8ac1b30..5f9bae2ac2a 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 167857684b1..9b4a2dd0b9a 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 |