Merge "Make host resolver call __connect() rather than connect() so mark isn't cleared."
diff --git a/benchmarks/unistd_benchmark.cpp b/benchmarks/unistd_benchmark.cpp
index e839bf8..12b788a 100644
--- a/benchmarks/unistd_benchmark.cpp
+++ b/benchmarks/unistd_benchmark.cpp
@@ -28,3 +28,14 @@
StopBenchmarkTiming();
}
BENCHMARK(BM_unistd_getpid);
+
+static void BM_unistd_gettid(int iters) {
+ StartBenchmarkTiming();
+
+ for (int i = 0; i < iters; ++i) {
+ gettid();
+ }
+
+ StopBenchmarkTiming();
+}
+BENCHMARK(BM_unistd_gettid);
diff --git a/libc/Android.mk b/libc/Android.mk
index d8c8f63..4783bd3 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -54,7 +54,6 @@
bionic/initgroups.c \
bionic/ioctl.c \
bionic/isatty.c \
- bionic/issetugid.c \
bionic/md5.c \
bionic/memmem.c \
bionic/pathconf.c \
@@ -129,6 +128,7 @@
bionic/getauxval.cpp \
bionic/getcwd.cpp \
bionic/getpgrp.cpp \
+ bionic/gettid.cpp \
bionic/inotify_init.cpp \
bionic/lchown.cpp \
bionic/lfs64_support.cpp \
@@ -256,7 +256,6 @@
upstream-freebsd/lib/libc/string/wcstok.c \
upstream-freebsd/lib/libc/string/wmemchr.c \
upstream-freebsd/lib/libc/string/wmemcpy.c \
- upstream-freebsd/lib/libc/string/wmemmove.c \
upstream-freebsd/lib/libc/string/wmemset.c \
libc_upstream_netbsd_src_files := \
diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT
index 785d191..584c1ae 100644
--- a/libc/SYSCALLS.TXT
+++ b/libc/SYSCALLS.TXT
@@ -38,7 +38,6 @@
uid_t getresuid:getresuid(uid_t* ruid, uid_t* euid, uid_t* suid) arm64,mips,mips64,x86_64
gid_t getresgid:getresgid32(gid_t* rgid, gid_t* egid, gid_t* sgid) arm,x86
gid_t getresgid:getresgid(gid_t* rgid, gid_t* egid, gid_t* sgid) arm64,mips,mips64,x86_64
-pid_t gettid() all
ssize_t readahead(int, off64_t, size_t) all
int getgroups:getgroups32(int, gid_t*) arm,x86
int getgroups:getgroups(int, gid_t*) arm64,mips,mips64,x86_64
diff --git a/libc/arch-arm/arm.mk b/libc/arch-arm/arm.mk
index c509b83..7c423ab 100644
--- a/libc/arch-arm/arm.mk
+++ b/libc/arch-arm/arm.mk
@@ -24,6 +24,7 @@
upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \
+ upstream-freebsd/lib/libc/string/wmemmove.c \
upstream-openbsd/lib/libc/string/bcopy.c \
upstream-openbsd/lib/libc/string/stpcpy.c \
upstream-openbsd/lib/libc/string/stpncpy.c \
diff --git a/libc/arch-arm/syscalls/gettid.S b/libc/arch-arm/syscalls/gettid.S
deleted file mode 100644
index 3928be1..0000000
--- a/libc/arch-arm/syscalls/gettid.S
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Generated by gensyscalls.py. Do not edit. */
-
-#include <private/bionic_asm.h>
-
-ENTRY(gettid)
- mov ip, r7
- ldr r7, =__NR_gettid
- swi #0
- mov r7, ip
- cmn r0, #(MAX_ERRNO + 1)
- bxls lr
- neg r0, r0
- b __set_errno
-END(gettid)
diff --git a/libc/arch-arm64/arm64.mk b/libc/arch-arm64/arm64.mk
index 93b0b0b..62974b6 100644
--- a/libc/arch-arm64/arm64.mk
+++ b/libc/arch-arm64/arm64.mk
@@ -14,7 +14,6 @@
upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \
- upstream-openbsd/lib/libc/string/bcopy.c \
upstream-openbsd/lib/libc/string/stpcpy.c \
upstream-openbsd/lib/libc/string/stpncpy.c \
upstream-openbsd/lib/libc/string/strcat.c \
@@ -35,7 +34,6 @@
### CPU specific source files
libc_bionic_src_files_arm64 := \
arch-arm64/bionic/__bionic_clone.S \
- arch-arm64/bionic/bzero_arm64.c \
arch-arm64/bionic/_exit_with_stack_teardown.S \
arch-arm64/bionic/__get_sp.S \
arch-arm64/bionic/__rt_sigreturn.S \
diff --git a/libc/arch-arm64/bionic/bzero_arm64.c b/libc/arch-arm64/bionic/bzero_arm64.c
deleted file mode 100644
index 1ef920c..0000000
--- a/libc/arch-arm64/bionic/bzero_arm64.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <string.h>
-
-void bzero(void* s, size_t n) {
- memset(s, '\0', n);
-}
diff --git a/libc/arch-arm64/generic/bionic/bcopy.S b/libc/arch-arm64/generic/bionic/bcopy.S
new file mode 100644
index 0000000..7079e8b
--- /dev/null
+++ b/libc/arch-arm64/generic/bionic/bcopy.S
@@ -0,0 +1,30 @@
+/* Copyright (c) 2014, Linaro Limited
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the Linaro nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#define BCOPY
+#include "memmove.S"
+#undef BCOPY
diff --git a/libc/arch-arm64/generic/bionic/bzero.S b/libc/arch-arm64/generic/bionic/bzero.S
new file mode 100644
index 0000000..c6175d6
--- /dev/null
+++ b/libc/arch-arm64/generic/bionic/bzero.S
@@ -0,0 +1,30 @@
+/* Copyright (c) 2014, Linaro Limited
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the Linaro nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#define BZERO
+#include "memset.S"
+#undef BZERO
diff --git a/libc/arch-arm64/generic/bionic/memmove.S b/libc/arch-arm64/generic/bionic/memmove.S
index d6ecb86..8b366a3 100644
--- a/libc/arch-arm64/generic/bionic/memmove.S
+++ b/libc/arch-arm64/generic/bionic/memmove.S
@@ -29,11 +29,16 @@
*
* ARMv8-a, AArch64
* Unaligned accesses
+ * wchar_t is 4 bytes
*/
#include <private/bionic_asm.h>
/* Parameters and result. */
+#ifdef BCOPY
+#define origdstin x1
+#define origsrc x0
+#endif
#define dstin x0
#define src x1
#define count x2
@@ -54,7 +59,18 @@
#define D_l x13
#define D_h x14
+#ifdef BCOPY
+ENTRY(bcopy)
+ /* Swap src and dst so that a branch to memcpy doesn't cause issues. */
+ mov tmp1, origsrc
+ mov origsrc, origdstin
+ mov origdstin, tmp1
+#elif defined(WMEMMOVE)
+ENTRY(wmemmove)
+ lsl count, count, #2
+#else
ENTRY(memmove)
+#endif
cmp dstin, src
b.lo .Ldownwards
add tmp1, src, count
@@ -316,4 +332,10 @@
tst count, #0x3f
b.ne .Ltail63down
ret
+#ifdef BCOPY
+END(bcopy)
+#elif defined(WMEMMOVE)
+END(wmemmove)
+#else
END(memmove)
+#endif
diff --git a/libc/arch-arm64/generic/bionic/memset.S b/libc/arch-arm64/generic/bionic/memset.S
index 4750fe3..7c204b4 100644
--- a/libc/arch-arm64/generic/bionic/memset.S
+++ b/libc/arch-arm64/generic/bionic/memset.S
@@ -38,15 +38,19 @@
data blocks more efficiently. In some circumstances this might be
unsafe, for example in an asymmetric multiprocessor environment with
different DC clear lengths (neither the upper nor lower lengths are
- safe to use). The feature can be disabled by defining DONT_USE_DC.
+ safe to use).
If code may be run in a virtualized environment, then define
MAYBE_VIRT. This will cause the code to cache the system register
values rather than re-reading them each call. */
#define dstin x0
-#define val w1
+#ifdef BZERO
+#define count x1
+#else
#define count x2
+#endif
+#define val w1
#define tmp1 x3
#define tmp1w w3
#define tmp2 x4
@@ -60,13 +64,18 @@
#define dst x8
#define tmp3w w9
+#ifdef BZERO
+ENTRY(bzero)
+#else
ENTRY(memset)
+#endif
mov dst, dstin /* Preserve return value. */
- ands A_lw, val, #255
-#ifndef DONT_USE_DC
- b.eq .Lzero_mem
+#ifdef BZERO
+ b .Lzero_mem
#endif
+ ands A_lw, val, #255
+ b.eq .Lzero_mem
orr A_lw, A_lw, A_lw, lsl #8
orr A_lw, A_lw, A_lw, lsl #16
orr A_l, A_l, A_l, lsl #32
@@ -143,7 +152,6 @@
b.ne .Ltail63
ret
-#ifndef DONT_USE_DC
/* For zeroing memory, check to see if we can use the ZVA feature to
* zero entire 'cache' lines. */
.Lzero_mem:
@@ -225,7 +233,11 @@
ands count, count, zva_bits_x
b.ne .Ltail_maybe_long
ret
+#ifdef BZERO
+END(bzero)
+#else
END(memset)
+#endif
#ifdef MAYBE_VIRT
.bss
@@ -233,4 +245,3 @@
.Lcache_clear:
.space 4
#endif
-#endif /* DONT_USE_DC */
diff --git a/libc/arch-arm64/generic/bionic/wmemmove.S b/libc/arch-arm64/generic/bionic/wmemmove.S
new file mode 100644
index 0000000..e4f67f7
--- /dev/null
+++ b/libc/arch-arm64/generic/bionic/wmemmove.S
@@ -0,0 +1,30 @@
+/* Copyright (c) 2014, Linaro Limited
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the Linaro nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#define WMEMMOVE
+#include "memmove.S"
+#undef WMEMMOVE
diff --git a/libc/arch-arm64/generic/generic.mk b/libc/arch-arm64/generic/generic.mk
index 14920a6..976431a 100644
--- a/libc/arch-arm64/generic/generic.mk
+++ b/libc/arch-arm64/generic/generic.mk
@@ -1,4 +1,6 @@
libc_bionic_src_files_arm64 += \
+ arch-arm64/generic/bionic/bcopy.S \
+ arch-arm64/generic/bionic/bzero.S \
arch-arm64/generic/bionic/memcmp.S \
arch-arm64/generic/bionic/memcpy.S \
arch-arm64/generic/bionic/memmove.S \
@@ -7,3 +9,4 @@
arch-arm64/generic/bionic/strlen.S \
arch-arm64/generic/bionic/strncmp.S \
arch-arm64/generic/bionic/strnlen.S \
+ arch-arm64/generic/bionic/wmemmove.S
diff --git a/libc/arch-arm64/syscalls/gettid.S b/libc/arch-arm64/syscalls/gettid.S
deleted file mode 100644
index 44ca913..0000000
--- a/libc/arch-arm64/syscalls/gettid.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Generated by gensyscalls.py. Do not edit. */
-
-#include <private/bionic_asm.h>
-
-ENTRY(gettid)
- stp x29, x30, [sp, #-16]!
- .cfi_def_cfa_offset 16
- .cfi_rel_offset x29, 0
- .cfi_rel_offset x30, 8
- mov x29, sp
-
- mov x8, __NR_gettid
- svc #0
-
- ldp x29, x30, [sp], #16
- .cfi_def_cfa_offset 0
- .cfi_restore x29
- .cfi_restore x30
-
- cmn x0, #(MAX_ERRNO + 1)
- cneg x0, x0, hi
- b.hi __set_errno
-
- ret
-END(gettid)
diff --git a/libc/arch-mips/mips.mk b/libc/arch-mips/mips.mk
index 2c87a9e..0244712 100644
--- a/libc/arch-mips/mips.mk
+++ b/libc/arch-mips/mips.mk
@@ -26,6 +26,7 @@
upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \
+ upstream-freebsd/lib/libc/string/wmemmove.c \
upstream-openbsd/lib/libc/string/bcopy.c \
upstream-openbsd/lib/libc/string/stpcpy.c \
upstream-openbsd/lib/libc/string/stpncpy.c \
diff --git a/libc/arch-mips/syscalls/gettid.S b/libc/arch-mips/syscalls/gettid.S
deleted file mode 100644
index cfdc57b..0000000
--- a/libc/arch-mips/syscalls/gettid.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Generated by gensyscalls.py. Do not edit. */
-
-#include <private/bionic_asm.h>
-
-ENTRY(gettid)
- .set noreorder
- .cpload t9
- li v0, __NR_gettid
- syscall
- bnez a3, 1f
- move a0, v0
- j ra
- nop
-1:
- la t9,__set_errno
- j t9
- nop
- .set reorder
-END(gettid)
diff --git a/libc/arch-mips64/mips64.mk b/libc/arch-mips64/mips64.mk
index 26390a6..5759104 100644
--- a/libc/arch-mips64/mips64.mk
+++ b/libc/arch-mips64/mips64.mk
@@ -16,6 +16,7 @@
upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \
+ upstream-freebsd/lib/libc/string/wmemmove.c \
upstream-openbsd/lib/libc/string/bcopy.c \
upstream-openbsd/lib/libc/string/stpcpy.c \
upstream-openbsd/lib/libc/string/stpncpy.c \
diff --git a/libc/arch-mips64/syscalls/gettid.S b/libc/arch-mips64/syscalls/gettid.S
deleted file mode 100644
index 30c30c8..0000000
--- a/libc/arch-mips64/syscalls/gettid.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Generated by gensyscalls.py. Do not edit. */
-
-#include <private/bionic_asm.h>
-
-ENTRY(gettid)
- .set push
- .set noreorder
- li v0, __NR_gettid
- syscall
- bnez a3, 1f
- move a0, v0
- j ra
- nop
-1:
- move t0, ra
- bal 2f
- nop
-2:
- .cpsetup ra, t1, 2b
- LA t9,__set_errno
- .cpreturn
- j t9
- move ra, t0
- .set pop
-END(gettid)
diff --git a/libc/arch-x86/bionic/__bionic_clone.S b/libc/arch-x86/bionic/__bionic_clone.S
index af6ef19..7c972de 100644
--- a/libc/arch-x86/bionic/__bionic_clone.S
+++ b/libc/arch-x86/bionic/__bionic_clone.S
@@ -38,6 +38,8 @@
jmp .L_bc_return
.L_bc_child:
+ # We don't want anyone to unwind past this point.
+ .cfi_undefined %eip
call __bionic_clone_entry
hlt
diff --git a/libc/arch-x86/syscalls/__accept4.S b/libc/arch-x86/syscalls/__accept4.S
index 573eddb..18a76a1 100644
--- a/libc/arch-x86/syscalls/__accept4.S
+++ b/libc/arch-x86/syscalls/__accept4.S
@@ -4,10 +4,11 @@
ENTRY(__accept4)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $18, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/__brk.S b/libc/arch-x86/syscalls/__brk.S
index 728bf81..2439752 100644
--- a/libc/arch-x86/syscalls/__brk.S
+++ b/libc/arch-x86/syscalls/__brk.S
@@ -4,7 +4,7 @@
ENTRY(__brk)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_brk, %eax
diff --git a/libc/arch-x86/syscalls/__connect.S b/libc/arch-x86/syscalls/__connect.S
index 2f53b33..3149e8c 100644
--- a/libc/arch-x86/syscalls/__connect.S
+++ b/libc/arch-x86/syscalls/__connect.S
@@ -4,10 +4,11 @@
ENTRY(__connect)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $3, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/__epoll_pwait.S b/libc/arch-x86/syscalls/__epoll_pwait.S
index 9bcc142..67545b1 100644
--- a/libc/arch-x86/syscalls/__epoll_pwait.S
+++ b/libc/arch-x86/syscalls/__epoll_pwait.S
@@ -4,18 +4,23 @@
ENTRY(__epoll_pwait)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- pushl %ebp
- .cfi_def_cfa_offset 24
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
- .cfi_rel_offset ebp, 20
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
+ pushl %ebp
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ebp, 0
mov 28(%esp), %ebx
mov 32(%esp), %ecx
mov 36(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__exit.S b/libc/arch-x86/syscalls/__exit.S
index eaddc5e..d768306 100644
--- a/libc/arch-x86/syscalls/__exit.S
+++ b/libc/arch-x86/syscalls/__exit.S
@@ -4,7 +4,7 @@
ENTRY(__exit)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_exit, %eax
diff --git a/libc/arch-x86/syscalls/__fcntl64.S b/libc/arch-x86/syscalls/__fcntl64.S
index faefa65..b2d5664 100644
--- a/libc/arch-x86/syscalls/__fcntl64.S
+++ b/libc/arch-x86/syscalls/__fcntl64.S
@@ -4,12 +4,14 @@
ENTRY(__fcntl64)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__fstatfs64.S b/libc/arch-x86/syscalls/__fstatfs64.S
index dfd04af..d80ecc5 100644
--- a/libc/arch-x86/syscalls/__fstatfs64.S
+++ b/libc/arch-x86/syscalls/__fstatfs64.S
@@ -4,12 +4,14 @@
ENTRY(__fstatfs64)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__getcpu.S b/libc/arch-x86/syscalls/__getcpu.S
index d1da871..23ce3f0 100644
--- a/libc/arch-x86/syscalls/__getcpu.S
+++ b/libc/arch-x86/syscalls/__getcpu.S
@@ -4,12 +4,14 @@
ENTRY(__getcpu)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__getcwd.S b/libc/arch-x86/syscalls/__getcwd.S
index a9834e2..5454d7a 100644
--- a/libc/arch-x86/syscalls/__getcwd.S
+++ b/libc/arch-x86/syscalls/__getcwd.S
@@ -4,10 +4,11 @@
ENTRY(__getcwd)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_getcwd, %eax
diff --git a/libc/arch-x86/syscalls/__getpriority.S b/libc/arch-x86/syscalls/__getpriority.S
index 99d33bb..2d97f0d 100644
--- a/libc/arch-x86/syscalls/__getpriority.S
+++ b/libc/arch-x86/syscalls/__getpriority.S
@@ -4,10 +4,11 @@
ENTRY(__getpriority)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_getpriority, %eax
diff --git a/libc/arch-x86/syscalls/__ioctl.S b/libc/arch-x86/syscalls/__ioctl.S
index ad617f0..eb248fb 100644
--- a/libc/arch-x86/syscalls/__ioctl.S
+++ b/libc/arch-x86/syscalls/__ioctl.S
@@ -4,12 +4,14 @@
ENTRY(__ioctl)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__llseek.S b/libc/arch-x86/syscalls/__llseek.S
index 2dab8a9..7a1ea83 100644
--- a/libc/arch-x86/syscalls/__llseek.S
+++ b/libc/arch-x86/syscalls/__llseek.S
@@ -4,16 +4,20 @@
ENTRY(__llseek)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__mmap2.S b/libc/arch-x86/syscalls/__mmap2.S
index 963abf3..603ee2b 100644
--- a/libc/arch-x86/syscalls/__mmap2.S
+++ b/libc/arch-x86/syscalls/__mmap2.S
@@ -4,18 +4,23 @@
ENTRY(__mmap2)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- pushl %ebp
- .cfi_def_cfa_offset 24
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
- .cfi_rel_offset ebp, 20
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
+ pushl %ebp
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ebp, 0
mov 28(%esp), %ebx
mov 32(%esp), %ecx
mov 36(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__openat.S b/libc/arch-x86/syscalls/__openat.S
index 6b05bec..a6db672 100644
--- a/libc/arch-x86/syscalls/__openat.S
+++ b/libc/arch-x86/syscalls/__openat.S
@@ -4,14 +4,17 @@
ENTRY(__openat)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__ppoll.S b/libc/arch-x86/syscalls/__ppoll.S
index e5af93c..d8ac98a 100644
--- a/libc/arch-x86/syscalls/__ppoll.S
+++ b/libc/arch-x86/syscalls/__ppoll.S
@@ -4,16 +4,20 @@
ENTRY(__ppoll)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__pselect6.S b/libc/arch-x86/syscalls/__pselect6.S
index 984a67e..9c66a3c 100644
--- a/libc/arch-x86/syscalls/__pselect6.S
+++ b/libc/arch-x86/syscalls/__pselect6.S
@@ -4,18 +4,23 @@
ENTRY(__pselect6)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- pushl %ebp
- .cfi_def_cfa_offset 24
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
- .cfi_rel_offset ebp, 20
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
+ pushl %ebp
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ebp, 0
mov 28(%esp), %ebx
mov 32(%esp), %ecx
mov 36(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__ptrace.S b/libc/arch-x86/syscalls/__ptrace.S
index d3b8031..54e8221 100644
--- a/libc/arch-x86/syscalls/__ptrace.S
+++ b/libc/arch-x86/syscalls/__ptrace.S
@@ -4,14 +4,17 @@
ENTRY(__ptrace)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__reboot.S b/libc/arch-x86/syscalls/__reboot.S
index b644906..daea66e 100644
--- a/libc/arch-x86/syscalls/__reboot.S
+++ b/libc/arch-x86/syscalls/__reboot.S
@@ -4,14 +4,17 @@
ENTRY(__reboot)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__rt_sigaction.S b/libc/arch-x86/syscalls/__rt_sigaction.S
index 1c5fdcc..d182a82 100644
--- a/libc/arch-x86/syscalls/__rt_sigaction.S
+++ b/libc/arch-x86/syscalls/__rt_sigaction.S
@@ -4,14 +4,17 @@
ENTRY(__rt_sigaction)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__rt_sigpending.S b/libc/arch-x86/syscalls/__rt_sigpending.S
index 5522195..d83ccc0 100644
--- a/libc/arch-x86/syscalls/__rt_sigpending.S
+++ b/libc/arch-x86/syscalls/__rt_sigpending.S
@@ -4,10 +4,11 @@
ENTRY(__rt_sigpending)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_rt_sigpending, %eax
diff --git a/libc/arch-x86/syscalls/__rt_sigprocmask.S b/libc/arch-x86/syscalls/__rt_sigprocmask.S
index 0df7301..4ca9443 100644
--- a/libc/arch-x86/syscalls/__rt_sigprocmask.S
+++ b/libc/arch-x86/syscalls/__rt_sigprocmask.S
@@ -4,14 +4,17 @@
ENTRY(__rt_sigprocmask)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__rt_sigsuspend.S b/libc/arch-x86/syscalls/__rt_sigsuspend.S
index 0e7dbdf..f1a4cf3 100644
--- a/libc/arch-x86/syscalls/__rt_sigsuspend.S
+++ b/libc/arch-x86/syscalls/__rt_sigsuspend.S
@@ -4,10 +4,11 @@
ENTRY(__rt_sigsuspend)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_rt_sigsuspend, %eax
diff --git a/libc/arch-x86/syscalls/__rt_sigtimedwait.S b/libc/arch-x86/syscalls/__rt_sigtimedwait.S
index cfbc7a6..4fae0f7 100644
--- a/libc/arch-x86/syscalls/__rt_sigtimedwait.S
+++ b/libc/arch-x86/syscalls/__rt_sigtimedwait.S
@@ -4,14 +4,17 @@
ENTRY(__rt_sigtimedwait)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__sched_getaffinity.S b/libc/arch-x86/syscalls/__sched_getaffinity.S
index a9b9f79..bddbab5 100644
--- a/libc/arch-x86/syscalls/__sched_getaffinity.S
+++ b/libc/arch-x86/syscalls/__sched_getaffinity.S
@@ -4,12 +4,14 @@
ENTRY(__sched_getaffinity)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__set_thread_area.S b/libc/arch-x86/syscalls/__set_thread_area.S
index ce06233..0772ffe 100644
--- a/libc/arch-x86/syscalls/__set_thread_area.S
+++ b/libc/arch-x86/syscalls/__set_thread_area.S
@@ -4,7 +4,7 @@
ENTRY(__set_thread_area)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_set_thread_area, %eax
diff --git a/libc/arch-x86/syscalls/__set_tid_address.S b/libc/arch-x86/syscalls/__set_tid_address.S
index 6a3943d..e61c2ac 100644
--- a/libc/arch-x86/syscalls/__set_tid_address.S
+++ b/libc/arch-x86/syscalls/__set_tid_address.S
@@ -4,7 +4,7 @@
ENTRY(__set_tid_address)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_set_tid_address, %eax
diff --git a/libc/arch-x86/syscalls/__sigaction.S b/libc/arch-x86/syscalls/__sigaction.S
index 8824a85..b4ca292 100644
--- a/libc/arch-x86/syscalls/__sigaction.S
+++ b/libc/arch-x86/syscalls/__sigaction.S
@@ -4,12 +4,14 @@
ENTRY(__sigaction)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__signalfd4.S b/libc/arch-x86/syscalls/__signalfd4.S
index 7cbe474..1faafac 100644
--- a/libc/arch-x86/syscalls/__signalfd4.S
+++ b/libc/arch-x86/syscalls/__signalfd4.S
@@ -4,14 +4,17 @@
ENTRY(__signalfd4)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__socket.S b/libc/arch-x86/syscalls/__socket.S
index 5e52d8f..2386b98 100644
--- a/libc/arch-x86/syscalls/__socket.S
+++ b/libc/arch-x86/syscalls/__socket.S
@@ -4,10 +4,11 @@
ENTRY(__socket)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $1, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/__statfs64.S b/libc/arch-x86/syscalls/__statfs64.S
index 7a91f1d..69dd87e 100644
--- a/libc/arch-x86/syscalls/__statfs64.S
+++ b/libc/arch-x86/syscalls/__statfs64.S
@@ -4,12 +4,14 @@
ENTRY(__statfs64)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__timer_create.S b/libc/arch-x86/syscalls/__timer_create.S
index 68480d1..520046f 100644
--- a/libc/arch-x86/syscalls/__timer_create.S
+++ b/libc/arch-x86/syscalls/__timer_create.S
@@ -4,12 +4,14 @@
ENTRY(__timer_create)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__timer_delete.S b/libc/arch-x86/syscalls/__timer_delete.S
index a2732e1..8fff727 100644
--- a/libc/arch-x86/syscalls/__timer_delete.S
+++ b/libc/arch-x86/syscalls/__timer_delete.S
@@ -4,7 +4,7 @@
ENTRY(__timer_delete)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_timer_delete, %eax
diff --git a/libc/arch-x86/syscalls/__timer_getoverrun.S b/libc/arch-x86/syscalls/__timer_getoverrun.S
index a340bfe..372625b 100644
--- a/libc/arch-x86/syscalls/__timer_getoverrun.S
+++ b/libc/arch-x86/syscalls/__timer_getoverrun.S
@@ -4,7 +4,7 @@
ENTRY(__timer_getoverrun)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_timer_getoverrun, %eax
diff --git a/libc/arch-x86/syscalls/__timer_gettime.S b/libc/arch-x86/syscalls/__timer_gettime.S
index 4aeb8eb..9588bf7 100644
--- a/libc/arch-x86/syscalls/__timer_gettime.S
+++ b/libc/arch-x86/syscalls/__timer_gettime.S
@@ -4,10 +4,11 @@
ENTRY(__timer_gettime)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_timer_gettime, %eax
diff --git a/libc/arch-x86/syscalls/__timer_settime.S b/libc/arch-x86/syscalls/__timer_settime.S
index f93bca4..7b0ab43 100644
--- a/libc/arch-x86/syscalls/__timer_settime.S
+++ b/libc/arch-x86/syscalls/__timer_settime.S
@@ -4,14 +4,17 @@
ENTRY(__timer_settime)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/__waitid.S b/libc/arch-x86/syscalls/__waitid.S
index cda5238..7e63f8a 100644
--- a/libc/arch-x86/syscalls/__waitid.S
+++ b/libc/arch-x86/syscalls/__waitid.S
@@ -4,16 +4,20 @@
ENTRY(__waitid)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/_exit.S b/libc/arch-x86/syscalls/_exit.S
index 793c9d5..5b569b9 100644
--- a/libc/arch-x86/syscalls/_exit.S
+++ b/libc/arch-x86/syscalls/_exit.S
@@ -4,7 +4,7 @@
ENTRY(_exit)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_exit_group, %eax
diff --git a/libc/arch-x86/syscalls/acct.S b/libc/arch-x86/syscalls/acct.S
index 6abaffc..7fa4508 100644
--- a/libc/arch-x86/syscalls/acct.S
+++ b/libc/arch-x86/syscalls/acct.S
@@ -4,7 +4,7 @@
ENTRY(acct)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_acct, %eax
diff --git a/libc/arch-x86/syscalls/bind.S b/libc/arch-x86/syscalls/bind.S
index 7c2acb5..c99ada1 100644
--- a/libc/arch-x86/syscalls/bind.S
+++ b/libc/arch-x86/syscalls/bind.S
@@ -4,10 +4,11 @@
ENTRY(bind)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $2, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/capget.S b/libc/arch-x86/syscalls/capget.S
index aa7b432..82065cf 100644
--- a/libc/arch-x86/syscalls/capget.S
+++ b/libc/arch-x86/syscalls/capget.S
@@ -4,10 +4,11 @@
ENTRY(capget)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_capget, %eax
diff --git a/libc/arch-x86/syscalls/capset.S b/libc/arch-x86/syscalls/capset.S
index 6c31083..8c9367f 100644
--- a/libc/arch-x86/syscalls/capset.S
+++ b/libc/arch-x86/syscalls/capset.S
@@ -4,10 +4,11 @@
ENTRY(capset)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_capset, %eax
diff --git a/libc/arch-x86/syscalls/chdir.S b/libc/arch-x86/syscalls/chdir.S
index a51ac6e..00986d4 100644
--- a/libc/arch-x86/syscalls/chdir.S
+++ b/libc/arch-x86/syscalls/chdir.S
@@ -4,7 +4,7 @@
ENTRY(chdir)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_chdir, %eax
diff --git a/libc/arch-x86/syscalls/chroot.S b/libc/arch-x86/syscalls/chroot.S
index be8f686..cb8a099 100644
--- a/libc/arch-x86/syscalls/chroot.S
+++ b/libc/arch-x86/syscalls/chroot.S
@@ -4,7 +4,7 @@
ENTRY(chroot)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_chroot, %eax
diff --git a/libc/arch-x86/syscalls/clock_getres.S b/libc/arch-x86/syscalls/clock_getres.S
index ce7e6f7..5fef51a 100644
--- a/libc/arch-x86/syscalls/clock_getres.S
+++ b/libc/arch-x86/syscalls/clock_getres.S
@@ -4,10 +4,11 @@
ENTRY(clock_getres)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_clock_getres, %eax
diff --git a/libc/arch-x86/syscalls/clock_gettime.S b/libc/arch-x86/syscalls/clock_gettime.S
index b1cdb1a..4275edc 100644
--- a/libc/arch-x86/syscalls/clock_gettime.S
+++ b/libc/arch-x86/syscalls/clock_gettime.S
@@ -4,10 +4,11 @@
ENTRY(clock_gettime)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_clock_gettime, %eax
diff --git a/libc/arch-x86/syscalls/clock_nanosleep.S b/libc/arch-x86/syscalls/clock_nanosleep.S
index 6c025e3..1f0fcc6 100644
--- a/libc/arch-x86/syscalls/clock_nanosleep.S
+++ b/libc/arch-x86/syscalls/clock_nanosleep.S
@@ -4,14 +4,17 @@
ENTRY(clock_nanosleep)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/clock_settime.S b/libc/arch-x86/syscalls/clock_settime.S
index 7c863e1..4f59a10 100644
--- a/libc/arch-x86/syscalls/clock_settime.S
+++ b/libc/arch-x86/syscalls/clock_settime.S
@@ -4,10 +4,11 @@
ENTRY(clock_settime)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_clock_settime, %eax
diff --git a/libc/arch-x86/syscalls/close.S b/libc/arch-x86/syscalls/close.S
index 3eb3be1..3f4e034 100644
--- a/libc/arch-x86/syscalls/close.S
+++ b/libc/arch-x86/syscalls/close.S
@@ -4,7 +4,7 @@
ENTRY(close)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_close, %eax
diff --git a/libc/arch-x86/syscalls/delete_module.S b/libc/arch-x86/syscalls/delete_module.S
index 11ff762..8923f46 100644
--- a/libc/arch-x86/syscalls/delete_module.S
+++ b/libc/arch-x86/syscalls/delete_module.S
@@ -4,10 +4,11 @@
ENTRY(delete_module)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_delete_module, %eax
diff --git a/libc/arch-x86/syscalls/dup.S b/libc/arch-x86/syscalls/dup.S
index 98070e2..ed922de 100644
--- a/libc/arch-x86/syscalls/dup.S
+++ b/libc/arch-x86/syscalls/dup.S
@@ -4,7 +4,7 @@
ENTRY(dup)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_dup, %eax
diff --git a/libc/arch-x86/syscalls/dup3.S b/libc/arch-x86/syscalls/dup3.S
index 4380e6a..d1a714d 100644
--- a/libc/arch-x86/syscalls/dup3.S
+++ b/libc/arch-x86/syscalls/dup3.S
@@ -4,12 +4,14 @@
ENTRY(dup3)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/epoll_create1.S b/libc/arch-x86/syscalls/epoll_create1.S
index ca5d4d1..69ddd9b 100644
--- a/libc/arch-x86/syscalls/epoll_create1.S
+++ b/libc/arch-x86/syscalls/epoll_create1.S
@@ -4,7 +4,7 @@
ENTRY(epoll_create1)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_epoll_create1, %eax
diff --git a/libc/arch-x86/syscalls/epoll_ctl.S b/libc/arch-x86/syscalls/epoll_ctl.S
index df345cd..2a50db8 100644
--- a/libc/arch-x86/syscalls/epoll_ctl.S
+++ b/libc/arch-x86/syscalls/epoll_ctl.S
@@ -4,14 +4,17 @@
ENTRY(epoll_ctl)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/eventfd.S b/libc/arch-x86/syscalls/eventfd.S
index 333bca4..48a07a2 100644
--- a/libc/arch-x86/syscalls/eventfd.S
+++ b/libc/arch-x86/syscalls/eventfd.S
@@ -4,10 +4,11 @@
ENTRY(eventfd)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_eventfd2, %eax
diff --git a/libc/arch-x86/syscalls/execve.S b/libc/arch-x86/syscalls/execve.S
index 95523bc..345b5a4 100644
--- a/libc/arch-x86/syscalls/execve.S
+++ b/libc/arch-x86/syscalls/execve.S
@@ -4,12 +4,14 @@
ENTRY(execve)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/faccessat.S b/libc/arch-x86/syscalls/faccessat.S
index 0ad6224..1f340f7 100644
--- a/libc/arch-x86/syscalls/faccessat.S
+++ b/libc/arch-x86/syscalls/faccessat.S
@@ -4,14 +4,17 @@
ENTRY(faccessat)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/fallocate64.S b/libc/arch-x86/syscalls/fallocate64.S
index 7e03c54..be3d45b 100644
--- a/libc/arch-x86/syscalls/fallocate64.S
+++ b/libc/arch-x86/syscalls/fallocate64.S
@@ -4,18 +4,23 @@
ENTRY(fallocate64)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- pushl %ebp
- .cfi_def_cfa_offset 24
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
- .cfi_rel_offset ebp, 20
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
+ pushl %ebp
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ebp, 0
mov 28(%esp), %ebx
mov 32(%esp), %ecx
mov 36(%esp), %edx
diff --git a/libc/arch-x86/syscalls/fchdir.S b/libc/arch-x86/syscalls/fchdir.S
index 4298c2a..da95c0b 100644
--- a/libc/arch-x86/syscalls/fchdir.S
+++ b/libc/arch-x86/syscalls/fchdir.S
@@ -4,7 +4,7 @@
ENTRY(fchdir)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_fchdir, %eax
diff --git a/libc/arch-x86/syscalls/fchmod.S b/libc/arch-x86/syscalls/fchmod.S
index d4ef36f..fe189f4 100644
--- a/libc/arch-x86/syscalls/fchmod.S
+++ b/libc/arch-x86/syscalls/fchmod.S
@@ -4,10 +4,11 @@
ENTRY(fchmod)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_fchmod, %eax
diff --git a/libc/arch-x86/syscalls/fchmodat.S b/libc/arch-x86/syscalls/fchmodat.S
index 4fb6995..794450b 100644
--- a/libc/arch-x86/syscalls/fchmodat.S
+++ b/libc/arch-x86/syscalls/fchmodat.S
@@ -4,14 +4,17 @@
ENTRY(fchmodat)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/fchown.S b/libc/arch-x86/syscalls/fchown.S
index 326fe16..5e82388 100644
--- a/libc/arch-x86/syscalls/fchown.S
+++ b/libc/arch-x86/syscalls/fchown.S
@@ -4,12 +4,14 @@
ENTRY(fchown)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/fchownat.S b/libc/arch-x86/syscalls/fchownat.S
index 802dc44..bfe61e9 100644
--- a/libc/arch-x86/syscalls/fchownat.S
+++ b/libc/arch-x86/syscalls/fchownat.S
@@ -4,16 +4,20 @@
ENTRY(fchownat)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/fdatasync.S b/libc/arch-x86/syscalls/fdatasync.S
index 02e09be..17846ce 100644
--- a/libc/arch-x86/syscalls/fdatasync.S
+++ b/libc/arch-x86/syscalls/fdatasync.S
@@ -4,7 +4,7 @@
ENTRY(fdatasync)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_fdatasync, %eax
diff --git a/libc/arch-x86/syscalls/fgetxattr.S b/libc/arch-x86/syscalls/fgetxattr.S
index 99a920d..335d298 100644
--- a/libc/arch-x86/syscalls/fgetxattr.S
+++ b/libc/arch-x86/syscalls/fgetxattr.S
@@ -4,14 +4,17 @@
ENTRY(fgetxattr)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/flistxattr.S b/libc/arch-x86/syscalls/flistxattr.S
index a1691fc..5cab5ad 100644
--- a/libc/arch-x86/syscalls/flistxattr.S
+++ b/libc/arch-x86/syscalls/flistxattr.S
@@ -4,12 +4,14 @@
ENTRY(flistxattr)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/flock.S b/libc/arch-x86/syscalls/flock.S
index a4388e9..277dd2a 100644
--- a/libc/arch-x86/syscalls/flock.S
+++ b/libc/arch-x86/syscalls/flock.S
@@ -4,10 +4,11 @@
ENTRY(flock)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_flock, %eax
diff --git a/libc/arch-x86/syscalls/fremovexattr.S b/libc/arch-x86/syscalls/fremovexattr.S
index 6377974..a60e031 100644
--- a/libc/arch-x86/syscalls/fremovexattr.S
+++ b/libc/arch-x86/syscalls/fremovexattr.S
@@ -4,10 +4,11 @@
ENTRY(fremovexattr)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_fremovexattr, %eax
diff --git a/libc/arch-x86/syscalls/fsetxattr.S b/libc/arch-x86/syscalls/fsetxattr.S
index 2f926a5..c4d4854 100644
--- a/libc/arch-x86/syscalls/fsetxattr.S
+++ b/libc/arch-x86/syscalls/fsetxattr.S
@@ -4,16 +4,20 @@
ENTRY(fsetxattr)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/fstat64.S b/libc/arch-x86/syscalls/fstat64.S
index 4e85c71..054f6de 100644
--- a/libc/arch-x86/syscalls/fstat64.S
+++ b/libc/arch-x86/syscalls/fstat64.S
@@ -4,10 +4,11 @@
ENTRY(fstat64)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_fstat64, %eax
diff --git a/libc/arch-x86/syscalls/fstatat64.S b/libc/arch-x86/syscalls/fstatat64.S
index 05cec7b..928d071 100644
--- a/libc/arch-x86/syscalls/fstatat64.S
+++ b/libc/arch-x86/syscalls/fstatat64.S
@@ -4,14 +4,17 @@
ENTRY(fstatat64)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/fsync.S b/libc/arch-x86/syscalls/fsync.S
index 71183cb..f12d010 100644
--- a/libc/arch-x86/syscalls/fsync.S
+++ b/libc/arch-x86/syscalls/fsync.S
@@ -4,7 +4,7 @@
ENTRY(fsync)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_fsync, %eax
diff --git a/libc/arch-x86/syscalls/ftruncate.S b/libc/arch-x86/syscalls/ftruncate.S
index 1003077..062982c 100644
--- a/libc/arch-x86/syscalls/ftruncate.S
+++ b/libc/arch-x86/syscalls/ftruncate.S
@@ -4,10 +4,11 @@
ENTRY(ftruncate)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_ftruncate, %eax
diff --git a/libc/arch-x86/syscalls/ftruncate64.S b/libc/arch-x86/syscalls/ftruncate64.S
index 586086d..71920be 100644
--- a/libc/arch-x86/syscalls/ftruncate64.S
+++ b/libc/arch-x86/syscalls/ftruncate64.S
@@ -4,12 +4,14 @@
ENTRY(ftruncate64)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/getdents.S b/libc/arch-x86/syscalls/getdents.S
index 9823feb..0b045b2 100644
--- a/libc/arch-x86/syscalls/getdents.S
+++ b/libc/arch-x86/syscalls/getdents.S
@@ -4,12 +4,14 @@
ENTRY(getdents)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/getgroups.S b/libc/arch-x86/syscalls/getgroups.S
index e4247e7..d9b7d80 100644
--- a/libc/arch-x86/syscalls/getgroups.S
+++ b/libc/arch-x86/syscalls/getgroups.S
@@ -4,10 +4,11 @@
ENTRY(getgroups)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_getgroups32, %eax
diff --git a/libc/arch-x86/syscalls/getitimer.S b/libc/arch-x86/syscalls/getitimer.S
index 2deebc9..8f3a0ee 100644
--- a/libc/arch-x86/syscalls/getitimer.S
+++ b/libc/arch-x86/syscalls/getitimer.S
@@ -4,10 +4,11 @@
ENTRY(getitimer)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_getitimer, %eax
diff --git a/libc/arch-x86/syscalls/getpeername.S b/libc/arch-x86/syscalls/getpeername.S
index e894093..1ea42a0 100644
--- a/libc/arch-x86/syscalls/getpeername.S
+++ b/libc/arch-x86/syscalls/getpeername.S
@@ -4,10 +4,11 @@
ENTRY(getpeername)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $7, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/getpgid.S b/libc/arch-x86/syscalls/getpgid.S
index c50a09f..179c7db 100644
--- a/libc/arch-x86/syscalls/getpgid.S
+++ b/libc/arch-x86/syscalls/getpgid.S
@@ -4,7 +4,7 @@
ENTRY(getpgid)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_getpgid, %eax
diff --git a/libc/arch-x86/syscalls/getresgid.S b/libc/arch-x86/syscalls/getresgid.S
index ad74e56..ce8d89a 100644
--- a/libc/arch-x86/syscalls/getresgid.S
+++ b/libc/arch-x86/syscalls/getresgid.S
@@ -4,12 +4,14 @@
ENTRY(getresgid)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/getresuid.S b/libc/arch-x86/syscalls/getresuid.S
index 6cf60b3..f444d16 100644
--- a/libc/arch-x86/syscalls/getresuid.S
+++ b/libc/arch-x86/syscalls/getresuid.S
@@ -4,12 +4,14 @@
ENTRY(getresuid)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/getrlimit.S b/libc/arch-x86/syscalls/getrlimit.S
index 5e75b6b..66f4e6f 100644
--- a/libc/arch-x86/syscalls/getrlimit.S
+++ b/libc/arch-x86/syscalls/getrlimit.S
@@ -4,10 +4,11 @@
ENTRY(getrlimit)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_ugetrlimit, %eax
diff --git a/libc/arch-x86/syscalls/getrusage.S b/libc/arch-x86/syscalls/getrusage.S
index 2dfd005..8d4fd7b 100644
--- a/libc/arch-x86/syscalls/getrusage.S
+++ b/libc/arch-x86/syscalls/getrusage.S
@@ -4,10 +4,11 @@
ENTRY(getrusage)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_getrusage, %eax
diff --git a/libc/arch-x86/syscalls/getsid.S b/libc/arch-x86/syscalls/getsid.S
index 1f60309..39e5551 100644
--- a/libc/arch-x86/syscalls/getsid.S
+++ b/libc/arch-x86/syscalls/getsid.S
@@ -4,7 +4,7 @@
ENTRY(getsid)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_getsid, %eax
diff --git a/libc/arch-x86/syscalls/getsockname.S b/libc/arch-x86/syscalls/getsockname.S
index 5c22bdf..ec0cc84 100644
--- a/libc/arch-x86/syscalls/getsockname.S
+++ b/libc/arch-x86/syscalls/getsockname.S
@@ -4,10 +4,11 @@
ENTRY(getsockname)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $6, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/getsockopt.S b/libc/arch-x86/syscalls/getsockopt.S
index 9c02d23..cf109f1 100644
--- a/libc/arch-x86/syscalls/getsockopt.S
+++ b/libc/arch-x86/syscalls/getsockopt.S
@@ -4,10 +4,11 @@
ENTRY(getsockopt)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $15, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/gettid.S b/libc/arch-x86/syscalls/gettid.S
deleted file mode 100644
index 1f264b1..0000000
--- a/libc/arch-x86/syscalls/gettid.S
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Generated by gensyscalls.py. Do not edit. */
-
-#include <private/bionic_asm.h>
-
-ENTRY(gettid)
- movl $__NR_gettid, %eax
- int $0x80
- cmpl $-MAX_ERRNO, %eax
- jb 1f
- negl %eax
- pushl %eax
- call __set_errno
- addl $4, %esp
- orl $-1, %eax
-1:
- ret
-END(gettid)
diff --git a/libc/arch-x86/syscalls/gettimeofday.S b/libc/arch-x86/syscalls/gettimeofday.S
index 10c5de9..801e7ab 100644
--- a/libc/arch-x86/syscalls/gettimeofday.S
+++ b/libc/arch-x86/syscalls/gettimeofday.S
@@ -4,10 +4,11 @@
ENTRY(gettimeofday)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_gettimeofday, %eax
diff --git a/libc/arch-x86/syscalls/getxattr.S b/libc/arch-x86/syscalls/getxattr.S
index f491a0c..5bd1ab8 100644
--- a/libc/arch-x86/syscalls/getxattr.S
+++ b/libc/arch-x86/syscalls/getxattr.S
@@ -4,14 +4,17 @@
ENTRY(getxattr)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/init_module.S b/libc/arch-x86/syscalls/init_module.S
index 1a159d3..8afd644 100644
--- a/libc/arch-x86/syscalls/init_module.S
+++ b/libc/arch-x86/syscalls/init_module.S
@@ -4,12 +4,14 @@
ENTRY(init_module)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/inotify_add_watch.S b/libc/arch-x86/syscalls/inotify_add_watch.S
index 424698d..0de8f88 100644
--- a/libc/arch-x86/syscalls/inotify_add_watch.S
+++ b/libc/arch-x86/syscalls/inotify_add_watch.S
@@ -4,12 +4,14 @@
ENTRY(inotify_add_watch)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/inotify_init1.S b/libc/arch-x86/syscalls/inotify_init1.S
index 1b437c6..0920618 100644
--- a/libc/arch-x86/syscalls/inotify_init1.S
+++ b/libc/arch-x86/syscalls/inotify_init1.S
@@ -4,7 +4,7 @@
ENTRY(inotify_init1)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_inotify_init1, %eax
diff --git a/libc/arch-x86/syscalls/inotify_rm_watch.S b/libc/arch-x86/syscalls/inotify_rm_watch.S
index 18ec3ca..37394c5 100644
--- a/libc/arch-x86/syscalls/inotify_rm_watch.S
+++ b/libc/arch-x86/syscalls/inotify_rm_watch.S
@@ -4,10 +4,11 @@
ENTRY(inotify_rm_watch)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_inotify_rm_watch, %eax
diff --git a/libc/arch-x86/syscalls/ioprio_get.S b/libc/arch-x86/syscalls/ioprio_get.S
index 6dfc767..ff78773 100644
--- a/libc/arch-x86/syscalls/ioprio_get.S
+++ b/libc/arch-x86/syscalls/ioprio_get.S
@@ -4,10 +4,11 @@
ENTRY(ioprio_get)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_ioprio_get, %eax
diff --git a/libc/arch-x86/syscalls/ioprio_set.S b/libc/arch-x86/syscalls/ioprio_set.S
index bcefacb..7a3e919 100644
--- a/libc/arch-x86/syscalls/ioprio_set.S
+++ b/libc/arch-x86/syscalls/ioprio_set.S
@@ -4,12 +4,14 @@
ENTRY(ioprio_set)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/kill.S b/libc/arch-x86/syscalls/kill.S
index 499158b..fbf5fa8 100644
--- a/libc/arch-x86/syscalls/kill.S
+++ b/libc/arch-x86/syscalls/kill.S
@@ -4,10 +4,11 @@
ENTRY(kill)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_kill, %eax
diff --git a/libc/arch-x86/syscalls/klogctl.S b/libc/arch-x86/syscalls/klogctl.S
index f422ac8..03f24b8 100644
--- a/libc/arch-x86/syscalls/klogctl.S
+++ b/libc/arch-x86/syscalls/klogctl.S
@@ -4,12 +4,14 @@
ENTRY(klogctl)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/lgetxattr.S b/libc/arch-x86/syscalls/lgetxattr.S
index def7c66..6ee2c55 100644
--- a/libc/arch-x86/syscalls/lgetxattr.S
+++ b/libc/arch-x86/syscalls/lgetxattr.S
@@ -4,14 +4,17 @@
ENTRY(lgetxattr)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/linkat.S b/libc/arch-x86/syscalls/linkat.S
index ffb1b5d..d9876eb 100644
--- a/libc/arch-x86/syscalls/linkat.S
+++ b/libc/arch-x86/syscalls/linkat.S
@@ -4,16 +4,20 @@
ENTRY(linkat)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/listen.S b/libc/arch-x86/syscalls/listen.S
index 7e4d2f3..b671b25 100644
--- a/libc/arch-x86/syscalls/listen.S
+++ b/libc/arch-x86/syscalls/listen.S
@@ -4,10 +4,11 @@
ENTRY(listen)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $4, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/listxattr.S b/libc/arch-x86/syscalls/listxattr.S
index 5b94a72..e86b82e 100644
--- a/libc/arch-x86/syscalls/listxattr.S
+++ b/libc/arch-x86/syscalls/listxattr.S
@@ -4,12 +4,14 @@
ENTRY(listxattr)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/llistxattr.S b/libc/arch-x86/syscalls/llistxattr.S
index 1c64591..8d13da8 100644
--- a/libc/arch-x86/syscalls/llistxattr.S
+++ b/libc/arch-x86/syscalls/llistxattr.S
@@ -4,12 +4,14 @@
ENTRY(llistxattr)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/lremovexattr.S b/libc/arch-x86/syscalls/lremovexattr.S
index d67b221..9dab0a3 100644
--- a/libc/arch-x86/syscalls/lremovexattr.S
+++ b/libc/arch-x86/syscalls/lremovexattr.S
@@ -4,10 +4,11 @@
ENTRY(lremovexattr)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_lremovexattr, %eax
diff --git a/libc/arch-x86/syscalls/lseek.S b/libc/arch-x86/syscalls/lseek.S
index 5a58b81..2d03f46 100644
--- a/libc/arch-x86/syscalls/lseek.S
+++ b/libc/arch-x86/syscalls/lseek.S
@@ -4,12 +4,14 @@
ENTRY(lseek)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/lsetxattr.S b/libc/arch-x86/syscalls/lsetxattr.S
index f2dba39..1452298 100644
--- a/libc/arch-x86/syscalls/lsetxattr.S
+++ b/libc/arch-x86/syscalls/lsetxattr.S
@@ -4,16 +4,20 @@
ENTRY(lsetxattr)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/madvise.S b/libc/arch-x86/syscalls/madvise.S
index edd37b5..fd4af11 100644
--- a/libc/arch-x86/syscalls/madvise.S
+++ b/libc/arch-x86/syscalls/madvise.S
@@ -4,12 +4,14 @@
ENTRY(madvise)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/mincore.S b/libc/arch-x86/syscalls/mincore.S
index 44ea364..01eb519 100644
--- a/libc/arch-x86/syscalls/mincore.S
+++ b/libc/arch-x86/syscalls/mincore.S
@@ -4,12 +4,14 @@
ENTRY(mincore)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/mkdirat.S b/libc/arch-x86/syscalls/mkdirat.S
index d80e3fb..b022838 100644
--- a/libc/arch-x86/syscalls/mkdirat.S
+++ b/libc/arch-x86/syscalls/mkdirat.S
@@ -4,12 +4,14 @@
ENTRY(mkdirat)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/mknodat.S b/libc/arch-x86/syscalls/mknodat.S
index 20560df..233c0b2 100644
--- a/libc/arch-x86/syscalls/mknodat.S
+++ b/libc/arch-x86/syscalls/mknodat.S
@@ -4,14 +4,17 @@
ENTRY(mknodat)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/mlock.S b/libc/arch-x86/syscalls/mlock.S
index 78cfa58..fb4641f 100644
--- a/libc/arch-x86/syscalls/mlock.S
+++ b/libc/arch-x86/syscalls/mlock.S
@@ -4,10 +4,11 @@
ENTRY(mlock)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_mlock, %eax
diff --git a/libc/arch-x86/syscalls/mlockall.S b/libc/arch-x86/syscalls/mlockall.S
index 4e78fef..9403351 100644
--- a/libc/arch-x86/syscalls/mlockall.S
+++ b/libc/arch-x86/syscalls/mlockall.S
@@ -4,7 +4,7 @@
ENTRY(mlockall)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_mlockall, %eax
diff --git a/libc/arch-x86/syscalls/mount.S b/libc/arch-x86/syscalls/mount.S
index cc1a518..d99f5f4 100644
--- a/libc/arch-x86/syscalls/mount.S
+++ b/libc/arch-x86/syscalls/mount.S
@@ -4,16 +4,20 @@
ENTRY(mount)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/mprotect.S b/libc/arch-x86/syscalls/mprotect.S
index 9c30af4..3205f83 100644
--- a/libc/arch-x86/syscalls/mprotect.S
+++ b/libc/arch-x86/syscalls/mprotect.S
@@ -4,12 +4,14 @@
ENTRY(mprotect)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/mremap.S b/libc/arch-x86/syscalls/mremap.S
index 1439ef5..2b20079 100644
--- a/libc/arch-x86/syscalls/mremap.S
+++ b/libc/arch-x86/syscalls/mremap.S
@@ -4,14 +4,17 @@
ENTRY(mremap)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/msync.S b/libc/arch-x86/syscalls/msync.S
index d330967..339e381 100644
--- a/libc/arch-x86/syscalls/msync.S
+++ b/libc/arch-x86/syscalls/msync.S
@@ -4,12 +4,14 @@
ENTRY(msync)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/munlock.S b/libc/arch-x86/syscalls/munlock.S
index ce6197d..5fb29cb 100644
--- a/libc/arch-x86/syscalls/munlock.S
+++ b/libc/arch-x86/syscalls/munlock.S
@@ -4,10 +4,11 @@
ENTRY(munlock)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_munlock, %eax
diff --git a/libc/arch-x86/syscalls/munmap.S b/libc/arch-x86/syscalls/munmap.S
index be7eec6..2d348db 100644
--- a/libc/arch-x86/syscalls/munmap.S
+++ b/libc/arch-x86/syscalls/munmap.S
@@ -4,10 +4,11 @@
ENTRY(munmap)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_munmap, %eax
diff --git a/libc/arch-x86/syscalls/nanosleep.S b/libc/arch-x86/syscalls/nanosleep.S
index 9faa06b..9d8ae9d 100644
--- a/libc/arch-x86/syscalls/nanosleep.S
+++ b/libc/arch-x86/syscalls/nanosleep.S
@@ -4,10 +4,11 @@
ENTRY(nanosleep)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_nanosleep, %eax
diff --git a/libc/arch-x86/syscalls/personality.S b/libc/arch-x86/syscalls/personality.S
index 8116e2d..412bbed 100644
--- a/libc/arch-x86/syscalls/personality.S
+++ b/libc/arch-x86/syscalls/personality.S
@@ -4,7 +4,7 @@
ENTRY(personality)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_personality, %eax
diff --git a/libc/arch-x86/syscalls/pipe2.S b/libc/arch-x86/syscalls/pipe2.S
index c2e11a2..bfe03a2 100644
--- a/libc/arch-x86/syscalls/pipe2.S
+++ b/libc/arch-x86/syscalls/pipe2.S
@@ -4,10 +4,11 @@
ENTRY(pipe2)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_pipe2, %eax
diff --git a/libc/arch-x86/syscalls/prctl.S b/libc/arch-x86/syscalls/prctl.S
index 1a5daca..fca343f 100644
--- a/libc/arch-x86/syscalls/prctl.S
+++ b/libc/arch-x86/syscalls/prctl.S
@@ -4,16 +4,20 @@
ENTRY(prctl)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/pread64.S b/libc/arch-x86/syscalls/pread64.S
index 32a76c5..6cf4e4b 100644
--- a/libc/arch-x86/syscalls/pread64.S
+++ b/libc/arch-x86/syscalls/pread64.S
@@ -4,16 +4,20 @@
ENTRY(pread64)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/prlimit64.S b/libc/arch-x86/syscalls/prlimit64.S
index 2256425..65316a7 100644
--- a/libc/arch-x86/syscalls/prlimit64.S
+++ b/libc/arch-x86/syscalls/prlimit64.S
@@ -4,14 +4,17 @@
ENTRY(prlimit64)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/pwrite64.S b/libc/arch-x86/syscalls/pwrite64.S
index b003435..cccea8b 100644
--- a/libc/arch-x86/syscalls/pwrite64.S
+++ b/libc/arch-x86/syscalls/pwrite64.S
@@ -4,16 +4,20 @@
ENTRY(pwrite64)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/read.S b/libc/arch-x86/syscalls/read.S
index ad1c19a..f80db31 100644
--- a/libc/arch-x86/syscalls/read.S
+++ b/libc/arch-x86/syscalls/read.S
@@ -4,12 +4,14 @@
ENTRY(read)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/readahead.S b/libc/arch-x86/syscalls/readahead.S
index a4d634f..f53769a 100644
--- a/libc/arch-x86/syscalls/readahead.S
+++ b/libc/arch-x86/syscalls/readahead.S
@@ -4,14 +4,17 @@
ENTRY(readahead)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/readlinkat.S b/libc/arch-x86/syscalls/readlinkat.S
index 37df8d8..229dafe 100644
--- a/libc/arch-x86/syscalls/readlinkat.S
+++ b/libc/arch-x86/syscalls/readlinkat.S
@@ -4,14 +4,17 @@
ENTRY(readlinkat)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/readv.S b/libc/arch-x86/syscalls/readv.S
index 05445c0..8cb01a0 100644
--- a/libc/arch-x86/syscalls/readv.S
+++ b/libc/arch-x86/syscalls/readv.S
@@ -4,12 +4,14 @@
ENTRY(readv)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/recvfrom.S b/libc/arch-x86/syscalls/recvfrom.S
index df489c8..dd99a09 100644
--- a/libc/arch-x86/syscalls/recvfrom.S
+++ b/libc/arch-x86/syscalls/recvfrom.S
@@ -4,10 +4,11 @@
ENTRY(recvfrom)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $12, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/recvmmsg.S b/libc/arch-x86/syscalls/recvmmsg.S
index a7adac8..f916fcd 100644
--- a/libc/arch-x86/syscalls/recvmmsg.S
+++ b/libc/arch-x86/syscalls/recvmmsg.S
@@ -4,10 +4,11 @@
ENTRY(recvmmsg)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $19, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/recvmsg.S b/libc/arch-x86/syscalls/recvmsg.S
index a587b00..12dad28 100644
--- a/libc/arch-x86/syscalls/recvmsg.S
+++ b/libc/arch-x86/syscalls/recvmsg.S
@@ -4,10 +4,11 @@
ENTRY(recvmsg)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $17, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/removexattr.S b/libc/arch-x86/syscalls/removexattr.S
index 99192f0..3974a07 100644
--- a/libc/arch-x86/syscalls/removexattr.S
+++ b/libc/arch-x86/syscalls/removexattr.S
@@ -4,10 +4,11 @@
ENTRY(removexattr)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_removexattr, %eax
diff --git a/libc/arch-x86/syscalls/renameat.S b/libc/arch-x86/syscalls/renameat.S
index 831b24c..2982f51 100644
--- a/libc/arch-x86/syscalls/renameat.S
+++ b/libc/arch-x86/syscalls/renameat.S
@@ -4,14 +4,17 @@
ENTRY(renameat)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/sched_get_priority_max.S b/libc/arch-x86/syscalls/sched_get_priority_max.S
index 0b7c269..3205c72 100644
--- a/libc/arch-x86/syscalls/sched_get_priority_max.S
+++ b/libc/arch-x86/syscalls/sched_get_priority_max.S
@@ -4,7 +4,7 @@
ENTRY(sched_get_priority_max)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_sched_get_priority_max, %eax
diff --git a/libc/arch-x86/syscalls/sched_get_priority_min.S b/libc/arch-x86/syscalls/sched_get_priority_min.S
index ce28f8c..39c4d2c 100644
--- a/libc/arch-x86/syscalls/sched_get_priority_min.S
+++ b/libc/arch-x86/syscalls/sched_get_priority_min.S
@@ -4,7 +4,7 @@
ENTRY(sched_get_priority_min)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_sched_get_priority_min, %eax
diff --git a/libc/arch-x86/syscalls/sched_getparam.S b/libc/arch-x86/syscalls/sched_getparam.S
index 2c3b7b9..47cb4af 100644
--- a/libc/arch-x86/syscalls/sched_getparam.S
+++ b/libc/arch-x86/syscalls/sched_getparam.S
@@ -4,10 +4,11 @@
ENTRY(sched_getparam)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_sched_getparam, %eax
diff --git a/libc/arch-x86/syscalls/sched_getscheduler.S b/libc/arch-x86/syscalls/sched_getscheduler.S
index 6a3842a..07fbe6b 100644
--- a/libc/arch-x86/syscalls/sched_getscheduler.S
+++ b/libc/arch-x86/syscalls/sched_getscheduler.S
@@ -4,7 +4,7 @@
ENTRY(sched_getscheduler)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_sched_getscheduler, %eax
diff --git a/libc/arch-x86/syscalls/sched_rr_get_interval.S b/libc/arch-x86/syscalls/sched_rr_get_interval.S
index c1055da..e7a1038 100644
--- a/libc/arch-x86/syscalls/sched_rr_get_interval.S
+++ b/libc/arch-x86/syscalls/sched_rr_get_interval.S
@@ -4,10 +4,11 @@
ENTRY(sched_rr_get_interval)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_sched_rr_get_interval, %eax
diff --git a/libc/arch-x86/syscalls/sched_setaffinity.S b/libc/arch-x86/syscalls/sched_setaffinity.S
index bd3d0ab..bb35259 100644
--- a/libc/arch-x86/syscalls/sched_setaffinity.S
+++ b/libc/arch-x86/syscalls/sched_setaffinity.S
@@ -4,12 +4,14 @@
ENTRY(sched_setaffinity)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/sched_setparam.S b/libc/arch-x86/syscalls/sched_setparam.S
index 2329268..3e93c4c 100644
--- a/libc/arch-x86/syscalls/sched_setparam.S
+++ b/libc/arch-x86/syscalls/sched_setparam.S
@@ -4,10 +4,11 @@
ENTRY(sched_setparam)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_sched_setparam, %eax
diff --git a/libc/arch-x86/syscalls/sched_setscheduler.S b/libc/arch-x86/syscalls/sched_setscheduler.S
index a3ce8ab..fcabf12 100644
--- a/libc/arch-x86/syscalls/sched_setscheduler.S
+++ b/libc/arch-x86/syscalls/sched_setscheduler.S
@@ -4,12 +4,14 @@
ENTRY(sched_setscheduler)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/sched_yield.S b/libc/arch-x86/syscalls/sched_yield.S
index fb563c4..a8b22e3 100644
--- a/libc/arch-x86/syscalls/sched_yield.S
+++ b/libc/arch-x86/syscalls/sched_yield.S
@@ -4,7 +4,7 @@
ENTRY(sched_yield)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_sched_yield, %eax
diff --git a/libc/arch-x86/syscalls/sendfile.S b/libc/arch-x86/syscalls/sendfile.S
index 280a4ae..30bf3ad 100644
--- a/libc/arch-x86/syscalls/sendfile.S
+++ b/libc/arch-x86/syscalls/sendfile.S
@@ -4,14 +4,17 @@
ENTRY(sendfile)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/sendfile64.S b/libc/arch-x86/syscalls/sendfile64.S
index 383c8c6..5a7f2bb 100644
--- a/libc/arch-x86/syscalls/sendfile64.S
+++ b/libc/arch-x86/syscalls/sendfile64.S
@@ -4,14 +4,17 @@
ENTRY(sendfile64)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/sendmmsg.S b/libc/arch-x86/syscalls/sendmmsg.S
index 46dd6cd..09a3292 100644
--- a/libc/arch-x86/syscalls/sendmmsg.S
+++ b/libc/arch-x86/syscalls/sendmmsg.S
@@ -4,10 +4,11 @@
ENTRY(sendmmsg)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $20, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/sendmsg.S b/libc/arch-x86/syscalls/sendmsg.S
index 70bad29..eaf7fb3 100644
--- a/libc/arch-x86/syscalls/sendmsg.S
+++ b/libc/arch-x86/syscalls/sendmsg.S
@@ -4,10 +4,11 @@
ENTRY(sendmsg)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $16, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/sendto.S b/libc/arch-x86/syscalls/sendto.S
index dbe520d..0cf5e0a 100644
--- a/libc/arch-x86/syscalls/sendto.S
+++ b/libc/arch-x86/syscalls/sendto.S
@@ -4,10 +4,11 @@
ENTRY(sendto)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $11, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/setgid.S b/libc/arch-x86/syscalls/setgid.S
index 69ac15b..b0b7185 100644
--- a/libc/arch-x86/syscalls/setgid.S
+++ b/libc/arch-x86/syscalls/setgid.S
@@ -4,7 +4,7 @@
ENTRY(setgid)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_setgid32, %eax
diff --git a/libc/arch-x86/syscalls/setgroups.S b/libc/arch-x86/syscalls/setgroups.S
index f704c46..be227ca 100644
--- a/libc/arch-x86/syscalls/setgroups.S
+++ b/libc/arch-x86/syscalls/setgroups.S
@@ -4,10 +4,11 @@
ENTRY(setgroups)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_setgroups32, %eax
diff --git a/libc/arch-x86/syscalls/setitimer.S b/libc/arch-x86/syscalls/setitimer.S
index 1573816..4a323da 100644
--- a/libc/arch-x86/syscalls/setitimer.S
+++ b/libc/arch-x86/syscalls/setitimer.S
@@ -4,12 +4,14 @@
ENTRY(setitimer)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/setns.S b/libc/arch-x86/syscalls/setns.S
index 2c39a21..fa69b4a 100644
--- a/libc/arch-x86/syscalls/setns.S
+++ b/libc/arch-x86/syscalls/setns.S
@@ -4,10 +4,11 @@
ENTRY(setns)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_setns, %eax
diff --git a/libc/arch-x86/syscalls/setpgid.S b/libc/arch-x86/syscalls/setpgid.S
index ae69633..eba780c 100644
--- a/libc/arch-x86/syscalls/setpgid.S
+++ b/libc/arch-x86/syscalls/setpgid.S
@@ -4,10 +4,11 @@
ENTRY(setpgid)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_setpgid, %eax
diff --git a/libc/arch-x86/syscalls/setpriority.S b/libc/arch-x86/syscalls/setpriority.S
index b58cd13..5ea0519 100644
--- a/libc/arch-x86/syscalls/setpriority.S
+++ b/libc/arch-x86/syscalls/setpriority.S
@@ -4,12 +4,14 @@
ENTRY(setpriority)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/setregid.S b/libc/arch-x86/syscalls/setregid.S
index 561a658..ae5bfca 100644
--- a/libc/arch-x86/syscalls/setregid.S
+++ b/libc/arch-x86/syscalls/setregid.S
@@ -4,10 +4,11 @@
ENTRY(setregid)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_setregid32, %eax
diff --git a/libc/arch-x86/syscalls/setresgid.S b/libc/arch-x86/syscalls/setresgid.S
index a210975..64b5f7e 100644
--- a/libc/arch-x86/syscalls/setresgid.S
+++ b/libc/arch-x86/syscalls/setresgid.S
@@ -4,12 +4,14 @@
ENTRY(setresgid)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/setresuid.S b/libc/arch-x86/syscalls/setresuid.S
index 920e68b..2a29fa5 100644
--- a/libc/arch-x86/syscalls/setresuid.S
+++ b/libc/arch-x86/syscalls/setresuid.S
@@ -4,12 +4,14 @@
ENTRY(setresuid)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/setreuid.S b/libc/arch-x86/syscalls/setreuid.S
index 7f911ad..200a83a 100644
--- a/libc/arch-x86/syscalls/setreuid.S
+++ b/libc/arch-x86/syscalls/setreuid.S
@@ -4,10 +4,11 @@
ENTRY(setreuid)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_setreuid32, %eax
diff --git a/libc/arch-x86/syscalls/setrlimit.S b/libc/arch-x86/syscalls/setrlimit.S
index e103ecf..64a46c0 100644
--- a/libc/arch-x86/syscalls/setrlimit.S
+++ b/libc/arch-x86/syscalls/setrlimit.S
@@ -4,10 +4,11 @@
ENTRY(setrlimit)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_setrlimit, %eax
diff --git a/libc/arch-x86/syscalls/setsockopt.S b/libc/arch-x86/syscalls/setsockopt.S
index f56f812..e57c9d2 100644
--- a/libc/arch-x86/syscalls/setsockopt.S
+++ b/libc/arch-x86/syscalls/setsockopt.S
@@ -4,10 +4,11 @@
ENTRY(setsockopt)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $14, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/settimeofday.S b/libc/arch-x86/syscalls/settimeofday.S
index 1ae4d58..4b2eca9 100644
--- a/libc/arch-x86/syscalls/settimeofday.S
+++ b/libc/arch-x86/syscalls/settimeofday.S
@@ -4,10 +4,11 @@
ENTRY(settimeofday)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_settimeofday, %eax
diff --git a/libc/arch-x86/syscalls/setuid.S b/libc/arch-x86/syscalls/setuid.S
index 6549fd4..cf10ad6 100644
--- a/libc/arch-x86/syscalls/setuid.S
+++ b/libc/arch-x86/syscalls/setuid.S
@@ -4,7 +4,7 @@
ENTRY(setuid)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_setuid32, %eax
diff --git a/libc/arch-x86/syscalls/setxattr.S b/libc/arch-x86/syscalls/setxattr.S
index fae04df..5edba2d 100644
--- a/libc/arch-x86/syscalls/setxattr.S
+++ b/libc/arch-x86/syscalls/setxattr.S
@@ -4,16 +4,20 @@
ENTRY(setxattr)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- pushl %edi
- .cfi_def_cfa_offset 20
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
- .cfi_rel_offset edi, 16
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
+ pushl %edi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edi, 0
mov 24(%esp), %ebx
mov 28(%esp), %ecx
mov 32(%esp), %edx
diff --git a/libc/arch-x86/syscalls/shutdown.S b/libc/arch-x86/syscalls/shutdown.S
index 13e8fd9..f1d606a 100644
--- a/libc/arch-x86/syscalls/shutdown.S
+++ b/libc/arch-x86/syscalls/shutdown.S
@@ -4,10 +4,11 @@
ENTRY(shutdown)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $13, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/sigaltstack.S b/libc/arch-x86/syscalls/sigaltstack.S
index 71fdb12..64872df 100644
--- a/libc/arch-x86/syscalls/sigaltstack.S
+++ b/libc/arch-x86/syscalls/sigaltstack.S
@@ -4,10 +4,11 @@
ENTRY(sigaltstack)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_sigaltstack, %eax
diff --git a/libc/arch-x86/syscalls/socketpair.S b/libc/arch-x86/syscalls/socketpair.S
index 3681c4f..4027752 100644
--- a/libc/arch-x86/syscalls/socketpair.S
+++ b/libc/arch-x86/syscalls/socketpair.S
@@ -4,10 +4,11 @@
ENTRY(socketpair)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov $8, %ebx
mov %esp, %ecx
addl $12, %ecx
diff --git a/libc/arch-x86/syscalls/swapoff.S b/libc/arch-x86/syscalls/swapoff.S
index 31f8be1..1657e64 100644
--- a/libc/arch-x86/syscalls/swapoff.S
+++ b/libc/arch-x86/syscalls/swapoff.S
@@ -4,7 +4,7 @@
ENTRY(swapoff)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_swapoff, %eax
diff --git a/libc/arch-x86/syscalls/swapon.S b/libc/arch-x86/syscalls/swapon.S
index 687c492..16d0617 100644
--- a/libc/arch-x86/syscalls/swapon.S
+++ b/libc/arch-x86/syscalls/swapon.S
@@ -4,10 +4,11 @@
ENTRY(swapon)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_swapon, %eax
diff --git a/libc/arch-x86/syscalls/symlinkat.S b/libc/arch-x86/syscalls/symlinkat.S
index 1f33f7b..78f9fa7 100644
--- a/libc/arch-x86/syscalls/symlinkat.S
+++ b/libc/arch-x86/syscalls/symlinkat.S
@@ -4,12 +4,14 @@
ENTRY(symlinkat)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/sync.S b/libc/arch-x86/syscalls/sync.S
index f80296f..a0cf66f 100644
--- a/libc/arch-x86/syscalls/sync.S
+++ b/libc/arch-x86/syscalls/sync.S
@@ -4,7 +4,7 @@
ENTRY(sync)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_sync, %eax
diff --git a/libc/arch-x86/syscalls/sysinfo.S b/libc/arch-x86/syscalls/sysinfo.S
index 8b9a23e..1619edb 100644
--- a/libc/arch-x86/syscalls/sysinfo.S
+++ b/libc/arch-x86/syscalls/sysinfo.S
@@ -4,7 +4,7 @@
ENTRY(sysinfo)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_sysinfo, %eax
diff --git a/libc/arch-x86/syscalls/tgkill.S b/libc/arch-x86/syscalls/tgkill.S
index e57645c..69ffdf8 100644
--- a/libc/arch-x86/syscalls/tgkill.S
+++ b/libc/arch-x86/syscalls/tgkill.S
@@ -4,12 +4,14 @@
ENTRY(tgkill)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/timerfd_create.S b/libc/arch-x86/syscalls/timerfd_create.S
index 33b2980..c0bc5b5 100644
--- a/libc/arch-x86/syscalls/timerfd_create.S
+++ b/libc/arch-x86/syscalls/timerfd_create.S
@@ -4,10 +4,11 @@
ENTRY(timerfd_create)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_timerfd_create, %eax
diff --git a/libc/arch-x86/syscalls/timerfd_gettime.S b/libc/arch-x86/syscalls/timerfd_gettime.S
index 66b004b..5dd7ad7 100644
--- a/libc/arch-x86/syscalls/timerfd_gettime.S
+++ b/libc/arch-x86/syscalls/timerfd_gettime.S
@@ -4,10 +4,11 @@
ENTRY(timerfd_gettime)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_timerfd_gettime, %eax
diff --git a/libc/arch-x86/syscalls/timerfd_settime.S b/libc/arch-x86/syscalls/timerfd_settime.S
index 3f4035e..bb027df 100644
--- a/libc/arch-x86/syscalls/timerfd_settime.S
+++ b/libc/arch-x86/syscalls/timerfd_settime.S
@@ -4,14 +4,17 @@
ENTRY(timerfd_settime)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/times.S b/libc/arch-x86/syscalls/times.S
index b9e2845..075750d 100644
--- a/libc/arch-x86/syscalls/times.S
+++ b/libc/arch-x86/syscalls/times.S
@@ -4,7 +4,7 @@
ENTRY(times)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_times, %eax
diff --git a/libc/arch-x86/syscalls/truncate.S b/libc/arch-x86/syscalls/truncate.S
index 019894c..9270a53 100644
--- a/libc/arch-x86/syscalls/truncate.S
+++ b/libc/arch-x86/syscalls/truncate.S
@@ -4,10 +4,11 @@
ENTRY(truncate)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_truncate, %eax
diff --git a/libc/arch-x86/syscalls/truncate64.S b/libc/arch-x86/syscalls/truncate64.S
index 99b71b0..89c2c4a 100644
--- a/libc/arch-x86/syscalls/truncate64.S
+++ b/libc/arch-x86/syscalls/truncate64.S
@@ -4,12 +4,14 @@
ENTRY(truncate64)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/umask.S b/libc/arch-x86/syscalls/umask.S
index 485b326..81df64d 100644
--- a/libc/arch-x86/syscalls/umask.S
+++ b/libc/arch-x86/syscalls/umask.S
@@ -4,7 +4,7 @@
ENTRY(umask)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_umask, %eax
diff --git a/libc/arch-x86/syscalls/umount2.S b/libc/arch-x86/syscalls/umount2.S
index 100d38c..cd21623 100644
--- a/libc/arch-x86/syscalls/umount2.S
+++ b/libc/arch-x86/syscalls/umount2.S
@@ -4,10 +4,11 @@
ENTRY(umount2)
pushl %ebx
- pushl %ecx
.cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
mov 12(%esp), %ebx
mov 16(%esp), %ecx
movl $__NR_umount2, %eax
diff --git a/libc/arch-x86/syscalls/uname.S b/libc/arch-x86/syscalls/uname.S
index f1ba3b9..9d65e85 100644
--- a/libc/arch-x86/syscalls/uname.S
+++ b/libc/arch-x86/syscalls/uname.S
@@ -4,7 +4,7 @@
ENTRY(uname)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_uname, %eax
diff --git a/libc/arch-x86/syscalls/unlinkat.S b/libc/arch-x86/syscalls/unlinkat.S
index 1a573d4..68bf05b 100644
--- a/libc/arch-x86/syscalls/unlinkat.S
+++ b/libc/arch-x86/syscalls/unlinkat.S
@@ -4,12 +4,14 @@
ENTRY(unlinkat)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/unshare.S b/libc/arch-x86/syscalls/unshare.S
index 95fdbf6..7e48cb1 100644
--- a/libc/arch-x86/syscalls/unshare.S
+++ b/libc/arch-x86/syscalls/unshare.S
@@ -4,7 +4,7 @@
ENTRY(unshare)
pushl %ebx
- .cfi_def_cfa_offset 4
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
mov 8(%esp), %ebx
movl $__NR_unshare, %eax
diff --git a/libc/arch-x86/syscalls/utimensat.S b/libc/arch-x86/syscalls/utimensat.S
index 099f551..4b2a9b6 100644
--- a/libc/arch-x86/syscalls/utimensat.S
+++ b/libc/arch-x86/syscalls/utimensat.S
@@ -4,14 +4,17 @@
ENTRY(utimensat)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/wait4.S b/libc/arch-x86/syscalls/wait4.S
index b6196f8..bd4bd50 100644
--- a/libc/arch-x86/syscalls/wait4.S
+++ b/libc/arch-x86/syscalls/wait4.S
@@ -4,14 +4,17 @@
ENTRY(wait4)
pushl %ebx
- pushl %ecx
- pushl %edx
- pushl %esi
- .cfi_def_cfa_offset 16
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
- .cfi_rel_offset esi, 12
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
+ pushl %esi
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset esi, 0
mov 20(%esp), %ebx
mov 24(%esp), %ecx
mov 28(%esp), %edx
diff --git a/libc/arch-x86/syscalls/write.S b/libc/arch-x86/syscalls/write.S
index 971cb30..a464196 100644
--- a/libc/arch-x86/syscalls/write.S
+++ b/libc/arch-x86/syscalls/write.S
@@ -4,12 +4,14 @@
ENTRY(write)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/syscalls/writev.S b/libc/arch-x86/syscalls/writev.S
index ab8e705..da9ae7c 100644
--- a/libc/arch-x86/syscalls/writev.S
+++ b/libc/arch-x86/syscalls/writev.S
@@ -4,12 +4,14 @@
ENTRY(writev)
pushl %ebx
- pushl %ecx
- pushl %edx
- .cfi_def_cfa_offset 12
+ .cfi_def_cfa_offset 8
.cfi_rel_offset ebx, 0
- .cfi_rel_offset ecx, 4
- .cfi_rel_offset edx, 8
+ pushl %ecx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset ecx, 0
+ pushl %edx
+ .cfi_adjust_cfa_offset 4
+ .cfi_rel_offset edx, 0
mov 16(%esp), %ebx
mov 20(%esp), %ecx
mov 24(%esp), %edx
diff --git a/libc/arch-x86/x86.mk b/libc/arch-x86/x86.mk
index aa183cb..d13a934 100644
--- a/libc/arch-x86/x86.mk
+++ b/libc/arch-x86/x86.mk
@@ -12,6 +12,7 @@
bionic/__memset_chk.cpp \
bionic/__strcpy_chk.cpp \
bionic/__strcat_chk.cpp \
+ upstream-freebsd/lib/libc/string/wmemmove.c \
# These are shared by all the 32-bit targets, but not the 64-bit ones.
diff --git a/libc/arch-x86_64/syscalls/gettid.S b/libc/arch-x86_64/syscalls/gettid.S
deleted file mode 100644
index 65ecc16..0000000
--- a/libc/arch-x86_64/syscalls/gettid.S
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Generated by gensyscalls.py. Do not edit. */
-
-#include <private/bionic_asm.h>
-
-ENTRY(gettid)
- movl $__NR_gettid, %eax
- syscall
- cmpq $-MAX_ERRNO, %rax
- jb 1f
- negl %eax
- movl %eax, %edi
- call __set_errno
- orq $-1, %rax
-1:
- ret
-END(gettid)
diff --git a/libc/arch-x86_64/x86_64.mk b/libc/arch-x86_64/x86_64.mk
index e3c2562..c54cdb8 100644
--- a/libc/arch-x86_64/x86_64.mk
+++ b/libc/arch-x86_64/x86_64.mk
@@ -14,6 +14,7 @@
upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \
+ upstream-freebsd/lib/libc/string/wmemmove.c \
upstream-openbsd/lib/libc/string/strlcat.c \
upstream-openbsd/lib/libc/string/strlcpy.c \
diff --git a/libc/bionic/brk.cpp b/libc/bionic/brk.cpp
index 4d08a61..4e46193 100644
--- a/libc/bionic/brk.cpp
+++ b/libc/bionic/brk.cpp
@@ -56,19 +56,19 @@
}
// Avoid overflow.
- intptr_t old_brk = reinterpret_cast<intptr_t>(__bionic_brk);
- if ((increment > 0 && INTPTR_MAX - increment > old_brk) ||
- (increment < 0 && (increment == PTRDIFF_MIN || old_brk < -increment))) {
+ uintptr_t old_brk = reinterpret_cast<uintptr_t>(__bionic_brk);
+ if ((increment > 0 && static_cast<uintptr_t>(increment) > (UINTPTR_MAX - old_brk)) ||
+ (increment < 0 && static_cast<uintptr_t>(-increment) > old_brk)) {
errno = ENOMEM;
return reinterpret_cast<void*>(-1);
}
void* desired_brk = reinterpret_cast<void*>(old_brk + increment);
__bionic_brk = __brk(desired_brk);
-
if (__bionic_brk < desired_brk) {
errno = ENOMEM;
return reinterpret_cast<void*>(-1);
}
+
return reinterpret_cast<void*>(old_brk);
}
diff --git a/libc/bionic/clone.cpp b/libc/bionic/clone.cpp
index 2c507c4..d38a422 100644
--- a/libc/bionic/clone.cpp
+++ b/libc/bionic/clone.cpp
@@ -32,7 +32,7 @@
#include <stdarg.h>
extern "C" pid_t __bionic_clone(uint32_t flags, void* child_stack, int* parent_tid, void* tls, int* child_tid, int (*fn)(void*), void* arg);
-extern "C" void __exit(int status);
+extern "C" __noreturn void __exit(int status);
// Called from the __bionic_clone assembler to call the thread function then exit.
extern "C" __LIBC_HIDDEN__ void __bionic_clone_entry(int (*fn)(void*), void* arg) {
diff --git a/libc/bionic/issetugid.c b/libc/bionic/gettid.cpp
similarity index 90%
rename from libc/bionic/issetugid.c
rename to libc/bionic/gettid.cpp
index 81f8e41..f42e36a 100644
--- a/libc/bionic/issetugid.c
+++ b/libc/bionic/gettid.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (C) 2014 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,11 +25,11 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
+
#include <unistd.h>
-int issetugid(void)
-{
- /* for Bionic, this is sufficient */
- return 0;
-}
+#include "pthread_internal.h"
+pid_t gettid() {
+ return __get_thread()->tid;
+}
diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index 4900a8a..1284b9a 100644
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -31,7 +31,6 @@
#include <ctype.h>
#include <inttypes.h>
-#include <linux/futex.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
@@ -201,25 +200,20 @@
return vdprintf(fd, fmt, ap);
}
-static inline int __futex(volatile void* ftx, int op, int value, const struct timespec* timeout) {
- // Our generated syscall assembler sets errno, but our callers (pthread functions) don't want to.
- int saved_errno = errno;
- if (syscall(__NR_futex, ftx, op, value, timeout) == 0) {
- return 0;
- }
- int result = -errno;
- errno = saved_errno;
- return result;
-}
+#define __futex_wake __real_futex_wake
+#define __futex_wait __real_futex_wait
+#include "private/bionic_futex.h"
+#undef __futex_wake
+#undef __futex_wait
// This used to be in <sys/atomics.h>.
extern "C" int __futex_wake(volatile void* ftx, int count) {
- return __futex(ftx, FUTEX_WAKE, count, NULL);
+ return __real_futex_wake(ftx, count);
}
// This used to be in <sys/atomics.h>.
extern "C" int __futex_wait(volatile void* ftx, int value, const struct timespec* timeout) {
- return __futex(ftx, FUTEX_WAIT, value, timeout);
+ return __real_futex_wait(ftx, value, timeout);
}
// Unity's libmono uses this.
diff --git a/libc/bionic/new.cpp b/libc/bionic/new.cpp
index cb19dfa..fcfd1bd 100644
--- a/libc/bionic/new.cpp
+++ b/libc/bionic/new.cpp
@@ -14,15 +14,18 @@
* limitations under the License.
*/
+#include <errno.h>
#include <new>
#include <stdlib.h>
+#include "private/libc_logging.h"
+
const std::nothrow_t std::nothrow = {};
void* operator new(std::size_t size) {
void* p = malloc(size);
if (p == NULL) {
- abort();
+ __libc_fatal("new failed to allocate %zu bytes", size);
}
return p;
}
@@ -30,7 +33,7 @@
void* operator new[](std::size_t size) {
void* p = malloc(size);
if (p == NULL) {
- abort();
+ __libc_fatal("new[] failed to allocate %zu bytes", size);
}
return p;
}
diff --git a/libc/bionic/pthread_create.cpp b/libc/bionic/pthread_create.cpp
index 303af81..c4cb262 100644
--- a/libc/bionic/pthread_create.cpp
+++ b/libc/bionic/pthread_create.cpp
@@ -144,10 +144,8 @@
// notify gdb about this thread before we start doing anything.
// This also provides the memory barrier needed to ensure that all memory
// accesses previously made by the creating thread are visible to us.
- pthread_mutex_t* start_mutex = (pthread_mutex_t*) &thread->tls[TLS_SLOT_START_MUTEX];
- pthread_mutex_lock(start_mutex);
- pthread_mutex_destroy(start_mutex);
- thread->tls[TLS_SLOT_START_MUTEX] = NULL;
+ pthread_mutex_lock(&thread->startup_handshake_mutex);
+ pthread_mutex_destroy(&thread->startup_handshake_mutex);
__init_alternate_signal_stack(thread);
@@ -204,7 +202,8 @@
// The child stack is the same address, just growing in the opposite direction.
// At offsets >= 0, we have the TLS slots.
// At offsets < 0, we have the child stack.
- thread->tls = (void**)((uint8_t*)(thread->attr.stack_base) + thread->attr.stack_size - BIONIC_TLS_SLOTS * sizeof(void*));
+ thread->tls = reinterpret_cast<void**>(reinterpret_cast<uint8_t*>(thread->attr.stack_base) +
+ thread->attr.stack_size - BIONIC_TLS_SLOTS * sizeof(void*));
void* child_stack = thread->tls;
__init_tls(thread);
@@ -214,9 +213,8 @@
// This also provides the memory barrier we need to ensure that all
// memory accesses previously performed by this thread are visible to
// the new thread.
- pthread_mutex_t* start_mutex = (pthread_mutex_t*) &thread->tls[TLS_SLOT_START_MUTEX];
- pthread_mutex_init(start_mutex, NULL);
- pthread_mutex_lock(start_mutex);
+ pthread_mutex_init(&thread->startup_handshake_mutex, NULL);
+ pthread_mutex_lock(&thread->startup_handshake_mutex);
thread->start_routine = start_routine;
thread->start_routine_arg = arg;
@@ -237,7 +235,7 @@
// We don't have to unlock the mutex at all because clone(2) failed so there's no child waiting to
// be unblocked, but we're about to unmap the memory the mutex is stored in, so this serves as a
// reminder that you can't rewrite this function to use a ScopedPthreadMutexLocker.
- pthread_mutex_unlock(start_mutex);
+ pthread_mutex_unlock(&thread->startup_handshake_mutex);
if ((thread->attr.flags & PTHREAD_ATTR_FLAG_USER_ALLOCATED_STACK) == 0) {
munmap(thread->attr.stack_base, thread->attr.stack_size);
}
@@ -252,7 +250,7 @@
// Letting the thread run is the easiest way to clean up its resources.
thread->attr.flags |= PTHREAD_ATTR_FLAG_DETACHED;
thread->start_routine = __do_nothing;
- pthread_mutex_unlock(start_mutex);
+ pthread_mutex_unlock(&thread->startup_handshake_mutex);
return init_errno;
}
@@ -264,7 +262,7 @@
// Publish the pthread_t and unlock the mutex to let the new thread start running.
*thread_out = reinterpret_cast<pthread_t>(thread);
- pthread_mutex_unlock(start_mutex);
+ pthread_mutex_unlock(&thread->startup_handshake_mutex);
return 0;
}
diff --git a/libc/bionic/pthread_exit.cpp b/libc/bionic/pthread_exit.cpp
index de818cd..2470c9c 100644
--- a/libc/bionic/pthread_exit.cpp
+++ b/libc/bionic/pthread_exit.cpp
@@ -34,8 +34,8 @@
#include "pthread_internal.h"
-extern "C" void _exit_with_stack_teardown(void*, size_t);
-extern "C" void __exit(int);
+extern "C" __noreturn void _exit_with_stack_teardown(void*, size_t);
+extern "C" __noreturn void __exit(int);
extern "C" int __set_tid_address(int*);
/* CAVEAT: our implementation of pthread_cleanup_push/pop doesn't support C++ exceptions
@@ -127,7 +127,4 @@
_exit_with_stack_teardown(stack_base, stack_size);
}
-
- // NOTREACHED, but we told the compiler this function is noreturn, and it doesn't believe us.
- abort();
}
diff --git a/libc/bionic/pthread_internal.h b/libc/bionic/pthread_internal.h
index 295d9d6..490ae86 100644
--- a/libc/bionic/pthread_internal.h
+++ b/libc/bionic/pthread_internal.h
@@ -48,6 +48,8 @@
void* alternate_signal_stack;
+ pthread_mutex_t startup_handshake_mutex;
+
/*
* The dynamic linker implements dlerror(3), which makes it hard for us to implement this
* per-thread buffer by simply using malloc(3) and free(3).
diff --git a/libc/bionic/pthread_mutex.cpp b/libc/bionic/pthread_mutex.cpp
index 27ed3e1..5461661 100644
--- a/libc/bionic/pthread_mutex.cpp
+++ b/libc/bionic/pthread_mutex.cpp
@@ -305,9 +305,7 @@
* "type" value is zero, so the only bits that will be set are the ones in
* the lock state field.
*/
-static __inline__ void
-_normal_lock(pthread_mutex_t* mutex, int shared)
-{
+static inline void _normal_lock(pthread_mutex_t* mutex, int shared) {
/* convenience shortcuts */
const int unlocked = shared | MUTEX_STATE_BITS_UNLOCKED;
const int locked_uncontended = shared | MUTEX_STATE_BITS_LOCKED_UNCONTENDED;
@@ -335,8 +333,9 @@
* that the mutex is in state 2 when we go to sleep on it, which
* guarantees a wake-up call.
*/
- while (__bionic_swap(locked_contended, &mutex->value) != unlocked)
- __futex_wait_ex(&mutex->value, shared, locked_contended, 0);
+ while (__bionic_swap(locked_contended, &mutex->value) != unlocked) {
+ __futex_wait_ex(&mutex->value, shared, locked_contended, NULL);
+ }
}
ANDROID_MEMBAR_FULL();
}
@@ -345,9 +344,7 @@
* Release a non-recursive mutex. The caller is responsible for determining
* that we are in fact the owner of this lock.
*/
-static __inline__ void
-_normal_unlock(pthread_mutex_t* mutex, int shared)
-{
+static inline void _normal_unlock(pthread_mutex_t* mutex, int shared) {
ANDROID_MEMBAR_FULL();
/*
@@ -409,9 +406,7 @@
* mvalue is the current mutex value (already loaded)
* mutex pointers to the mutex.
*/
-static __inline__ __attribute__((always_inline)) int
-_recursive_increment(pthread_mutex_t* mutex, int mvalue, int mtype)
-{
+static inline __always_inline int _recursive_increment(pthread_mutex_t* mutex, int mvalue, int mtype) {
if (mtype == MUTEX_TYPE_BITS_ERRORCHECK) {
/* trying to re-lock a mutex we already acquired */
return EDEADLK;
@@ -451,7 +446,7 @@
mtype = (mvalue & MUTEX_TYPE_MASK);
shared = (mvalue & MUTEX_SHARED_MASK);
- /* Handle normal case first */
+ /* Handle non-recursive case first */
if ( __predict_true(mtype == MUTEX_TYPE_BITS_NORMAL) ) {
_normal_lock(mutex, shared);
return 0;
diff --git a/libc/include/sys/ucontext.h b/libc/include/sys/ucontext.h
index d6c6b43..f62380d 100644
--- a/libc/include/sys/ucontext.h
+++ b/libc/include/sys/ucontext.h
@@ -68,8 +68,13 @@
struct ucontext* uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
- sigset_t uc_sigmask;
- char __padding[128 - sizeof(sigset_t)];
+ // Android has a wrong (smaller) sigset_t on ARM.
+ union {
+ sigset_t bionic;
+ uint32_t kernel[2];
+ } uc_sigmask;
+ // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM.
+ char __padding[120];
unsigned long uc_regspace[128] __attribute__((__aligned__(8)));
} ucontext_t;
@@ -83,6 +88,7 @@
struct ucontext *uc_link;
stack_t uc_stack;
sigset_t uc_sigmask;
+ // The kernel adds extra padding after uc_sigmask to match glibc sigset_t on ARM64.
char __padding[128 - sizeof(sigset_t)];
mcontext_t uc_mcontext;
} ucontext_t;
@@ -146,8 +152,11 @@
struct ucontext* uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
- sigset_t uc_sigmask;
- char __padding[128 - sizeof(sigset_t)];
+ // Android has a wrong (smaller) sigset_t on x86.
+ union {
+ sigset_t bionic;
+ uint32_t kernel[2];
+ } uc_sigmask;
struct _libc_fpstate __fpregs_mem;
} ucontext_t;
@@ -198,7 +207,6 @@
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
- char __padding[128 - sizeof(sigset_t)];
} ucontext_t;
#elif defined(__mips64__)
@@ -275,7 +283,6 @@
stack_t uc_stack;
mcontext_t uc_mcontext;
sigset_t uc_sigmask;
- char __padding[128 - sizeof(sigset_t)];
struct _libc_fpstate __fpregs_mem;
} ucontext_t;
diff --git a/libc/include/unistd.h b/libc/include/unistd.h
index 08a82e6..b4982cb 100644
--- a/libc/include/unistd.h
+++ b/libc/include/unistd.h
@@ -92,7 +92,6 @@
extern int setresgid(gid_t, gid_t, gid_t);
extern int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid);
extern int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid);
-extern int issetugid(void);
extern char* getlogin(void);
extern char* getusershell(void);
extern void setusershell(void);
diff --git a/libc/private/bionic_futex.h b/libc/private/bionic_futex.h
index dd277ed..bd2bd36 100644
--- a/libc/private/bionic_futex.h
+++ b/libc/private/bionic_futex.h
@@ -39,14 +39,14 @@
struct timespec;
-static inline int __futex(volatile void* ftx, int op, int value, const struct timespec* timeout) {
+static inline __always_inline int __futex(volatile void* ftx, int op, int value, const struct timespec* timeout) {
// Our generated syscall assembler sets errno, but our callers (pthread functions) don't want to.
int saved_errno = errno;
- if (syscall(__NR_futex, ftx, op, value, timeout) == 0) {
- return 0;
+ int result = syscall(__NR_futex, ftx, op, value, timeout);
+ if (__predict_false(result == -1)) {
+ result = -errno;
+ errno = saved_errno;
}
- int result = -errno;
- errno = saved_errno;
return result;
}
diff --git a/libc/private/bionic_tls.h b/libc/private/bionic_tls.h
index c2cf196..b52013f 100644
--- a/libc/private/bionic_tls.h
+++ b/libc/private/bionic_tls.h
@@ -46,32 +46,27 @@
** pre-allocated slot directly for performance reason).
**/
-/* Well-known TLS slots. What data goes in which slot is arbitrary unless otherwise noted. */
+// Well-known TLS slots. What data goes in which slot is arbitrary unless otherwise noted.
enum {
- TLS_SLOT_SELF = 0, /* The kernel requires this specific slot for x86. */
+ TLS_SLOT_SELF = 0, // The kernel requires this specific slot for x86.
TLS_SLOT_THREAD_ID,
TLS_SLOT_ERRNO,
- /* This slot in the child's TLS is used to synchronize the parent and child
- * during thread initialization. The child finishes with this mutex before
- * running any code that can set errno, so we can reuse the errno slot. */
- TLS_SLOT_START_MUTEX = TLS_SLOT_ERRNO,
-
- /* These two aren't used by bionic itself, but allow the graphics code to
- * access TLS directly rather than using the pthread API. */
+ // These two aren't used by bionic itself, but allow the graphics code to
+ // access TLS directly rather than using the pthread API.
TLS_SLOT_OPENGL_API = 3,
TLS_SLOT_OPENGL = 4,
- /* This slot is only used to pass information from the dynamic linker to
- * libc.so when the C library is loaded in to memory. The C runtime init
- * function will then clear it. Since its use is extremely temporary,
- * we reuse an existing location that isn't needed during libc startup. */
+ // This slot is only used to pass information from the dynamic linker to
+ // libc.so when the C library is loaded in to memory. The C runtime init
+ // function will then clear it. Since its use is extremely temporary,
+ // we reuse an existing location that isn't needed during libc startup.
TLS_SLOT_BIONIC_PREINIT = TLS_SLOT_OPENGL_API,
- TLS_SLOT_STACK_GUARD = 5, /* GCC requires this specific slot for x86. */
+ TLS_SLOT_STACK_GUARD = 5, // GCC requires this specific slot for x86.
TLS_SLOT_DLERROR,
- TLS_SLOT_FIRST_USER_SLOT /* Must come last! */
+ TLS_SLOT_FIRST_USER_SLOT // Must come last!
};
/*
diff --git a/libc/stdio/local.h b/libc/stdio/local.h
index 3c5388c..151e009 100644
--- a/libc/stdio/local.h
+++ b/libc/stdio/local.h
@@ -54,7 +54,9 @@
* The NDK apparently includes an android_support.a library that
* refers to __srefill in its copy of the vsnprintf implementation.
*/
-__LIBC_HIDDEN__ int __srefill(FILE*);
+/* TODO(LP64): __LIBC_HIDDEN__ int __srefill(FILE*);*/
+/* http://b/15291317: the LP64 NDK needs to be fixed to remove that cruft. */
+__LIBC_ABI_PUBLIC__ int __srefill(FILE*);
#else
__LIBC_ABI_PUBLIC__ int __srget(FILE*);
__LIBC_ABI_PUBLIC__ int __swbuf(int, FILE*);
diff --git a/libc/tools/gensyscalls.py b/libc/tools/gensyscalls.py
index 87d51e3..5e4ddc5 100755
--- a/libc/tools/gensyscalls.py
+++ b/libc/tools/gensyscalls.py
@@ -323,17 +323,20 @@
stack_bias = numparams*4 + 4
offset = 0
mov_result = ""
- cfi_result = " .cfi_def_cfa_offset %d\n" % (numparams*4)
+ first_push = True
for register in x86_registers[:numparams]:
result += " pushl %%%s\n" % register
+ if first_push:
+ result += " .cfi_def_cfa_offset 8\n"
+ result += " .cfi_rel_offset %s, 0\n" % register
+ first_push = False
+ else:
+ result += " .cfi_adjust_cfa_offset 4\n"
+ result += " .cfi_rel_offset %s, 0\n" % register
mov_result += " mov %d(%%esp), %%%s\n" % (stack_bias+offset, register)
- cfi_result += " .cfi_rel_offset %s, %d\n" % (register, offset)
offset += 4
- if numparams:
- result += cfi_result
- result += mov_result
-
+ result += mov_result
result += x86_call % syscall
for register in reversed(x86_registers[:numparams]):
@@ -353,10 +356,11 @@
# save the regs we need
result += " pushl %ebx\n"
- result += " pushl %ecx\n"
result += " .cfi_def_cfa_offset 8\n"
result += " .cfi_rel_offset ebx, 0\n"
- result += " .cfi_rel_offset ecx, 4\n"
+ result += " pushl %ecx\n"
+ result += " .cfi_adjust_cfa_offset 4\n"
+ result += " .cfi_rel_offset ecx, 0\n"
stack_bias = 12
# set the call id (%ebx)
diff --git a/libc/upstream-openbsd/android/include/openbsd-compat.h b/libc/upstream-openbsd/android/include/openbsd-compat.h
index bacd1d7..8618e31 100644
--- a/libc/upstream-openbsd/android/include/openbsd-compat.h
+++ b/libc/upstream-openbsd/android/include/openbsd-compat.h
@@ -31,4 +31,7 @@
#define _X _CTYPE_X
#define _B _CTYPE_B
+/* OpenBSD has this, but we can't really implement it correctly on Linux. */
+#define issetugid() 0
+
#endif
diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata
index d78c819..b3c9444 100644
--- a/libc/zoneinfo/tzdata
+++ b/libc/zoneinfo/tzdata
Binary files differ
diff --git a/libm/Android.mk b/libm/Android.mk
index 4dfb216..b67395f 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -241,6 +241,11 @@
-Wno-unknown-pragmas \
-fvisibility=hidden \
+# Workaround the GCC "(long)fn -> lfn" optimization bug which will result in
+# self recursions for lrint, lrintf, and lrintl.
+# BUG: 14225968
+libm_common_cflags += -fno-builtin-rint -fno-builtin-rintf -fno-builtin-rintl
+
libm_common_includes := $(LOCAL_PATH)/upstream-freebsd/lib/msun/src/
libm_ld_includes := $(LOCAL_PATH)/upstream-freebsd/lib/msun/ld128/
@@ -270,10 +275,8 @@
LOCAL_C_INCLUDES_x86_64 := $(libm_ld_includes)
LOCAL_SRC_FILES_x86_64 := amd64/fenv.c $(libm_ld_src_files)
-LOCAL_CFLAGS_mips := -fno-builtin-rintf -fno-builtin-rint
LOCAL_SRC_FILES_mips := mips/fenv.c
-LOCAL_CFLAGS_mips64 := -fno-builtin-rintf -fno-builtin-rint
LOCAL_C_INCLUDES_mips64 := $(libm_ld_includes)
LOCAL_SRC_FILES_mips64 := mips/fenv.c $(libm_ld_src_files)
diff --git a/tests/Android.mk b/tests/Android.mk
index d753acc..db8dd8c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -86,7 +86,6 @@
signal_test.cpp \
stack_protector_test.cpp \
stack_unwinding_test.cpp \
- stack_unwinding_test_impl.c \
stdatomic_test.cpp \
stdint_test.cpp \
stdio_test.cpp \
@@ -121,6 +120,9 @@
libBionicStandardTests_ldlibs_host := \
-lrt \
+libBionicStandardTests_whole_static_libraries := \
+ libBionicUnwindTest \
+
module := libBionicStandardTests
module_tag := optional
build_type := target
@@ -130,6 +132,25 @@
include $(LOCAL_PATH)/Android.build.mk
# -----------------------------------------------------------------------------
+# Special stack unwinding test library compiled with special flags.
+# -----------------------------------------------------------------------------
+libBionicUnwindTest_cflags := \
+ $(test_cflags) \
+ -fexceptions \
+ -fnon-call-exceptions \
+
+libBionicUnwindTest_src_files := \
+ stack_unwinding_test_impl.c \
+
+module := libBionicUnwindTest
+module_tag := optional
+build_type := target
+build_target := STATIC_TEST_LIBRARY
+include $(LOCAL_PATH)/Android.build.mk
+build_type := host
+include $(LOCAL_PATH)/Android.build.mk
+
+# -----------------------------------------------------------------------------
# Fortify tests.
# -----------------------------------------------------------------------------
$(foreach compiler,gcc clang, \
@@ -291,8 +312,10 @@
atexit_testlib.cpp
module := libtest_atexit
-build_type := target
build_target := SHARED_LIBRARY
+build_type := target
+include $(LOCAL_PATH)/Android.build.mk
+build_type := host
include $(LOCAL_PATH)/Android.build.mk
# -----------------------------------------------------------------------------
diff --git a/tests/atexit_testlib.cpp b/tests/atexit_testlib.cpp
index 1fefdf0..d35f57b 100644
--- a/tests/atexit_testlib.cpp
+++ b/tests/atexit_testlib.cpp
@@ -71,6 +71,5 @@
atexit_valid_this_in_static_dtor = valid_this_in_static_dtor;
atexit(atexit_handler_regular);
atexit(atexit_handler_with_atexit);
- atexit(NULL);
}
diff --git a/tests/stdatomic_test.cpp b/tests/stdatomic_test.cpp
index 44f5c7b..d41bfa9 100644
--- a/tests/stdatomic_test.cpp
+++ b/tests/stdatomic_test.cpp
@@ -100,31 +100,31 @@
TEST(stdatomic, atomic_compare_exchange) {
atomic_int i;
- atomic_int expected;
+ int expected;
atomic_store(&i, 123);
- atomic_store(&expected, 123);
+ expected = 123;
ASSERT_TRUE(atomic_compare_exchange_strong(&i, &expected, 456));
ASSERT_FALSE(atomic_compare_exchange_strong(&i, &expected, 456));
- ASSERT_EQ(456, atomic_load(&expected));
+ ASSERT_EQ(456, expected);
atomic_store(&i, 123);
- atomic_store(&expected, 123);
+ expected = 123;
ASSERT_TRUE(atomic_compare_exchange_strong_explicit(&i, &expected, 456, memory_order_relaxed, memory_order_relaxed));
ASSERT_FALSE(atomic_compare_exchange_strong_explicit(&i, &expected, 456, memory_order_relaxed, memory_order_relaxed));
- ASSERT_EQ(456, atomic_load(&expected));
+ ASSERT_EQ(456, expected);
atomic_store(&i, 123);
- atomic_store(&expected, 123);
+ expected = 123;
ASSERT_TRUE(atomic_compare_exchange_weak(&i, &expected, 456));
ASSERT_FALSE(atomic_compare_exchange_weak(&i, &expected, 456));
- ASSERT_EQ(456, atomic_load(&expected));
+ ASSERT_EQ(456, expected);
atomic_store(&i, 123);
- atomic_store(&expected, 123);
+ expected = 123;
ASSERT_TRUE(atomic_compare_exchange_weak_explicit(&i, &expected, 456, memory_order_relaxed, memory_order_relaxed));
ASSERT_FALSE(atomic_compare_exchange_weak_explicit(&i, &expected, 456, memory_order_relaxed, memory_order_relaxed));
- ASSERT_EQ(456, atomic_load(&expected));
+ ASSERT_EQ(456, expected);
}
TEST(stdatomic, atomic_fetch_add) {
diff --git a/tests/stdio_test.cpp b/tests/stdio_test.cpp
index fa1b260..0ff85bf 100644
--- a/tests/stdio_test.cpp
+++ b/tests/stdio_test.cpp
@@ -61,16 +61,15 @@
ASSERT_EQ(rc, 6);
lseek(tf.fd, SEEK_SET, 0);
+ FILE* tfile = fdopen(tf.fd, "r");
+ ASSERT_TRUE(tfile != NULL);
- char buf[6];
- int bytes_to_read = 6;
- do {
- int bytes_read = read(tf.fd, buf, bytes_to_read);
- ASSERT_TRUE(bytes_to_read >= 0);
- bytes_to_read -= bytes_read;
- } while (bytes_to_read > 0);
-
+ char buf[7];
+ ASSERT_EQ(buf, fgets(buf, sizeof(buf), tfile));
ASSERT_STREQ("hello\n", buf);
+ // Make sure there isn't anything else in the file.
+ ASSERT_EQ(NULL, fgets(buf, sizeof(buf), tfile));
+ fclose(tfile);
}
TEST(stdio, getdelim) {
diff --git a/tests/unistd_test.cpp b/tests/unistd_test.cpp
index 3f31861..6aa259a 100644
--- a/tests/unistd_test.cpp
+++ b/tests/unistd_test.cpp
@@ -56,21 +56,82 @@
ASSERT_EQ(ENOMEM, errno);
}
+#if defined(__GLIBC__)
+#define SBRK_MIN INTPTR_MIN
+#define SBRK_MAX INTPTR_MAX
+#else
+#define SBRK_MIN PTRDIFF_MIN
+#define SBRK_MAX PTRDIFF_MAX
+#endif
+
TEST(unistd, sbrk_ENOMEM) {
- intptr_t current_brk = reinterpret_cast<intptr_t>(get_brk());
+#if defined(__BIONIC__) && !defined(__LP64__)
+ // There is no way to guarantee that all overflow conditions can be tested
+ // without manipulating the underlying values of the current break.
+ extern void* __bionic_brk;
+
+ class ScopedBrk {
+ public:
+ ScopedBrk() : saved_brk_(__bionic_brk) {}
+ virtual ~ScopedBrk() { __bionic_brk = saved_brk_; }
+
+ private:
+ void* saved_brk_;
+ };
+
+ ScopedBrk scope_brk;
+
+ // Set the current break to a point that will cause an overflow.
+ __bionic_brk = reinterpret_cast<void*>(static_cast<uintptr_t>(PTRDIFF_MAX) + 2);
// Can't increase by so much that we'd overflow.
ASSERT_EQ(reinterpret_cast<void*>(-1), sbrk(PTRDIFF_MAX));
ASSERT_EQ(ENOMEM, errno);
- // Can't reduce by more than the current break.
- ASSERT_EQ(reinterpret_cast<void*>(-1), sbrk(-(current_brk + 1)));
- ASSERT_EQ(ENOMEM, errno);
+ // Set the current break to a point that will cause an overflow.
+ __bionic_brk = reinterpret_cast<void*>(static_cast<uintptr_t>(PTRDIFF_MAX));
-#if defined(__BIONIC__)
- // The maximum negative value is an interesting special case that glibc gets wrong.
ASSERT_EQ(reinterpret_cast<void*>(-1), sbrk(PTRDIFF_MIN));
ASSERT_EQ(ENOMEM, errno);
+
+ __bionic_brk = reinterpret_cast<void*>(static_cast<uintptr_t>(PTRDIFF_MAX) - 1);
+
+ ASSERT_EQ(reinterpret_cast<void*>(-1), sbrk(PTRDIFF_MIN + 1));
+ ASSERT_EQ(ENOMEM, errno);
+#else
+ class ScopedBrk {
+ public:
+ ScopedBrk() : saved_brk_(get_brk()) {}
+ virtual ~ScopedBrk() { brk(saved_brk_); }
+
+ private:
+ void* saved_brk_;
+ };
+
+ ScopedBrk scope_brk;
+
+ uintptr_t cur_brk = reinterpret_cast<uintptr_t>(get_brk());
+ if (cur_brk < static_cast<uintptr_t>(-(SBRK_MIN+1))) {
+ // Do the overflow test for a max negative increment.
+ ASSERT_EQ(reinterpret_cast<void*>(-1), sbrk(SBRK_MIN));
+#if defined(__BIONIC__)
+ // GLIBC does not set errno in overflow case.
+ ASSERT_EQ(ENOMEM, errno);
+#endif
+ }
+
+ uintptr_t overflow_brk = static_cast<uintptr_t>(SBRK_MAX) + 2;
+ if (cur_brk < overflow_brk) {
+ // Try and move the value to PTRDIFF_MAX + 2.
+ cur_brk = reinterpret_cast<uintptr_t>(sbrk(overflow_brk));
+ }
+ if (cur_brk >= overflow_brk) {
+ ASSERT_EQ(reinterpret_cast<void*>(-1), sbrk(SBRK_MAX));
+#if defined(__BIONIC__)
+ // GLIBC does not set errno in overflow case.
+ ASSERT_EQ(ENOMEM, errno);
+#endif
+ }
#endif
}
diff --git a/tests/wchar_test.cpp b/tests/wchar_test.cpp
index 50b8608..5a250a2 100644
--- a/tests/wchar_test.cpp
+++ b/tests/wchar_test.cpp
@@ -442,3 +442,14 @@
EXPECT_EQ(24U, wcsftime(buf, sizeof(buf), L"%c", &t));
EXPECT_STREQ(L"Sun Mar 10 00:00:00 2100", buf);
}
+
+TEST(wchar, wmemmove) {
+ const wchar_t const_wstr[] = L"This is a test of something or other.....";
+ wchar_t* wstr = new wchar_t[sizeof(const_wstr)];
+
+ wmemmove(wstr, const_wstr, sizeof(const_wstr)/sizeof(wchar_t));
+ EXPECT_STREQ(const_wstr, wstr);
+
+ wmemmove(wstr+5, wstr, sizeof(const_wstr)/sizeof(wchar_t) - 6);
+ EXPECT_STREQ(L"This This is a test of something or other", wstr);
+}