From patchwork Mon Dec 16 08:49:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 103164 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 71C323858283 for ; Mon, 16 Dec 2024 08:50:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 71C323858283 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=UkiOxqAp X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id AFBE1385840D for ; Mon, 16 Dec 2024 08:49:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AFBE1385840D 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 AFBE1385840D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::429 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734338990; cv=none; b=FprgVQzvV0A8Km4P/rTUvR+cmBXr1JBvBvpg5VXfsuLA6qHwOO7eKnCLnh0GXdSwxMxmwvN3pcwVFjCLMj6OCqolCkwRmvCykgKs+Mo+XujMq/y7soN7XIEIF9F7p4I3hRDffQdphy9g+rUCGd+Zt2kzwQD79eFeJp8ehF/1q18= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734338990; c=relaxed/simple; bh=2VdR7pKh27D24dMXqeNKciSnSEf6ujUkkcBEIladZ5w=; h=DKIM-Signature:Message-ID:Date:MIME-Version:To:From:Subject; b=taaK1Lp0S9R6B0bHGe5nuwuZ15KwbPsmYIc2r90rdYrjm+/wN5PbdPQF77cADr108e08suGnfK/xBHuKmPSHBKcF5bqTUorv6/4V2+KtP/H1+C7lhrykoqHLyHnuFBf41uuO1mfNIvF7SKdoSL2XNn35fo6ojt8M6T63asO5QMM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AFBE1385840D Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-385dece873cso1620290f8f.0 for ; Mon, 16 Dec 2024 00:49:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1734338988; x=1734943788; darn=sourceware.org; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=NMBlEpA3BK4UhSZWKq/XWegdb7HgxGTXV1UADPwpgMI=; b=UkiOxqApoUDeklLn0IKOjfm1DjZ43j947ni+xzVxfcW+eMKd6Zm9vxoJLM9AXq4efT G8PBJg2naFY4Ck6hKJvYZMCOYq/p4g/p5pdN/pgtrVvfsndtg4+en7mAlRC7aKAdKdG1 y0JK24VRjY5z/vdiMD6Eash7sSh1JztSw/VT+tkXuiwjwY0LaYbB/N3Y09aXIownQy9n ZCt8kXuNZ8lp+3jIfaqHWGGW1RgjV8tvjrd4nqnQ+QySFT7ln7bc1WPaKQ59d44MNtFj ubHZdnTxDemz0rrAChZWLiyk20dgPv2+dw3d1MNQCy3LBliNw3dG1sfON0d0ujoXkrTA h9ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734338988; x=1734943788; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NMBlEpA3BK4UhSZWKq/XWegdb7HgxGTXV1UADPwpgMI=; b=KFGkW0NuUj0qg8Jhu6jF9xJIiKmI/yCUN7H5wp6BsXJdWy/57ykSaTLxEyw00RvFWs 26bb+cwJJpv++b4xZus6hog91WhRvNtDXVaCkWrfLpRrxXIWv/OP9lrtc8MU6wy96Avk oIh7T9nEsCOoJsFUuvGZSzeej/h3JQ9UEXdlbLjCuf1nPtzF8Cku+/zJe5qwma0acSzf w9nIS+FeRdEFgsf5FarBQhW8wCUrQxTii/VnwIkWJFPlk9gK6/1SC6FYZA9XHhGM1jKM NDNauhhXLjq/NlfhYGnubT+U6MfLLCk2JX1zZlp19/c5wz1cr7cKG7/eU5Il38KuZ3pt gpgw== X-Gm-Message-State: AOJu0YzKD2GfHYsbWD7IHcE4usHpGeSncE+LuXv6hrb7PxEOtGXsnGBG 4es7+0tmdg3spKVV+k1HFP7Sg70JxAdtPoY8A9IThsR3yXPkUoa8n7vQ0ds53NkiYejD1RPz4D0 = X-Gm-Gg: ASbGncvyMd/u5DzQEPcAbD0OFEfSzC0t5uR3tACdZr5SMMrrSJmFS27D/ATXiYayP0c lhFUMtIVItZGmrvpGYF7QCgvKQI7yTfa9B9x+ECi4oPeLkeC4Jq71fqsCke1fYrlHUx4VVQyUTa 3JoBwIi0DCx3bukrAffnsfnHdkendLMOGLlwfe3jipvrahxpbLJsRCoyZ3sTwrsxZUXd1YmNUcG MhEK7JI/i4i4wVzM2dbURf7aBfSYspMzJgQLoqV0unb4mkem4Yv+wmn4DKB1pPSMhBVh8HhFbC5 m6PKCzVQ72l5KhDqpzf8XP1KEpDr36XqymDjs5MNtA== X-Google-Smtp-Source: AGHT+IGD7FSP330XZOFJgUeBV1F7qpocJxWXhVIrwHlSm79AAtCEOwpVW9SUfLNplIbqkk5HFPwiLw== X-Received: by 2002:a5d:64ab:0:b0:385:ef8e:a641 with SMTP id ffacd0b85a97d-38880ae0e46mr9930403f8f.28.1734338986748; Mon, 16 Dec 2024 00:49:46 -0800 (PST) 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 ffacd0b85a97d-388c8046dabsm7657807f8f.81.2024.12.16.00.49.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Dec 2024 00:49:46 -0800 (PST) Message-ID: <180a41de-760c-4f7c-918d-1633ae388696@suse.com> Date: Mon, 16 Dec 2024 09:49:48 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Binutils Cc: "H.J. Lu" From: Jan Beulich Subject: [PATCH] x86-64: correct CODE_5 relocs 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 X-Spam-Status: No, score=-3022.6 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 Two of them had their numbers swapped; luckily they aren't really in use just yet. Correct indentation as well while at it. --- a/include/elf/x86-64.h +++ b/include/elf/x86-64.h @@ -96,18 +96,18 @@ START_RELOC_NUMBERS (elf_x86_64_reloc_ty instruction starts at 5 bytes before the relocation offset, relaxable. */ RELOC_NUMBER (R_X86_64_CODE_5_GOTPCRELX, 46) + /* PC relative offset to IE GOT entry if the instruction starts at + 5 bytes before the relocation offset. */ + RELOC_NUMBER (R_X86_64_CODE_5_GOTTPOFF, 47) /* 32 bit signed pc relative offset to TLS descriptor in the GOT if instruction starts at 5 bytes before the relocation offset. */ - RELOC_NUMBER (R_X86_64_CODE_5_GOTPC32_TLSDESC, 47) - /* PC relative offset to IE GOT entry if the instruction starts at - 5 bytes before the relocation offset. */ - RELOC_NUMBER (R_X86_64_CODE_5_GOTTPOFF, 48) + RELOC_NUMBER (R_X86_64_CODE_5_GOTPC32_TLSDESC, 48) /* Load from 32 bit signed pc relative offset to GOT entry if the instruction starts at 6 bytes before the relocation offset, relaxable. */ RELOC_NUMBER (R_X86_64_CODE_6_GOTPCRELX, 49) - /* PC relative offset to IE GOT entry if the instruction starts at - 6 bytes before the relocation offset. */ + /* PC relative offset to IE GOT entry if the instruction starts at + 6 bytes before the relocation offset. */ RELOC_NUMBER (R_X86_64_CODE_6_GOTTPOFF, 50) /* 32 bit signed pc relative offset to TLS descriptor in the GOT if instruction starts at 6 bytes before the relocation offset. */