diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/utilmisc.C | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/utilmisc.C b/src/lib/utilmisc.C index 36f568d11..a3771a303 100644 --- a/src/lib/utilmisc.C +++ b/src/lib/utilmisc.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2018 */ +/* Contributors Listed Below - COPYRIGHT 2014,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,14 +29,19 @@ namespace Util { bool isSimics() __attribute__((alias("__isSimicsRunning"))); -extern "C" void __isSimicsRunning() NEVER_INLINE; +extern "C" bool __isSimicsRunning() NEVER_INLINE; -void __isSimicsRunning() +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wreturn-type" + +bool __isSimicsRunning() { asm volatile("li 3, 0"); MAGIC_INSTRUCTION(MAGIC_SIMICS_CHECK); } +#pragma GCC diagnostic pop + bool isSimicsRunning() { static bool simics = isSimics(); |
