From patchwork Thu Nov 23 18:02:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 169079 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp620732vqx; Thu, 23 Nov 2023 10:03:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IFa+aIIDk4s1WblPQ0dZgH+kVAz6loOyPwbXVtkNqRD88ouMKm0NjLTQj9iRuWSNoejCaup X-Received: by 2002:a9d:7359:0:b0:6b8:6f94:d3a2 with SMTP id l25-20020a9d7359000000b006b86f94d3a2mr227785otk.25.1700762595570; Thu, 23 Nov 2023 10:03:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700762595; cv=none; d=google.com; s=arc-20160816; b=FM4poGm72wr3wyFRyjacQx/9CtElJxx9v9RPV/6Q4iJ3t0fSMzBW/cXwiEBSxzxP0L TRB/4/lDvVDmNVkYIKsDDA0L1jWzegqPBMIUBdcFnc1Wl+LZJ139UWvtYtLlpTECDltF Bbt2IkQJf6AGvRHIn7VVye/IMxRAvOoBl0UkmiMHKKv17gsjDOWVPoufmUJzKYT6f6/0 IuZsovK2jzMW4fGXsO9wQBgSSGsB6mYBYUeehaqz3Aj+7/Js/DP+A5No69vsvBRAIY5q ml+4/aPjxViqakWYO91ALjGh6ReDXKXf8g6a/oVjhR0YU1DsaEwBmxbieTUZA9l1kSjt lNfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IZhERP1k0Mx/BUzQA+h6IX0Zi/l8fXxzweZfh/vGwZ8=; fh=Ko90S6CcquqsKV5pBC25n2aB8JM02zepEUn8C/ehD7Y=; b=Sd5u0/jJN9ik9cs8mzP/9xQB6A8I/sywAuysz4mh+Pr+H1HDdY3ZXZsxjJGd6oyuPi STWiZ9jFNh6WVlx2lllbkcVFRaBgiynCwpt4OLnYb7TAsqRGpGePmH7xnYOuXnE8bG7r e3QbHEhrhCsny8OrFIH+6BiuKJ7fnoOJJeg4tDQaZBvqPqjstwikomchPo1EbRe24Gpu W9OVBnApT1x17gfucxLzF4mTEfJP4Sd34L+/mVcR0JeddBPEFw9UHDskGenzBrwVq4jW ay93EnBBaunklQluqTwNkS8+/R6Nd38w2wXcyJy1AWikb2sXG/o+uajwAm/U0J92jHcW YTZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=bm0dFaWF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id el37-20020a05683071a500b006d63e64b59csi701853otb.289.2023.11.23.10.03.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:03:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=bm0dFaWF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id CBE408253FC2; Thu, 23 Nov 2023 10:03:06 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230179AbjKWSC6 (ORCPT + 99 others); Thu, 23 Nov 2023 13:02:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229929AbjKWSC4 (ORCPT ); Thu, 23 Nov 2023 13:02:56 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF6F810D2 for ; Thu, 23 Nov 2023 10:03:02 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id A28F94152B for ; Thu, 23 Nov 2023 18:03:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1700762581; bh=IZhERP1k0Mx/BUzQA+h6IX0Zi/l8fXxzweZfh/vGwZ8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bm0dFaWF0mhS5DLbODavbNYMvM69+E+3vjvIBl2Iba1Xzq28JNt72GpC1UqaE97t/ L/m8pg7pxbKA8V0plM0KjKDswRouZA757qXL6R4kaaw0MxtZsvW1N1+USaLxWBF5qU //OZaIUhbxAb9Wr6S+W7rgaUWsrgBdfKYVW8WIteoJEDqJFXWR5azEAG6dOu/7/IYo 96IclmAWpq2gQEBn2b7K82bXKltxvO/l9U1xSpL47o22yORiufp9KYU+SIDoDs+6ne p4MNgYQLM9oETvtwS4EZBrL1Jj8vpI0LWFKiQNW/bGmrHxC6ONbjvqlrVh32Zty7T+ cG9OXH4S4l5rA== Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40b2977d7c5so5477955e9.2 for ; Thu, 23 Nov 2023 10:03:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700762581; x=1701367381; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IZhERP1k0Mx/BUzQA+h6IX0Zi/l8fXxzweZfh/vGwZ8=; b=VdOVaR8Bym0dQkb+Wh9qalNtxzv+AKnGOGNfZwoOwirNpreyAAlWFsXH/G9ZdG74ON EuMqYbRwksOcWahErqv/M8G2tLFevTrumw1ahkHxWwWwPbIaZhOjY1jNIR5TM2bw05QX zJ7Vpo4vkhnY6jrdMOw6sEbuk/88+vqwuPPyw0pcbTyClRLWhqtncqOQRbkej2VSRZnR 0HVeFfTBU81F/My35+WvuApfSiUt1QgoInVVePCP9iHy9FpD9qIgdfiWa0elfThbr+Xt EvLHtzQ7x6iey5koEJbXF9tsQ3Gk5Z/z3B2qvRMOEG8yvcVvO8Kjjo2RBwtMjor6ZsX/ 2sOg== X-Gm-Message-State: AOJu0YyvD2vUjfSNetPPuexKqBfu9paEkkXUlUiq++/phOGUDXiV4hIO hs6zW3ilFSV94v7zPuXdR2qQpk+UG7dHv717O9CEfE0xEmvq7ItlwroUR+oBxte75ItIjVNPCz1 Ta5si5o1P20E4vu8vXSKxvC365EsanZ3E0yoZFg4b4w== X-Received: by 2002:a05:600c:3b87:b0:401:b2c7:34a8 with SMTP id n7-20020a05600c3b8700b00401b2c734a8mr269710wms.7.1700762581181; Thu, 23 Nov 2023 10:03:01 -0800 (PST) X-Received: by 2002:a05:600c:3b87:b0:401:b2c7:34a8 with SMTP id n7-20020a05600c3b8700b00401b2c734a8mr269696wms.7.1700762580759; Thu, 23 Nov 2023 10:03:00 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id v11-20020a05600c444b00b0040b3867a297sm1026777wmn.36.2023.11.23.10.02.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:02:59 -0800 (PST) From: Dimitri John Ledkov To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Geert Uytterhoeven , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" Cc: linux-alpha@vger.kernel.org, linux-m68k@lists.linux-m68k.org, x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] alpha: remove a.out support from tools/objstrip Date: Thu, 23 Nov 2023 18:02:41 +0000 Message-Id: <20231123180246.750674-2-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231123180246.750674-1-dimitri.ledkov@canonical.com> References: <20231123180246.750674-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 23 Nov 2023 10:03:06 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783378839553726494 X-GMAIL-MSGID: 1783378839553726494 As a.out support has been dropped from alpha port, drop a.out support and make ELF support required. Only performed a test build on x86 for native x86 and cross-compiled for alpha. Signed-off-by: Dimitri John Ledkov --- arch/alpha/boot/tools/objstrip.c | 52 ++++---------------------------- 1 file changed, 6 insertions(+), 46 deletions(-) diff --git a/arch/alpha/boot/tools/objstrip.c b/arch/alpha/boot/tools/objstrip.c index 7cf92d172d..91c0ad29e1 100644 --- a/arch/alpha/boot/tools/objstrip.c +++ b/arch/alpha/boot/tools/objstrip.c @@ -21,17 +21,12 @@ #include #include -#include - -#include -#include -#include -#ifdef __ELF__ -# include -# define elfhdr elf64_hdr -# define elf_phdr elf64_phdr -# define elf_check_arch(x) ((x)->e_machine == EM_ALPHA) -#endif + +#include +#define elfhdr elf64_hdr +#define elf_phdr elf64_phdr +#define elf_check_arch(x) ((x)->e_machine == EM_ALPHA) + /* bootfile size must be multiple of BLOCK_SIZE: */ #define BLOCK_SIZE 512 @@ -55,13 +50,10 @@ main (int argc, char *argv[]) size_t nwritten, tocopy, n, mem_size, fil_size, pad = 0; int fd, ofd, i, j, verbose = 0, primary = 0; char buf[8192], *inname; - struct exec * aout; /* includes file & aout header */ long offset; -#ifdef __ELF__ struct elfhdr *elf; struct elf_phdr *elf_phdr; /* program header */ unsigned long long e_entry; -#endif prog_name = argv[0]; @@ -145,7 +137,6 @@ main (int argc, char *argv[]) exit(1); } -#ifdef __ELF__ elf = (struct elfhdr *) buf; if (memcmp(&elf->e_ident[EI_MAG0], ELFMAG, SELFMAG) == 0) { @@ -192,37 +183,6 @@ main (int argc, char *argv[]) prog_name, (long) elf_phdr->p_vaddr, elf_phdr->p_vaddr + fil_size, offset); } - } else -#endif - { - aout = (struct exec *) buf; - - if (!(aout->fh.f_flags & COFF_F_EXEC)) { - fprintf(stderr, "%s: %s is not in executable format\n", - prog_name, inname); - exit(1); - } - - if (aout->fh.f_opthdr != sizeof(aout->ah)) { - fprintf(stderr, "%s: %s has unexpected optional header size\n", - prog_name, inname); - exit(1); - } - - if (N_MAGIC(*aout) != OMAGIC) { - fprintf(stderr, "%s: %s is not an OMAGIC file\n", - prog_name, inname); - exit(1); - } - offset = N_TXTOFF(*aout); - fil_size = aout->ah.tsize + aout->ah.dsize; - mem_size = fil_size + aout->ah.bsize; - - if (verbose) { - fprintf(stderr, "%s: extracting %#016lx-%#016lx (at %lx)\n", - prog_name, aout->ah.text_start, - aout->ah.text_start + fil_size, offset); - } } if (lseek(fd, offset, SEEK_SET) != offset) { From patchwork Thu Nov 23 18:02:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 169081 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp621232vqx; Thu, 23 Nov 2023 10:03:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IHSsYJd9T/2hCy4+EliMtHp87gcIz01l1jXGbLeTgXF9wYbz5V2HEhX36G0ST4XV/lf2PPp X-Received: by 2002:a05:6808:e83:b0:3b5:6432:e0eb with SMTP id k3-20020a0568080e8300b003b56432e0ebmr133472oil.38.1700762633586; Thu, 23 Nov 2023 10:03:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700762633; cv=none; d=google.com; s=arc-20160816; b=w25TpuUzIQPROsQTTkEylts5+aO7u/Dt5zcf2i69tTD8ByxAKopEPrAAv8fTgysqmM ehspr2aryjQB4Or2h23PS5WOiyem4YrOyZIY0opEx82K08j9SLy82VYsldmrzX2n4wd7 BpIigSpo6c7XroHt1bFXpzh5NiTXeC26IUY8nNqpTwdeLa/iN4RDPhudMARpGWhG2SAh HHm9DjwXzMA5JtEiJSqpwJzA1ntqYmVM+jrTp6VYoZDPKVKlCeEoHFYBGXe6JzmORs8L nNHwV9bAhd5N9J9LIhIu2tOYq+2EY3vDl8i3s7O2B7d0c5rxlDGyyDutBiyv5q7axeO2 tGDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=R1n8ksDNdCksuRnFAcfne+WFQ6Clq7m+xUS67MT50PI=; fh=Ko90S6CcquqsKV5pBC25n2aB8JM02zepEUn8C/ehD7Y=; b=CmDDM5b/FJsKMpB27uRr5jrwN33Zvr96DH6FUQ/efbB8UYR1fAsCML2onPKnoKh2YX 7mJwv8G+jczuW04Zvt1YDddHjKSvIbmyxJH78O7PSmQbTGlg0Zf113XH/18/BxBLEe/T FDBN/o4vnGHQZea3nRc8p51WAtwhskgWemfz2qTaSZt4KXfEiXIdCMQ0sL5Z7B0tOJn9 uX4UEVhjg1PMJa+vKj3NhI3+Lbqg7Xd6VBptgbwf49EzWZam3yGO6yLLlC8ObnGRwa7v XRnzRHMAEJJTic7cp0Od5AfP19B3GW3uyG17Kth1lo/bulFyJzGqWbt/vJ9YC0P7SXnI Cfvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=nSSYG+2v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id bl28-20020a056808309c00b003a7ef91b24asi651396oib.137.2023.11.23.10.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:03:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=nSSYG+2v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 6C14D8253FC1; Thu, 23 Nov 2023 10:03:40 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345686AbjKWSD3 (ORCPT + 99 others); Thu, 23 Nov 2023 13:03:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231408AbjKWSDU (ORCPT ); Thu, 23 Nov 2023 13:03:20 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02D97170D for ; Thu, 23 Nov 2023 10:03:18 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 0D849420C3 for ; Thu, 23 Nov 2023 18:03:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1700762589; bh=R1n8ksDNdCksuRnFAcfne+WFQ6Clq7m+xUS67MT50PI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nSSYG+2v6U3wbTQ+u1/TJ+LyzNOrhqzCYNnD/gaWhsS70wTjQArJbJcDof3Re8EZ5 bCTPw22nexk33t788lEPvObqTk+a3JDoH2ZmRQRAno7wXrMDtQsmtn38btcOCSwDiC HHCtrtMflmQOUz8lV7BSbOmPXosXw8AMXtv6FUobcUrBKyQuoCR5NI0oEdubNamPXF ZHEai+xkY2juBW6JCNPUbaonoPIWxj1fXkf77NQRqBQs3xA3tyVMkzo7AJoVKmlDyO 15wGrJAZMLlkuQdwr+45CcgsDNRZOJDXACJxdOKI33yTh7U2CUSUmxFCi4ulkQbZRu aHsjLkFu4J02Q== Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-332e3f4c0b6so489086f8f.2 for ; Thu, 23 Nov 2023 10:03:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700762583; x=1701367383; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R1n8ksDNdCksuRnFAcfne+WFQ6Clq7m+xUS67MT50PI=; b=gUykt2uHR/ww6WVsUwQGKDrlE+UyeJcxJ5ODlPo/HkRapCfrBMJhKmbpyfItjnL04C QOWeT4Q9Irq5WxnPdxwzs8dpO0jFYtZhyZjbDFR2Gcg599sHJw+oW8c6jRD1mDU7LBIA ICYwTavn05cZM8Nv3+KaGzA0a3d58FMrJUZt6Qz9UJjYiHSP0XxUYmJGiSc5XcXx7M1L G6kXrFpz9wgwW536XG6JtmjOBd4CC16X3WFonc4d+nTRUZdCXfYOZDYKAEC2n1F99RX4 Te0zR+DwapjkMZAau8RYqlteWGYnynepyXHnDVlLMxG100R9pEpYUVN82ocgtAEGFuEY ZhyA== X-Gm-Message-State: AOJu0YxjSBVn0QMxinhcj2i/1CxB4GcGcnMuZIS8FgOYpd6sutztm+9h qCyE55Fb63RixTBb/xSGGZmELRUOjScm2GkNllR+FZXbcjceQLsHXVI38cEmEFuNhDxGfXuquvm kSuG7H2p7kcwsIX1xgIQpYPQOo7QNOkqqKW+uGuwRhZL1JwXZV+pH X-Received: by 2002:a5d:688e:0:b0:332:ca0b:5793 with SMTP id h14-20020a5d688e000000b00332ca0b5793mr145434wru.19.1700762583070; Thu, 23 Nov 2023 10:03:03 -0800 (PST) X-Received: by 2002:a5d:688e:0:b0:332:ca0b:5793 with SMTP id h14-20020a5d688e000000b00332ca0b5793mr145406wru.19.1700762582657; Thu, 23 Nov 2023 10:03:02 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id c9-20020adfef49000000b0032fb7b4f191sm2268350wrp.91.2023.11.23.10.03.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:03:01 -0800 (PST) From: Dimitri John Ledkov To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Geert Uytterhoeven , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" Cc: linux-alpha@vger.kernel.org, linux-m68k@lists.linux-m68k.org, x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] alpha: stop shipping a.out.h uapi headers Date: Thu, 23 Nov 2023 18:02:42 +0000 Message-Id: <20231123180246.750674-3-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231123180246.750674-1-dimitri.ledkov@canonical.com> References: <20231123180246.750674-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 23 Nov 2023 10:03:40 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783378879394702511 X-GMAIL-MSGID: 1783378879394702511 Stop shipping a.out.h uapi headers, unused. Signed-off-by: Dimitri John Ledkov --- arch/alpha/include/uapi/asm/a.out.h | 92 ----------------------------- 1 file changed, 92 deletions(-) delete mode 100644 arch/alpha/include/uapi/asm/a.out.h diff --git a/arch/alpha/include/uapi/asm/a.out.h b/arch/alpha/include/uapi/asm/a.out.h deleted file mode 100644 index 7d692df04b..0000000000 --- a/arch/alpha/include/uapi/asm/a.out.h +++ /dev/null @@ -1,92 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _UAPI__ALPHA_A_OUT_H__ -#define _UAPI__ALPHA_A_OUT_H__ - -#include - -/* - * OSF/1 ECOFF header structs. ECOFF files consist of: - * - a file header (struct filehdr), - * - an a.out header (struct aouthdr), - * - one or more section headers (struct scnhdr). - * The filhdr's "f_nscns" field contains the - * number of section headers. - */ - -struct filehdr -{ - /* OSF/1 "file" header */ - __u16 f_magic, f_nscns; - __u32 f_timdat; - __u64 f_symptr; - __u32 f_nsyms; - __u16 f_opthdr, f_flags; -}; - -struct aouthdr -{ - __u64 info; /* after that it looks quite normal.. */ - __u64 tsize; - __u64 dsize; - __u64 bsize; - __u64 entry; - __u64 text_start; /* with a few additions that actually make sense */ - __u64 data_start; - __u64 bss_start; - __u32 gprmask, fprmask; /* bitmask of general & floating point regs used in binary */ - __u64 gpvalue; -}; - -struct scnhdr -{ - char s_name[8]; - __u64 s_paddr; - __u64 s_vaddr; - __u64 s_size; - __u64 s_scnptr; - __u64 s_relptr; - __u64 s_lnnoptr; - __u16 s_nreloc; - __u16 s_nlnno; - __u32 s_flags; -}; - -struct exec -{ - /* OSF/1 "file" header */ - struct filehdr fh; - struct aouthdr ah; -}; - -/* - * Define's so that the kernel exec code can access the a.out header - * fields... - */ -#define a_info ah.info -#define a_text ah.tsize -#define a_data ah.dsize -#define a_bss ah.bsize -#define a_entry ah.entry -#define a_textstart ah.text_start -#define a_datastart ah.data_start -#define a_bssstart ah.bss_start -#define a_gprmask ah.gprmask -#define a_fprmask ah.fprmask -#define a_gpvalue ah.gpvalue - -#define N_TXTADDR(x) ((x).a_textstart) -#define N_DATADDR(x) ((x).a_datastart) -#define N_BSSADDR(x) ((x).a_bssstart) -#define N_DRSIZE(x) 0 -#define N_TRSIZE(x) 0 -#define N_SYMSIZE(x) 0 - -#define AOUTHSZ sizeof(struct aouthdr) -#define SCNHSZ sizeof(struct scnhdr) -#define SCNROUND 16 - -#define N_TXTOFF(x) \ - ((long) N_MAGIC(x) == ZMAGIC ? 0 : \ - (sizeof(struct exec) + (x).fh.f_nscns*SCNHSZ + SCNROUND - 1) & ~(SCNROUND - 1)) - -#endif /* _UAPI__ALPHA_A_OUT_H__ */ From patchwork Thu Nov 23 18:02:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 169080 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp621105vqx; Thu, 23 Nov 2023 10:03:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IGf0JVOwMLr3wHtHg+gGCdtokW2zqsHILqkvxYiWCSIowikX9EMcT9qQgz3bc2wfYZPuVD5 X-Received: by 2002:a05:6a00:4983:b0:6cb:5bf7:a50e with SMTP id dn3-20020a056a00498300b006cb5bf7a50emr4207353pfb.12.1700762624848; Thu, 23 Nov 2023 10:03:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700762624; cv=none; d=google.com; s=arc-20160816; b=aCXeU6oQ/XxVPUyZ6uV7qEuWAE3UAXm/EsxWvCm5EQfR7bSw3ydYEJtHclLtDNaz9v 0skaIboOU3JYt9F0hRbZqyOgJwE9BZAbTUI6ycPoVlZZGeS3JDsnSS3ke62FocGq7yx0 fCREvq9yJmenIG+MQXq9Zp3thwhTQWI8z78XnxaW7Ymi4ZmxMuZJl15vyuQC5/rbZZGJ KWA81n0WA6V82eu2eW3mEG5GnIE+oWV0c3HEUigSKQ/tdubdPGcHlbzNfWr7ROBFUIxg G0jwqpO3m/K85AYuKXw3xIz2EvRLLoqOnB89L/5hJ+46DM1bldMmhC7zmnpNV53xGjpK 0RUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Rm0AYGktCFDwiZQ3qlgqUctwWO5n1BUkIpQTDe2RZHA=; fh=Ko90S6CcquqsKV5pBC25n2aB8JM02zepEUn8C/ehD7Y=; b=quKRV1+nAYPEYNgSApNux9a9CRhvTpWanx/6UbO+tkG0rcscvD4x/QcHXeICArc1Mu o62cmjQorg8hsG+4hhonEDG4+ZRJ2PLM1Y0wj4q84tnitNvFMw0hAj2B7reHVMj65Tr3 PufuEhlsHBuxG1SKeYN13F+b8eNhDlBouu1Js09ri1BL8ELiyAQgJAUllcj3f9hkMroX 9piyPTaL/WLYP5COgBc6A18VFEQsHVefoqi//bKWSTy/VjD/S3+wUI+EFVi61XO3tM0b wdEwBZJbD7E89hYTN0t1EP5dVgOmOzXGw7GCY51YLpzYK1Ui9hIKkA/B4QdlgyDNsnb1 krgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=Ar41MqkZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id a27-20020aa78e9b000000b0068780155ddbsi1628496pfr.131.2023.11.23.10.03.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:03:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=Ar41MqkZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 2C6C68061370; Thu, 23 Nov 2023 10:03:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235295AbjKWSDZ (ORCPT + 99 others); Thu, 23 Nov 2023 13:03:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231400AbjKWSDU (ORCPT ); Thu, 23 Nov 2023 13:03:20 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0326C170E for ; Thu, 23 Nov 2023 10:03:18 -0800 (PST) Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 0B4F0420C2 for ; Thu, 23 Nov 2023 18:03:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1700762589; bh=Rm0AYGktCFDwiZQ3qlgqUctwWO5n1BUkIpQTDe2RZHA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ar41MqkZdDfnVnP0i1hKvpuuBVR+OvcBpG4lF65J6ExgiQaNOtCFNUyFyHLSxDOXU x6XfiG8eVtmGwwfrnn6hjhWHMuPDUeuPXRoAhgVVpPTn02IGtWEDjz7oyDWtVYKc4x JTXTvd3IZm/fxSNQNH+RyMrlZeh2cCmMcPsIR7bbG+kTgpw+5SMafP8BbVEEvou2le x3EVnmc7b+AVqAwy+NvD6qat5G8DARJL2espUsSOwKQbY+8e6utC97gsxQVIq0WEbQ eqjdd2Lsh/sl8Tx014QfuDiSdZtx6afWJfcrHC44Zkf/6Mb+f/9RGIMsfglI/lqupO 3eXi6BHegKOIQ== Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2c87972a358so8992881fa.2 for ; Thu, 23 Nov 2023 10:03:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700762585; x=1701367385; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Rm0AYGktCFDwiZQ3qlgqUctwWO5n1BUkIpQTDe2RZHA=; b=DQpO0dXC31vQ0jJgA8HLuy8Mr0H7HtOuZHls+KnInNAjKe90KgxOaDTZ0fkcz0G0Ac SG7bkFV94guunToiWXMMkJWEmW8B8Ex/vfzO0Uo+GZf0B/sAqsUMZQ8s6m3yopgwgmHC rgUtwwC2AHNTSt992XUAptDANT2hb1JuWkb2EavtrFSJS7ZjvynlEspMJZqBGyR5r9g2 dcVvUn4j8Nnpk92zdkW8KaA3DRMaZLRP297eIMji0GSxbGEm3x2Oj9xmPpp6/ycpURAQ MwjUd9dS6cmWuU8KYMc+yzFEAIrr54TilPkQnPohDeucVYgFWve8k432jjoPC93/0l/8 CmWw== X-Gm-Message-State: AOJu0YzaZX2iisAIsP936IvgMGUKDDrw4RrGJVBE8bSYjiwxdEwZbfc2 f5c2YZVldiqHfy/Ls8sARgw368UCZDkpRnf8qcR6C12tINH3VTx9rhQiw0P15pjjm8+850f+Xxc ZMi7ovRZnwNnpUvvjYzCEE3fkTy9d0LhDWVjC37Ucgg== X-Received: by 2002:a2e:8ec4:0:b0:2c5:380:2a10 with SMTP id e4-20020a2e8ec4000000b002c503802a10mr75204ljl.25.1700762585148; Thu, 23 Nov 2023 10:03:05 -0800 (PST) X-Received: by 2002:a2e:8ec4:0:b0:2c5:380:2a10 with SMTP id e4-20020a2e8ec4000000b002c503802a10mr75189ljl.25.1700762584814; Thu, 23 Nov 2023 10:03:04 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id bg9-20020a05600c3c8900b0040836519dd9sm2700868wmb.25.2023.11.23.10.03.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:03:03 -0800 (PST) From: Dimitri John Ledkov To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Geert Uytterhoeven , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" Cc: linux-alpha@vger.kernel.org, linux-m68k@lists.linux-m68k.org, x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] m68k: stop shipping a.out.h uapi headers Date: Thu, 23 Nov 2023 18:02:43 +0000 Message-Id: <20231123180246.750674-4-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231123180246.750674-1-dimitri.ledkov@canonical.com> References: <20231123180246.750674-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Thu, 23 Nov 2023 10:03:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783378869804416541 X-GMAIL-MSGID: 1783378869804416541 Stop shipping a.out.h uapi headers, unused. Signed-off-by: Dimitri John Ledkov Reviewed-by: Geert Uytterhoeven Acked-by: Geert Uytterhoeven --- arch/m68k/include/uapi/asm/a.out.h | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 arch/m68k/include/uapi/asm/a.out.h diff --git a/arch/m68k/include/uapi/asm/a.out.h b/arch/m68k/include/uapi/asm/a.out.h deleted file mode 100644 index 3eb24fd8b8..0000000000 --- a/arch/m68k/include/uapi/asm/a.out.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef __M68K_A_OUT_H__ -#define __M68K_A_OUT_H__ - -struct exec -{ - unsigned long a_info; /* Use macros N_MAGIC, etc for access */ - unsigned a_text; /* length of text, in bytes */ - unsigned a_data; /* length of data, in bytes */ - unsigned a_bss; /* length of uninitialized data area for file, in bytes */ - unsigned a_syms; /* length of symbol table data in file, in bytes */ - unsigned a_entry; /* start address */ - unsigned a_trsize; /* length of relocation info for text, in bytes */ - unsigned a_drsize; /* length of relocation info for data, in bytes */ -}; - -#define N_TRSIZE(a) ((a).a_trsize) -#define N_DRSIZE(a) ((a).a_drsize) -#define N_SYMSIZE(a) ((a).a_syms) - -#endif /* __M68K_A_OUT_H__ */ From patchwork Thu Nov 23 18:02:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 169082 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp621252vqx; Thu, 23 Nov 2023 10:03:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IFJkSWB3sTqJcjQCXkx8d/DcH8UyNOB+oZpW5qwaHH60qCjk/cR0Jgvl3bOYdCyHGzGhkEJ X-Received: by 2002:a05:6870:be89:b0:1e9:dd4b:d0aa with SMTP id nx9-20020a056870be8900b001e9dd4bd0aamr38977oab.48.1700762634583; Thu, 23 Nov 2023 10:03:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700762634; cv=none; d=google.com; s=arc-20160816; b=KN7Ztutfql1OhtoUtVp3YG5oriQtlR0fMkgkRfOMDTX4YSS84oC9WFuWsy9vLP/Ebd ou4hXMzP7u1SRow9uB3++qAdaY952b+w1cwiQvvTjgHgUy3Oi82PlLfJbcjIY2RagA07 soYEpiwU8ypdiTHIZTFJwXf2w+R5wOXtyytrnaOqxcymwv8JUpwVGqJu4OJ0ZHWRe+Yy 2CefDq8hxajs2Z+oIMCfgcK3wKaufaviSZQDnBhb1miTO1g2Si86Yauwys/tSSoYRAoj qnNPJwCjd07Uxtbhd0zYgPDLN2YMhojYbPZlY3hA+5OCGRuqn689S7wAX5YA4ycvzKEq d3Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HRyVYLIW8z4TePFCPPJByrkbbPXfNmIR6R9pb6rPiTE=; fh=lKYS+SVaOlvp+C5ev/GBl40j6smtq5tuBN+En+XnEBs=; b=Y2btX6lx2XN97DPi6sQaJqTPh4ddCTb3khOlRogcLe7m5ngZet3sXJIdRtW5X+5XhC F4BO7UfKXRrhC+m/CguqMiGnc+FSs/ssggN0rJdnnCO8TEw/arWRgItqhpupyR7n5sxH e2gKB8iUVsPkChTptxthLhAlE5V/J0yQX/glsZKnj3Min0iUt++l3OMaTUjS9ZiMeKOf nBh02XYUNq9t7LVloW1Ej9/Tgieh3kfZvogQlQ4pOI2m+RpIpyYg22DcHPC0zE4GwJeP 2I7pEwZwZSu2Z1bOxcMnedawixAaD3hkQ8Rd/HbF60CivR/cEQ36Qku8ekU7asW+6LpF 9I9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=STzh9Hxm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id oz8-20020a056870cb4800b001f95adf05fesi659871oab.303.2023.11.23.10.03.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:03:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=STzh9Hxm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id E9CAC8047788; Thu, 23 Nov 2023 10:03:43 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345949AbjKWSDe (ORCPT + 99 others); Thu, 23 Nov 2023 13:03:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233044AbjKWSDV (ORCPT ); Thu, 23 Nov 2023 13:03:21 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66C4A171E for ; Thu, 23 Nov 2023 10:03:20 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 24483420CC for ; Thu, 23 Nov 2023 18:03:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1700762593; bh=HRyVYLIW8z4TePFCPPJByrkbbPXfNmIR6R9pb6rPiTE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=STzh9HxmvKL1WJQrXA6F8XCvYwPhCkYj1CjKxLqAiXtLzewh85gKmO7z3JBB3UhoW oU0Ea40hqYKjOLZmUVftsRsh74rLSF067Tq6O8dQuTkOCH0yimuk/pfpXzBC/olG5g d4dkZ0pf5K4izAtpDx8SKBnFoLwNvYPgmU5hnwxs45YgvZJMLQp8eVFgb4YBECfh37 9o53F//4VN8edODRo6Usua2Of3MiKyuE0t8nr0BAncaXOSHF1jCL5aZan7KIII1UH3 /FclLjBw7zGGS1WZnn6gAugXDVfBVPiZnzjwZp7xjhwG5cPpbhjoGLGhgWrDt0UXds aG2ZS1mdcL+Vw== Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40b349b9711so6703645e9.0 for ; Thu, 23 Nov 2023 10:03:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700762587; x=1701367387; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HRyVYLIW8z4TePFCPPJByrkbbPXfNmIR6R9pb6rPiTE=; b=TfaWo01C8I4lwKU6J3FlQtLdd2zyt9aPtnYwm7zZ/v0uoyLIeVrz8eoIC0M5Rgyi1m yluEQJOaAfdEZzjryiAYn0JPMdQnvAMKDfRhNEqWOlGiubAO5Z7z+Y14VY2NmSh3ZNfM 2igCBve5tjo+JqNtgLPnMFMTP9YYB/uNGr9v1BJrCWGxzghr3cCZFor2P3NEFMJSQ0de A14JtEFrBpvbkR1TO1BHAfcHuOIfIFfnMNnWvr7HsP9/vd9EdR41nf+a2FrsG4B09A7i Dqvle0w4g+hvfBx1qO7bTlCcAblSReAehIP61RaJq8AdtuWIWQ2c30CATA+2URIwxIej M89w== X-Gm-Message-State: AOJu0YyyZp1ePZq//quSrHCIFcmez2wOobFiYb8gnO35PkhgAiItUABc KpFqAQqZpZjKb/cO7wC8GMQfMvtK/Mjhz9oaTd593/OSsVWs3/kh3EDDYzGZxlpdVFSFXdlrPty LfnERuWrCm0wyGkblso42OsoEa68ML1G63s7vS9KmKw== X-Received: by 2002:a05:600c:45d1:b0:40b:3056:7420 with SMTP id s17-20020a05600c45d100b0040b30567420mr283024wmo.39.1700762586738; Thu, 23 Nov 2023 10:03:06 -0800 (PST) X-Received: by 2002:a05:600c:45d1:b0:40b:3056:7420 with SMTP id s17-20020a05600c45d100b0040b30567420mr283001wmo.39.1700762586518; Thu, 23 Nov 2023 10:03:06 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id r15-20020a05600c35cf00b0040a5e69482esm3355473wmq.11.2023.11.23.10.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:03:05 -0800 (PST) From: Dimitri John Ledkov To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Geert Uytterhoeven , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" , x86@kernel.org Cc: linux-alpha@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] x86: stop shipping a.out.h uapi headers Date: Thu, 23 Nov 2023 18:02:44 +0000 Message-Id: <20231123180246.750674-5-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231123180246.750674-1-dimitri.ledkov@canonical.com> References: <20231123180246.750674-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 23 Nov 2023 10:03:44 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783378880299454587 X-GMAIL-MSGID: 1783378880299454587 Stop shipping a.out.h uapi headers, unused. Signed-off-by: Dimitri John Ledkov Acked-by: Ingo Molnar --- arch/x86/include/uapi/asm/a.out.h | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 arch/x86/include/uapi/asm/a.out.h diff --git a/arch/x86/include/uapi/asm/a.out.h b/arch/x86/include/uapi/asm/a.out.h deleted file mode 100644 index 094c49d8ea..0000000000 --- a/arch/x86/include/uapi/asm/a.out.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ASM_X86_A_OUT_H -#define _ASM_X86_A_OUT_H - -struct exec -{ - unsigned int a_info; /* Use macros N_MAGIC, etc for access */ - unsigned a_text; /* length of text, in bytes */ - unsigned a_data; /* length of data, in bytes */ - unsigned a_bss; /* length of uninitialized data area for file, in bytes */ - unsigned a_syms; /* length of symbol table data in file, in bytes */ - unsigned a_entry; /* start address */ - unsigned a_trsize; /* length of relocation info for text, in bytes */ - unsigned a_drsize; /* length of relocation info for data, in bytes */ -}; - -#define N_TRSIZE(a) ((a).a_trsize) -#define N_DRSIZE(a) ((a).a_drsize) -#define N_SYMSIZE(a) ((a).a_syms) - -#endif /* _ASM_X86_A_OUT_H */ From patchwork Thu Nov 23 18:02:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 169083 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp621335vqx; Thu, 23 Nov 2023 10:04:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IFrTqcWvcNrNW9WnWdCjVv0rxASbhK1KuOKMVZI7BXPqfiPg5NsI0Tqq/iyrAZRBAl32W4X X-Received: by 2002:a17:90b:350c:b0:281:10d:6067 with SMTP id ls12-20020a17090b350c00b00281010d6067mr259360pjb.16.1700762640647; Thu, 23 Nov 2023 10:04:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700762640; cv=none; d=google.com; s=arc-20160816; b=Omfj2gRwKJAXGox1JV0q50HlOYgORaQ7NbakhDSdddlC2ITLy0YqnyOmnyeYVfHzGW BzhT3xTbGpIA1CUGZTRy6p3XKGkgt613+2rJkQuJxbTpuy4mc4vDnyWBGxRZrONGVN0y d1Ilp7YkgEfLk7h7C01z04zJgzaoTQ5nOo3X/3g+bVV91GZJWbS6Xy6qY414xRUqVL5+ 5SFaBTeMu1Lw5pu5bIAU7F6GW9HEBk5qRNbIam8jOBvrMLvwT+MXfbd6VBa4FGPojVB/ 5QiopWtMXoe6GxZ6TN+0aVaYC8ISQKykWZPJTmfehBZ6SH1YJWsv+D9965d1FZfUDYUv yT5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=t/aBrAkZqTiWY/zs87nQmy2lYsgikda8sYn2IKoRE00=; fh=Ko90S6CcquqsKV5pBC25n2aB8JM02zepEUn8C/ehD7Y=; b=mwKxE8m0UQ/dQQwSkLiekjIevTOizYCfbC12O96+feu+FQSspO+wWu0mgg5kY9i/PJ scZKFkO8I4BVSf7ybHgiQs5MdTRl4kPelOQ7lxEvUVsxe4rUoHv1DA6EiZbjT0MECDGh ut1THX+R3/fgYs/FtG03gcukJMUgIXnq3b1FsLJk+xU+0cSJ/kkYu7Hwr6Sb3S4/348K nry0SGDmE0e7i1g/BUTQQmeNrpX9i6n21jyS8pPjbgSA3Tg735VDULmYEE7YkFP0lBXF LH93oSQ78w04/mbVMNCK+vZngv9W1oZtenFbCwbbqqcj3GRBxQ47IECplGPmM5j+v1vT AXIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=SPLfrWnp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id i11-20020a17090a718b00b00280f5032e03si2145976pjk.133.2023.11.23.10.03.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:04:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=SPLfrWnp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 51DC6809C148; Thu, 23 Nov 2023 10:03:53 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235229AbjKWSDn (ORCPT + 99 others); Thu, 23 Nov 2023 13:03:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231134AbjKWSDX (ORCPT ); Thu, 23 Nov 2023 13:03:23 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0213E1984 for ; Thu, 23 Nov 2023 10:03:21 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 0158040C4F for ; Thu, 23 Nov 2023 18:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1700762597; bh=t/aBrAkZqTiWY/zs87nQmy2lYsgikda8sYn2IKoRE00=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SPLfrWnpza0ZLj9laeW39hNJMYTM9CyaBRTyyYaXnSnEdzQycPLtmWifV63DXaFWu ArylpzWo/oWp1FzvUFQkNbhUnbgZ/N5tZbIJIJBqWGNn0E6xHVB8emEZvxT2xMZQLv 2VV5MYLN/kSGu5/i+OCuHhuEPKCyB8/SUqHBs2igWtdVWI6BMDd+OPRs3TcA0tQrdC aSGnXJUDt2MCDD2yXMHrtlN/vySysnc2iUDI9HKKYaAi/0ZrppJFT7QQ6bfVq4tlRu uEoOdWQW+9Ng98T5tPB3iWMZnGUP3TNxGqEsXtsDdC7wwpD1ehsqQfqmYtrvqoulR1 oYcnQrtEgp4lQ== Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40b2977d7c5so5478255e9.2 for ; Thu, 23 Nov 2023 10:03:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700762589; x=1701367389; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t/aBrAkZqTiWY/zs87nQmy2lYsgikda8sYn2IKoRE00=; b=c7ZYh9E4olF/P3B8l6ZoEaOlBYB+t3CvBYh7Evb2XqbBBwtBl+ZosCSrhtq2wEAHxy nKVf/Hcssa0depkKAFnMDi0cqQv0eq1et/RMS5Xa4cMUu1TUsz8LZmM2wgDRzssBKZWR aDd3DXjdmXpQJBYAgzVUtTAQOPZhsPucGwD2r8b+LZ+IXN48w33XfVOODNnbHqW6As4N 2j1IPExm3HijSMa+sedCmOIjuKTJImpGDoLhM3xWqPmORkDCk3xrWS2bwHBwa6kOfqz6 kUIjujA2k31O1CPkM077YhFY38WpOxUM8a0DFRN8Het1Hb4/XSe2KMSm9EYfFDQRoBt6 z10Q== X-Gm-Message-State: AOJu0YzTy6NlwkaYNkDpFOnqJ5dL8v8IVy7pKCY54Lz5wcaQkBlI3sLp GRrbukd3BL+XCXzFMMF/QFQmJF/lnLfreUz4lX/F+OTUxsy72FdG8sIe0IGqVMTXz6kcob7l/uM x1KL1rhxMwCJ8Tm1yUNnDOISbc1DO+aknMBzHCYdiDw== X-Received: by 2002:a05:600c:474d:b0:40b:32e7:2ffa with SMTP id w13-20020a05600c474d00b0040b32e72ffamr271275wmo.20.1700762588477; Thu, 23 Nov 2023 10:03:08 -0800 (PST) X-Received: by 2002:a05:600c:474d:b0:40b:32e7:2ffa with SMTP id w13-20020a05600c474d00b0040b32e72ffamr271257wmo.20.1700762588111; Thu, 23 Nov 2023 10:03:08 -0800 (PST) Received: from localhost ([2001:67c:1560:8007::aac:c15c]) by smtp.gmail.com with ESMTPSA id bd12-20020a05600c1f0c00b0040b3027ddc5sm3417227wmb.37.2023.11.23.10.03.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:03:07 -0800 (PST) From: Dimitri John Ledkov To: Richard Henderson , Ivan Kokshaysky , Matt Turner , Geert Uytterhoeven , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" Cc: linux-alpha@vger.kernel.org, linux-m68k@lists.linux-m68k.org, x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] uapi: remove a.out.h uapi header Date: Thu, 23 Nov 2023 18:02:45 +0000 Message-Id: <20231123180246.750674-6-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231123180246.750674-1-dimitri.ledkov@canonical.com> References: <20231123180246.750674-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 23 Nov 2023 10:03:53 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783378886635641543 X-GMAIL-MSGID: 1783378886635641543 Stop shipping a.out.h uapi headers, unused. Signed-off-by: Dimitri John Ledkov --- include/uapi/Kbuild | 4 - include/uapi/linux/a.out.h | 251 ------------------------------------- 2 files changed, 255 deletions(-) delete mode 100644 include/uapi/linux/a.out.h diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild index 61ee6e59c9..850597437b 100644 --- a/include/uapi/Kbuild +++ b/include/uapi/Kbuild @@ -1,8 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),) -no-export-headers += linux/a.out.h -endif - ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm.h),) no-export-headers += linux/kvm.h endif diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h deleted file mode 100644 index 5fafde3798..0000000000 --- a/include/uapi/linux/a.out.h +++ /dev/null @@ -1,251 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _UAPI__A_OUT_GNU_H__ -#define _UAPI__A_OUT_GNU_H__ - -#define __GNU_EXEC_MACROS__ - -#ifndef __STRUCT_EXEC_OVERRIDE__ - -#include - -#endif /* __STRUCT_EXEC_OVERRIDE__ */ - -#ifndef __ASSEMBLY__ - -/* these go in the N_MACHTYPE field */ -enum machine_type { -#if defined (M_OLDSUN2) - M__OLDSUN2 = M_OLDSUN2, -#else - M_OLDSUN2 = 0, -#endif -#if defined (M_68010) - M__68010 = M_68010, -#else - M_68010 = 1, -#endif -#if defined (M_68020) - M__68020 = M_68020, -#else - M_68020 = 2, -#endif -#if defined (M_SPARC) - M__SPARC = M_SPARC, -#else - M_SPARC = 3, -#endif - /* skip a bunch so we don't run into any of sun's numbers */ - M_386 = 100, - M_MIPS1 = 151, /* MIPS R3000/R3000 binary */ - M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ -}; - -#if !defined (N_MAGIC) -#define N_MAGIC(exec) ((exec).a_info & 0xffff) -#endif -#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff)) -#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff) -#define N_SET_INFO(exec, magic, type, flags) \ - ((exec).a_info = ((magic) & 0xffff) \ - | (((int)(type) & 0xff) << 16) \ - | (((flags) & 0xff) << 24)) -#define N_SET_MAGIC(exec, magic) \ - ((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff))) - -#define N_SET_MACHTYPE(exec, machtype) \ - ((exec).a_info = \ - ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16)) - -#define N_SET_FLAGS(exec, flags) \ - ((exec).a_info = \ - ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24)) - -/* Code indicating object file or impure executable. */ -#define OMAGIC 0407 -/* Code indicating pure executable. */ -#define NMAGIC 0410 -/* Code indicating demand-paged executable. */ -#define ZMAGIC 0413 -/* This indicates a demand-paged executable with the header in the text. - The first page is unmapped to help trap NULL pointer references */ -#define QMAGIC 0314 - -/* Code indicating core file. */ -#define CMAGIC 0421 - -#if !defined (N_BADMAG) -#define N_BADMAG(x) (N_MAGIC(x) != OMAGIC \ - && N_MAGIC(x) != NMAGIC \ - && N_MAGIC(x) != ZMAGIC \ - && N_MAGIC(x) != QMAGIC) -#endif - -#define _N_HDROFF(x) (1024 - sizeof (struct exec)) - -#if !defined (N_TXTOFF) -#define N_TXTOFF(x) \ - (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : \ - (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec))) -#endif - -#if !defined (N_DATOFF) -#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text) -#endif - -#if !defined (N_TRELOFF) -#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data) -#endif - -#if !defined (N_DRELOFF) -#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x)) -#endif - -#if !defined (N_SYMOFF) -#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x)) -#endif - -#if !defined (N_STROFF) -#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x)) -#endif - -/* Address of text segment in memory after it is loaded. */ -#if !defined (N_TXTADDR) -#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0) -#endif - -/* Address of data segment in memory after it is loaded. */ -#ifndef __KERNEL__ -#include -#endif -#if defined(__i386__) || defined(__mc68000__) -#define SEGMENT_SIZE 1024 -#else -#ifndef SEGMENT_SIZE -#ifndef __KERNEL__ -#define SEGMENT_SIZE getpagesize() -#endif -#endif -#endif - -#define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE) - -#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text) - -#ifndef N_DATADDR -#define N_DATADDR(x) \ - (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x)) \ - : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x)))) -#endif - -/* Address of bss segment in memory after it is loaded. */ -#if !defined (N_BSSADDR) -#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data) -#endif - -#if !defined (N_NLIST_DECLARED) -struct nlist { - union { - char *n_name; - struct nlist *n_next; - long n_strx; - } n_un; - unsigned char n_type; - char n_other; - short n_desc; - unsigned long n_value; -}; -#endif /* no N_NLIST_DECLARED. */ - -#if !defined (N_UNDF) -#define N_UNDF 0 -#endif -#if !defined (N_ABS) -#define N_ABS 2 -#endif -#if !defined (N_TEXT) -#define N_TEXT 4 -#endif -#if !defined (N_DATA) -#define N_DATA 6 -#endif -#if !defined (N_BSS) -#define N_BSS 8 -#endif -#if !defined (N_FN) -#define N_FN 15 -#endif - -#if !defined (N_EXT) -#define N_EXT 1 -#endif -#if !defined (N_TYPE) -#define N_TYPE 036 -#endif -#if !defined (N_STAB) -#define N_STAB 0340 -#endif - -/* The following type indicates the definition of a symbol as being - an indirect reference to another symbol. The other symbol - appears as an undefined reference, immediately following this symbol. - - Indirection is asymmetrical. The other symbol's value will be used - to satisfy requests for the indirect symbol, but not vice versa. - If the other symbol does not have a definition, libraries will - be searched to find a definition. */ -#define N_INDR 0xa - -/* The following symbols refer to set elements. - All the N_SET[ATDB] symbols with the same name form one set. - Space is allocated for the set in the text section, and each set - element's value is stored into one word of the space. - The first word of the space is the length of the set (number of elements). - - The address of the set is made into an N_SETV symbol - whose name is the same as the name of the set. - This symbol acts like a N_DATA global symbol - in that it can satisfy undefined external references. */ - -/* These appear as input to LD, in a .o file. */ -#define N_SETA 0x14 /* Absolute set element symbol */ -#define N_SETT 0x16 /* Text set element symbol */ -#define N_SETD 0x18 /* Data set element symbol */ -#define N_SETB 0x1A /* Bss set element symbol */ - -/* This is output from LD. */ -#define N_SETV 0x1C /* Pointer to set vector in data area. */ - -#if !defined (N_RELOCATION_INFO_DECLARED) -/* This structure describes a single relocation to be performed. - The text-relocation section of the file is a vector of these structures, - all of which apply to the text section. - Likewise, the data-relocation section applies to the data section. */ - -struct relocation_info -{ - /* Address (within segment) to be relocated. */ - int r_address; - /* The meaning of r_symbolnum depends on r_extern. */ - unsigned int r_symbolnum:24; - /* Nonzero means value is a pc-relative offset - and it should be relocated for changes in its own address - as well as for changes in the symbol or section specified. */ - unsigned int r_pcrel:1; - /* Length (as exponent of 2) of the field to be relocated. - Thus, a value of 2 indicates 1<<2 bytes. */ - unsigned int r_length:2; - /* 1 => relocate with value of symbol. - r_symbolnum is the index of the symbol - in file's the symbol table. - 0 => relocate with the address of a segment. - r_symbolnum is N_TEXT, N_DATA, N_BSS or N_ABS - (the N_EXT bit may be set also, but signifies nothing). */ - unsigned int r_extern:1; - /* Four bits that aren't used, but when writing an object file - it is desirable to clear them. */ - unsigned int r_pad:4; -}; -#endif /* no N_RELOCATION_INFO_DECLARED. */ - -#endif /*__ASSEMBLY__ */ -#endif /* _UAPI__A_OUT_GNU_H__ */