diff options
| author | dim <dim@FreeBSD.org> | 2016-02-06 13:39:20 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-02-06 13:39:20 +0000 |
| commit | 9c27ec33f2c82fe6c60c9c375a88f96a1e10a6a2 (patch) | |
| tree | 4efb8604227ede935238eb1c67b626da1265d459 /contrib/compiler-rt/lib/builtins/int_util.c | |
| parent | aef1771e36f9842a113b9905d0d5926fe9d694aa (diff) | |
| parent | 75958af7df18c2ae942829da1a8cf3b5bbcaeff6 (diff) | |
| download | FreeBSD-src-9c27ec33f2c82fe6c60c9c375a88f96a1e10a6a2.zip FreeBSD-src-9c27ec33f2c82fe6c60c9c375a88f96a1e10a6a2.tar.gz | |
Merge compiler-rt release_38 branch r258968.
Note that there is still a problem on amd64, causing SIGBUS in the early
startup of Address Sanitizer. This is being investigated.
Diffstat (limited to 'contrib/compiler-rt/lib/builtins/int_util.c')
| -rw-r--r-- | contrib/compiler-rt/lib/builtins/int_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/compiler-rt/lib/builtins/int_util.c b/contrib/compiler-rt/lib/builtins/int_util.c index 323e461..420d1e2 100644 --- a/contrib/compiler-rt/lib/builtins/int_util.c +++ b/contrib/compiler-rt/lib/builtins/int_util.c @@ -8,8 +8,8 @@ * ===----------------------------------------------------------------------=== */ -#include "int_util.h" #include "int_lib.h" +#include "int_util.h" /* NOTE: The definitions in this file are declared weak because we clients to be * able to arbitrarily package individual functions into separate .a files. If @@ -23,7 +23,7 @@ #ifdef KERNEL_USE -extern void panic(const char *, ...) __attribute__((noreturn)); +NORETURN extern void panic(const char *, ...); #ifndef _WIN32 __attribute__((visibility("hidden"))) #endif @@ -34,8 +34,8 @@ void compilerrt_abort_impl(const char *file, int line, const char *function) { #elif __APPLE__ /* from libSystem.dylib */ -extern void __assert_rtn(const char *func, const char *file, - int line, const char * message) __attribute__((noreturn)); +NORETURN extern void __assert_rtn(const char *func, const char *file, int line, + const char *message); #ifndef _WIN32 __attribute__((weak)) |
