diff --git a/include/toolchain/gcc.h b/include/toolchain/gcc.h
index 2d93a4fdce2..cf7c95306d7 100644
--- a/include/toolchain/gcc.h
+++ b/include/toolchain/gcc.h
@@ -29,11 +29,6 @@
 
 #define CODE_UNREACHABLE __builtin_unreachable()
 #define FUNC_NORETURN    __attribute__((__noreturn__))
-#if defined(__clang__)
-#define FUNC_NO_FP
-#else
-#define FUNC_NO_FP	 __attribute__((optimize("-fomit-frame-pointer")))
-#endif
 
 /* The GNU assembler for Cortex-M3 uses # for immediate values, not
  * comments, so the @nobits# trick does not work.
diff --git a/kernel/nanokernel/atomic_c.c b/kernel/nanokernel/atomic_c.c
index 1a1076dceda..b8f2a19bfe8 100644
--- a/kernel/nanokernel/atomic_c.c
+++ b/kernel/nanokernel/atomic_c.c
@@ -52,7 +52,7 @@
  * @param new_value value to compare against
  * @return Returns 1 if <new_value> is written, 0 otherwise.
  */
-FUNC_NO_FP int atomic_cas(atomic_t *target, atomic_val_t old_value,
+int atomic_cas(atomic_t *target, atomic_val_t old_value,
 			  atomic_val_t new_value)
 {
 	unsigned int key;
@@ -83,7 +83,7 @@ FUNC_NO_FP int atomic_cas(atomic_t *target, atomic_val_t old_value,
  *
  * @return The previous value from <target>
  */
-FUNC_NO_FP atomic_val_t atomic_add(atomic_t *target, atomic_val_t value)
+atomic_val_t atomic_add(atomic_t *target, atomic_val_t value)
 {
 	unsigned int key;
 	atomic_val_t ret;
@@ -111,7 +111,7 @@ FUNC_NO_FP atomic_val_t atomic_add(atomic_t *target, atomic_val_t value)
  *
  * @return The previous value from <target>
  */
-FUNC_NO_FP atomic_val_t atomic_sub(atomic_t *target, atomic_val_t value)
+atomic_val_t atomic_sub(atomic_t *target, atomic_val_t value)
 {
 	unsigned int key;
 	atomic_val_t ret;
@@ -137,7 +137,7 @@ FUNC_NO_FP atomic_val_t atomic_sub(atomic_t *target, atomic_val_t value)
  *
  * @return The value from <target> before the increment
  */
-FUNC_NO_FP atomic_val_t atomic_inc(atomic_t *target)
+atomic_val_t atomic_inc(atomic_t *target)
 {
 	unsigned int key;
 	atomic_val_t ret;
@@ -163,7 +163,7 @@ FUNC_NO_FP atomic_val_t atomic_inc(atomic_t *target)
  *
  * @return The value from <target> prior to the decrement
  */
-FUNC_NO_FP atomic_val_t atomic_dec(atomic_t *target)
+atomic_val_t atomic_dec(atomic_t *target)
 {
 	unsigned int key;
 	atomic_val_t ret;
@@ -190,7 +190,7 @@ FUNC_NO_FP atomic_val_t atomic_dec(atomic_t *target)
  *
  * @return The value read from <target>
  */
-FUNC_NO_FP atomic_val_t atomic_get(const atomic_t *target)
+atomic_val_t atomic_get(const atomic_t *target)
 {
 	return *target;
 }
@@ -207,7 +207,7 @@ FUNC_NO_FP atomic_val_t atomic_get(const atomic_t *target)
  *
  * @return The previous value from <target>
  */
-FUNC_NO_FP atomic_val_t atomic_set(atomic_t *target, atomic_val_t value)
+atomic_val_t atomic_set(atomic_t *target, atomic_val_t value)
 {
 	unsigned int key;
 	atomic_val_t ret;
@@ -234,7 +234,7 @@ FUNC_NO_FP atomic_val_t atomic_set(atomic_t *target, atomic_val_t value)
  *
  * @return The previous value from <target>
  */
-FUNC_NO_FP atomic_val_t atomic_clear(atomic_t *target)
+atomic_val_t atomic_clear(atomic_t *target)
 {
 	unsigned int key;
 	atomic_val_t ret;
@@ -262,7 +262,7 @@ FUNC_NO_FP atomic_val_t atomic_clear(atomic_t *target)
  *
  * @return The previous value from <target>
  */
-FUNC_NO_FP atomic_val_t atomic_or(atomic_t *target, atomic_val_t value)
+atomic_val_t atomic_or(atomic_t *target, atomic_val_t value)
 {
 	unsigned int key;
 	atomic_val_t ret;
@@ -290,7 +290,7 @@ FUNC_NO_FP atomic_val_t atomic_or(atomic_t *target, atomic_val_t value)
  *
  * @return The previous value from <target>
  */
-FUNC_NO_FP atomic_val_t atomic_xor(atomic_t *target, atomic_val_t value)
+atomic_val_t atomic_xor(atomic_t *target, atomic_val_t value)
 {
 	unsigned int key;
 	atomic_val_t ret;
@@ -318,7 +318,7 @@ FUNC_NO_FP atomic_val_t atomic_xor(atomic_t *target, atomic_val_t value)
  *
  * @return The previous value from <target>
  */
-FUNC_NO_FP atomic_val_t atomic_and(atomic_t *target, atomic_val_t value)
+atomic_val_t atomic_and(atomic_t *target, atomic_val_t value)
 {
 	unsigned int key;
 	atomic_val_t ret;
@@ -346,7 +346,7 @@ FUNC_NO_FP atomic_val_t atomic_and(atomic_t *target, atomic_val_t value)
  *
  * @return The previous value from <target>
  */
-FUNC_NO_FP atomic_val_t atomic_nand(atomic_t *target, atomic_val_t value)
+atomic_val_t atomic_nand(atomic_t *target, atomic_val_t value)
 {
 	unsigned int key;
 	atomic_val_t ret;
diff --git a/kernel/nanokernel/errno.c b/kernel/nanokernel/errno.c
index 47a2dba770f..46a2cb33a90 100644
--- a/kernel/nanokernel/errno.c
+++ b/kernel/nanokernel/errno.c
@@ -24,7 +24,7 @@
 
 #include <nano_private.h>
 
-FUNC_NO_FP int *_get_errno(void)
+int *_get_errno(void)
 {
 	return &_nanokernel.current->errno_var;
 }