wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unified - adapt the generation of des assembler to use GENERATE

Browse source 
This gets rid of the BEGINRAW..ENDRAW sections in crypto/des/build.info.

This also moves the assembler generating perl scripts to take the
output file name as last command line argument, where necessary.

Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Richard Levitte 2016-03-07 15:46:42 +01:00
parent 73d2fb66ef
commit 6d33da3487
4 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crypto/des/Makefile.in
View file

@ -59,9 +59,9 @@ dest4-sparcv9.S: asm/dest4-sparcv9.pl
$(PERL) asm/dest4-sparcv9.pl $(PERLASM_SCHEME) $@
des-586.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
$(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
$(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) $@
crypt586.s: asm/crypt586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
$(PERL) asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
$(PERL) asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS) $@
files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

5
crypto/des/asm/crypt586.pl
View file

@ -10,6 +10,9 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
push(@INC,"${dir}","${dir}../../perlasm");
require "x86asm.pl";
$output=pop;
open STDOUT,">$output";
&asm_init($ARGV[0],"crypt586.pl");
$L="edi";
@ -19,6 +22,8 @@ $R="esi";
&fcrypt_body("fcrypt_body");
&asm_finish();
close STDOUT;
sub fcrypt_body
{
local($name,$do_ip)=@_;

5
crypto/des/asm/des-586.pl
View file

@ -15,6 +15,9 @@ require "desboth.pl";
# format.
#
$output=pop;
open STDOUT,">$output";
&asm_init($ARGV[0],"des-586.pl");
$L="edi";
@ -39,6 +42,8 @@ $small_footprint=1 if (grep(/\-DOPENSSL_SMALL_FOOTPRINT/,@ARGV));
&asm_finish();
close STDOUT;
sub DES_encrypt_internal()
{
&function_begin_B("_x86_DES_encrypt");

17
crypto/des/build.info
View file

@ -8,16 +8,11 @@ SOURCE[../../libcrypto]=\
fcrypt.c xcbc_enc.c rpc_enc.c cbc_cksm.c \
read2pwd.c
BEGINRAW[Makefile]
##### DES assembler implementations
GENERATE[des_enc-sparc.S]=asm/des_enc.m4
GENERATE[dest4-sparcv9.S]=asm/dest4-sparcv9.pl $(PERLASM_SCHEME)
{- $builddir -}/des_enc-sparc.S: {- $sourcedir -}/asm/des_enc.m4
m4 -B 8192 {- $sourcedir -}/asm/des_enc.m4 > $@
{- $builddir -}/dest4-sparcv9.S: {- $sourcedir -}/asm/dest4-sparcv9.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/dest4-sparcv9.pl $(PERLASM_SCHEME) $@
GENERATE[des-586.s]=asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS)
DEPEND[des-586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl
GENERATE[crypt586.s]=asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS)
DEPEND[crypt586.s]=../perlasm/x86asm.pl ../perlasm/cbc.pl
{- $builddir -}/des-586.s: {- $sourcedir -}/asm/des-586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl {- $sourcetop -}/crypto/perlasm/cbc.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
{- $builddir -}/crypt586.s: {- $sourcedir -}/asm/crypt586.pl {- $sourcetop -}/crypto/perlasm/x86asm.pl {- $sourcetop -}/crypto/perlasm/cbc.pl
CC="$(CC)" $(PERL) {- $sourcedir -}/asm/crypt586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
ENDRAW[Makefile]