summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authoracurtis@xiphis.org <>2006-05-31 00:07:58 -0700
committeracurtis@xiphis.org <>2006-05-31 00:07:58 -0700
commit23e612ae11d8b88e8616871d967d1442c44e188b (patch)
treea62e725116c91213516881c9fbd73b92e0db774f /strings
parentb1fe1d3742f60e97b01ba19f143771a2c22805ec (diff)
downloadmariadb-git-23e612ae11d8b88e8616871d967d1442c44e188b.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.
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)