diff options
| author | Lukas Larsson <[email protected]> | 2017-09-11 15:15:57 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-09-11 15:15:57 +0200 |
| commit | 3b916092c488ef9d1fe93ab9c0afda88d589d97e (patch) | |
| tree | 07ef98d2993f4c7da9df355371628528248584f5 /erts/etc | |
| parent | c15bb1698267ae64aac08b3b48040c44174700e5 (diff) | |
| parent | 69721d73cb00e31e6b27ccdd363991cb1965b869 (diff) | |
| download | otp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.tar.gz otp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.tar.bz2 otp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.zip | |
Merge branch 'lukas/erts/non-smp-removal-cleanup/OTP-14518'
* lukas/erts/non-smp-removal-cleanup/OTP-14518:
Make estone work with older releases
erts: Allow read in ttsl driver to return EAGAIN
syntax_tools: Fix makefile dep
erts: non-smp removal cleanup in erlexec
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/erlexec.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index 55a55b658c..6b194e25da 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -237,7 +237,7 @@ static int verbose = 0; /* If non-zero, print some extra information. */ static int start_detached = 0; /* If non-zero, the emulator should be * started detached (in the background). */ -static int start_smp_emu = 0; /* Start the smp emulator. */ +static int start_smp_emu = 1; /* Start the smp emulator. */ static const char* emu_type = 0; /* Type of emulator (lcnt, valgrind, etc) */ #ifdef __WIN32__ @@ -460,8 +460,6 @@ int main(int argc, char **argv) * Construct the path of the executable. */ cpuinfo = erts_cpu_info_create(); - /* '-smp auto' is default */ - start_smp_emu = 1; #if defined(__WIN32__) && defined(WIN32_ALWAYS_DEBUG) emu_type = "debug"; @@ -1140,10 +1138,6 @@ usage_aux(void) #ifdef __WIN32__ "[-start_erl [datafile]] " #endif - "[-smp [auto" - "|enable" - "]" - "] " "[-make] [-man [manopts] MANPAGE] [-x] [-emu_args] [-start_epmd BOOLEAN] " "[-args_file FILENAME] [+A THREADS] [+a SIZE] [+B[c|d|i]] [+c [BOOLEAN]] " "[+C MODE] [+h HEAP_SIZE_OPTION] [+K BOOLEAN] " |