From 6accf55bf36ff527059c0c4fc608388a5440f758 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Thu, 7 May 2015 15:11:41 -0700
Subject: [PATCH 1/3] Revert "Try again to fix clang build."

Bug: http://b/20065774
This reverts commit dffd3c58389103d6ee712fac6544217c00c1f315.

Change-Id: I5dd095ff4ab133baa2afcbd4c79fbee55d05c459
(cherry picked from commit f920f821e27c845d2de54c1c92c3ab74587ed31a)
---
 libc/arch-arm64/bionic/libgcc_compat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libc/arch-arm64/bionic/libgcc_compat.c b/libc/arch-arm64/bionic/libgcc_compat.c
index 2dae3f552..904cc16af 100644
--- a/libc/arch-arm64/bionic/libgcc_compat.c
+++ b/libc/arch-arm64/bionic/libgcc_compat.c
@@ -1,6 +1,6 @@
 /* STOPSHIP: remove this once the flounder blobs have been rebuilt (http://b/20065774). */
 
-#if !defined(__clang__)
+#if defined(__clang__)
 
 extern void __clear_cache(char*, char*);
 extern char _Unwind_Backtrace;

From 20db14018193fb153824d7384c271f42e1e98b3c Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Thu, 7 May 2015 15:12:16 -0700
Subject: [PATCH 2/3] Revert "Fix clang build."

Bug: http://b/20065774
This reverts commit 0975a5d9d29019e764dc0ab2ddc75759bebffb9b.

(cherry picked from commit 6f0d7005f9bc6d293e5cfcd60c13a6af0ffa99fc)
---
 libc/arch-arm64/bionic/libgcc_compat.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libc/arch-arm64/bionic/libgcc_compat.c b/libc/arch-arm64/bionic/libgcc_compat.c
index 904cc16af..35158cef6 100644
--- a/libc/arch-arm64/bionic/libgcc_compat.c
+++ b/libc/arch-arm64/bionic/libgcc_compat.c
@@ -1,7 +1,5 @@
 /* STOPSHIP: remove this once the flounder blobs have been rebuilt (http://b/20065774). */
 
-#if defined(__clang__)
-
 extern void __clear_cache(char*, char*);
 extern char _Unwind_Backtrace;
 extern char _Unwind_GetIP;
@@ -11,5 +9,3 @@ void* __bionic_libgcc_compat_symbols[] = {
     &_Unwind_Backtrace,
     &_Unwind_GetIP,
 };
-
-#endif

From 6b27e6e8e095fe288a450dbc9f42ea4ccec39ff0 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Thu, 7 May 2015 15:12:24 -0700
Subject: [PATCH 3/3] Revert "Fix volantis boot."

Bug: http://b/20065774
This reverts commit 76e1cbca75e9fdaf7a7943f2c58e65433b283f4a.

(cherry picked from commit 7c2c01d681d7f2faa256a263996a35ac3edc94b3)
---
 libc/Android.mk                        |  3 +--
 libc/arch-arm64/arm64.mk               |  2 --
 libc/arch-arm64/bionic/libgcc_compat.c | 11 -----------
 libc/version_script.txt                |  5 -----
 4 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 libc/arch-arm64/bionic/libgcc_compat.c

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;