[svn] gcry - r1104 - in branches/LIBGCRYPT-1-2-BRANCH: . mpi

[svn author wk]

Author: wk
Date: 2005-09-14 20:56:36 +0200 (Wed, 14 Sep 2005)
New Revision: 1104

Modified:
   branches/LIBGCRYPT-1-2-BRANCH/ChangeLog
   branches/LIBGCRYPT-1-2-BRANCH/configure.ac
   branches/LIBGCRYPT-1-2-BRANCH/mpi/ChangeLog
   branches/LIBGCRYPT-1-2-BRANCH/mpi/Makefile.am
Log:
New configure option --enable-noexecstack.


Modified: branches/LIBGCRYPT-1-2-BRANCH/ChangeLog
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/ChangeLog	2005-09-13 10:18:54 UTC (rev 1103)
+++ branches/LIBGCRYPT-1-2-BRANCH/ChangeLog	2005-09-14 18:56:36 UTC (rev 1104)
@@ -1,3 +1,7 @@
+2005-09-14  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: New option --enable-noexecstack.
+
 2005-06-10  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Moved basic tests to the top.

Modified: branches/LIBGCRYPT-1-2-BRANCH/configure.ac
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/configure.ac	2005-09-13 10:18:54 UTC (rev 1103)
+++ branches/LIBGCRYPT-1-2-BRANCH/configure.ac	2005-09-14 18:56:36 UTC (rev 1104)
@@ -383,8 +383,17 @@
 [use_capabilities="$withval"],[use_capabilities=no])
 AC_MSG_RESULT($use_capabilities)
 
+# We don't have a test to check whether as(1) knows about the
+# non executable stack option.  Thus we provide an option to enable it.
+AC_MSG_CHECKING([whether non excutable stack support is requested])
+AC_ARG_ENABLE(noexecstack,
+              AC_HELP_STRING([--enable-noexecstack],
+                             [enable non executable stack support (gcc only)]),
+              noexecstack_support=$enableval, noexecstack_support=no)
+AC_MSG_RESULT($noexecstack_support)
 
 
+
 AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
                    [A human readable text with the name of the OS])
 
@@ -621,7 +630,15 @@
     else
         CFLAGS="$CFLAGS -Wall"
     fi
+
+    # Non exec stack hack.  Fixme: Write a test to check whether as
+    # can cope with it and use the enable-noexecstack option only to
+    # disable it in case it is required on some platforms.
+    if test "$noexecstack_support" = yes; then
+        NOEXECSTACK_FLAGS="-Wa,--noexecstack"
+    fi
 fi
+AC_SUBST(NOEXECSTACK_FLAGS)
 
 #
 # Make the version number in src/gcrypt.h the same as the one here.

Modified: branches/LIBGCRYPT-1-2-BRANCH/mpi/ChangeLog
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/mpi/ChangeLog	2005-09-13 10:18:54 UTC (rev 1103)
+++ branches/LIBGCRYPT-1-2-BRANCH/mpi/ChangeLog	2005-09-14 18:56:36 UTC (rev 1104)
@@ -1,3 +1,7 @@
+2005-09-14  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (AM_CCASFLAGS): Add AM_CCASFLAGS.
+
 2005-06-16  Werner Koch  <wk at g10code.com>
 
 	* mpiutil.c (gcry_mpi_randomize): Made P unsigned.

Modified: branches/LIBGCRYPT-1-2-BRANCH/mpi/Makefile.am
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/mpi/Makefile.am	2005-09-13 10:18:54 UTC (rev 1103)
+++ branches/LIBGCRYPT-1-2-BRANCH/mpi/Makefile.am	2005-09-14 18:56:36 UTC (rev 1104)
@@ -23,6 +23,7 @@
 
 INCLUDES =  -I$(top_srcdir)/src
 ASFLAGS = @MPI_SFLAGS@
+AM_CCASFLAGS = $(NOEXECSTACK_FLAGS)
 
 # We don't have .S sources listed, so automake does not autocreate these
 CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)