From 54b59fd17c20575ab6f752e0258848d79afa8ccc Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Fri, 21 Apr 2006 03:55:13 +0000
Subject: apple

---
 src/libsec/386/md5block.spp  | 5 +++++
 src/libsec/386/mkfile        | 2 +-
 src/libsec/386/sha1block.spp | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/libsec/386/md5block.spp b/src/libsec/386/md5block.spp
index b218683b..feebf615 100644
--- a/src/libsec/386/md5block.spp
+++ b/src/libsec/386/md5block.spp
@@ -116,8 +116,13 @@
 	.text
 
 	.p2align 2,0x90
+#ifdef __Darwin__
+	.globl __md5block
+	__md5block:
+#else
 	.globl _md5block
 	_md5block:
+#endif
 
 	/* Prelude */
 	pushl %ebp
diff --git a/src/libsec/386/mkfile b/src/libsec/386/mkfile
index 54f0ca71..6f970600 100644
--- a/src/libsec/386/mkfile
+++ b/src/libsec/386/mkfile
@@ -18,7 +18,7 @@ UPDATE=mkfile\
 %.s: %.spp
 	if [ `uname` = OpenBSD ] || [ `uname` = Darwin ]
 	then
-		gcc -xc -E $stem.spp >$stem.s
+		gcc -xc -D__`uname`__ -E $stem.spp >$stem.s
 	else
 		cpp $stem.spp >$stem.s
 	fi
diff --git a/src/libsec/386/sha1block.spp b/src/libsec/386/sha1block.spp
index 2a7eabdc..d568e4fe 100644
--- a/src/libsec/386/sha1block.spp
+++ b/src/libsec/386/sha1block.spp
@@ -1,8 +1,13 @@
 .text
 
 .p2align 2,0x90
+#ifdef __Darwin__
+.globl __sha1block
+__sha1block:
+#else
 .globl _sha1block
 _sha1block:
+#endif
 
 /* x = (wp[off-f] ^ wp[off-8] ^ wp[off-14] ^ wp[off-16]) <<< 1;
  * wp[off] = x;
-- 
cgit v1.2.3