diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:07 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:07 -0800 |
| commit | e5cc1f386b167b9f7bfdebc7219e89aa9b71e4b2 (patch) | |
| tree | 2cbd43daa6744ed80e833528f8cbfc0c485e5253 /linker | |
| parent | 6d6c82c7a0a6b9a89f61b61c66f9b90d9c7177dc (diff) | |
| download | bionic-e5cc1f386b167b9f7bfdebc7219e89aa9b71e4b2.tar.gz bionic-e5cc1f386b167b9f7bfdebc7219e89aa9b71e4b2.tar.bz2 bionic-e5cc1f386b167b9f7bfdebc7219e89aa9b71e4b2.zip | |
auto import from //branches/cupcake/...@126645
Diffstat (limited to 'linker')
| -rw-r--r-- | linker/Android.mk | 4 | ||||
| -rw-r--r-- | linker/linker.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/linker/Android.mk b/linker/Android.mk index 5d1114854..98eceda14 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 34ed80eff..8f15f6277 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" |