diff options
| author | Lukas Larsson <[email protected]> | 2019-08-05 14:31:23 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-08-05 14:31:23 +0200 |
| commit | bd252b3b91a96c1a81d6a18d79cdf6756c02f634 (patch) | |
| tree | 1570d33f041e9b27a50be8c122e36590927c1835 /erts | |
| parent | 312d6cd6762e586142e8d576f19733b8038fc0e4 (diff) | |
| parent | d07ee17021977d38ce41267732baf4ab646fdec7 (diff) | |
| download | otp-bd252b3b91a96c1a81d6a18d79cdf6756c02f634.tar.gz otp-bd252b3b91a96c1a81d6a18d79cdf6756c02f634.tar.bz2 otp-bd252b3b91a96c1a81d6a18d79cdf6756c02f634.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/lib_src/pthread/ethread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/lib_src/pthread/ethread.c b/erts/lib_src/pthread/ethread.c index b4b12fcd86..b567ed81b0 100644 --- a/erts/lib_src/pthread/ethread.c +++ b/erts/lib_src/pthread/ethread.c @@ -208,9 +208,9 @@ ethr_x86_cpuid__(int *eax, int *ebx, int *ecx, int *edx) "popl %%eax\n\t" "movl $0x0, %0\n\t" "xorl %%ecx, %%eax\n\t" - "jz no_cpuid\n\t" + "jz 1f\n\t" "movl $0x1, %0\n\t" - "no_cpuid:\n\t" + "1:\n\t" : "=r"(have_cpuid) : : "%eax", "%ecx", "cc"); |