The branch master has been updated
via b75ac3c2a3ae8549eb8afb701c1fc7a55c2afdb5 (commit)
from bb6b950e1c9ae118ba08458645589f815e3bcd90 (commit)
- Log -----------------------------------------------------------------
commit b75ac3c2a3ae8549eb8afb701c1fc7a55c2afdb5
Author: Andy Polyakov <[email protected]>
Date: Fri Mar 18 15:45:52 2016 +0100
Build system: VC-WIN64I fixups.
Reviewed-by: Richard Levitte <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 2 +-
Configurations/windows-makefile.tmpl | 4 ++--
crypto/md5/build.info | 5 +++++
crypto/rc4/build.info | 9 ++++++++-
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 459de9c..a6efb57 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1274,7 +1274,7 @@ sub vc_wince_info {
asflags => "-d debug",
asoutflag => "-o",
sys_id => "WIN64I",
- rc4_asm_src => "",
+ bn_asm_src => sub { my $r=join(" ",@_);
$r=~s|bn-ia64.s|bn_asm.c|; $r; },
perlasm_scheme => "ias",
},
"VC-WIN64A" => {
diff --git a/Configurations/windows-makefile.tmpl
b/Configurations/windows-makefile.tmpl
index d2c5eb6..0b8ac72 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -272,7 +272,7 @@ $target: $args{generator}->[0] $deps
set ASM=\$(AS)
set CC=\$(CC)
$generator \[email protected]
- \$(CC) \$(CFLAGS) $incs /EP /C \[email protected] > \$@
+ \$(CC) \$(CFLAGS) $incs /EP /C \[email protected] > \[email protected] && move /Y \[email protected] \$@
del /Q \[email protected]
EOF
}
@@ -286,7 +286,7 @@ EOF
}
return <<"EOF";
$target: $args{generator}->[0] $deps
- \$(CC) \$(CFLAGS) $incs /EP /C \$< > \$@
+ \$(CC) \$(CFLAGS) $incs /EP /C $args{generator}->[0] > \[email protected] && move /Y
\[email protected] \$@
EOF
}
}
diff --git a/crypto/md5/build.info b/crypto/md5/build.info
index 700c356..38323a3 100644
--- a/crypto/md5/build.info
+++ b/crypto/md5/build.info
@@ -9,6 +9,11 @@ GENERATE[md5-x86_64.s]=asm/md5-x86_64.pl $(PERLASM_SCHEME)
GENERATE[md5-sparcv9.S]=asm/md5-sparcv9.pl $(PERLASM_SCHEME)
INCLUDE[md5-sparcv9.o]=..
+BEGINRAW[makefile(windows)]
+{- $builddir -}\md5-ia64.asm: {- $sourcedir -}\asm\md5-ia64.S
+ $(CC) $(CFLAGS) -EP {- $sourcedir -}\asm\md5-ia64.S > [email protected] && move /Y
[email protected] $@
+ENDRAW[makefile(windows)]
+
BEGINRAW[Makefile]
{- $builddir -}/md5-ia64.s: {- $sourcedir -}/asm/md5-ia64.S
$(CC) $(CFLAGS) -E {- $sourcedir -}/asm/md5-ia64.S | \
diff --git a/crypto/rc4/build.info b/crypto/rc4/build.info
index d82a9ed..6c48889 100644
--- a/crypto/rc4/build.info
+++ b/crypto/rc4/build.info
@@ -10,10 +10,17 @@ GENERATE[rc4-md5-x86_64.s]=asm/rc4-md5-x86_64.pl
$(PERLASM_SCHEME)
GENERATE[rc4-parisc.s]=asm/rc4-parisc.pl $(PERLASM_SCHEME)
+BEGINRAW[makefile(windows)]
+{- $builddir -}\rc4-ia64.asm: {- $sourcedir -}\asm\rc4-ia64.pl
+ $(PERL) {- $sourcedir -}\asm\rc4-ia64.pl [email protected]
+ $(CC) -DSZ=4 -EP [email protected] > [email protected] && move /Y [email protected] $@
+ del /Q [email protected]
+ENDRAW[makefile(windows)]
+
BEGINRAW[Makefile]
{- $builddir -}/rc4-ia64.s: {- $sourcedir -}/asm/rc4-ia64.pl
@(trap "rm $@.*" INT 0; \
- perl $< $(CFLAGS) $(LIB_CFLAGS) [email protected]; \
+ $(PERL) $< $(CFLAGS) $(LIB_CFLAGS) [email protected]; \
case `awk '/^#define RC4_INT/{print$$NF}'
$(BLDDIR)/include/openssl/opensslconf.h` in \
int) set -x; $(CC) $(CFLAGS) $(LIB_CFLAGS) -DSZ=4 -E [email protected] > [email protected] &&
mv -f [email protected] $@;; \
char) set -x; $(CC) $(CFLAGS) $(LIB_CFLAGS) -DSZ=1 -E [email protected] > [email protected] &&
mv -f [email protected] $@;; \
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
