HTTP client: make server/proxy and port params more consistent; minor other improvements

[openssl.git] / crypto / x86_64cpuid.pl

diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl
index 966dddbb7d1060bd198546f5eed14e1c9bb5c816..32d18a23e85c6982b85164c4ba1a68d3c48c0bcc 100644 (file)
--- a/crypto/x86_64cpuid.pl
+++ b/crypto/x86_64cpuid.pl
@@ -42,6 +42,7 @@ print<<___;
 .align 16
 OPENSSL_atomic_add:
 .cfi_startproc
+       endbranch
        movl    ($arg1),%eax
 .Lspin:        leaq    ($arg2,%rax),%r8
        .byte   0xf0            # lock
@@ -58,6 +59,7 @@ OPENSSL_atomic_add:
 .align 16
 OPENSSL_rdtsc:
 .cfi_startproc
+       endbranch
        rdtsc
        shl     \$32,%rdx
        or      %rdx,%rax
@@ -70,6 +72,7 @@ OPENSSL_rdtsc:
 .align 16
 OPENSSL_ia32_cpuid:
 .cfi_startproc
+       endbranch
        mov     %rbx,%r8                # save %rbx
 .cfi_register  %rbx,%r8
 
@@ -239,6 +242,7 @@ OPENSSL_ia32_cpuid:
 .align  16
 OPENSSL_cleanse:
 .cfi_startproc
+       endbranch
        xor     %rax,%rax
        cmp     \$15,$arg2
        jae     .Lot
@@ -276,6 +280,7 @@ OPENSSL_cleanse:
 .align  16
 CRYPTO_memcmp:
 .cfi_startproc
+       endbranch
        xor     %rax,%rax
        xor     %r10,%r10
        cmp     \$0,$arg3
@@ -314,6 +319,7 @@ print<<___ if (!$win64);
 .align 16
 OPENSSL_wipe_cpu:
 .cfi_startproc
+       endbranch
        pxor    %xmm0,%xmm0
        pxor    %xmm1,%xmm1
        pxor    %xmm2,%xmm2
@@ -378,6 +384,7 @@ print<<___;
 .align 16
 OPENSSL_instrument_bus:
 .cfi_startproc
+       endbranch
        mov     $arg1,$out      # tribute to Win64
        mov     $arg2,$cnt
        mov     $arg2,$max
@@ -412,6 +419,7 @@ OPENSSL_instrument_bus:
 .align 16
 OPENSSL_instrument_bus2:
 .cfi_startproc
+       endbranch
        mov     $arg1,$out      # tribute to Win64
        mov     $arg2,$cnt
        mov     $arg3,$max
@@ -467,6 +475,7 @@ print<<___;
 .align 16
 OPENSSL_ia32_${rdop}_bytes:
 .cfi_startproc
+       endbranch
        xor     %rax, %rax      # return value
        cmp     \$0,$arg2
        je      .Ldone_${rdop}_bytes
@@ -510,4 +519,4 @@ ___
 gen_random("rdrand");
 gen_random("rdseed");
 
-close STDOUT or die "error closing STDOUT";    # flush
+close STDOUT or die "error closing STDOUT: $!";        # flush