build.info/Makefile.in: Itanium fixups.

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

build.info/Makefile.in: Itanium fixups.
Reviewed-by: N Richard Levitte <levitte@openssl.org>
6bfb7db3 · Andy Polyakov · Richard Levitte · d43a8fdc · 6bfb7db3 · 6bfb7db3
隐藏空白更改
内联并排

Showing with 12 addition and 12 deletion

crypto/bn/Makefile.in crypto/bn/Makefile.in +1 -1

crypto/rc4/build.info crypto/rc4/build.info +8 -8

crypto/sha/build.info crypto/sha/build.info +3 -3

未找到文件。
--- 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) $@


--- 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

--- 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