Merge pull request managarm#938 from Dennisbonke/assert

Dennisbonke · Oct 28, 2023 · e54b2e8 · e54b2e8
2 parents 332306a + bfb21b1
commit e54b2e8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/options/ansi/generic/assert-stubs.cpp b/options/ansi/generic/assert-stubs.cpp
@@ -5,7 +5,7 @@
 
 #include <bits/ensure.h>
 
-void __assert_fail(const char *assertion, const char *file, unsigned int line,
+[[noreturn]] void __assert_fail(const char *assertion, const char *file, unsigned int line,
 		const char *function) {
 	fprintf(stderr, "In function %s, file %s:%d: Assertion '%s' failed!\n",
 			function, file, line, assertion);

diff --git a/options/ansi/include/assert.h b/options/ansi/include/assert.h
@@ -9,7 +9,7 @@ extern "C" {
 #ifndef __MLIBC_ABI_ONLY
 
 // NOTE: This is not ISO C. Declared in LSB
-void __assert_fail(const char *assertion, const char *file, unsigned int line,
+__attribute__ ((__noreturn__)) void __assert_fail(const char *assertion, const char *file, unsigned int line,
 		const char *function);
 
 #endif /* !__MLIBC_ABI_ONLY */

diff --git a/options/glibc/generic/glibc-assert.cpp b/options/glibc/generic/glibc-assert.cpp
@@ -5,7 +5,7 @@
 
 #include <bits/ensure.h>
 
-void __assert_fail_perror(int errno, const char *file, unsigned int line,
+[[noreturn]] void __assert_fail_perror(int errno, const char *file, unsigned int line,
 		const char *function) {
 	char *errormsg = strerror(errno);
 	fprintf(stderr, "In function %s, file %s:%d: Errno '%s' failed!\n",

diff --git a/options/glibc/include/bits/glibc/glibc_assert.h b/options/glibc/include/bits/glibc/glibc_assert.h
@@ -7,7 +7,7 @@ extern "C" {
 
 #ifndef __MLIBC_ABI_ONLY
 
-void __assert_fail_perror(int errno, const char *file, unsigned int line,
+__attribute__ ((__noreturn__)) void __assert_fail_perror(int errno, const char *file, unsigned int line,
 		const char *function);
 
 #endif /* !__MLIBC_ABI_ONLY */