From patchwork Wed Sep 25 12:28:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 97953 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A2A523858D35 for ; Wed, 25 Sep 2024 12:28:51 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id EF16B3858D28 for ; Wed, 25 Sep 2024 12:28:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EF16B3858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EF16B3858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::432 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727267304; cv=none; b=uqVhKc19NJ15NQ8wAr3TsIwYaw+FaNbTIeZctE0w0ekTHXtB4YIte2UWblCmnhU1Ih+YR+IMNEvdbVp9rbevdRq4UEbbBEqtBLug71kSQ08WZemmt9iBUFsD/UP7W0V9IZxibuVRwM+MaMY6oDdq9Pmh8eRiukoTXxOWraw8DlQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727267304; c=relaxed/simple; bh=xBJf5t999lDiCr7Nu4iJJKfGrAUMcVeK5tlKMSp0iWs=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=NAgLzNIfvK128QtSuilyZXwmfnmr2x5Xh34+HDNBTZi8Md6Pjcwul8HTN+blfF3j6K8mI3C8z69BvC/oCa69M5vo/25GvwTmXRQ8rQ89qY0yczL6YIPd+jGE4IbeKpJX5xtqC/lf/f2kfwqqd8nwLHNp6vELPzbIIlBEu9xSAs8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-718da0821cbso5126331b3a.0 for ; Wed, 25 Sep 2024 05:28:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727267302; x=1727872102; darn=sourceware.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=XfotYWlptanbZdt0QuXFX/049umOMwpgxpJAL5KXxRU=; b=d5Nw9uCfgMh1HIx/oScHrscoUKf9+w9ua0rF3+6CbMlbj9WKG4DDXjEx2Th+OPXjn2 kFVmYJoMnQTcu5G3udEPa53sJU03sYQQJncRhGWybkjig/2chAZItbjW+JQid6wMafmq 1LFPULtwMvp3J1KJYfT9N1Z+sL0gASt5ORfvSUwUAa8LqJw2h8eDbzpP7XjMt8RW2w74 XYQ09symv1M6li2aqb5RlWJA6ThyJUgm0gWyrptY19muNW8W1RIF9YnV4pEuSJKLMfnT mqUIeqDI6x2AgqRkx04miRjLPv2QoGYOqQGU9cVFkT/7Jy2Mi5kXWKuY7tYDXSpZspwo biIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727267302; x=1727872102; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XfotYWlptanbZdt0QuXFX/049umOMwpgxpJAL5KXxRU=; b=M17fK1cgpzG5T79zvMJWfZ3VhX6qOYtZYURrDywU/5RqepEJlqk3PhwGKskO29mE8q yQ3UbNlOeJcryXeFxbsWzEJWzl20xR7iutvcO/S9V5nO1X7qpv9q4YqzDkjNflYocnrG SjFZthSRk5yfGfHPf7uZzcp8ovhC7A0HR2OXtcWwHRLhr98TvezMdwiXwQFakj9T9Ul6 8pELy92RlhU+eyMazJ6CW5SyzeOuN4fLljpqX2Fba1S9F7N67OPyr9je6KJvIAwc4Jsl dZtjqEp8I0vMtQ0L6HRx0Vao7TA45ICKZK/MKB3dTMQ2v8UehgentzpQV0WCHXe3OSQ2 W5Xw== X-Gm-Message-State: AOJu0YzNX0SyiXZrHmhZJcfGI4xgXHUy+ysvCpFsm4n4TlK2wiskKrGg NAL9N0Nj0JJJ7oXt8TzJ9mPWdl2YOzjwDHSFPyXNzs337u5jEGGP X-Google-Smtp-Source: AGHT+IGhOzT458YiJjkLXFFfnggWz9XmPOlGAYeYGiJBnDYnAVBJNhazoAis0afSqQ8pXhi45Q+OVQ== X-Received: by 2002:a05:6a21:6f83:b0:1d3:420f:1440 with SMTP id adf61e73a8af0-1d4e0bb35e7mr3472847637.48.1727267301836; Wed, 25 Sep 2024 05:28:21 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:7525:38c8:766a:cebe]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71b08688ec8sm1506540b3a.29.2024.09.25.05.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 05:28:21 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 11354114018F; Wed, 25 Sep 2024 21:58:19 +0930 (ACST) Date: Wed, 25 Sep 2024 21:58:19 +0930 From: Alan Modra To: binutils@sourceware.org Cc: "H.J. Lu" , Jan Beulich Subject: x86 build breakage Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3032.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org OK to apply the following? From 3ef6914d084c0f42404676e3fd7b8d7d34a33ec1 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 25 Sep 2024 21:32:03 +0930 Subject: Re: x86: Enable TLS relocation check only for ELF Some configurations (eg. i386-bsd, i386-msdos) broke with commit 9e0840deed38, due to the gotrel array being unused. Fix that. Also invert the preprocessor test around lex_got to make it positive logic and remove the LEX_AT condition which is no longer necessary. (The only x86 config files defining LEX_AT also define TE_PE.) diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index 25ecaa66104..3f8224e0720 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -1327,6 +1327,8 @@ static htab_t op_hash; /* Hash table for register lookup. */ static htab_t reg_hash; +#if (defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) || defined (OBJ_MACH_O) \ + || defined (TE_PE)) static const struct { const char *str; @@ -1414,6 +1416,7 @@ gotrel[] = #undef OPERAND_TYPE_IMM32_32S_64_DISP32_64 #undef OPERAND_TYPE_IMM64_DISP64 }; +#endif /* Various efficient no-op patterns for aligning code labels. Note: Don't try to assemble the instructions in the comments. @@ -12836,10 +12839,8 @@ x86_address_bytes (void) return stdoutput->arch_info->bits_per_address / 8; } -#if (!(defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) || defined (OBJ_MACH_O)) \ - || defined (LEX_AT)) && !defined (TE_PE) -# define lex_got(reloc, adjust, types) NULL -#else +#if (defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF) || defined (OBJ_MACH_O) \ + || defined (TE_PE)) /* Parse operands of the form @GOTOFF+ and similar .plt or .got references. @@ -12937,6 +12938,8 @@ lex_got (enum bfd_reloc_code_real *rel, /* Might be a symbol version string. Don't as_bad here. */ return NULL; } +#else +# define lex_got(reloc, adjust, types) NULL #endif bfd_reloc_code_real_type