commit 182523798c6025d8d3dd08bf0cf10ae87e022215
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 10 02:35:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 10 02:35:48 2018 +0000
tree d4d4e14a6c138a8f5da77bb6d1dc3043b64e4901
parent 68e1c5b75255991724b155b65ce768240acd99a3
parent c01b849c9a363f3ed725f36eff0e622a46c72bb8

Merge "Remove obsolete workaround."

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 32df911..79330fc 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -71,10 +71,6 @@
 #include "android-base/stringprintf.h"
 #include "ziparchive/zip_archive.h"
 
-// Override macros to use C++ style casts.
-#undef ELF_ST_TYPE
-#define ELF_ST_TYPE(x) (static_cast<uint32_t>(x) & 0xf)
-
 static std::unordered_map<void*, size_t> g_dso_handle_counters;
 
 static android_namespace_t* g_anonymous_namespace = &g_default_namespace;