From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id E548E38582AD; Fri, 5 Aug 2022 19:30:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E548E38582AD Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] aarch64: Use fewer ifdefs in bits/fcntl.h X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 2adfa58c4ffeed47c02449717f24b0e8f0a58ecb X-Git-Newrev: 084ac620b1d50fa86c1482669239fb391e1f49d1 Message-Id: <20220805193015.E548E38582AD@sourceware.org> Date: Fri, 5 Aug 2022 19:30:15 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 19:30:16 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=084ac620b1d50fa86c1482669239fb391e1f49d1 commit 084ac620b1d50fa86c1482669239fb391e1f49d1 Author: Szabolcs Nagy Date: Fri Jul 15 08:42:53 2022 +0100 aarch64: Use fewer ifdefs in bits/fcntl.h This simplifies adding the Morello purecap abi target. Diff: --- sysdeps/unix/sysv/linux/aarch64/bits/fcntl.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/aarch64/bits/fcntl.h b/sysdeps/unix/sysv/linux/aarch64/bits/fcntl.h index e3137e39e4..891749de80 100644 --- a/sysdeps/unix/sysv/linux/aarch64/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/aarch64/bits/fcntl.h @@ -29,9 +29,7 @@ # define __O_LARGEFILE 0400000 #else # define __O_LARGEFILE 0 -#endif -#ifdef __LP64__ # define F_GETLK64 5 # define F_SETLK64 6 # define F_SETLKW64 7