Use correct macro to guard floating-point initialization

[riscv-tests.git] / benchmarks / common / crt.S

diff --git a/benchmarks/common/crt.S b/benchmarks/common/crt.S
index 2dda05b440b6fab1549e401b5119243d85dbae8e..a821769c152d8cfe2d91e374e0e46d809d0839e5 100644 (file)
--- a/benchmarks/common/crt.S
+++ b/benchmarks/common/crt.S
@@ -2,7 +2,7 @@
 
 #include "encoding.h"
 
-#ifdef __riscv64
+#if __riscv_xlen == 64
 # define LREG ld
 # define SREG sd
 # define REGBYTES 8
@@ -56,7 +56,7 @@ _start:
 
   # make sure XLEN agrees with compilation choice
   csrr t0, misa
-#ifdef __riscv64
+#if __riscv_xlen == 64
   bltz t0, 1f
 #else
   bgez t0, 1f
@@ -65,7 +65,7 @@ _start:
   j tohost_exit
 1:
 
-#ifdef __riscv_hard_float
+#ifdef __riscv_flen
   # initialize FPU if we have one
   andi t0, t0, 1 << ('f' - 'a')
   beqz t0, 1f
@@ -129,6 +129,7 @@ _start:
 
   j _init
 
+  .align 2
 trap_entry:
   addi sp, sp, -272