diff options
| author | Dan Albert <danalbert@google.com> | 2015-05-07 15:12:24 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-05-08 09:36:03 -0700 |
| commit | 6b27e6e8e095fe288a450dbc9f42ea4ccec39ff0 (patch) | |
| tree | b434e9bb7215f102a848243acd79bcf9f9ea6a25 | |
| parent | 20db14018193fb153824d7384c271f42e1e98b3c (diff) | |
| download | android_bionic-6b27e6e8e095fe288a450dbc9f42ea4ccec39ff0.tar.gz android_bionic-6b27e6e8e095fe288a450dbc9f42ea4ccec39ff0.tar.bz2 android_bionic-6b27e6e8e095fe288a450dbc9f42ea4ccec39ff0.zip | |
Revert "Fix volantis boot."
Bug: http://b/20065774
This reverts commit 76e1cbca75e9fdaf7a7943f2c58e65433b283f4a.
(cherry picked from commit 7c2c01d681d7f2faa256a263996a35ac3edc94b3)
| -rw-r--r-- | libc/Android.mk | 3 | ||||
| -rw-r--r-- | libc/arch-arm64/arm64.mk | 2 | ||||
| -rw-r--r-- | libc/arch-arm64/bionic/libgcc_compat.c | 11 | ||||
| -rw-r--r-- | libc/version_script.txt | 5 |
4 files changed, 1 insertions, 20 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 4a20b3f7d..c8bdb061b 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1388,8 +1388,7 @@ LOCAL_LDFLAGS := -Wl,--version-script,$(LOCAL_PATH)/version_script.txt # We'd really like to do this for all architectures, but since this wasn't done # before, these symbols must continue to be exported on LP32 for binary # compatibility. -# TODO: disabled for http://b/20065774. -#LOCAL_LDFLAGS_64 := -Wl,--exclude-libs,libgcc.a +LOCAL_LDFLAGS_64 := -Wl,--exclude-libs,libgcc.a # TODO: This is to work around b/19059885. Remove after root cause is fixed LOCAL_LDFLAGS_arm := -Wl,--hash-style=sysv diff --git a/libc/arch-arm64/arm64.mk b/libc/arch-arm64/arm64.mk index 6a2f31378..470a03838 100644 --- a/libc/arch-arm64/arm64.mk +++ b/libc/arch-arm64/arm64.mk @@ -40,8 +40,6 @@ libc_bionic_src_files_arm64 += \ arch-arm64/bionic/syscall.S \ arch-arm64/bionic/vfork.S \ -# Work around for http://b/20065774. -libc_bionic_src_files_arm64 += arch-arm64/bionic/libgcc_compat.c libc_crt_target_cflags_arm64 := \ -I$(LOCAL_PATH)/arch-arm64/include diff --git a/libc/arch-arm64/bionic/libgcc_compat.c b/libc/arch-arm64/bionic/libgcc_compat.c deleted file mode 100644 index 35158cef6..000000000 --- a/libc/arch-arm64/bionic/libgcc_compat.c +++ /dev/null @@ -1,11 +0,0 @@ -/* STOPSHIP: remove this once the flounder blobs have been rebuilt (http://b/20065774). */ - -extern void __clear_cache(char*, char*); -extern char _Unwind_Backtrace; -extern char _Unwind_GetIP; - -void* __bionic_libgcc_compat_symbols[] = { - &__clear_cache, - &_Unwind_Backtrace, - &_Unwind_GetIP, -}; diff --git a/libc/version_script.txt b/libc/version_script.txt index 349a2fc2c..afc5e5c47 100644 --- a/libc/version_script.txt +++ b/libc/version_script.txt @@ -1,9 +1,4 @@ LIBC { - global: - /* Work-around for http://b/20065774. */ - __clear_cache; - _Unwind_Backtrace; - _Unwind_GetIP; local: _ZSt7nothrow; _ZdaPv; |