Commit 2460c7f1 authored by Andy Polyakov's avatar Andy Polyakov Committed by Richard Levitte
Browse files

poly1305/asm/poly1305-x86_64.pl: make it work with linux-x32. 

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 0a86f668

Configurations/10-main.conf

+1 −1
Changes for Configurations/10-main.conf: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -745,7 +745,7 @@ sub vc_wince_info { 
        inherit_from     => [ "linux-generic32", asm("x86_64_asm") ],

        inherit_from     => [ "linux-generic32", asm("x86_64_asm") ],

        cflags           => add("-mx32 -DL_ENDIAN"),

        cflags           => add("-mx32 -DL_ENDIAN"),

        bn_ops           => "SIXTY_FOUR_BIT",

        bn_ops           => "SIXTY_FOUR_BIT",

        perlasm_scheme   => "elf",

        perlasm_scheme   => "elf32",

        shared_ldflag    => "-mx32",

        shared_ldflag    => "-mx32",

        multilib         => "x32",

        multilib         => "x32",

    },

    },

crypto/poly1305/asm/poly1305-x86_64.pl

+8 −2
Changes for crypto/poly1305/asm/poly1305-x86_64.pl: 8 added lines, 2 removed lines.
Original line number Original line Diff line number Diff line
@@ -165,10 +165,16 @@ $code.=<<___; 
	and	8($inp),%rcx

	and	8($inp),%rcx

	mov	%rax,24($ctx)

	mov	%rax,24($ctx)

	mov	%rcx,32($ctx)

	mov	%rcx,32($ctx)



___

$code.=<<___	if ($flavour !~ /elf32/);

	mov	%r10,0(%rdx)

	mov	%r10,0(%rdx)

	mov	%r11,8(%rdx)

	mov	%r11,8(%rdx)



___

$code.=<<___	if ($flavour =~ /elf32/);

	mov	%r10d,0(%rdx)

	mov	%r11d,4(%rdx)

___

$code.=<<___;

	mov	\$1,%eax

	mov	\$1,%eax

.Lno_key:

.Lno_key:

	ret

	ret