Update

[l4.git] / kernel / fiasco / src / lib / minilibc / include / assert.h

diff --git a/kernel/fiasco/src/lib/minilibc/include/assert.h b/kernel/fiasco/src/lib/minilibc/include/assert.h
index e8e0c8402bdfd5c061cadff2ac380373f1b4c388..67129e9cc995a920ea90391168e26313e4df99b4 100644 (file)
--- a/kernel/fiasco/src/lib/minilibc/include/assert.h
+++ b/kernel/fiasco/src/lib/minilibc/include/assert.h
@@ -2,41 +2,24 @@
 #define _ASSERT_H
 
 #include <cdefs.h>
-#include <fiasco_defs.h>
 
-#if (__GNUC__>=3)
-#  define ASSERT_EXPECT_FALSE(exp)     __builtin_expect((exp), 0)
+#ifdef NDEBUG
+# define assert(expr) do { } while (0)
+# define check(expr)  (void)(expr)
 #else
-#  define ASSERT_EXPECT_FALSE(exp)     (exp)
-#endif
+# include <stdio.h>
 
-#if defined ASSERT_KDB_KE
-#  include "kdb_ke.h"
-#  define assert(expr)                                         \
-   do { if (ASSERT_EXPECT_FALSE(!(expr)))                      \
-         kdb_ke(#expr); } while(0)
-#  define check(expr) assert(expr)
-#else
 __BEGIN_DECLS
-/* This prints an "Assertion failed" message and aborts.  */
-void FIASCO_COLD __assert_fail (const char *__assertion, const char *__file,
-                   unsigned int __line, void *ret)
-     __attribute__ ((__noreturn__));
-
+void
+assert_fail(char const *expr_msg, char const *file, unsigned int line);
 __END_DECLS
 
-
-/* We don't show information about the current function since it needs
- * additional space -- especially with gcc-2.95. The function name
- * can be found by searching the EIP in the kernel image. */
-#  undef assert
-#  ifdef NDEBUG
-#    define assert(expr)  do {} while (0)
-#    define check(expr) (void)(expr)
-#  else
-#    define assert(expr)                                               \
-     do { if (ASSERT_EXPECT_FALSE(!(expr))) __assert_fail (#expr, __FILE__, __LINE__, __builtin_return_address(0)); } while (0)
-#  endif
+# define assert(expression) \
+    do \
+      if (__builtin_expect(!(expression), 0)) \
+        assert_fail(#expression, __FILE__, __LINE__); \
+    while (0)
+# define check(expr) assert(expr)
 #endif
 
 #endif