From patchwork Fri Oct 4 07:32:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 98357 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 44F653846425 for ; Fri, 4 Oct 2024 07:32:30 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by sourceware.org (Postfix) with ESMTPS id BB0ED385DDFB for ; Fri, 4 Oct 2024 07:32:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BB0ED385DDFB Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org BB0ED385DDFB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::52c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728027125; cv=none; b=P+FZIbJjznnrzCgZxJHlbkLtocAUggmHWltOI02/ahgugK+wU1oZL/ZKlZ2zk2LIIqwEqSNGUP97badM5cQmzNjoNwmEYhx6O7hh8GlWVwJzYVtX+7Eo44rkk0kQO6ibHnyeXdJ5H53oZuoI033mPefTaxzS/43L0V+Wl10i2vM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728027125; c=relaxed/simple; bh=9EYurng9B9rLVDbZCQ+xuVOrRlQq17030b7wb6xaoZ0=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=vdinJqIk53s819i+jnNW2m/oQQa2NXWaUPotuuKzZYbg9B+y0y5IonJU51ZsTOAiuwwGxig1mblc9fb/tQNmzh8TcWAy+h2v5hI5jJE8mj39eHI4ua2/UPwlQWqEB/9ShEi7YJefRHNh3N+oTO5eGE6o9laLjiHX196Hh2fSAYU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-5c88e6926e5so1835460a12.3 for ; Fri, 04 Oct 2024 00:32:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1728027122; x=1728631922; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:cc:content-language :references:to:from:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=2JQH7rG1BD++t9veOgLsQAWRJea/vQNRxBWW1o493sg=; b=CmzhUecRXsUsgcERkQVec36ENjWehtg9/yEDp2pVL5sVQjm0t8hkFLJ4Xtf5q/Midg wtZb+z5UZPEtTVz+TgG1AjQ/tUqGkdvoxxQLM6Gm+wnZA0BRy4/uCEA+fE33/XEN/65A bQq0RaoLhxzOj0iKqTOdQNDA6as24UdovAcSOS9br75QgtW0KwSLyFk9NRg9E7REZ+kG fDiXfWFvuuDcmTep+JNziahy7xqFsP3szjYlzG0wuUAeJN+dBUn+XfHLy3y3j/GS8Xmd NmjK9E3uovqfJyty3lzi74EdXuGonPlSZXYQ2pHl3pRskipyWsKTe5kOqiWPSEThXZnz 55Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728027122; x=1728631922; h=content-transfer-encoding:in-reply-to:autocrypt:cc:content-language :references:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2JQH7rG1BD++t9veOgLsQAWRJea/vQNRxBWW1o493sg=; b=jEDv20G00k9wddUDYBxkEu5FBqbseIWVyYilRoQcl6IiSJ1P62KW+MT3NcFPsz8k+G X7PMqFOBLk1dtuFa20JQl/YHcFvN9oEycrZCNimCrQitwKA+FDrPEZeTeNOFRFsd5RZn hVFE1LgjHvb1xqwbUPL7hxadUc0Tn4uEu2by/5toqYVNNaoNCPPNVWHW/pj7EcmBkOJE bc6Vdohjq1TQ62J9O18RELnK8p1pl2YYwX23ZHHvqZybUsKtKTffHVK1zVkMr5CQ7Isw N351MmMx/8YvyOvTrKgxNDqYy1Odl+qiKcCm5IrbxywBi+ysJxFWIU/oGpt6YMjvPwry ejMg== X-Gm-Message-State: AOJu0YzMa8PBeUl8G8ObeIDJVyhRxTjo4MQVddmf+ZPaEkk2w+XeOpjM MdXxhlR8JIN7a+AEtNxbzeqRaQ6uAy7c424bSMXlCkFxijUyKS1MokZaiaTMVfQU79pAp/ZgRNY = X-Google-Smtp-Source: AGHT+IGFJ3RsIdd2PBCodJGhTMUFoxj3MKZq+a0yoCiqhyAIMy66pkj39YowlW5szfoNI+/RzsJo9Q== X-Received: by 2002:a05:6402:1d54:b0:5c8:81bd:ac90 with SMTP id 4fb4d7f45d1cf-5c8d2e75d91mr1306782a12.27.1728027122303; Fri, 04 Oct 2024 00:32:02 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c8ca3fce32sm1536445a12.57.2024.10.04.00.32.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Oct 2024 00:32:02 -0700 (PDT) Message-ID: <0d5cc1d7-1a4a-4d19-86a9-fa16e383fa94@suse.com> Date: Fri, 4 Oct 2024 09:32:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v2 2/2] bfd/ELF: drop align_file_position() From: Jan Beulich To: Binutils References: <15edc241-783f-43e6-9e87-343e8a141c5c@suse.com> Content-Language: en-US Cc: Nick Clifton , Alan Modra Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <15edc241-783f-43e6-9e87-343e8a141c5c@suse.com> X-Spam-Status: No, score=-3023.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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 Switch the sole user to BFD_ALIGN() instead. (It's comment was partly wrong [stale?] anyway, talking of some maximum that was nowhere in sight.) --- v2: New. --- a/bfd/elf.c +++ b/bfd/elf.c @@ -4547,15 +4547,6 @@ elf_map_symbols (bfd *abfd, unsigned int return true; } -/* Align to the maximum file alignment that could be required for any - ELF data structure. */ - -static inline file_ptr -align_file_position (file_ptr off, int align) -{ - return (off + align - 1) & ~(align - 1); -} - /* Assign a file position to a section, optionally aligning to the required section alignment. */ @@ -7106,7 +7097,7 @@ _bfd_elf_assign_file_positions_for_non_l /* Place the section headers. */ i_ehdrp = elf_elfheader (abfd); - off = align_file_position (off, 1 << bed->s->log_file_align); + off = BFD_ALIGN (off, 1u << bed->s->log_file_align); i_ehdrp->e_shoff = off; off += i_ehdrp->e_shnum * i_ehdrp->e_shentsize; elf_next_file_pos (abfd) = off;