From e5cc1f386b167b9f7bfdebc7219e89aa9b71e4b2 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 15 Jan 2009 16:12:07 -0800
Subject: auto import from //branches/cupcake/...@126645

---
 linker/Android.mk | 4 ++++
 linker/linker.c   | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'linker')

diff --git a/linker/Android.mk b/linker/Android.mk
index 5d11148..98eceda 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -18,6 +18,10 @@ LOCAL_LDFLAGS := -Wl,-Ttext,$(LINKER_TEXT_BASE)
 
 LOCAL_CFLAGS += -DPRELINK -DLINKER_TEXT_BASE=$(LINKER_TEXT_BASE) -DLINKER_AREA_SIZE=$(LINKER_AREA_SIZE)
 
+# we need to access the Bionic private header <bionic_tls.h>
+# in the linker
+LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/private
+
 ifeq ($(TARGET_ARCH),arm)
 LOCAL_CFLAGS += -DANDROID_ARM_LINKER
 else
diff --git a/linker/linker.c b/linker/linker.c
index 34ed80e..8f15f62 100644
--- a/linker/linker.c
+++ b/linker/linker.c
@@ -14,7 +14,9 @@
 #include <sys/mman.h>
 
 #include <sys/atomics.h>
-#include <sys/tls.h>
+
+/* special private C library header - see Android.mk */
+#include <bionic_tls.h>
 
 #include "linker.h"
 #include "linker_debug.h"
-- 
cgit v1.1