about summary refs log tree commit diff
path: root/src/thread/i386
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-08-03 19:45:21 -0400
committerRich Felker <dalias@aerifal.cx>2011-08-03 19:45:21 -0400
commit730bee725a770b543181424b52203dd1634ab5d1 (patch)
treeef0eac3484242a94ce6854423c6b1cb3ecfcc76a /src/thread/i386
parentfc0ecd35d8e0041c81bbe08c10c7fcb946da85e0 (diff)
downloadmusl-730bee725a770b543181424b52203dd1634ab5d1.tar.gz
musl-730bee725a770b543181424b52203dd1634ab5d1.tar.xz
musl-730bee725a770b543181424b52203dd1634ab5d1.zip
fix static linking dependency bloat with cancellation
previously, pthread_cleanup_push/pop were pulling in all of
pthread_create due to dependency on the __pthread_unwind_next
function. this was not needed, as cancellation cleanup handlers can
never be called unless pthread_exit or pthread_cancel is reachable.
Diffstat (limited to 'src/thread/i386')
-rw-r--r--src/thread/i386/cancellation2.s8
-rw-r--r--src/thread/i386/cancellation3.s8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/thread/i386/cancellation2.s b/src/thread/i386/cancellation2.s
index 4e4438b5..beeffb91 100644
--- a/src/thread/i386/cancellation2.s
+++ b/src/thread/i386/cancellation2.s
@@ -14,3 +14,11 @@ __pthread_unregister_cancel:
 	call __pthread_unregister_cancel_3
 	popl %eax
 	ret
+
+.global __pthread_unwind_next
+.type   __pthread_unwind_next,@function
+__pthread_unwind_next:
+	pushl %eax
+	call __pthread_unwind_next_3
+	popl %eax
+	ret
diff --git a/src/thread/i386/cancellation3.s b/src/thread/i386/cancellation3.s
deleted file mode 100644
index 88340224..00000000
--- a/src/thread/i386/cancellation3.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.text
-.global __pthread_unwind_next
-.type   __pthread_unwind_next,@function
-__pthread_unwind_next:
-	pushl %eax
-	call __pthread_unwind_next_3
-	popl %eax
-	ret