aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-09-24 10:34:31 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-09-24 10:34:31 -0700
commit8e2d812b49f7de9487e1c816229106af0cf39d0d (patch)
tree43543261bb5485b1c109e0e9f93dcb2f7bcd227d
parent4db5a7e8f78708a3a73c325804d1ca6238351699 (diff)
parentbaa4d38f13f436bdeba724f0825bbe985637be22 (diff)
Merge pull request #1660 from waywardmonkeys/fix-performance-regression
Fix performance regression
-rw-r--r--system/include/libc/assert.h2
-rw-r--r--system/lib/libc/musl/readme.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/include/libc/assert.h b/system/include/libc/assert.h
index ab745db1..c64d3e52 100644
--- a/system/include/libc/assert.h
+++ b/system/include/libc/assert.h
@@ -12,7 +12,7 @@
extern "C" {
#endif
-void __assert_fail (const char *, const char *, int, const char *);
+_Noreturn void __assert_fail (const char *, const char *, int, const char *);
#ifdef __cplusplus
}
diff --git a/system/lib/libc/musl/readme.txt b/system/lib/libc/musl/readme.txt
index 16c58423..9ca04036 100644
--- a/system/lib/libc/musl/readme.txt
+++ b/system/lib/libc/musl/readme.txt
@@ -6,3 +6,4 @@ Differences from upstream musl include:
* various 64 bit types are 32 bit instead including off_t,
ino_t, dev_t, blkcnt_t, fsblkcnt_t, fsfilcnt_t, rlim_t.
* We don't define _POSIX_SHARED_MEMORY_OBJECTS.
+* We flag __assert_fail as _Noreturn.