From patchwork Fri Oct 28 15:05:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 688435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t56X15nHhz9sR9 for ; Sat, 29 Oct 2016 02:05:53 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=L2T/8LXM; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= mm2+gtyzHagkdjT77q8hTrKUhYbMr13Ir8jfs2ytIlR5tqKDQPX+fBGqo86F0wUZ 60Ffn2cDlAIZ/3SbXaGFWBO2QP3P57fZ0QXTLVGYtk8jRbuOdmfRlzUZnYZus2am unRNc+Yl2LAZmDdDQWoy7fDexw9cGm42EGSRXwKqUv8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=QGoDa6 iHDT84ycrysVcYH13GK68=; b=L2T/8LXM3Kx//FJb084phlYKIegQPFhXRCB9Yk uXWbKxIWSsyDTzTbKv/kjvCOsd0tkMgMYIfQDUzLC2VKo41KwV5ip7L1FsLa4pam MFgazATIca9J629eQKoOg+cgR9xNyYvn132CIoEAeWQB1DacgLuQ9KeAHemxrlTk kAnMo= Received: (qmail 89924 invoked by alias); 28 Oct 2016 15:05:46 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 89890 invoked by uid 89); 28 Oct 2016 15:05:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=6th, imply X-HELO: mx1.redhat.com Date: Fri, 28 Oct 2016 17:05:42 +0200 To: libc-alpha@sourceware.org Subject: [PATCH] i386: Support CFLAGS which imply -fno-omit-frame-pointer [BZ #20729] User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20161028150542.A781D439942E0@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2016-10-28 Florian Weimer [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. diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile index 6073a9f..2596cdf 100644 --- a/sysdeps/unix/sysv/linux/i386/Makefile +++ b/sysdeps/unix/sysv/linux/i386/Makefile @@ -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)