Module Name: src
Committed By: joerg
Date: Sun Mar 2 13:27:38 UTC 2014
Modified Files:
src/sys/arch/hpcarm/hpcarm: hpc_machdep.c kloader_machdep.c
Log Message:
Mark cpu_reset as dead and add an explicit __builtin_unreachable for a
terminal function call for clang's noreturn diagnostic.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hpcarm/hpcarm/kloader_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpcarm/hpcarm/hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.102 src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.103
--- src/sys/arch/hpcarm/hpcarm/hpc_machdep.c:1.102 Sun Aug 18 22:26:51 2013
+++ src/sys/arch/hpcarm/hpcarm/hpc_machdep.c Sun Mar 2 13:27:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hpc_machdep.c,v 1.102 2013/08/18 22:26:51 matt Exp $ */
+/* $NetBSD: hpc_machdep.c,v 1.103 2014/03/02 13:27:38 joerg Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.102 2013/08/18 22:26:51 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.103 2014/03/02 13:27:38 joerg Exp $");
#include "opt_cputypes.h"
#include "opt_kloader.h"
@@ -101,7 +101,7 @@ void dumpsys(void);
void (*__sleep_func)(void *);
void *__sleep_ctx;
-void (*__cpu_reset)(void) = cpu_reset;
+void (*__cpu_reset)(void) __dead = cpu_reset;
u_int initarm(int, char **, struct bootinfo *);
#if defined(CPU_SA1100) || defined(CPU_SA1110)
Index: src/sys/arch/hpcarm/hpcarm/kloader_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/kloader_machdep.c:1.1 src/sys/arch/hpcarm/hpcarm/kloader_machdep.c:1.2
--- src/sys/arch/hpcarm/hpcarm/kloader_machdep.c:1.1 Sat Mar 31 14:02:54 2012
+++ src/sys/arch/hpcarm/hpcarm/kloader_machdep.c Sun Mar 2 13:27:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader_machdep.c,v 1.1 2012/03/31 14:02:54 nonaka Exp $ */
+/* $NetBSD: kloader_machdep.c,v 1.2 2014/03/02 13:27:38 joerg Exp $ */
/*-
* Copyright (C) 2012 NONAKA Kimihiro <non...@netbsd.org>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kloader_machdep.c,v 1.1 2012/03/31 14:02:54 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kloader_machdep.c,v 1.2 2014/03/02 13:27:38 joerg Exp $");
#include "debug_kloader.h"
#include "opt_cputypes.h"
@@ -67,7 +67,7 @@ kloader_reboot_setup(const char *filenam
void
kloader_hpcarm_reset(void)
{
- extern void (*__cpu_reset)(void);
+ extern void (*__cpu_reset)(void) __dead;
__cpu_reset();
/*NOTREACHED*/
@@ -83,6 +83,7 @@ kloader_hpcarm_jump(kloader_bootfunc_t f
/* jump to 2nd boot-loader */
(*func)(kbi, tag);
+ __builtin_unreachable();
}
/*
