From patchwork Mon May 11 05:11:30 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 134751 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F301F4BA23D2 for ; Mon, 11 May 2026 05:13:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F301F4BA23D2 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=F3kRR4xw X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by sourceware.org (Postfix) with ESMTPS id 4BB1A4BA23DF for ; Mon, 11 May 2026 05:11:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4BB1A4BA23DF 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 4BB1A4BA23DF Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778476304; cv=none; b=dq15X8Baqr6SflfrceHPLQvLoTVas/2G59cx5QUFTVxwamQ1147mw+nAwzTlrefCVU5l2O0Qe9/69wXllUGyN1w8OC+Fkv0CvQPxctOvxFmwuY0Bv3bOX6DZw8bVToHQLl1KAkX2JIHcvlRRJcFUxEbY3xpKA2cjHA7KjqgDvYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778476304; c=relaxed/simple; bh=4SJou7TLDOI0jGFK0gRA+AbrmQKD+NN/CtOIM1TElH0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=kBiMhUuSu+7rejwFofLmbfscrYO3eYx6cZg3bARZBTUDhPhmGU4VPlu3TanN9chCwY3hnbFR/DAw0GEIUDMO/eyvs2uTQZg+0/m2CgCztdzZEY+OewUCVzTiGQgQT0KxrD0iV1InPWduqEu9VdLp2Mm4rivpddcNqwtBW65UNIA= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20251104 header.b=F3kRR4xw DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4BB1A4BA23DF Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2bab82d75fdso20394475ad.2 for ; Sun, 10 May 2026 22:11:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778476303; x=1779081103; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OHOhg6pnhFkqoHDRu7EBNtvVHwcdllvKnjYpCtdKV5o=; b=F3kRR4xwuJtai3SN3gVnMK36ZB27EW5RW+fui4l8Uyp81ZGf7Z9zmSFv9CcVrd4rZY dUcVvDaOkSW1bwYlKJRptWe8+vaAetCuiz9GLAhaiOd7Erognu1ScFPUmySYfo8mxtI+ tdR8p41ah/UDelTNzzhfK/4+6QPrqaHpRX/lr62TJZyKSc5AFjbjNkkxGx7ZuECGcrjr iQkOx1MsxXCiKg75HAWuAw2zUFUGDic8zOjwSydFFlKZl+mPFd/ozBSMi+qW2WkWozAJ k8C8wtf32cCXUKTnsF1ssCeZcdN1MAxvbLtLFgy0cY0JwClqTxKRv8YKX1M4z3ge25Nw q2Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778476303; x=1779081103; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=OHOhg6pnhFkqoHDRu7EBNtvVHwcdllvKnjYpCtdKV5o=; b=dzZVAG9IdvVxbS5IEd8uPu7bXJ+TL4ntQmfDUdy/OjxslSgzv/yVEollBh35n/cHbG 16IgyeixOQNJVvLUq68O5jLH8VLCh8KKWD0m391kExde500mXwXloRZf6dkb0kgFMqY+ AwG8zudV00KCST2bEvTHawvnl1Rmb5lwEYGO2sNmW0IRGIwVD2STro9U65t8KzHt5tfl VopxmGGUWKU40nakHwf2olXgOtvf1zumqBPcDy09jJqs1ZqU6jgkrO4fguoxAfWd+T5t ydDH1iRCUDzMEne8zfvlTVuPMR3YxAu+zkwRkr5T9ko5DDv4R5yD9mGJSRWeoc2enfos Ua4Q== X-Gm-Message-State: AOJu0YynZlWaV2jPoxOjTykiYDk2jdCQW2dQeYMg4DmutUcm8prg7F0S tCwoB5tkeRc5trKMN7iN5RndYjK3SFtr22UckkELZF4M+btl5lUDNQMiSxQbpw== X-Gm-Gg: Acq92OFF21DqLSMcbp/It5Lgko8ayIJtKZow/mJ+F/YmZJTGkV7Hk4U5lyBvkOp56v0 hNcORom1ejPYx6RnLsz/wUAxEJu+JSdmVJ4H4BnhpOnoLnIytrPD6tjM33yHxNF26+gxiTtJo5S uXyp89D0w2ULNPzHExH37XRVS0twSNZffp/X0p9nUjz31xHcW+cTKY5/7hNfKuHlbKpe7r8g+bj Ut47HlBj8qk1AbdOTNHvmIDAI8+dqhu58FLaAanlUEA3yUILB53wCg/riSrbvvrzQjW3sLdUkGC tYfC/5tXkoIY2Uh3vU2RsnBsBFUWrT6Ftr/h1pSSDl9Je9lyHrVNpQfm1vggEZcyVDdVMK89gZO cG4/dl0xn0hSD9v2GQHCDATZ43I7lAGJmPwBIz5jdAPz3W9o4O9XPaIpQDPaETF8CiAWgS5BQX/ r04NEnfip2gaSS51UQaWCwtsEaOQa6/Z5pQDkE0EKC41IO6NohBf8sefSp9Q== X-Received: by 2002:a17:902:c410:b0:2ae:5eab:132e with SMTP id d9443c01a7336-2bc7a9ac1b5mr88891105ad.12.1778476303048; Sun, 10 May 2026 22:11:43 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:1195:f39d:dcd2:8fed]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1d2709bsm93193495ad.5.2026.05.10.22.11.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2026 22:11:42 -0700 (PDT) From: Alan Modra To: binutils@sourceware.org Subject: cris: dynobj mach Date: Mon, 11 May 2026 14:41:30 +0930 Message-ID: <81d45b16059ea78b3d39f8e26bb722d8badd104d.1778457849.git.amodra@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-3029.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_BLOCKED, 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 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 A comment in cris check_relocs bemoans not being able to access the output bfd in adjust_dynamic_symbol. A little over three years after the comment was written, commit f13a99db51c0 gave that access. So let's make use of it and remove a restriction. * elf32-cris.c (elf_cris_adjust_dynamic_symbol): Get mach from output bfd, not dynobj. (cris_elf_check_relocs): Remove dynobj mach check. diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c index 8e5e82d2ce8..cc27a68ea2c 100644 --- a/bfd/elf32-cris.c +++ b/bfd/elf32-cris.c @@ -2676,7 +2676,7 @@ elf_cris_adjust_dynamic_symbol (struct bfd_link_info *info, && !h->def_regular))); plt_entry_size - = (bfd_get_mach (dynobj) == bfd_mach_cris_v32 + = (bfd_get_mach (info->output_bfd) == bfd_mach_cris_v32 ? PLT_ENTRY_SIZE_V32 : PLT_ENTRY_SIZE); /* If this is a function, put it in the procedure linkage table. We @@ -3033,22 +3033,7 @@ cris_elf_check_relocs (bfd *abfd, case R_CRIS_16_GOTPLT: case R_CRIS_32_GOTPLT: if (dynobj == NULL) - { - elf_hash_table (info)->dynobj = dynobj = abfd; - - /* We could handle this if we can get a handle on the - output bfd in elf_cris_adjust_dynamic_symbol. Failing - that, we must insist on dynobj being a specific mach. */ - if (bfd_get_mach (dynobj) == bfd_mach_cris_v10_v32) - { - _bfd_error_handler - /* xgettext:c-format */ - (_("%pB, section %pA: v10/v32 compatible object" - " must not contain a PIC relocation"), - abfd, sec); - return false; - } - } + elf_hash_table (info)->dynobj = dynobj = abfd; if (sgot == NULL) {