Merge pull request #892 from OlegHahm/crash_noreturn

cpu: satisfy compiler in crash.c for ARM and MSP430
RIOT-OS · Apr 9, 2014 · f302491 · f302491
2 parents ab08fbb + aeb5415
commit f302491
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/cpu/arm_common/crash.c b/cpu/arm_common/crash.c
@@ -60,4 +60,14 @@ NORETURN void core_panic(int crash_code, const char *message)
     /* DEVELHELP not set => reboot system */
     (void) reboot(RB_AUTOBOOT);
 #endif
+
+    /* tell the compiler that we won't return from this function
+       (even if we actually won't even get here...) */
+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ >= 5)
+    __builtin_unreachable();
+#else
+    while (1) {
+        /* do nothing, but do it often */
+    }
+#endif
 }
diff --git a/cpu/lpc1768/crash.c b/cpu/lpc1768/crash.c
@@ -61,4 +61,14 @@ NORETURN void core_panic(int crash_code, const char *message)
     /* DEVELHELP not set => reboot system */
     (void) reboot(RB_AUTOBOOT);
 #endif
+
+    /* tell the compiler that we won't return from this function
+       (even if we actually won't even get here...) */
+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ >= 5)
+    __builtin_unreachable();
+#else
+    while (1) {
+        /* do nothing, but do it often */
+    }
+#endif
 }
diff --git a/cpu/msp430-common/crash.c b/cpu/msp430-common/crash.c
@@ -60,4 +60,14 @@ NORETURN void core_panic(int crash_code, const char *message)
     /* DEVELHELP not set => reboot system */
     (void) reboot(RB_AUTOBOOT);
 #endif
+
+    /* tell the compiler that we won't return from this function
+       (even if we actually won't even get here...) */
+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ >= 5)
+    __builtin_unreachable();
+#else
+    while (1) {
+        /* do nothing, but do it often */
+    }
+#endif
 }
diff --git a/cpu/native/crash.c b/cpu/native/crash.c
@@ -58,9 +58,13 @@ NORETURN void core_panic(int crash_code, const char *message)
     (void) reboot(RB_AUTOBOOT);
 #endif
 
-    /* proove the compiler that we won't return from this function
+    /* tell the compiler that we won't return from this function
        (even if we actually won't even get here...) */
+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ >= 5)
+    __builtin_unreachable();
+#else
     while (1) {
-        /* nothing in particular */;
+        /* do nothing, but do it often */
     }
+#endif
 }