1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/utilmisc.C b/src/lib/utilmisc.C
index a3771a303..8d53d4c52 100644
--- a/src/lib/utilmisc.C
+++ b/src/lib/utilmisc.C
@@ -31,17 +31,13 @@ namespace Util
 bool isSimics() __attribute__((alias("__isSimicsRunning")));
 extern "C" bool __isSimicsRunning() NEVER_INLINE;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wreturn-type"
-
 bool __isSimicsRunning()
 {
-    asm volatile("li 3, 0");
+    long register r3 asm("r3") = 0;
     MAGIC_INSTRUCTION(MAGIC_SIMICS_CHECK);
+    return r3;
 }
 
-#pragma GCC diagnostic pop
-
 bool isSimicsRunning()
 {
     static bool simics = isSimics();