Use the correct assembly routines on NetBSD/i386 depending on whether

it's a.out or ELF.

3 files changed, 22 insertions, 13 deletions

diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 5060a231968..26f67d09817 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.33 2004/12/24 22:02:38 jlam Exp $
+$NetBSD: distinfo,v 1.34 2004/12/25 19:09:08 jlam Exp $
 
 SHA1 (openssl-0.9.7e.tar.gz) = b2eb7f13cc09655ec2378c3dde3025bf7072af54
 Size (openssl-0.9.7e.tar.gz) = 3043231 bytes
-SHA1 (patch-aa) = 9296072404e29ed120dee8ffbcadffd1abc04b3d
-SHA1 (patch-ac) = d87e0f442db523f2247c3485ea1a93d7f82275c4
+SHA1 (patch-aa) = 80fa04df4aed2009f158f8c10b00ff087a68643a
+SHA1 (patch-ac) = 5c7681182a3f40a91e4431db668b70bec997d3ee
 SHA1 (patch-ad) = 3d0a5534c6946aeda219d670f241a01e72d86c6a
 SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8
 SHA1 (patch-af) = 4909cf3d5441ae51917281642b3871e1466fd2fa
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index 5e714f5c4f4..2dba2f5ffb0 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.15 2004/12/24 22:02:38 jlam Exp $
+$NetBSD: patch-aa,v 1.16 2004/12/25 19:09:09 jlam Exp $
 
---- config.orig	2004-06-28 18:01:05.000000000 -0400
+--- config.orig	Mon Jun 28 18:01:05 2004
 +++ config
 @@ -155,6 +155,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
  	echo "mips4-sgi-irix64"; exit 0
@@ -13,12 +13,20 @@ $NetBSD: patch-aa,v 1.15 2004/12/24 22:02:38 jlam Exp $
      Linux:[2-9].*)
  	echo "${MACHINE}-whatever-linux2"; exit 0
  	;;
-@@ -655,8 +659,9 @@ EOF
+@@ -654,9 +658,16 @@ EOF
+   ia64-*-freebsd*) OUT="FreeBSD-ia64" ;;
    *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
    *-freebsd[1-2]*) OUT="FreeBSD" ;;
-   *86*-*-netbsd) OUT="NetBSD-x86" ;;
+-  *86*-*-netbsd) OUT="NetBSD-x86" ;;
 -  sun3*-*-netbsd) OUT="NetBSD-m68" ;;
 -  *-*-netbsd) OUT="NetBSD-sparc" ;;
++  *86*-*-netbsd)
++	if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++		OUT="NetBSD-x86-aout"
++	else
++		OUT="NetBSD-x86-elf"
++	fi
++	;;
 +  sun3*-*-netbsd) OUT="NetBSD-m68k" ;;
 +  *-*-netbsd) OUT="NetBSD-${MACHINE_ARCH}" ;;
 +  *-*-interix3) OUT="Interix3" ;;
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
index 529535189a1..fa7d4ace39b 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.18 2004/12/24 22:02:38 jlam Exp $
+$NetBSD: patch-ac,v 1.19 2004/12/25 19:09:09 jlam Exp $
 
---- Configure.orig	2004-10-01 07:34:28.000000000 -0400
+--- Configure.orig	Fri Oct  1 07:34:28 2004
 +++ Configure
-@@ -400,9 +400,22 @@ my %table=(
+@@ -400,9 +400,23 @@ my %table=(
  "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "linux-ia64-ecc",   "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -22,13 +22,14 @@ $NetBSD: patch-ac,v 1.18 2004/12/24 22:02:38 jlam Exp $
 +"NetBSD-sparc", "gcc:-DTERMIOS -O2 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-sparc64", "gcc:-DTERMIOS -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-vax", "gcc:-DTERMIOS -O2 -Wall -DL_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"NetBSD-x86", "gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-x86-aout", "gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"NetBSD-x86-elf", "gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86_64", "gcc:-DTERMIOS -O2 -DMD32_REG_T=int::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"Interix3","gcc:-DTERMIOS -O2 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::::::::::dlfcn:bsd-gcc-shared::-Wl,--image-base,\$\$((\$\$RANDOM %64/2*1048576+1577058304)):.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "FreeBSD-elf",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-@@ -832,6 +845,10 @@ PROCESS_ARGS:
+@@ -832,6 +846,10 @@ PROCESS_ARGS:
  				{
  				$libs.=$_." ";
  				}
@@ -39,7 +40,7 @@ $NetBSD: patch-ac,v 1.18 2004/12/24 22:02:38 jlam Exp $
  			elsif (/^-[^-]/ or /^\+/)
  				{
  				$flags.=$_." ";
-@@ -1297,7 +1314,7 @@ while (<IN>)
+@@ -1297,7 +1315,7 @@ while (<IN>)
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
  		{
  		my $sotmp = $1;