build.info/Makefile.in: Itanium fixups.

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/crypto/bn/Makefile.in b/crypto/bn/Makefile.in
index 85b7d56f44430b1c3ef5d4278076de2c29bfaadb..eb610e715c67ea82a3d51017bb2c8a5aa8c880a2 100644 (file)
--- a/crypto/bn/Makefile.in
+++ b/crypto/bn/Makefile.in
@@ -105,7 +105,7 @@ rsaz-avx2.s:        asm/rsaz-avx2.pl
        $(PERL) asm/rsaz-avx2.pl $(PERLASM_SCHEME) $@
 
 bn-ia64.s:     asm/ia64.S
-       $(CC) $(CFLAGS) -E asm/ia64.S $@
+       $(CC) $(CFLAGS) -E asm/ia64.S > $@
 ia64-mont.s:   asm/ia64-mont.pl
        $(PERL) asm/ia64-mont.pl $(CFLAGS) $@
 

diff --git a/crypto/rc4/build.info b/crypto/rc4/build.info
index 8e6df35a63bc0d944b3ec0cc8e060fd0685155c6..d82a9ed8793c954f81ef77636b9cdf1572909e11 100644 (file)
--- a/crypto/rc4/build.info
+++ b/crypto/rc4/build.info
@@ -8,17 +8,17 @@ DEPEND[rc4-586.s]=../perlasm/x86asm.pl
 GENERATE[rc4-x86_64.s]=asm/rc4-x86_64.pl $(PERLASM_SCHEME)
 GENERATE[rc4-md5-x86_64.s]=asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME)
 
-GENERATE[rc4-ia64.S]=asm/rc4-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
-
 GENERATE[rc4-parisc.s]=asm/rc4-parisc.pl $(PERLASM_SCHEME)
 
 BEGINRAW[Makefile]
-{- $builddir -}/rc4-ia64.s: rc4-ia64.S
-       @case `awk '/^#define RC4_INT/{print$$NF}' $(SRCDIR)/include/openssl/opensslconf.h` in \
-       int)    set -x; $(CC) $(CFLAGS) $(LIB_CFLAGS) -DSZ=4 -E rc4-ia64.S > $@ ;; \
-       char)   set -x; $(CC) $(CFLAGS) $(LIB_CFLAGS) -DSZ=1 -E rc4-ia64.S > $@ ;; \
-       *)      exit 1 ;; \
-       esac
+{- $builddir -}/rc4-ia64.s: {- $sourcedir -}/asm/rc4-ia64.pl
+       @(trap "rm $@.*" INT 0; \
+         perl $< $(CFLAGS) $(LIB_CFLAGS) $@.S; \
+         case `awk '/^#define RC4_INT/{print$$NF}' $(BLDDIR)/include/openssl/opensslconf.h` in \
+         int)  set -x; $(CC) $(CFLAGS) $(LIB_CFLAGS) -DSZ=4 -E $@.S > $@.i && mv -f $@.i $@;; \
+         char) set -x; $(CC) $(CFLAGS) $(LIB_CFLAGS) -DSZ=1 -E $@.S > $@.i && mv -f $@.i $@;; \
+         *)    exit 1 ;; \
+         esac )
 
 # GNU make "catch all"
 {- $builddir -}/rc4-%.s:       {- $sourcedir -}/asm/rc4-%.pl

diff --git a/crypto/sha/build.info b/crypto/sha/build.info
index 55248b3c36f5ccaec18e9a65ddc88653cfa5fa2e..7aa3a9187257a8183487f10d2a0b87678ea6f59f 100644 (file)
--- a/crypto/sha/build.info
+++ b/crypto/sha/build.info
@@ -9,9 +9,9 @@ DEPEND[sha256-586.s]=../perlasm/x86asm.pl
 GENERATE[sha512-586.s]=asm/sha512-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(LIB_CFLAGS) $(PROCESSOR)
 DEPEND[sha512-586.s]=../perlasm/x86asm.pl
 
-GENERATE[sha1-ia64.s]=sha1-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
-GENERATE[sha256-ia64.s]=sha512-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
-GENERATE[sha512-ia64.s]=sha512-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
+GENERATE[sha1-ia64.s]=asm/sha1-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
+GENERATE[sha256-ia64.s]=asm/sha512-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
+GENERATE[sha512-ia64.s]=asm/sha512-ia64.pl $(CFLAGS) $(LIB_CFLAGS)
 
 GENERATE[sha1-alpha.s]=asm/sha1-alpha.pl