diff --git a/lib/System/SearchForAddressOfSpecialSymbol.cpp b/lib/System/SearchForAddressOfSpecialSymbol.cpp
index 2fcc3401c36..51ba417c214 100644
--- a/lib/System/SearchForAddressOfSpecialSymbol.cpp
+++ b/lib/System/SearchForAddressOfSpecialSymbol.cpp
@@ -32,14 +32,6 @@ static void *DoSearch(const char* symbolName) {
     EXPLICIT_SYMBOL(__ashrdi3);
     EXPLICIT_SYMBOL(__cmpdi2);
     EXPLICIT_SYMBOL(__divdi3);
-
-    // Clang doesn't always link against libgcc.a, which is the only thing which
-    // defines ___eprintf in the modern world. Just don't attempt to export this
-    // symbol when building with Clang.
-#ifndef __clang__
-    EXPLICIT_SYMBOL(__eprintf);
-#endif
-
     EXPLICIT_SYMBOL(__fixdfdi);
     EXPLICIT_SYMBOL(__fixsfdi);
     EXPLICIT_SYMBOL(__fixunsdfdi);
@@ -50,6 +42,11 @@ static void *DoSearch(const char* symbolName) {
     EXPLICIT_SYMBOL(__moddi3);
     EXPLICIT_SYMBOL(__udivdi3);
     EXPLICIT_SYMBOL(__umoddi3);
+
+    // __eprintf is sometimes used for assert() handling on x86.
+#ifdef __i386__
+    EXPLICIT_SYMBOL(__eprintf);
+#endif
   }
 #endif