Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751251AbdFAVQe (ORCPT ); Thu, 1 Jun 2017 17:16:34 -0400 Received: from l2mail1.panix.com ([166.84.1.75]:59693 "EHLO l2mail1.panix.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751125AbdFAVQd (ORCPT ); Thu, 1 Jun 2017 17:16:33 -0400 X-Greylist: delayed 947 seconds by postgrey-1.27 at vger.kernel.org; Thu, 01 Jun 2017 17:16:33 EDT From: Zack Weinberg To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [PATCH] uapi/linux/a.out.h: don't use deprecated system-specific predefines. Date: Thu, 1 Jun 2017 17:00:45 -0400 Message-Id: <20170601210045.8638-1-zackw@panix.com> X-Mailer: git-send-email 2.13.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2043 Lines: 61 uapi/linux/a.out.h uses a number of predefined macros that are deprecated because they're in the application namespace (e.g. '#ifdef linux' instead of '#ifdef __linux__'). This patch corrects all of them. The primary reason this is worth bothering to fix, considering how obsolete a.out binary support is, is that the GCC build process considers this such a severe error that it will copy the header into a private directory and change the macro names, which causes future updates to the header to be masked. This header probably doesn't get updated very often anymore, but it is the _only_ uapi header that gets this treatment, so IMHO it is worth patching just to drive that number all the way to zero. Signed-off-by: Zack Weinberg --- include/uapi/linux/a.out.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h index 7caf44c7fa51..e163133cf1b0 100644 --- a/include/uapi/linux/a.out.h +++ b/include/uapi/linux/a.out.h @@ -115,21 +115,21 @@ enum machine_type { /* Address of data segment in memory after it is loaded. Note that it is up to you to define SEGMENT_SIZE on machines not listed here. */ -#if defined(vax) || defined(hp300) || defined(pyr) +#if defined(__vax__) || defined(__hp300__) || defined(__pyr__) #define SEGMENT_SIZE page_size #endif -#ifdef sony +#ifdef __sony__ #define SEGMENT_SIZE 0x2000 #endif /* Sony. */ -#ifdef is68k +#ifdef __is68k__ #define SEGMENT_SIZE 0x20000 #endif -#if defined(m68k) && defined(PORTAR) +#if defined(__m68k__) && defined(__PORTAR__) #define PAGE_SIZE 0x400 #define SEGMENT_SIZE PAGE_SIZE #endif -#ifdef linux +#ifdef __linux__ #ifndef __KERNEL__ #include #endif @@ -260,7 +260,7 @@ struct relocation_info unsigned int r_extern:1; /* Four bits that aren't used, but when writing an object file it is desirable to clear them. */ -#ifdef NS32K +#ifdef __NS32K__ unsigned r_bsr:1; unsigned r_disp:1; unsigned r_pad:2; -- 2.11.0