i386: Support CFLAGS which imply -fno-omit-frame-pointer [BZ #20729]
Commit Message
2016-10-28 Florian Weimer <fweimer@redhat.com>
[BZ #20729]
Support i386 builds with CFLAGS which imply -fno-omit-frame-pointer.
* sysdeps/unix/sysv/linux/i386/Makefile
(uses-6-syscall-arguments): Define.
[subdir == misc] (CFLAGS-epoll_pwait.o, CFLAGS-epoll_pwait.os)
(CFLAGS-mmap.o, CFLAGS-mmap.os, CFLAGS-mmap64.o, CFLAGS-mmap64.os)
(CFLAGS-pselect.o, CFLAGS-pselect.os, CFLAGS-rtld-mmap.os): Use it.
[subdir = sysvipc] (CFLAGS-semtimedop.o, CFLAGS-semtimedop.os):
Likewise.
[subdir = io] (CFLAGS-posix_fadvise64.o, CFLAGS-posix_fadvise64.os)
(CFLAGS-posix_fallocate.o, CFLAGS-posix_fallocate.os)
(CFLAGS-posix_fallocate64.o, CFLAGS-posix_fallocate64.os)
(CFLAGS-sync_file_range.o, CFLAGS-sync_file_range.os)
(CFLAGS-fallocate.o, CFLAGS-fallocate.os, CFLAGS-fallocate64.o)
(CFLAGS-fallocate64.os): Likewise.
[subdir = nptl] (CFLAGS-pthread_rwlock_timedrdlock.o)
(CFLAGS-pthread_rwlock_timedrdlock.os)
(CFLAGS-pthread_rwlock_timedwrlock.o)
(CFLAGS-pthread_rwlock_timedwrlock.os, CFLAGS-sem_wait.o)
(CFLAGS-sem_wait.os, CFLAGS-sem_timedwait.o)
(CFLAGS-sem_timedwait.os): Likewise.
Comments
On 10/28/2016 11:05 AM, Florian Weimer wrote:
> 2016-10-28 Florian Weimer <fweimer@redhat.com>
>
> [BZ #20729]
> Support i386 builds with CFLAGS which imply -fno-omit-frame-pointer.
> * sysdeps/unix/sysv/linux/i386/Makefile
> (uses-6-syscall-arguments): Define.
> [subdir == misc] (CFLAGS-epoll_pwait.o, CFLAGS-epoll_pwait.os)
> (CFLAGS-mmap.o, CFLAGS-mmap.os, CFLAGS-mmap64.o, CFLAGS-mmap64.os)
> (CFLAGS-pselect.o, CFLAGS-pselect.os, CFLAGS-rtld-mmap.os): Use it.
> [subdir = sysvipc] (CFLAGS-semtimedop.o, CFLAGS-semtimedop.os):
> Likewise.
> [subdir = io] (CFLAGS-posix_fadvise64.o, CFLAGS-posix_fadvise64.os)
> (CFLAGS-posix_fallocate.o, CFLAGS-posix_fallocate.os)
> (CFLAGS-posix_fallocate64.o, CFLAGS-posix_fallocate64.os)
> (CFLAGS-sync_file_range.o, CFLAGS-sync_file_range.os)
> (CFLAGS-fallocate.o, CFLAGS-fallocate.os, CFLAGS-fallocate64.o)
> (CFLAGS-fallocate64.os): Likewise.
> [subdir = nptl] (CFLAGS-pthread_rwlock_timedrdlock.o)
> (CFLAGS-pthread_rwlock_timedrdlock.os)
> (CFLAGS-pthread_rwlock_timedwrlock.o)
> (CFLAGS-pthread_rwlock_timedwrlock.os, CFLAGS-sem_wait.o)
> (CFLAGS-sem_wait.os, CFLAGS-sem_timedwait.o)
> (CFLAGS-sem_timedwait.os): Likewise.
I like 'uses-6-syscall-arguments' to make this more readable.
LGTM.
Tested on i486 build.
@@ -1,21 +1,26 @@
# The default ABI is 32.
default-abi := 32
+# %ebp is used to pass the 6th argument to system calls, so these
+# system calls are incompatible with a frame pointer.
+uses-6-syscall-arguments = -fomit-frame-pointer
+
ifeq ($(subdir),misc)
sysdep_routines += ioperm iopl vm86
-# %ebp may be used to pass the 6th argument to syscall.
-CFLAGS-epoll_pwait.o += -fomit-frame-pointer
-CFLAGS-epoll_pwait.os += -fomit-frame-pointer
-CFLAGS-mmap.o += -fomit-frame-pointer
-CFLAGS-mmap.os += -fomit-frame-pointer
-CFLAGS-mmap64.o += -fomit-frame-pointer
-CFLAGS-mmap64.os += -fomit-frame-pointer
+CFLAGS-epoll_pwait.o += $(uses-6-syscall-arguments)
+CFLAGS-epoll_pwait.os += $(uses-6-syscall-arguments)
+CFLAGS-mmap.o += $(uses-6-syscall-arguments)
+CFLAGS-mmap.os += $(uses-6-syscall-arguments)
+CFLAGS-mmap64.o += $(uses-6-syscall-arguments)
+CFLAGS-mmap64.os += $(uses-6-syscall-arguments)
+CFLAGS-pselect.o += $(uses-6-syscall-arguments)
+CFLAGS-pselect.os += $(uses-6-syscall-arguments)
+CFLAGS-rtld-mmap.os += $(uses-6-syscall-arguments)
endif
ifeq ($(subdir),sysvipc)
-# %ebp may be used to pass the 6th argument to syscall.
-CFLAGS-semtimedop.o += -fomit-frame-pointer
-CFLAGS-semtimedop.os += -fomit-frame-pointer
+CFLAGS-semtimedop.o += $(uses-6-syscall-arguments)
+CFLAGS-semtimedop.os += $(uses-6-syscall-arguments)
endif
ifeq ($(subdir),elf)
@@ -23,12 +28,22 @@ sysdep-others += lddlibc4
install-bin += lddlibc4
endif
-# fallocate, posix_fallocate use six-argument inline syscalls.
ifeq ($(subdir),io)
sysdep_routines += libc-do-syscall
+CFLAGS-posix_fadvise64.o += $(uses-6-syscall-arguments)
+CFLAGS-posix_fadvise64.os += $(uses-6-syscall-arguments)
+CFLAGS-posix_fallocate.o += $(uses-6-syscall-arguments)
+CFLAGS-posix_fallocate.os += $(uses-6-syscall-arguments)
+CFLAGS-posix_fallocate64.o += $(uses-6-syscall-arguments)
+CFLAGS-posix_fallocate64.os += $(uses-6-syscall-arguments)
+CFLAGS-sync_file_range.o += $(uses-6-syscall-arguments)
+CFLAGS-sync_file_range.os += $(uses-6-syscall-arguments)
+CFLAGS-fallocate.o += $(uses-6-syscall-arguments)
+CFLAGS-fallocate.os += $(uses-6-syscall-arguments)
+CFLAGS-fallocate64.o += $(uses-6-syscall-arguments)
+CFLAGS-fallocate64.os += $(uses-6-syscall-arguments)
endif
-# libpthread uses six-argument inline syscalls.
ifeq ($(subdir),nptl)
libpthread-sysdep_routines += libc-do-syscall
libpthread-shared-only-routines += libc-do-syscall
@@ -50,6 +65,14 @@ ifeq ($(subdir),nptl)
# pull in __syscall_error routine
libpthread-routines += sysdep
libpthread-shared-only-routines += sysdep
+CFLAGS-pthread_rwlock_timedrdlock.o += $(uses-6-syscall-arguments)
+CFLAGS-pthread_rwlock_timedrdlock.os += $(uses-6-syscall-arguments)
+CFLAGS-pthread_rwlock_timedwrlock.o += $(uses-6-syscall-arguments)
+CFLAGS-pthread_rwlock_timedwrlock.os += $(uses-6-syscall-arguments)
+CFLAGS-sem_wait.o += $(uses-6-syscall-arguments)
+CFLAGS-sem_wait.os += $(uses-6-syscall-arguments)
+CFLAGS-sem_timedwait.o += $(uses-6-syscall-arguments)
+CFLAGS-sem_timedwait.os += $(uses-6-syscall-arguments)
endif
ifeq ($(subdir),rt)