2 files changed, 19 insertions, 4 deletions
diff --git a/src/internal/libc.c b/src/internal/libc.c
index 5e8e9d95..954efedf 100644
--- a/src/internal/libc.c
+++ b/src/internal/libc.c
@@ -1,3 +1,11 @@
 #include "libc.h"
 
-struct libc libc;
+#ifdef __PIC__
+struct __libc *__libc_loc()
+{
+	static struct __libc __libc;
+	return &__libc;
+}
+#else
+struct __libc __libc;
+#endif
diff --git a/src/internal/libc.h b/src/internal/libc.h
index ea221b6f..8a84be0b 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -4,8 +4,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#define libc __libc
-extern struct libc {
+struct __libc {
 	void (*lock)(volatile int *);
 	void (*cancelpt)(int);
 	int (*atexit)(void (*)(void));
@@ -16,7 +15,15 @@ extern struct libc {
 	int (*rsyscall)(int, long, long, long, long, long, long);
 	void (**tsd_keys)(void *);
 	void (*fork_handler)(int);
-} libc;
+};
+
+#ifdef __PIC__
+extern struct __libc *__libc_loc(void) __attribute__((const));
+#define libc (*__libc_loc())
+#else
+extern struct __libc __libc;
+#define libc __libc
+#endif
 
 
 /* Designed to avoid any overhead in non-threaded processes */