Browse Source

rework cancellation weak alias logic not to depend on archive order

if the order of object files in the static archive libc.a was not
respected by the linker, the old logic could wrongly cause POSIX
symbols outside of the ISO C namespace to be pulled into pure C
programs. this should not happen with well-behaved linkers, but
relying on the link order was a bad idea anyway.

files are renamed to better reflect their contents now that they don't
need names to control their order as members in the archive file.
Rich Felker 10 years ago
parent
commit
d96b12b755
3 changed files with 12 additions and 6 deletions
  1. 5 4
      src/thread/__syscall_cp.c
  2. 1 1
      src/thread/pthread_cancel.c
  3. 6 1
      src/thread/pthread_testcancel.c

+ 5 - 4
src/thread/cancel_dummy.c → src/thread/__syscall_cp.c

@@ -8,10 +8,11 @@ static long sccp(syscall_arg_t nr,
 	return (__syscall)(nr, u, v, w, x, y, z);
 }
 
-weak_alias(sccp, __syscall_cp);
+weak_alias(sccp, __syscall_cp_c);
 
-static void dummy()
+long (__syscall_cp)(syscall_arg_t nr,
+                    syscall_arg_t u, syscall_arg_t v, syscall_arg_t w,
+                    syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
 {
+	return __syscall_cp_c(nr, u, v, w, x, y, z);
 }
-
-weak_alias(dummy, __testcancel);

+ 1 - 1
src/thread/cancel_impl.c → src/thread/pthread_cancel.c

@@ -13,7 +13,7 @@ long __syscall_cp_asm(volatile void *, syscall_arg_t,
                       syscall_arg_t, syscall_arg_t, syscall_arg_t,
                       syscall_arg_t, syscall_arg_t, syscall_arg_t);
 
-long (__syscall_cp)(syscall_arg_t nr,
+long __syscall_cp_c(syscall_arg_t nr,
                     syscall_arg_t u, syscall_arg_t v, syscall_arg_t w,
                     syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
 {

+ 6 - 1
src/thread/pthread_testcancel.c

@@ -1,6 +1,11 @@
 #include "pthread_impl.h"
+#include "libc.h"
 
-void __testcancel(void);
+static void dummy()
+{
+}
+
+weak_alias(dummy, __testcancel);
 
 void pthread_testcancel()
 {