Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751169AbdFBHKQ (ORCPT ); Fri, 2 Jun 2017 03:10:16 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:58544 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750807AbdFBHKP (ORCPT ); Fri, 2 Jun 2017 03:10:15 -0400 Date: Fri, 2 Jun 2017 00:10:14 -0700 From: Christoph Hellwig To: Zack Weinberg Cc: linux-kernel@vger.kernel.org, Linus Torvalds Subject: Re: [PATCH] uapi/linux/a.out.h: don't use deprecated system-specific predefines. Message-ID: <20170602071014.GA16118@infradead.org> References: <20170601210045.8638-1-zackw@panix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170601210045.8638-1-zackw@panix.com> User-Agent: Mutt/1.8.0 (2017-02-23) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2114 Lines: 77 > /* 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 Can we please fix these conditionals so that only those relevant to Linux remain? e.g. something like the patch below: diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h index 7caf44c7fa51..295cd3ef6330 100644 --- a/include/uapi/linux/a.out.h +++ b/include/uapi/linux/a.out.h @@ -112,24 +112,7 @@ enum machine_type { #define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0) #endif -/* 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) -#define SEGMENT_SIZE page_size -#endif -#ifdef sony -#define SEGMENT_SIZE 0x2000 -#endif /* Sony. */ -#ifdef is68k -#define SEGMENT_SIZE 0x20000 -#endif -#if defined(m68k) && defined(PORTAR) -#define PAGE_SIZE 0x400 -#define SEGMENT_SIZE PAGE_SIZE -#endif - -#ifdef linux +/* Address of data segment in memory after it is loaded. */ #ifndef __KERNEL__ #include #endif @@ -142,7 +125,6 @@ enum machine_type { #endif #endif #endif -#endif #define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE) @@ -260,13 +242,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 - unsigned r_bsr:1; - unsigned r_disp:1; - unsigned r_pad:2; -#else unsigned int r_pad:4; -#endif }; #endif /* no N_RELOCATION_INFO_DECLARED. */