1 files changed, 11 insertions, 12 deletions
diff --git a/erts/emulator/hipe/hipe_x86_glue.h b/erts/emulator/hipe/hipe_x86_glue.h
index 0e9fcd61f1..de2b061706 100644
--- a/erts/emulator/hipe/hipe_x86_glue.h
+++ b/erts/emulator/hipe/hipe_x86_glue.h
@@ -58,18 +58,17 @@ static __inline__ unsigned int max(unsigned int x, unsigned int y)
 
 static __inline__ void hipe_arch_glue_init(void)
 {
-    static struct hipe_sdesc_with_exnra nbif_return_sdesc = {
-	.exnra = (unsigned long)nbif_fail,
-	.sdesc = {
-	    .bucket = { .hvalue = (unsigned long)nbif_return },
-            .fsize = 0,
-            .has_exnra = 1,
-            .arity = 0,
-	#ifdef DEBUG
-	    .dbg_F = am_return,
-	#endif
-	},
-    };
+    static struct hipe_sdesc_with_exnra nbif_return_sdesc;
+
+    nbif_return_sdesc.exnra = (unsigned long)nbif_fail;
+    nbif_return_sdesc.sdesc.bucket.hvalue = (unsigned long)nbif_return;
+    nbif_return_sdesc.sdesc.fsize = 0;
+    nbif_return_sdesc.sdesc.has_exnra = 1;
+    nbif_return_sdesc.sdesc.stk_nargs = 0;
+    nbif_return_sdesc.sdesc.m_aix = atom_val(am_Empty);
+    nbif_return_sdesc.sdesc.f_aix = atom_val(am_return);
+    nbif_return_sdesc.sdesc.a     = 0;
+
     hipe_init_sdesc_table(&nbif_return_sdesc.sdesc);
 }