commit 952a70a9da73531b3af8c789a84ffb505c339c36
author Ian Rogers <irogers@google.com> Thu May 08 19:05:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 08 19:05:58 2014 +0000
tree 2e05d2c3be8b7e282f38e352bdb26eec5b7fc338
parent 7182529ecc590a315cf430d1a077810a89f08dc6
parent 6eb40c77d9d022d18fdf84a37445e05f75d05255

am 6eb40c77: Merge "Only disable @PLT symbols for clang 3.3."

* commit '6eb40c77d9d022d18fdf84a37445e05f75d05255':
  Only disable @PLT symbols for clang 3.3.

runtime/arch/x86/asm_support_x86.S

diff --git a/runtime/arch/x86/asm_support_x86.S b/runtime/arch/x86/asm_support_x86.S
index d7c88ba..909bd3e 100644
--- a/runtime/arch/x86/asm_support_x86.S
+++ b/runtime/arch/x86/asm_support_x86.S
@@ -86,7 +86,13 @@
     // Symbols.
 #if !defined(__APPLE__)
     #define SYMBOL(name) name
-    #define PLT_SYMBOL(name) name  // ## @PLT  // TODO: Disabled for old clang 3.3
+    #if defined(__clang__) && (__clang_major__ < 4) && (__clang_minor__ < 5)
+        // TODO: Disabled for old clang 3.3, this leads to text reolocations and there should be a
+        // better fix.
+        #define PLT_SYMBOL(name) name // ## @PLT
+    #else
+        #define PLT_SYMBOL(name) name ## @PLT
+    #endif
 #else
     // Mac OS' symbols have an _ prefix.
     #define SYMBOL(name) _ ## name