diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 4aeae9c9209..fd9a5dd70ff 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-02  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* sim-options.c (standard_option_handler): Add default cases to
+	switches.
+
 2021-05-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* callback.c (os_error): Change __attribute__((noreturn)) to
diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c
index 1522cac9379..1efb21fc62b 100644
--- a/sim/common/sim-options.c
+++ b/sim/common/sim-options.c
@@ -236,6 +236,7 @@ standard_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
 	    case USER_ENVIRONMENT: type = "user"; break;
 	    case VIRTUAL_ENVIRONMENT: type = "virtual"; break;
 	    case OPERATING_ENVIRONMENT: type = "operating"; break;
+	    default: abort ();
 	    }
 	  sim_io_eprintf (sd, "Simulator compiled for the %s environment only.\n",
 			  type);
@@ -284,6 +285,7 @@ standard_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
 	case FORCED_ALIGNMENT:
 	  sim_io_eprintf (sd, "Simulator compiled for forced alignment only.\n");
 	  break;
+	default: abort ();
 	}
       return SIM_RC_FAIL;