Changeset e464759 for src

Timestamp:

Apr 27, 2017, 1:54:41 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

0c78741

Parents:

075d862

Message:

Abortf is not a proper C linkage function

Location:

src/libcfa

Files:

• interpose.c (modified) (2 diffs)
• libhdr/libtools.h (modified) (1 diff)

src/libcfa/interpose.c

@@ -26 +26 @@
 
 #include "libhdr/libdebug.h"
+#include "libhdr/libtools.h"
 #include "startup.h"
-
-void abortf( const char *fmt, ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__));
 
 void interpose_startup(void)  __attribute__(( constructor( STARTUP_PRIORITY_CORE ) ));
@@ -115 +114 @@
 static char abort_text[ abort_text_size ];
 
-void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
-        void * kernel_data = kernel_abort();
-        
-        int len;
-        
-        if( fmt ) {
-                va_list args;
-                va_start( args, fmt );
+extern "C" {
+        void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__)) {
+                void * kernel_data = kernel_abort();
 
-                len = vsnprintf( abort_text, abort_text_size, fmt, args );
+                int len;
 
-                va_end( args );
+                if( fmt ) {
+                        va_list args;
+                        va_start( args, fmt );
 
+                        len = vsnprintf( abort_text, abort_text_size, fmt, args );
+
+                        va_end( args );
+
+                        __lib_debug_write( STDERR_FILENO, abort_text, len );
+                        __lib_debug_write( STDERR_FILENO, "\n", 1 );
+                }
+
+                len = snprintf( abort_text, abort_text_size, "Cforall Runtime error (UNIX pid:%ld)\n", (long int)getpid() ); // use UNIX pid (versus getPid)
                 __lib_debug_write( STDERR_FILENO, abort_text, len );
-                __lib_debug_write( STDERR_FILENO, "\n", 1 );
-        }
-
-        len = snprintf( abort_text, abort_text_size, "Cforall Runtime error (UNIX pid:%ld)\n", (long int)getpid() ); // use UNIX pid (versus getPid)
-        __lib_debug_write( STDERR_FILENO, abort_text, len );
 
 
-        kernel_abort_msg( kernel_data, abort_text, abort_text_size );
+                kernel_abort_msg( kernel_data, abort_text, abort_text_size );
 
-        libc_abort();
+                libc_abort();
+        }
 }

src/libcfa/libhdr/libtools.h

@@ -22 +22 @@
 // } // libAbort
 
-#define abortf(...) abort();
-
+#ifdef __cforall
+extern "C" {
+#endif
+void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__));
+#ifdef __cforall
+}
+#endif
 
 #endif //__LIB_TOOLS_H__