diff options
| author | Elliott Hughes <enh@google.com> | 2013-10-09 15:50:50 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-10-09 16:00:17 -0700 |
| commit | eb847bc8666842a3cfc9c06e8458ad1abebebaf0 (patch) | |
| tree | 15e070fb706ba7599d5f402a8f934a7399541a6a /libstdc++ | |
| parent | 0c17099a71cb5d1b36b7aab66fd7341b3fc9106d (diff) | |
| download | bionic-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 'libstdc++')
| -rw-r--r-- | libstdc++/src/one_time_construction.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libstdc++/src/one_time_construction.cpp b/libstdc++/src/one_time_construction.cpp index 8ba18df..5574311 100644 --- a/libstdc++/src/one_time_construction.cpp +++ b/libstdc++/src/one_time_construction.cpp @@ -5,8 +5,9 @@ #include <stddef.h> #include <sys/atomics.h> #include <endian.h> -#include <private/bionic_futex.h> -#include <private/bionic_atomic_inline.h> + +#include "private/bionic_atomic_inline.h" +#include "private/bionic_futex.h" // This file contains C++ ABI support functions for one time // constructors as defined in the "Run-time ABI for the ARM Architecture" |