summaryrefslogtreecommitdiffstats
path: root/libc/arch-arm/krait/bionic
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-10-09 15:50:50 -0700
committerElliott Hughes <enh@google.com>2013-10-09 16:00:17 -0700
commiteb847bc8666842a3cfc9c06e8458ad1abebebaf0 (patch)
tree15e070fb706ba7599d5f402a8f934a7399541a6a /libc/arch-arm/krait/bionic
parent0c17099a71cb5d1b36b7aab66fd7341b3fc9106d (diff)
downloadbionic-eb847bc8666842a3cfc9c06e8458ad1abebebaf0.zip
bionic-eb847bc8666842a3cfc9c06e8458ad1abebebaf0.tar.gz
bionic-eb847bc8666842a3cfc9c06e8458ad1abebebaf0.tar.bz2
Fix x86_64 build, clean up intermediate libraries.
The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
Diffstat (limited to 'libc/arch-arm/krait/bionic')
-rw-r--r--libc/arch-arm/krait/bionic/__strcat_chk.S2
-rw-r--r--libc/arch-arm/krait/bionic/__strcpy_chk.S2
-rw-r--r--libc/arch-arm/krait/bionic/memcpy.S2
-rw-r--r--libc/arch-arm/krait/bionic/memset.S2
4 files changed, 4 insertions, 4 deletions
diff --git a/libc/arch-arm/krait/bionic/__strcat_chk.S b/libc/arch-arm/krait/bionic/__strcat_chk.S
index 00fd01e..7111540 100644
--- a/libc/arch-arm/krait/bionic/__strcat_chk.S
+++ b/libc/arch-arm/krait/bionic/__strcat_chk.S
@@ -27,7 +27,7 @@
*/
#include <machine/asm.h>
-#include "libc_events.h"
+#include "private/libc_events.h"
.syntax unified
diff --git a/libc/arch-arm/krait/bionic/__strcpy_chk.S b/libc/arch-arm/krait/bionic/__strcpy_chk.S
index 3c802b5..f02a32d 100644
--- a/libc/arch-arm/krait/bionic/__strcpy_chk.S
+++ b/libc/arch-arm/krait/bionic/__strcpy_chk.S
@@ -27,7 +27,7 @@
*/
#include <machine/asm.h>
-#include "libc_events.h"
+#include "private/libc_events.h"
.syntax unified
diff --git a/libc/arch-arm/krait/bionic/memcpy.S b/libc/arch-arm/krait/bionic/memcpy.S
index d3278d2..44cc144 100644
--- a/libc/arch-arm/krait/bionic/memcpy.S
+++ b/libc/arch-arm/krait/bionic/memcpy.S
@@ -29,7 +29,7 @@
/* Assumes neon instructions and a cache line size of 32 bytes. */
#include <machine/asm.h>
-#include "libc_events.h"
+#include "private/libc_events.h"
/*
* This code assumes it is running on a processor that supports all arm v7
diff --git a/libc/arch-arm/krait/bionic/memset.S b/libc/arch-arm/krait/bionic/memset.S
index 6595e1f..b5a9d78 100644
--- a/libc/arch-arm/krait/bionic/memset.S
+++ b/libc/arch-arm/krait/bionic/memset.S
@@ -28,7 +28,7 @@
#include <machine/cpu-features.h>
#include <machine/asm.h>
-#include "libc_events.h"
+#include "private/libc_events.h"
/*
* This code assumes it is running on a processor that supports all arm v7