Reinstate r133513 (reverted in r133700) with an additional fix for a

[oota-llvm.git] / include / llvm / Support / Compiler.h

diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h
index 2d2a0b124abe4015bb0e19232639beb931967610..e0921572182bde9d17c3907990db725995540852 100644 (file)
--- a/include/llvm/Support/Compiler.h
+++ b/include/llvm/Support/Compiler.h
@@ -128,17 +128,10 @@
 
 // LLVM_BUILTIN_UNREACHABLE - On compilers which support it, expands
 // to an expression which states that it is undefined behavior for the
-// compiler to reach this point.
+// compiler to reach this point.  Otherwise is not defined.
 #if defined(__clang__) || (__GNUC__ > 4) \
  || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
 # define LLVM_BUILTIN_UNREACHABLE __builtin_unreachable()
-#else
-#ifdef __cplusplus
-extern "C" LLVM_ATTRIBUTE_NORETURN void abort();
-#else
-extern LLVM_ATTRIBUTE_NORETURN void abort();
-#endif
-# define LLVM_BUILTIN_UNREACHABLE abort()
 #endif
 
 #endif