From 42a57eff1ce95e0e33bd6d0ce1f06ced9f210151 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Tue, 19 Jul 2005 17:40:15 +0000
Subject: better architecture splitting

---
 src/libthread/FreeBSD-386-asm.s | 54 +++++++++++++++++++++++++++++++++++++++++
 src/libthread/FreeBSDasm.s      | 54 -----------------------------------------
 src/libthread/Linux-386-asm.s   |  7 ++++++
 src/libthread/Linuxasm.s        |  7 ------
 src/libthread/NetBSD-386-asm.s  |  7 ++++++
 src/libthread/NetBSDasm.s       |  7 ------
 src/libthread/sysofiles.sh      |  8 +++---
 7 files changed, 72 insertions(+), 72 deletions(-)
 create mode 100644 src/libthread/FreeBSD-386-asm.s
 delete mode 100644 src/libthread/FreeBSDasm.s
 create mode 100644 src/libthread/Linux-386-asm.s
 delete mode 100644 src/libthread/Linuxasm.s
 create mode 100644 src/libthread/NetBSD-386-asm.s
 delete mode 100644 src/libthread/NetBSDasm.s

(limited to 'src')

diff --git a/src/libthread/FreeBSD-386-asm.s b/src/libthread/FreeBSD-386-asm.s
new file mode 100644
index 00000000..f9a80255
--- /dev/null
+++ b/src/libthread/FreeBSD-386-asm.s
@@ -0,0 +1,54 @@
+.globl _tas
+_tas:
+	movl $0xCAFEBABE, %eax
+	movl 4(%esp), %ecx
+	xchgl %eax, 0(%ecx)
+	ret
+
+.globl setmcontext
+setmcontext:
+	movl 4(%esp), %edx
+	movl	8(%edx), %fs
+	movl	12(%edx), %es
+	movl	16(%edx), %ds
+	movl	76(%edx), %ss
+	movl	20(%edx), %edi
+	movl	24(%edx), %esi
+	movl	28(%edx), %ebp
+	movl	%esp, %ecx		 
+	movl	72(%edx), %esp		 
+	pushl	60(%edx)	/* eip */	 
+	pushl	44(%edx)	/* ecx */	 
+	pushl	48(%edx)	/* eax */	 
+	movl	36(%edx), %ebx		 
+	movl	40(%edx), %edx
+	movl	12(%ecx), %eax		 
+	popl	%eax			 
+	popl	%ecx
+	ret
+
+.globl getmcontext
+getmcontext:
+	pushl	%edx
+	movl	8(%esp), %edx
+	movl	%fs, 8(%edx)
+	movl	%es, 12(%edx)
+	movl	%ds, 16(%edx)
+	movl	%ss, 76(%edx)
+	movl	%edi, 20(%edx)
+	movl	%esi, 24(%edx)
+	movl	%ebp, 28(%edx)
+	movl	%ebx, 36(%edx)
+	movl	$1, 48(%edx)
+	popl	%eax
+	movl	%eax, 40(%edx)		 
+	movl	%ecx, 44(%edx)
+	movl	(%esp), %eax	/* eip */		 
+	movl	%eax, 60(%edx)		 
+	movl	%esp, %eax		 
+	addl	$4, %eax	/* setmcontext will re-push the eip */	 
+	movl	%eax, 72(%edx)
+	movl	40(%edx), %edx		 
+	xorl	%eax, %eax		 
+	ret
+
diff --git a/src/libthread/FreeBSDasm.s b/src/libthread/FreeBSDasm.s
deleted file mode 100644
index f9a80255..00000000
--- a/src/libthread/FreeBSDasm.s
+++ /dev/null
@@ -1,54 +0,0 @@
-.globl _tas
-_tas:
-	movl $0xCAFEBABE, %eax
-	movl 4(%esp), %ecx
-	xchgl %eax, 0(%ecx)
-	ret
-
-.globl setmcontext
-setmcontext:
-	movl 4(%esp), %edx
-	movl	8(%edx), %fs
-	movl	12(%edx), %es
-	movl	16(%edx), %ds
-	movl	76(%edx), %ss
-	movl	20(%edx), %edi
-	movl	24(%edx), %esi
-	movl	28(%edx), %ebp
-	movl	%esp, %ecx		 
-	movl	72(%edx), %esp		 
-	pushl	60(%edx)	/* eip */	 
-	pushl	44(%edx)	/* ecx */	 
-	pushl	48(%edx)	/* eax */	 
-	movl	36(%edx), %ebx		 
-	movl	40(%edx), %edx
-	movl	12(%ecx), %eax		 
-	popl	%eax			 
-	popl	%ecx
-	ret
-
-.globl getmcontext
-getmcontext:
-	pushl	%edx
-	movl	8(%esp), %edx
-	movl	%fs, 8(%edx)
-	movl	%es, 12(%edx)
-	movl	%ds, 16(%edx)
-	movl	%ss, 76(%edx)
-	movl	%edi, 20(%edx)
-	movl	%esi, 24(%edx)
-	movl	%ebp, 28(%edx)
-	movl	%ebx, 36(%edx)
-	movl	$1, 48(%edx)
-	popl	%eax
-	movl	%eax, 40(%edx)		 
-	movl	%ecx, 44(%edx)
-	movl	(%esp), %eax	/* eip */		 
-	movl	%eax, 60(%edx)		 
-	movl	%esp, %eax		 
-	addl	$4, %eax	/* setmcontext will re-push the eip */	 
-	movl	%eax, 72(%edx)
-	movl	40(%edx), %edx		 
-	xorl	%eax, %eax		 
-	ret
-
diff --git a/src/libthread/Linux-386-asm.s b/src/libthread/Linux-386-asm.s
new file mode 100644
index 00000000..197f12b5
--- /dev/null
+++ b/src/libthread/Linux-386-asm.s
@@ -0,0 +1,7 @@
+.globl _tas
+_tas:
+	movl $0xCAFEBABE, %eax
+	movl 4(%esp), %ecx
+	xchgl %eax, 0(%ecx)
+	ret
+
diff --git a/src/libthread/Linuxasm.s b/src/libthread/Linuxasm.s
deleted file mode 100644
index 197f12b5..00000000
--- a/src/libthread/Linuxasm.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.globl _tas
-_tas:
-	movl $0xCAFEBABE, %eax
-	movl 4(%esp), %ecx
-	xchgl %eax, 0(%ecx)
-	ret
-
diff --git a/src/libthread/NetBSD-386-asm.s b/src/libthread/NetBSD-386-asm.s
new file mode 100644
index 00000000..197f12b5
--- /dev/null
+++ b/src/libthread/NetBSD-386-asm.s
@@ -0,0 +1,7 @@
+.globl _tas
+_tas:
+	movl $0xCAFEBABE, %eax
+	movl 4(%esp), %ecx
+	xchgl %eax, 0(%ecx)
+	ret
+
diff --git a/src/libthread/NetBSDasm.s b/src/libthread/NetBSDasm.s
deleted file mode 100644
index 197f12b5..00000000
--- a/src/libthread/NetBSDasm.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.globl _tas
-_tas:
-	movl $0xCAFEBABE, %eax
-	movl 4(%esp), %ecx
-	xchgl %eax, 0(%ecx)
-	ret
-
diff --git a/src/libthread/sysofiles.sh b/src/libthread/sysofiles.sh
index 4832145b..3c3ee9c0 100644
--- a/src/libthread/sysofiles.sh
+++ b/src/libthread/sysofiles.sh
@@ -7,18 +7,18 @@ case "$tag" in
 *-Linux-2.6.*)
 	echo pthread.o
 	;;
-*-FreeBSD-5.*)
+*-FreeBSD-[5-9].*)
 	echo pthread.o
 	;;
 *-Linux-*)
 	# will have to fix this for linux power pc
-	echo $SYSNAME.o ${SYSNAME}asm.o
+	echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME.o
 	;;
 *-FreeBSD-*)
-	echo $SYSNAME.o ${SYSNAME}asm.o
+	echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME.o
 	;;
 *-NetBSD-*)
-	echo $SYSNAME.o ${SYSNAME}asm.o
+	echo ${SYSNAME}-${OBJTYPE}-asm.o $SYSNAME.o
 	;;
 *-Darwin-*)
 	echo ${SYSNAME}-${OBJTYPE}-asm.o ${SYSNAME}-${OBJTYPE}.o pthread.o
-- 
cgit v1.2.3