Merge branch 'lukas/erts/rename_xmqd_to_hmqd/OTP-13366'

* lukas/erts/rename_xmqd_to_hmqd/OTP-13366:
  erts: Rename erl flag +xmqd to +hmqd in erlexec
  Fix proc_lib message_queue_data spec
  erts: Fix total_heap_size calculation for on_heap
  erts: Rename erl flag +xmqd to +hmqd

1 files changed, 2 insertions, 21 deletions

diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 82a0303f86..5a5021b003 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -150,6 +150,7 @@ static char *plush_val_switches[] = {
     "ms",
     "mbs",
     "pds",
+    "mqd",
     "",
     NULL
 };
@@ -160,12 +161,6 @@ static char *plusr_val_switches[] = {
     NULL
 };
 
-/* +x arguments with values */
-static char *plusx_val_switches[] = {
-    "mqd",
-    NULL
-};
-
 /* +z arguments with values */
 static char *plusz_val_switches[] = {
     "dbbl",
@@ -986,20 +981,6 @@ int main(int argc, char **argv)
 		      add_Eargs(argv[i+1]);
 		      i++;
 		      break;
-		  case 'x':
-		      if (!is_one_of_strings(&argv[i][2], plusx_val_switches)) {
-			  goto the_default;
-		      } else {
-			  if (i+1 >= argc
-			      || argv[i+1][0] == '-'
-			      || argv[i+1][0] == '+')
-			      usage(argv[i]);
-			  argv[i][0] = '-';
-			  add_Eargs(argv[i]);
-			  add_Eargs(argv[i+1]);
-			  i++;
-		      }
-		      break;
 		  case 'z':
 		      if (!is_one_of_strings(&argv[i][2], plusz_val_switches)) {
 			  goto the_default;
@@ -1200,7 +1181,7 @@ usage_aux(void)
 	  "[+S NO_SCHEDULERS:NO_SCHEDULERS_ONLINE] "
 	  "[+SP PERCENTAGE_SCHEDULERS:PERCENTAGE_SCHEDULERS_ONLINE] "
 	  "[+T LEVEL] [+V] [+v] "
-	  "[+W<i|w|e>]  [+x DEFAULT_PROC_FLAGS] [+z MISC_OPTION] [args ...]\n");
+	  "[+W<i|w|e>] [+z MISC_OPTION] [args ...]\n");
   exit(1);
 }