[compiler-rt] r341736 - Switch to using a reserved identifier for this internal compiler-rt function.

[Richard Smith via llvm-commits]

Author: rsmith
Date: Fri Sep  7 17:17:37 2018
New Revision: 341736

URL: http://llvm.org/viewvc/llvm-project?rev=341736&view=rev
Log:
Switch to using a reserved identifier for this internal compiler-rt function.

Modified:
    compiler-rt/trunk/lib/builtins/int_util.c
    compiler-rt/trunk/lib/builtins/int_util.h

Modified: compiler-rt/trunk/lib/builtins/int_util.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/int_util.c?rev=341736&r1=341735&r2=341736&view=diff
==============================================================================
--- compiler-rt/trunk/lib/builtins/int_util.c (original)
+++ compiler-rt/trunk/lib/builtins/int_util.c Fri Sep  7 17:17:37 2018
@@ -27,7 +27,7 @@ NORETURN extern void panic(const char *,
 #ifndef _WIN32
 __attribute__((visibility("hidden")))
 #endif
-void compilerrt_abort_impl(const char *file, int line, const char *function) {
+void __compilerrt_abort_impl(const char *file, int line, const char *function) {
   panic("%s:%d: abort in %s", file, line, function);
 }
 
@@ -41,7 +41,7 @@ NORETURN extern void __assert_rtn(const
 __attribute__((weak))
 __attribute__((visibility("hidden")))
 #endif
-void compilerrt_abort_impl(const char *file, int line, const char *function) {
+void __compilerrt_abort_impl(const char *file, int line, const char *function) {
   __assert_rtn(function, file, line, "libcompiler_rt abort");
 }
 
@@ -51,7 +51,7 @@ void compilerrt_abort_impl(const char *f
 __attribute__((weak))
 __attribute__((visibility("hidden")))
 #endif
-void compilerrt_abort_impl(const char *file, int line, const char *function) {
+void __compilerrt_abort_impl(const char *file, int line, const char *function) {
   __builtin_trap();
 }
 
@@ -64,7 +64,7 @@ void compilerrt_abort_impl(const char *f
 __attribute__((weak))
 __attribute__((visibility("hidden")))
 #endif
-void compilerrt_abort_impl(const char *file, int line, const char *function) {
+void __compilerrt_abort_impl(const char *file, int line, const char *function) {
   abort();
 }
 

Modified: compiler-rt/trunk/lib/builtins/int_util.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/int_util.h?rev=341736&r1=341735&r2=341736&view=diff
==============================================================================
--- compiler-rt/trunk/lib/builtins/int_util.h (original)
+++ compiler-rt/trunk/lib/builtins/int_util.h Fri Sep  7 17:17:37 2018
@@ -20,10 +20,10 @@
 #define INT_UTIL_H
 
 /** \brief Trigger a program abort (or panic for kernel code). */
-#define compilerrt_abort() compilerrt_abort_impl(__FILE__, __LINE__, __func__)
+#define compilerrt_abort() __compilerrt_abort_impl(__FILE__, __LINE__, __func__)
 
-NORETURN void compilerrt_abort_impl(const char *file, int line,
-                                    const char *function);
+NORETURN void __compilerrt_abort_impl(const char *file, int line,
+                                      const char *function);
 
 #define COMPILE_TIME_ASSERT(expr) COMPILE_TIME_ASSERT1(expr, __COUNTER__)
 #define COMPILE_TIME_ASSERT1(expr, cnt) COMPILE_TIME_ASSERT2(expr, cnt)