Fixed jump_alias for non-PIC, and disabled it for PIC, since it

doesn't work for PIC right now. This fixes current crashing sigaction calls.

Fixed jump_alias for non-PIC, and disabled it for PIC, since it
d2937316 · Ove Kaaven · Alexandre Julliard · 4a07ed8e · d2937316
Commit d2937316 authored May 09, 2000 by Ove Kaaven Committed by Alexandre Julliard May 09, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

pthread.c scheduler/pthread.c +8 -3

No files found.
--- a/scheduler/pthread.c
+++ b/scheduler/pthread.c
@@ -38,13 +38,18 @@

 /* adapt as necessary (a construct like this is used in glibc sources) */
 #define strong_alias(orig, alias) \
- asm(".globl " PSTR(alias) "\n\t.set " PSTR(alias) "," PSTR(orig))
+ asm(".globl " PSTR(alias) "\n" \
+     "\t.set " PSTR(alias) "," PSTR(orig))

 /* strong_alias does not work on external symbols (.o format limitation?),
 * so for those, we need to use the pogo stick */
-#ifdef __i386__
+#if defined(__i386__) && !defined(__PIC__)
+/* FIXME: PIC */
 #define jump_alias(orig, alias) \
- asm(".globl " PSTR(alias) "\n\t" PSTR(alias) ":\n\tjmp " PSTR(orig))
+ asm(".globl " PSTR(alias) "\n" \
+     "\t.type " PSTR(alias) ",@function\n" \
+     PSTR(alias) ":\n" \
+     "\tjmp " PSTR(orig))
 #endif

 /* get necessary libc symbols */