Commit 76d0badd authored by unknown's avatar unknown
Browse files

Merge xiphis.org:/home/antony/work2/p4-bug12096.2 

into  xiphis.org:/home/antony/work2/p4-bug12096.2-merge


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 2f45384b edcba744

config/ac-macros/compiler_flag.m4

+22 −0
Original line number Diff line number Diff line
@@ -38,3 +38,25 @@ AC_DEFUN([AC_SYS_OS_COMPILER_FLAG], 
 fi

])



AC_DEFUN([AC_CHECK_NOEXECSTACK],

[

 AC_CACHE_CHECK(whether --noexecstack is desirable for .S files,

		mysql_cv_as_noexecstack, [dnl

  cat > conftest.c <<EOF

void foo (void) { }

EOF

  if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS

		     -S -o conftest.s conftest.c 1>&AS_MESSAGE_LOG_FD]) \

     && grep .note.GNU-stack conftest.s >/dev/null \

     && AC_TRY_COMMAND([${CC-cc} $CCASFLAGS $CPPFLAGS -Wa,--noexecstack

		       -c -o conftest.o conftest.s 1>&AS_MESSAGE_LOG_FD])

  then

    mysql_cv_as_noexecstack=yes

  else

    mysql_cv_as_noexecstack=no

  fi

  rm -f conftest*])

 if test $mysql_cv_as_noexecstack = yes; then

   CCASFLAGS="$CCASFLAGS -Wa,--noexecstack"

 fi

])

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -515,6 +515,10 @@ AM_PROG_CC_STDC 


# We need an assembler, too

AM_PROG_AS

CCASFLAGS="$CCASFLAGS $ASFLAGS"



# Check if we need noexec stack for assembler

AC_CHECK_NOEXECSTACK



if test "$am_cv_prog_cc_stdc" = "no"

then

strings/Makefile.am

+0 −6
Original line number Diff line number Diff line
@@ -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)