File 2412-Remove-obsolete-MYm-flag.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2412-Remove-obsolete-MYm-flag.patch of Package erlang

From 3b050c5a6c94032023f327e89ebd007d76a3f8c2 Mon Sep 17 00:00:00 2001
From: Richard Carlsson <carlsson.richard@gmail.com>
Date: Fri, 15 May 2020 10:44:38 +0200
Subject: [PATCH 2/2] Remove obsolete +MYm flag

---
 erts/doc/src/erts_alloc.xml                   |  7 -------
 erts/etc/common/erlexec.c                     | 20 +------------------
 .../old_format.dump                           |  1 -
 lib/runtime_tools/src/system_information.erl  |  1 -
 .../information_test_report.dat               |  1 -
 5 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index 986bf213a4..ccadecd3c6 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -423,13 +423,6 @@
 <c>sys_alloc</c> cannot be disabled.
 </note>
 </item>
- <tag><marker id="MYm"/><c>+MYm libc</c></tag>
- <item>
- <c>malloc</c> library to use. Only
- <c>libc</c> is available. <c>libc</c> enables the standard
- <c>libc</c> <c>malloc</c> implementation. By default <c>libc</c>
- is used.
- </item>
 <tag><marker id="MYtt"/><c><![CDATA[+MYtt <size>]]></c></tag>
 <item>
 Trim threshold size (in kilobytes). This is the maximum amount
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 9a2488c93c..dc2ea6ef09 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -422,7 +422,6 @@ int main(int argc, char **argv)
 int i;
 char* s;
 char *epmd_prog = NULL;
- char *malloc_lib;
 int process_args = 1;
 int print_args_exit = 0;
 int print_qouted_cmd_exit = 0;
@@ -489,21 +488,8 @@ int main(int argc, char **argv)
 #endif
 
 /* We need to do this before the ordinary processing. */
- malloc_lib = get_env("ERL_MALLOC_LIB");
 while (i < argc) {
-	if (argv[i][0] == '+') {
-	 if (argv[i][1] == 'M' && argv[i][2] == 'Y' && argv[i][3] == 'm') {
-		if (argv[i][4] == '\0') {
-		 if (++i < argc)
-			malloc_lib = argv[i];
-		 else
-			usage("+MYm");
-		}
-		else
-		 malloc_lib = &argv[i][4];
-	 }
-	}
-	else if (argv[i][0] == '-') {
+	if (argv[i][0] == '-') {
 	 if (strcmp(argv[i], "-smp") == 0) {
 		if (i + 1 >= argc)
 		 goto smp;
@@ -541,10 +527,6 @@ int main(int argc, char **argv)
 	i++;
 }
 
- if (malloc_lib) {
-	if (strcmp(malloc_lib, "libc") != 0)
-	 usage("+MYm");
- }
 emu = add_extra_suffixes(emu);
 emu_name = strsave(emu);
 erts_snprintf(tmpStr, sizeof(tmpStr), "%s" DIRSEP "%s" BINARY_EXT, bindir, emu);
diff --git a/lib/observer/test/crashdump_viewer_SUITE_data/old_format.dump b/lib/observer/test/crashdump_viewer_SUITE_data/old_format.dump
index 0b30fdf2f1..47f3639631 100644
--- a/lib/observer/test/crashdump_viewer_SUITE_data/old_format.dump
+++ b/lib/observer/test/crashdump_viewer_SUITE_data/old_format.dump
@@ -793,7 +793,6 @@ dsend
 dsend_nosuspend
 dunlink
 duplicate_bag
-elib_malloc
 emulator
 enable_trace
 env
diff --git a/lib/runtime_tools/src/system_information.erl b/lib/runtime_tools/src/system_information.erl
index 8f7bfa195b..4673a2a9d0 100644
--- a/lib/runtime_tools/src/system_information.erl
+++ b/lib/runtime_tools/src/system_information.erl
@@ -397,7 +397,6 @@ os_getenv_erts_specific() ->
 	 "ERL_EMULATOR_DLL",
 	 "ERL_FULLSWEEP_AFTER",
 	 "ERL_LIBS",
-	 "ERL_MALLOC_LIB",
 	 "ERL_MAX_PORTS",
 	 "ERL_MAX_ETS_TABLES",
 	 "ERL_NO_KERNEL_POLL",
diff --git a/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
index a9399a5d53..94120c0dc7 100644
--- a/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
+++ b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
@@ -9739,7 +9739,6 @@
 {"ERL_EMULATOR_DLL",false},
 {"ERL_FULLSWEEP_AFTER",false},
 {"ERL_LIBS",false},
- {"ERL_MALLOC_LIB",false},
 {"ERL_MAX_PORTS",false},
 {"ERL_MAX_ETS_TABLES",false},
 {"ERL_NO_VFORK",false},
-- 
2.26.2

Places

File 2412-Remove-obsolete-MYm-flag.patch of Package erlang

Places