[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  4e3d2866b6e8e7a700ea22e05840a093bfd7a4b1 (commit)
      from  cc77d0d84ab8e476f74373cad3d65210042baf02 (commit)


- Log -----------------------------------------------------------------
commit 4e3d2866b6e8e7a700ea22e05840a093bfd7a4b1
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Jun 12 16:21:37 2016 +0200

    perlasm/x86*.pl: add endbranch instruction.
    
    For further information see "Control-flow Enforcement Technology
    Preview" by Intel.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/perlasm/x86_64-xlate.pl | 4 ++++
 crypto/perlasm/x86asm.pl       | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index 391362d..8856905 100755
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -864,6 +864,10 @@ my $vprotq = sub {
     }
 };
 
+my $endbranch = sub {
+    (0xf3,0x0f,0x1e,0xfa);
+};
+
 if ($nasm) {
     print <<___;
 default	rel
diff --git a/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl
index 4590ade..1ff46c9 100644
--- a/crypto/perlasm/x86asm.pl
+++ b/crypto/perlasm/x86asm.pl
@@ -172,6 +172,11 @@ sub ::vprotd
     {	&::generic("vprotd", at _);	}
 }
 
+sub ::endbranch
+{
+    &::data_byte(0xf3,0x0f,0x1e,0xfb);
+}
+
 # label management
 $lbdecor="L";		# local label decoration, set by package
 $label="000";