[llvm-branch-commits] [llvm-branch] r137138 - /llvm/branches/Apple/Morbo/lib/System/SearchForAddressOfSpecialSymbol.cpp

[Eric Christopher]

Author: echristo
Date: Tue Aug  9 14:57:22 2011
New Revision: 137138

URL: http://llvm.org/viewvc/llvm-project?rev=137138&view=rev
Log:
Fix eprintf include. It's not needed for x86_64 and sometimes the clang
runtime support libraries aren't around.

Modified:
    llvm/branches/Apple/Morbo/lib/System/SearchForAddressOfSpecialSymbol.cpp

Modified: llvm/branches/Apple/Morbo/lib/System/SearchForAddressOfSpecialSymbol.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/System/SearchForAddressOfSpecialSymbol.cpp?rev=137138&r1=137137&r2=137138&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/System/SearchForAddressOfSpecialSymbol.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/System/SearchForAddressOfSpecialSymbol.cpp Tue Aug  9 14:57:22 2011
@@ -32,7 +32,6 @@
     EXPLICIT_SYMBOL(__ashrdi3);
     EXPLICIT_SYMBOL(__cmpdi2);
     EXPLICIT_SYMBOL(__divdi3);
-    EXPLICIT_SYMBOL(__eprintf);
     EXPLICIT_SYMBOL(__fixdfdi);
     EXPLICIT_SYMBOL(__fixsfdi);
     EXPLICIT_SYMBOL(__fixunsdfdi);
@@ -43,6 +42,16 @@
     EXPLICIT_SYMBOL(__moddi3);
     EXPLICIT_SYMBOL(__udivdi3);
     EXPLICIT_SYMBOL(__umoddi3);
+
+    // __eprintf is sometimes used for assert() handling on x86.
+    //
+    // FIXME: Currently disabled when using Clang, as we don't always have our
+    // runtime support libraries available.
+    #ifndef __clang__
+    #ifdef __i386__
+    EXPLICIT_SYMBOL(__eprintf);
+    #endif
+    #endif
   }
 #endif