summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-11-18 13:03:34 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-11-18 13:03:34 +0000
commitba203ef1916dc426afb4a069b00fe7cbed3cd8d9 (patch)
tree817f68d251811fcf8b2deb8aa30e841e2b7d0ed4
parenta5988ffad4a20bca7cc28d71c24cce42c0f7e835 (diff)
- add __hot and __cold annotations
Will spare us quite some likely()/unlikely() occurances. See http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html for details
-rw-r--r--include/libc-symbols.h8
-rw-r--r--libc/sysdeps/linux/common/ssp.c6
2 files changed, 11 insertions, 3 deletions
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index dacc03cf9..64dcf2c07 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -63,6 +63,14 @@
#ifndef unlikely
# define unlikely(x) __builtin_expect((!!(x)),0)
#endif
+#if defined __GNUC__ && !(__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+# ifndef __cold
+# define __cold __attribute__ ((__cold__))
+# endif
+# ifndef __hot
+# define __hot __attribute__ ((__hot__))
+# endif
+#endif
#ifndef __LINUX_COMPILER_H
# define __LINUX_COMPILER_H
#endif
diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c
index 1563700d5..08ef00d6a 100644
--- a/libc/sysdeps/linux/common/ssp.c
+++ b/libc/sysdeps/linux/common/ssp.c
@@ -64,7 +64,7 @@ static void block_signals(void)
sigaction(SSP_SIGTYPE, &sa, NULL);
}
-static void ssp_write(int fd, const char *msg1, const char *msg2, const char *msg3)
+static void ssp_write(int fd, const char *msg1, const char *msg2, const char *msg3) __cold
{
write(fd, msg1, strlen(msg1));
write(fd, msg2, strlen(msg2));
@@ -83,7 +83,7 @@ static attribute_noreturn void terminate(void)
_exit(127);
}
-void __stack_smash_handler(char func[], int damaged __attribute__ ((unused))) attribute_noreturn;
+void __stack_smash_handler(char func[], int damaged __attribute__ ((unused))) attribute_noreturn __cold;
void __stack_smash_handler(char func[], int damaged)
{
static const char message[] = ": stack smashing attack in function ";
@@ -97,7 +97,7 @@ void __stack_smash_handler(char func[], int damaged)
terminate();
}
-void __stack_chk_fail(void) attribute_noreturn;
+void __stack_chk_fail(void) attribute_noreturn __cold;
void __stack_chk_fail(void)
{
static const char msg1[] = "stack smashing detected: ";