Revert previous Linux-specific/centric commit#19629. If it really has to

be done, it's definitely not the way to do it. So far answer to the
question was to ./config -Wa,--noexecstack (adopted by RedHat).

diff --git a/CHANGES b/CHANGES
index c9f22266008eee6c4fb917a67c9498ceffb9e0cb..6f713d9e874bfa27204100a699aa9795a928e17a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,9 +4,6 @@
 
  Changes between 1.0.0 and 1.1.0  [xx XXX xxxx]
 
 
  Changes between 1.0.0 and 1.1.0  [xx XXX xxxx]
 

-  *) Make generated asm have non-executable stack.
-     [Contributed by Google <agl@google.com>]
-

   *) New function OPENSSL_gmtime_diff to find the difference in days
      and seconds between two tm structures. This will be used to provide
      additional functionality for ASN1_TIME.
   *) New function OPENSSL_gmtime_diff to find the difference in days
      and seconds between two tm structures. This will be used to provide
      additional functionality for ASN1_TIME.

diff --git a/crypto/aes/asm/aes-x86_64.pl b/crypto/aes/asm/aes-x86_64.pl
index a757b47146790bf1a675a508184c65d031f64550..a545e892aef00c6584c5bf31e1389ee3dc8bbeb1 100755 (executable)
--- a/crypto/aes/asm/aes-x86_64.pl
+++ b/crypto/aes/asm/aes-x86_64.pl
@@ -42,8 +42,7 @@ $verticalspin=1;      # unlike 32-bit version $verticalspin performs
                        # ~15% better on both AMD and Intel cores
 $speed_limit=512;      # see aes-586.pl for details
 
                        # ~15% better on both AMD and Intel cores
 $speed_limit=512;      # see aes-586.pl for details
 

-$code=".section .note.GNU-stack,\"\",\@progbits\n";
-$code.=".text\n";
+$code=".text\n";

 
 $s0="%eax";
 $s1="%ebx";
 
 $s0="%eax";
 $s1="%ebx";

diff --git a/crypto/bn/asm/x86_64-mont.pl b/crypto/bn/asm/x86_64-mont.pl
index b62373f567cb85a55703208a97f2f74c2ffb4a0f..3b7a6f243f21e65882daa79e575c4a12ea6dce2c 100755 (executable)
--- a/crypto/bn/asm/x86_64-mont.pl
+++ b/crypto/bn/asm/x86_64-mont.pl
@@ -45,7 +45,6 @@ $m0="%rbx";
 $m1="%rbp";
 
 $code=<<___;
 $m1="%rbp";
 
 $code=<<___;

-.section .note.GNU-stack,"",\@progbits

 .text
 
 .globl bn_mul_mont
 .text
 
 .globl bn_mul_mont

diff --git a/crypto/md5/asm/md5-x86_64.pl b/crypto/md5/asm/md5-x86_64.pl
index b75cf3b7a48db879c59f9bed66c5c7843c7ceca3..867885435e2930d3de96664532f5403fadc059f2 100755 (executable)
--- a/crypto/md5/asm/md5-x86_64.pl
+++ b/crypto/md5/asm/md5-x86_64.pl
@@ -123,7 +123,6 @@ no warnings qw(uninitialized);
 open STDOUT,"| $^X $xlate $flavour $output";
 
 $code .= <<EOF;
 open STDOUT,"| $^X $xlate $flavour $output";
 
 $code .= <<EOF;

-.section .note.GNU-stack,"",\@progbits

 .text
 .align 16
 
 .text
 .align 16
 

diff --git a/crypto/rc4/asm/rc4-x86_64.pl b/crypto/rc4/asm/rc4-x86_64.pl
index a134127e8c654adeb676eef37b9ea07ba5b6fe77..677be5fe25badfe44a315855a827c65d71543e72 100755 (executable)
--- a/crypto/rc4/asm/rc4-x86_64.pl
+++ b/crypto/rc4/asm/rc4-x86_64.pl
@@ -82,7 +82,6 @@ $YY="%r12";
 $TY="%r13";
 
 $code=<<___;
 $TY="%r13";
 
 $code=<<___;

-.section .note.GNU-stack,"",\@progbits

 .text
 
 .globl RC4
 .text
 
 .globl RC4

diff --git a/crypto/sha/asm/sha1-x86_64.pl b/crypto/sha/asm/sha1-x86_64.pl
index a00f7c679974972edd5b74226af02e35e3a98cbf..35ab0e7e78508b42699609047c2a1a659a10f34d 100755 (executable)
--- a/crypto/sha/asm/sha1-x86_64.pl
+++ b/crypto/sha/asm/sha1-x86_64.pl
@@ -178,7 +178,6 @@ unshift(@xi,pop(@xi));
 }
 
 $code.=<<___;
 }
 
 $code.=<<___;

-.section .note.GNU-stack,"",\@progbits

 .text
 
 .globl sha1_block_data_order
 .text
 
 .globl sha1_block_data_order

diff --git a/crypto/sha/asm/sha512-x86_64.pl b/crypto/sha/asm/sha512-x86_64.pl
index aaf9c57875ed9b9d6ca778d1cfcedcdef94d6a02..e6643f8cf613d2addb4591f60c0962bacd6c28db 100755 (executable)
--- a/crypto/sha/asm/sha512-x86_64.pl
+++ b/crypto/sha/asm/sha512-x86_64.pl
@@ -178,8 +178,6 @@ ___
 }
 
 $code=<<___;
 }
 
 $code=<<___;

-.section .note.GNU-stack,"",\@progbits
-

 .text
 
 .globl $func
 .text
 
 .globl $func

diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl
index 72010c9cbe020c018ce1795158210184ca3f6e36..c96821a3c811d55567f43caebce6f47a8308c790 100644 (file)
--- a/crypto/x86_64cpuid.pl
+++ b/crypto/x86_64cpuid.pl
@@ -16,13 +16,6 @@ print<<___;
 .section       .init
        call    OPENSSL_cpuid_setup
 
 .section       .init
        call    OPENSSL_cpuid_setup
 

-___
-
-if ($flavour =~ /elf/) {
-  print ".section .note.GNU-stack,\"\",\@progbits\n"
-}
-
-print<<___;

 .text
 
 .globl OPENSSL_atomic_add
 .text
 
 .globl OPENSSL_atomic_add