summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <acurtis@xiphis.org>2006-05-31 00:07:58 -0700
committerunknown <acurtis@xiphis.org>2006-05-31 00:07:58 -0700
commit32a7fafe093d9d3a84eca63a6e4aad02c508539f (patch)
treea62e725116c91213516881c9fbd73b92e0db774f /strings
parent4121c1ca1f950d02f990b74d2de79400b9e8eeee (diff)
downloadmariadb-git-32a7fafe093d9d3a84eca63a6e4aad02c508539f.tar.gz
Bug#12096
"Add line for non-executable stack in .s files" Fix so that configure will use "--noexecstack" for assembler if gcc supports option and compiled C doesn't need executable stack. config/ac-macros/compiler_flag.m4: Bug#12096 Add macro to check if "--noexecstack" should be used when compiling assembler configure.in: Bug#12096 Add macro to check if "--noexecstack" should be used when compiling assembler strings/Makefile.am: Bug#12096 Automake knows how to handle assembler
Diffstat (limited to 'strings')
-rw-r--r--strings/Makefile.am6
1 files changed, 0 insertions, 6 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am
index c43cf0f290a..7ee115c09e5 100644
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -66,12 +66,6 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
#strtoull.o: @CHARSET_OBJS@
-if ASSEMBLER
-# On Linux gcc can compile the assembly files
-%.o : %.s
- $(AS) $(ASFLAGS) -o $@ $<
-endif
-
FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
str_test: str_test.c $(pkglib_LIBRARIES)