commit b410f4ecf88d975a6fa79440b251f10f2bd97b77
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 25 23:05:25 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 25 23:05:25 2017 +0000
tree f3a927d8a3c83057da360656937c256e419ff756
parent ea101198f9d9fabf1799847b09b0f215f39f0375
parent 3413a7546007cb333280a633dea34ebb2a102541

Merge "Remove an obsolete aarch64 hack."

libc/arch-common/bionic/__dso_handle.h

diff --git a/libc/arch-common/bionic/__dso_handle.h b/libc/arch-common/bionic/__dso_handle.h
index d4bff77..fa40060 100644
--- a/libc/arch-common/bionic/__dso_handle.h
+++ b/libc/arch-common/bionic/__dso_handle.h
@@ -28,11 +28,6 @@
 
 
 #ifndef CRT_LEGACY_WORKAROUND
-__attribute__ ((visibility ("hidden")))
+__attribute__((__visibility__("hidden")))
 #endif
-#ifdef __aarch64__
-__attribute__ ((section (".data")))
-#else
-__attribute__ ((section (".bss")))
-#endif
-void *__dso_handle = (void *) 0;
+void* __dso_handle = (void*) 0;

libc/arch-common/bionic/__dso_handle_so.h

diff --git a/libc/arch-common/bionic/__dso_handle_so.h b/libc/arch-common/bionic/__dso_handle_so.h
index fab328a..e2c26b6 100644
--- a/libc/arch-common/bionic/__dso_handle_so.h
+++ b/libc/arch-common/bionic/__dso_handle_so.h
@@ -26,11 +26,4 @@
  * SUCH DAMAGE.
  */
 
-
-__attribute__ ((visibility ("hidden")))
-__attribute__ ((section (".data")))
-#ifdef __aarch64__
-void *__dso_handle = (void *) 0;
-#else
-void *__dso_handle = &__dso_handle;
-#endif
+__attribute__((__visibility__("hidden"))) void* __dso_handle = &__dso_handle;