Index: gnupg-1.4.0/configure.ac
===================================================================
--- gnupg-1.4.0/configure.ac
+++ gnupg-1.4.0/configure.ac
@@ -1189,6 +1189,8 @@
 
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 
+AM_CONDITIONAL(USING_GCC, test x$GCC = xyes)
+
 GNUPG_CHECK_GNUMAKE
 
 # add some extra libs here so that previous tests don't fail for
Index: gnupg-1.4.0/mpi/Makefile.am
===================================================================
--- gnupg-1.4.0/mpi/Makefile.am
+++ gnupg-1.4.0/mpi/Makefile.am
@@ -71,9 +71,14 @@
 
 # cancel the default rules used by libtool which do not really
 # work and add one to cpp .S files
+if USING_GCC
+.S.o:
+	 $(COMPILE) -Wa,--noexecstack -c $<
+else
 .S.o:
 	 $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > _$*.s
 	 $(COMPILE) $(ASFLAGS) -c _$*.s
 	 mv -f _$*.o $*.o
+endif
 
 .S.lo: