Add quotes to avoid a null test expression.

[deliverable/binutils-gdb.git] / gdb / armnbsd-tdep.c

diff --git a/gdb/armnbsd-tdep.c b/gdb/armnbsd-tdep.c
index 4767888be71289e072a54a1e54a0b45f89a1e14c..9f2a346cb28b2f4678ccba498fbc0ac64094d967 100644 (file)
--- a/gdb/armnbsd-tdep.c
+++ b/gdb/armnbsd-tdep.c
@@ -64,7 +64,7 @@ arm_netbsd_init_abi_common (struct gdbarch_info info,
 
     default:
       internal_error (__FILE__, __LINE__,
-                     "arm_gdbarch_init: bad byte order for float format");
+                     _("arm_gdbarch_init: bad byte order for float format"));
     }
 
   tdep->jb_pc = ARM_NBSD_JB_PC;
@@ -78,10 +78,8 @@ arm_netbsd_aout_init_abi (struct gdbarch_info info,
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
   arm_netbsd_init_abi_common (info, gdbarch);
-
-  set_gdbarch_in_solib_call_trampoline
-    (gdbarch, arm_netbsd_aout_in_solib_call_trampoline);
-  tdep->fp_model = ARM_FLOAT_SOFT_FPA;
+  if (tdep->fp_model == ARM_FLOAT_AUTO)
+    tdep->fp_model = ARM_FLOAT_SOFT_FPA;
 }
 
 static void
@@ -95,7 +93,8 @@ arm_netbsd_elf_init_abi (struct gdbarch_info info,
   set_solib_svr4_fetch_link_map_offsets (gdbarch,
                                 nbsd_ilp32_solib_svr4_fetch_link_map_offsets);
 
-  tdep->fp_model = ARM_FLOAT_SOFT_VFP;
+  if (tdep->fp_model == ARM_FLOAT_AUTO)
+    tdep->fp_model = ARM_FLOAT_SOFT_VFP;
 }
 
 static enum gdb_osabi