From patchwork Fri Nov 28 11:50:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 125510 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 7D1CF3858CDA for ; Fri, 28 Nov 2025 11:51:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7D1CF3858CDA 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=SgCYhA8d X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id 064D73858D1E for ; Fri, 28 Nov 2025 11:50:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 064D73858D1E 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 064D73858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::330 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1764330622; cv=none; b=CJUwU19PU3kp7do6bwQfxc24rmckAx13T9OdbJ9ZRTD5GMH6A4Sq5UhOyqhWOTurNOmmvtYOM52sXlXMAotsejDs8ShSZNltukP+4oH1puW1vnvIqrCngN0vyk6AxOBTfp4M0HHtXtb7H+6sTA5h9KAA80mDJbBimzH6VvdvSIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1764330622; c=relaxed/simple; bh=lnQaeMRtFTHQ9VFfY6UYyGDUNw51MG7S0PCH0lHcCuQ=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=VR7PIDHyPDmS8OTDEmPYDpgb3tnnP9DkHzcExlzuuzOhzAUZcIPDyRMcjpeRBI2aV4iSaZU7Utsh/YhGiXrdR0WgfiUTI5VOIjY59osxvdR9NxYmBVYMkz45Vu/OHCshriRu+fUkfntGfCRe/6na8CGpUrOXlTK/G9VFYVBy81Q= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 064D73858D1E Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-477a2ab455fso17986665e9.3 for ; Fri, 28 Nov 2025 03:50:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1764330621; x=1764935421; 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=yJMcbJhmEft44YGUVU5oT2OrgHS+5MXxcLWEHwsA208=; b=SgCYhA8dsstSuS/LuMzqDFxVBZONQB7P4TbE3mNncG7R3kCpde5iHtF0UEhkgKFSQR ISvWCspD8ktuTdYZY8Cvtbc0GJ29ka3A14iNXLlLcvEsPfZ86wrQcLeO/Re4AXLtWmJw 0DXGG1Jpoypsufv52LNAFpWp4P7GZYZG/AWF0S97SGimx9/CB6zICg146SZ6I1IfzLFn uD2WF4AhLryVRoGGmZkTb6gVDPCb+FBhMPGPZxoLKNToNfioiY1iUe7SsyiLLJw7wi7D sUj9vlqngkPkwY6Bks0Vd1hCodZcIs7VnZNhI8fi0bSgNlLjTWgF72r25l1wIe2VRgkg OGeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764330621; x=1764935421; h=content-transfer-encoding:in-reply-to:autocrypt:cc:content-language :references:to:from:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yJMcbJhmEft44YGUVU5oT2OrgHS+5MXxcLWEHwsA208=; b=TfeqBxU6IRXUYQMbnkpAP51hKeaYlYEkDxY/Hlu2VJ3Q2vpmO/8XZHJy4bm1z+N3lU VHoSy37yyhUmH1GvlPmIoV6LzTH1hgS0Wjki7HqK92OxtquWfH8Q/vZhpkUXv6xsKBMt IFs3Tis0Y3cNOYJkZtlBfaptm99Qi2Xx5SjeiyiSBJcASTFETiypdZkvPKy3UnkOfg0V G133hXbFGeG92eSZNDMqq5Qah1ejE420F5oKa3m9vdWxOcAVSksPP50vDudrvcs1/sgA 1P8xO1T1b40a3YOkMEGPUst0OCixE82xbd67mdmXQh0YnU1P8UQ70XLcEpE7fKm0Mwgd 9GWw== X-Gm-Message-State: AOJu0YxLaNw37gMVo8jexlamlOIbHMzLt6TP7qijUNQ84EUlLJZxMy7t oTIAZLg9DpclcIE7On14H2WlzjX8fQr7aGYw0kLuSiMPEkItJILyE+uCmraCwgFEeD9PuJl1wpM bais= X-Gm-Gg: ASbGncusCsCAnqgWCxiFyEqesuRvK4dT5oKZ47j3+5PsmAl8ijt77jjefoakWy6Z+J9 aELO1gVp+Y37uy5yHdCiVRsIuLuzEXVbhSyRH46NnhcSC8otf4NtEJKSi+FTBq0SIKiHuEUhGRL FeGOD4lkaLwmQavmXvIOghSoCJ5k/8NaLgQYyzFQlif22nHnTLUTY+WYGkARf8nbyeJ/2TEG29H 51r3DYyXCTJaYWUhl2Nvx7iKL/8qhoG3ih5llUGL/KlFRmRvQOxHqCfNDagM3MMFeYfuqeP5k+x M/C+VaBhKkVFlwrRuun4lytICl0Ut1adsrL93UGBEWRtrJdpAKjMhFXt2F4ihrYu0MfLQdX2o+g 1OX+SJPsraNJNmPhTvbNkNkV3zZ40hc/6iEvdlo/iODogtwB/CAUfcNtVIqnTcbxnHPwOsgEEfC pGABiyVeF/fdFdF51z8BnvdWZ2KiVwEWPpauXkuzhNjXrzEr/C+P4yAjMUubP+kx4N26Y4ecZU1 1I= X-Google-Smtp-Source: AGHT+IEMtYR0kF/W2TzqllSbwEIsaBnb+IXpBnaJj7TIMjBW6skaU6g4aa9XErGSYX7XWx4atIG2Eg== X-Received: by 2002:a05:600c:4691:b0:477:58af:a91d with SMTP id 5b1f17b1804b1-477c10c8e61mr262427185e9.5.1764330620327; Fri, 28 Nov 2025 03:50:20 -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-42e1caa86d0sm9126747f8f.39.2025.11.28.03.50.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 28 Nov 2025 03:50:19 -0800 (PST) Message-ID: Date: Fri, 28 Nov 2025 12:50:17 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 12/14] bfd/ELF: fold BFD_RELOC__J{,U}MP_SLOT From: Jan Beulich To: Binutils References: Content-Language: en-US Cc: Alexandre Oliva , Claudiu Zissulescu , Nick Clifton , "ramana.radhakrishnan@arm.com" , Richard Earnshaw , Hans-Peter Nilsson , "H.J. Lu" , Jon Beniston , Doug Evans , Chenghua Xu , "Maciej W. Rozycki" , Kuan-Lin Chen , Wei-Cheng Wang , Christian Svensson , Stefan Kristiansson , Stafford Horne , Andreas Krebbel , Joseph Myers , Jan-Benedict Glaw , Max Filippov , Sterling Augustine , "David S. Miller" , "Jose E. Marchesi" 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: X-Spam-Status: No, score=-3017.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, UPPERCASE_50_75 autolearn=no 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 There's no need to have a separate reloc per arch; just like for other more or less generic ones a single one will (mostly) do. Arm64, C-Sky, and KVX - sadly - are exceptions. --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -3335,6 +3335,7 @@ enum bfd_reloc_code_real BFD_RELOC_8_PLTOFF, BFD_RELOC_COPY, BFD_RELOC_GLOB_DAT, + BFD_RELOC_JMP_SLOT, BFD_RELOC_IRELATIVE, /* Size relocations. */ @@ -3342,7 +3343,6 @@ enum bfd_reloc_code_real BFD_RELOC_SIZE64, /* Relocations used by 68K ELF. */ - BFD_RELOC_68K_JMP_SLOT, BFD_RELOC_68K_RELATIVE, BFD_RELOC_68K_TLS_GD32, BFD_RELOC_68K_TLS_GD16, @@ -3406,7 +3406,6 @@ enum bfd_reloc_code_real BFD_RELOC_SPARC_PC10, BFD_RELOC_SPARC_PC22, BFD_RELOC_SPARC_WPLT30, - BFD_RELOC_SPARC_JMP_SLOT, BFD_RELOC_SPARC_RELATIVE, BFD_RELOC_SPARC_UA16, BFD_RELOC_SPARC_UA32, @@ -3735,9 +3734,6 @@ enum bfd_reloc_code_real BFD_RELOC_MICROMIPS_TLS_TPREL_LO16, BFD_RELOC_MIPS_EH, - /* MIPS ELF relocations (VxWorks and PLT extensions). */ - BFD_RELOC_MIPS_JUMP_SLOT, - /* Moxie ELF relocations. */ BFD_RELOC_MOXIE_10_PCREL, @@ -3808,9 +3804,6 @@ enum bfd_reloc_code_real bytes in the instruction. */ BFD_RELOC_MN10300_GOT16, - /* Create PLT entry. */ - BFD_RELOC_MN10300_JMP_SLOT, - /* Adjust by program base. */ BFD_RELOC_MN10300_RELATIVE, @@ -3845,7 +3838,6 @@ enum bfd_reloc_code_real /* i386/elf relocations. */ BFD_RELOC_386_GOT32, BFD_RELOC_386_PLT32, - BFD_RELOC_386_JUMP_SLOT, BFD_RELOC_386_RELATIVE, BFD_RELOC_386_GOTOFF, BFD_RELOC_386_GOTPC, @@ -3868,7 +3860,6 @@ enum bfd_reloc_code_real /* x86-64/elf relocations. */ BFD_RELOC_X86_64_GOT32, - BFD_RELOC_X86_64_JUMP_SLOT, BFD_RELOC_X86_64_RELATIVE, BFD_RELOC_X86_64_GOTPCREL, BFD_RELOC_X86_64_32S, @@ -3941,7 +3932,6 @@ enum bfd_reloc_code_real BFD_RELOC_PPC_BA16, BFD_RELOC_PPC_BA16_BRTAKEN, BFD_RELOC_PPC_BA16_BRNTAKEN, - BFD_RELOC_PPC_JMP_SLOT, BFD_RELOC_PPC_RELATIVE, BFD_RELOC_PPC_LOCAL24PC, BFD_RELOC_PPC_EMB_NADDR32, @@ -4198,7 +4188,6 @@ enum bfd_reloc_code_real BFD_RELOC_ARM_TLS_IE32_FDPIC, /* Relocations for setting up GOTs and PLTs for shared libraries. */ - BFD_RELOC_ARM_JUMP_SLOT, BFD_RELOC_ARM_GOT32, BFD_RELOC_ARM_RELATIVE, BFD_RELOC_ARM_GOTOFF, @@ -4319,7 +4308,6 @@ enum bfd_reloc_code_real BFD_RELOC_SH_LABEL, BFD_RELOC_SH_LOOP_START, BFD_RELOC_SH_LOOP_END, - BFD_RELOC_SH_JMP_SLOT, BFD_RELOC_SH_RELATIVE, BFD_RELOC_SH_GOTPC, BFD_RELOC_SH_GOT_LOW16, @@ -4428,7 +4416,6 @@ enum bfd_reloc_code_real BFD_RELOC_ARC_32_PCREL, BFD_RELOC_ARC_GOT32, BFD_RELOC_ARC_GOTPC32, - BFD_RELOC_ARC_JMP_SLOT, BFD_RELOC_ARC_RELATIVE, BFD_RELOC_ARC_GOTOFF, BFD_RELOC_ARC_GOTPC, @@ -4668,7 +4655,6 @@ enum bfd_reloc_code_real /* For PIC. */ BFD_RELOC_M32R_GOT24, BFD_RELOC_M32R_26_PLTREL, - BFD_RELOC_M32R_JMP_SLOT, BFD_RELOC_M32R_RELATIVE, BFD_RELOC_M32R_GOTOFF, BFD_RELOC_M32R_GOTOFF_HI_ULO, @@ -4763,7 +4749,6 @@ enum bfd_reloc_code_real BFD_RELOC_NDS32_GOT20, BFD_RELOC_NDS32_9_PLTREL, BFD_RELOC_NDS32_25_PLTREL, - BFD_RELOC_NDS32_JMP_SLOT, BFD_RELOC_NDS32_RELATIVE, BFD_RELOC_NDS32_GOTOFF, BFD_RELOC_NDS32_GOTOFF_HI20, @@ -5001,7 +4986,6 @@ enum bfd_reloc_code_real BFD_RELOC_V850_32_GOT, BFD_RELOC_V850_22_PLT_PCREL, BFD_RELOC_V850_32_PLT_PCREL, - BFD_RELOC_V850_JMP_SLOT, BFD_RELOC_V850_RELATIVE, BFD_RELOC_V850_16_GOTOFF, BFD_RELOC_V850_32_GOTOFF, @@ -5063,7 +5047,6 @@ enum bfd_reloc_code_real BFD_RELOC_C6000_SBR_GOT_H16_W, BFD_RELOC_C6000_DSBT_INDEX, BFD_RELOC_C6000_PREL31, - BFD_RELOC_C6000_JUMP_SLOT, BFD_RELOC_C6000_EHTYPE, BFD_RELOC_C6000_PCR_H16, BFD_RELOC_C6000_PCR_L16, @@ -5152,7 +5135,6 @@ enum bfd_reloc_code_real BFD_RELOC_METAG_RELBRANCH_PLT, BFD_RELOC_METAG_GOTOFF, BFD_RELOC_METAG_PLT, - BFD_RELOC_METAG_JMP_SLOT, BFD_RELOC_METAG_RELATIVE, BFD_RELOC_METAG_TLS_GD, BFD_RELOC_METAG_TLS_LDM, @@ -5477,9 +5459,6 @@ enum bfd_reloc_code_real /* 12 bit GOT offset. */ BFD_RELOC_390_GOT12, - /* Create PLT entry. */ - BFD_RELOC_390_JMP_SLOT, - /* Adjust by program base. */ BFD_RELOC_390_RELATIVE, @@ -5939,7 +5918,6 @@ enum bfd_reloc_code_real BFD_RELOC_CRIS_UNSIGNED_4, /* Relocs used in ELF shared libraries for CRIS. */ - BFD_RELOC_CRIS_JUMP_SLOT, BFD_RELOC_CRIS_RELATIVE, /* 32-bit offset to symbol-entry within GOT. */ @@ -5993,7 +5971,6 @@ enum bfd_reloc_code_real BFD_RELOC_OR1K_PLT26, BFD_RELOC_OR1K_PLTA26, BFD_RELOC_OR1K_GOTOFF_SLO16, - BFD_RELOC_OR1K_JMP_SLOT, BFD_RELOC_OR1K_RELATIVE, BFD_RELOC_OR1K_TLS_GD_HI16, BFD_RELOC_OR1K_TLS_GD_LO16, @@ -6036,7 +6013,6 @@ enum bfd_reloc_code_real BFD_RELOC_RELC, /* Relocations used by VAX ELF. */ - BFD_RELOC_VAX_JMP_SLOT, BFD_RELOC_VAX_RELATIVE, /* Morpho MT - 16 bit immediate relocation. */ @@ -6129,7 +6105,6 @@ enum bfd_reloc_code_real BFD_RELOC_XTENSA_RTLD, /* Xtensa relocations for ELF shared objects. */ - BFD_RELOC_XTENSA_JMP_SLOT, BFD_RELOC_XTENSA_RELATIVE, /* Xtensa relocation used in ELF object files for symbols that may @@ -6268,7 +6243,6 @@ enum bfd_reloc_code_real BFD_RELOC_LM32_16_GOT, BFD_RELOC_LM32_GOTOFF_HI16, BFD_RELOC_LM32_GOTOFF_LO16, - BFD_RELOC_LM32_JMP_SLOT, BFD_RELOC_LM32_RELATIVE, /* Difference between two section addreses. Must be followed by a @@ -6963,7 +6937,6 @@ enum bfd_reloc_code_real BFD_RELOC_AARCH64_BRANCH9, /* Tilera TILEPro Relocations. */ - BFD_RELOC_TILEPRO_JMP_SLOT, BFD_RELOC_TILEPRO_RELATIVE, BFD_RELOC_TILEPRO_BROFF_X1, BFD_RELOC_TILEPRO_JOFFLONG_X1, @@ -7049,7 +7022,6 @@ enum bfd_reloc_code_real BFD_RELOC_TILEGX_HW0_LAST, BFD_RELOC_TILEGX_HW1_LAST, BFD_RELOC_TILEGX_HW2_LAST, - BFD_RELOC_TILEGX_JMP_SLOT, BFD_RELOC_TILEGX_RELATIVE, BFD_RELOC_TILEGX_BROFF_X1, BFD_RELOC_TILEGX_JUMPOFF_X1, --- a/bfd/elf-m10300.c +++ b/bfd/elf-m10300.c @@ -664,7 +664,7 @@ static const struct mn10300_reloc_map mn { BFD_RELOC_MN10300_GOT16, R_MN10300_GOT16 }, { BFD_RELOC_COPY, R_MN10300_COPY }, { BFD_RELOC_GLOB_DAT, R_MN10300_GLOB_DAT }, - { BFD_RELOC_MN10300_JMP_SLOT, R_MN10300_JMP_SLOT }, + { BFD_RELOC_JMP_SLOT, R_MN10300_JMP_SLOT }, { BFD_RELOC_MN10300_RELATIVE, R_MN10300_RELATIVE }, { BFD_RELOC_MN10300_TLS_GD, R_MN10300_TLS_GD }, { BFD_RELOC_MN10300_TLS_LD, R_MN10300_TLS_LD }, --- a/bfd/elf32-arc.c +++ b/bfd/elf32-arc.c @@ -387,6 +387,7 @@ arc_elf_link_hash_table_create (bfd *abf #define BFD_RELOC_ARC_PLT32 BFD_RELOC_32_PLT_PCREL #define BFD_RELOC_ARC_COPY BFD_RELOC_COPY #define BFD_RELOC_ARC_GLOB_DAT BFD_RELOC_GLOB_DAT +#define BFD_RELOC_ARC_JMP_SLOT BFD_RELOC_JMP_SLOT static const struct arc_reloc_map arc_reloc_map[] = { --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -2017,7 +2017,7 @@ static const struct elf32_arm_reloc_map {BFD_RELOC_THUMB_PCREL_BRANCH9, R_ARM_THM_JUMP8}, {BFD_RELOC_THUMB_PCREL_BRANCH7, R_ARM_THM_JUMP6}, {BFD_RELOC_GLOB_DAT, R_ARM_GLOB_DAT}, - {BFD_RELOC_ARM_JUMP_SLOT, R_ARM_JUMP_SLOT}, + {BFD_RELOC_JMP_SLOT, R_ARM_JUMP_SLOT}, {BFD_RELOC_ARM_RELATIVE, R_ARM_RELATIVE}, {BFD_RELOC_ARM_GOTOFF, R_ARM_GOTOFF32}, {BFD_RELOC_ARM_GOTPC, R_ARM_GOTPC}, --- a/bfd/elf32-cris.c +++ b/bfd/elf32-cris.c @@ -400,7 +400,7 @@ static const struct cris_reloc_map cris_ { BFD_RELOC_VTABLE_ENTRY, R_CRIS_GNU_VTENTRY }, { BFD_RELOC_COPY, R_CRIS_COPY }, { BFD_RELOC_GLOB_DAT, R_CRIS_GLOB_DAT }, - { BFD_RELOC_CRIS_JUMP_SLOT, R_CRIS_JUMP_SLOT }, + { BFD_RELOC_JMP_SLOT, R_CRIS_JUMP_SLOT }, { BFD_RELOC_CRIS_RELATIVE, R_CRIS_RELATIVE }, { BFD_RELOC_CRIS_16_GOT, R_CRIS_16_GOT }, { BFD_RELOC_CRIS_32_GOT, R_CRIS_32_GOT }, --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -224,8 +224,8 @@ elf_i386_reloc_type_lookup (bfd *abfd, TRACE ("BFD_RELOC_GLOB_DAT"); return &elf_howto_table[R_386_GLOB_DAT]; - case BFD_RELOC_386_JUMP_SLOT: - TRACE ("BFD_RELOC_386_JUMP_SLOT"); + case BFD_RELOC_JMP_SLOT: + TRACE ("BFD_RELOC_JMP_SLOT"); return &elf_howto_table[R_386_JUMP_SLOT]; case BFD_RELOC_386_RELATIVE: --- a/bfd/elf32-lm32.c +++ b/bfd/elf32-lm32.c @@ -446,7 +446,7 @@ static const struct lm32_reloc_map lm32_ { BFD_RELOC_LM32_GOTOFF_LO16, R_LM32_GOTOFF_LO16 }, { BFD_RELOC_COPY, R_LM32_COPY }, { BFD_RELOC_GLOB_DAT, R_LM32_GLOB_DAT }, - { BFD_RELOC_LM32_JMP_SLOT, R_LM32_JMP_SLOT }, + { BFD_RELOC_JMP_SLOT, R_LM32_JMP_SLOT }, { BFD_RELOC_LM32_RELATIVE, R_LM32_RELATIVE }, }; --- a/bfd/elf32-m32r.c +++ b/bfd/elf32-m32r.c @@ -1213,7 +1213,7 @@ static const struct m32r_reloc_map m32r_ { BFD_RELOC_M32R_26_PLTREL, R_M32R_26_PLTREL }, { BFD_RELOC_COPY, R_M32R_COPY }, { BFD_RELOC_GLOB_DAT, R_M32R_GLOB_DAT }, - { BFD_RELOC_M32R_JMP_SLOT, R_M32R_JMP_SLOT }, + { BFD_RELOC_JMP_SLOT, R_M32R_JMP_SLOT }, { BFD_RELOC_M32R_RELATIVE, R_M32R_RELATIVE }, { BFD_RELOC_M32R_GOTOFF, R_M32R_GOTOFF }, { BFD_RELOC_M32R_GOTPC24, R_M32R_GOTPC24 }, --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -390,7 +390,7 @@ static const struct { BFD_RELOC_8_PLTOFF, R_68K_PLT8O }, { BFD_RELOC_NONE, R_68K_COPY }, { BFD_RELOC_GLOB_DAT, R_68K_GLOB_DAT }, - { BFD_RELOC_68K_JMP_SLOT, R_68K_JMP_SLOT }, + { BFD_RELOC_JMP_SLOT, R_68K_JMP_SLOT }, { BFD_RELOC_68K_RELATIVE, R_68K_RELATIVE }, { BFD_RELOC_CTOR, R_68K_32 }, { BFD_RELOC_VTABLE_INHERIT, R_68K_GNU_VTINHERIT }, --- a/bfd/elf32-metag.c +++ b/bfd/elf32-metag.c @@ -721,7 +721,7 @@ static const struct metag_reloc_map meta { BFD_RELOC_METAG_GOTOFF, R_METAG_GOTOFF }, { BFD_RELOC_METAG_PLT, R_METAG_PLT }, { BFD_RELOC_COPY, R_METAG_COPY }, - { BFD_RELOC_METAG_JMP_SLOT, R_METAG_JMP_SLOT }, + { BFD_RELOC_JMP_SLOT, R_METAG_JMP_SLOT }, { BFD_RELOC_METAG_RELATIVE, R_METAG_RELATIVE }, { BFD_RELOC_GLOB_DAT, R_METAG_GLOB_DAT }, { BFD_RELOC_METAG_TLS_GD, R_METAG_TLS_GD }, --- a/bfd/elf32-mips.c +++ b/bfd/elf32-mips.c @@ -3591,7 +3591,7 @@ mips_elf32_reloc_type_lookup (bfd *abfd, return &elf_mips_gnu_pcrel32; case BFD_RELOC_COPY: return &elf_mips_copy_howto; - case BFD_RELOC_MIPS_JUMP_SLOT: + case BFD_RELOC_JMP_SLOT: return &elf_mips_jump_slot_howto; case BFD_RELOC_MIPS_EH: return &elf_mips_eh_howto; --- a/bfd/elf32-nds32.c +++ b/bfd/elf32-nds32.c @@ -3115,7 +3115,7 @@ static const struct nds32_reloc_map_entr {BFD_RELOC_NDS32_25_PLTREL, R_NDS32_25_PLTREL}, {BFD_RELOC_COPY, R_NDS32_COPY}, {BFD_RELOC_GLOB_DAT, R_NDS32_GLOB_DAT}, - {BFD_RELOC_NDS32_JMP_SLOT, R_NDS32_JMP_SLOT}, + {BFD_RELOC_JMP_SLOT, R_NDS32_JMP_SLOT}, {BFD_RELOC_NDS32_RELATIVE, R_NDS32_RELATIVE}, {BFD_RELOC_NDS32_GOTOFF, R_NDS32_GOTOFF}, {BFD_RELOC_NDS32_GOTOFF_HI20, R_NDS32_GOTOFF_HI20}, --- a/bfd/elf32-or1k.c +++ b/bfd/elf32-or1k.c @@ -877,7 +877,7 @@ static const struct or1k_reloc_map or1k_ { BFD_RELOC_OR1K_PLT26, R_OR1K_PLT26 }, { BFD_RELOC_GLOB_DAT, R_OR1K_GLOB_DAT }, { BFD_RELOC_COPY, R_OR1K_COPY }, - { BFD_RELOC_OR1K_JMP_SLOT, R_OR1K_JMP_SLOT }, + { BFD_RELOC_JMP_SLOT, R_OR1K_JMP_SLOT }, { BFD_RELOC_OR1K_RELATIVE, R_OR1K_RELATIVE }, { BFD_RELOC_OR1K_TLS_GD_HI16, R_OR1K_TLS_GD_HI16 }, { BFD_RELOC_OR1K_TLS_GD_LO16, R_OR1K_TLS_GD_LO16 }, --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -207,7 +207,7 @@ elf_s390_reloc_type_lookup (bfd *abfd AT return &elf_howto_table[(int) R_390_COPY]; case BFD_RELOC_GLOB_DAT: return &elf_howto_table[(int) R_390_GLOB_DAT]; - case BFD_RELOC_390_JMP_SLOT: + case BFD_RELOC_JMP_SLOT: return &elf_howto_table[(int) R_390_JMP_SLOT]; case BFD_RELOC_390_RELATIVE: return &elf_howto_table[(int) R_390_RELATIVE]; --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -357,7 +357,7 @@ static const struct elf_reloc_map sh_rel { BFD_RELOC_32_PLT_PCREL, R_SH_PLT32 }, { BFD_RELOC_COPY, R_SH_COPY }, { BFD_RELOC_GLOB_DAT, R_SH_GLOB_DAT }, - { BFD_RELOC_SH_JMP_SLOT, R_SH_JMP_SLOT }, + { BFD_RELOC_JMP_SLOT, R_SH_JMP_SLOT }, { BFD_RELOC_SH_RELATIVE, R_SH_RELATIVE }, { BFD_RELOC_32_GOTOFF, R_SH_GOTOFF }, { BFD_RELOC_SH_GOTPC, R_SH_GOTPC }, --- a/bfd/elf32-tic6x.c +++ b/bfd/elf32-tic6x.c @@ -1423,7 +1423,7 @@ static const tic6x_reloc_map elf32_tic6x { BFD_RELOC_C6000_DSBT_INDEX, R_C6000_DSBT_INDEX }, { BFD_RELOC_C6000_PREL31, R_C6000_PREL31 }, { BFD_RELOC_COPY, R_C6000_COPY }, - { BFD_RELOC_C6000_JUMP_SLOT, R_C6000_JUMP_SLOT }, + { BFD_RELOC_JMP_SLOT, R_C6000_JUMP_SLOT }, { BFD_RELOC_C6000_EHTYPE, R_C6000_EHTYPE }, { BFD_RELOC_C6000_PCR_H16, R_C6000_PCR_H16 }, { BFD_RELOC_C6000_PCR_L16, R_C6000_PCR_L16 }, --- a/bfd/elf32-tilepro.c +++ b/bfd/elf32-tilepro.c @@ -585,7 +585,7 @@ static const reloc_map tilepro_reloc_map /* Custom relocations. */ TH_REMAP (BFD_RELOC_COPY, R_TILEPRO_COPY) TH_REMAP (BFD_RELOC_GLOB_DAT, R_TILEPRO_GLOB_DAT) - TH_REMAP (BFD_RELOC_TILEPRO_JMP_SLOT, R_TILEPRO_JMP_SLOT) + TH_REMAP (BFD_RELOC_JMP_SLOT, R_TILEPRO_JMP_SLOT) TH_REMAP (BFD_RELOC_TILEPRO_RELATIVE, R_TILEPRO_RELATIVE) TH_REMAP (BFD_RELOC_TILEPRO_BROFF_X1, R_TILEPRO_BROFF_X1) TH_REMAP (BFD_RELOC_TILEPRO_JOFFLONG_X1, R_TILEPRO_JOFFLONG_X1) --- a/bfd/elf32-v850.c +++ b/bfd/elf32-v850.c @@ -1738,7 +1738,7 @@ static const struct v850_elf_reloc_map v { BFD_RELOC_V850_32_PLT_PCREL, R_V850_32_PLT }, { BFD_RELOC_COPY, R_V850_COPY }, { BFD_RELOC_GLOB_DAT, R_V850_GLOB_DAT }, - { BFD_RELOC_V850_JMP_SLOT, R_V850_JMP_SLOT }, + { BFD_RELOC_JMP_SLOT, R_V850_JMP_SLOT }, { BFD_RELOC_V850_RELATIVE, R_V850_RELATIVE }, { BFD_RELOC_V850_16_GOTOFF, R_V850_16_GOTOFF }, { BFD_RELOC_V850_32_GOTOFF, R_V850_32_GOTOFF }, --- a/bfd/elf32-vax.c +++ b/bfd/elf32-vax.c @@ -312,7 +312,7 @@ static const struct { BFD_RELOC_32_PLT_PCREL, R_VAX_PLT32 }, { BFD_RELOC_NONE, R_VAX_COPY }, { BFD_RELOC_GLOB_DAT, R_VAX_GLOB_DAT }, - { BFD_RELOC_VAX_JMP_SLOT, R_VAX_JMP_SLOT }, + { BFD_RELOC_JMP_SLOT, R_VAX_JMP_SLOT }, { BFD_RELOC_VAX_RELATIVE, R_VAX_RELATIVE }, { BFD_RELOC_CTOR, R_VAX_32 }, { BFD_RELOC_VTABLE_INHERIT, R_VAX_GNU_VTINHERIT }, --- a/bfd/elf32-xtensa.c +++ b/bfd/elf32-xtensa.c @@ -418,8 +418,8 @@ elf_xtensa_reloc_type_lookup (bfd *abfd TRACE ("BFD_RELOC_GLOB_DAT"); return &elf_howto_table[(unsigned) R_XTENSA_GLOB_DAT ]; - case BFD_RELOC_XTENSA_JMP_SLOT: - TRACE ("BFD_RELOC_XTENSA_JMP_SLOT"); + case BFD_RELOC_JMP_SLOT: + TRACE ("BFD_RELOC_JMP_SLOT"); return &elf_howto_table[(unsigned) R_XTENSA_JMP_SLOT ]; case BFD_RELOC_XTENSA_RELATIVE: --- a/bfd/elf64-mips.c +++ b/bfd/elf64-mips.c @@ -3852,7 +3852,7 @@ bfd_elf64_bfd_reloc_type_lookup (bfd *ab return &elf_mips_eh_howto; case BFD_RELOC_COPY: return &elf_mips_copy_howto; - case BFD_RELOC_MIPS_JUMP_SLOT: + case BFD_RELOC_JMP_SLOT: return &elf_mips_jump_slot_howto; default: bfd_set_error (bfd_error_bad_value); --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -221,7 +221,7 @@ elf_s390_reloc_type_lookup (bfd *abfd, return &elf_howto_table[(int) R_390_COPY]; case BFD_RELOC_GLOB_DAT: return &elf_howto_table[(int) R_390_GLOB_DAT]; - case BFD_RELOC_390_JMP_SLOT: + case BFD_RELOC_JMP_SLOT: return &elf_howto_table[(int) R_390_JMP_SLOT]; case BFD_RELOC_390_RELATIVE: return &elf_howto_table[(int) R_390_RELATIVE]; --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -236,7 +236,7 @@ static const struct elf_reloc_map x86_64 { BFD_RELOC_32_PLT_PCREL, R_X86_64_PLT32,}, { BFD_RELOC_COPY, R_X86_64_COPY, }, { BFD_RELOC_GLOB_DAT, R_X86_64_GLOB_DAT, }, - { BFD_RELOC_X86_64_JUMP_SLOT, R_X86_64_JUMP_SLOT, }, + { BFD_RELOC_JMP_SLOT, R_X86_64_JUMP_SLOT, }, { BFD_RELOC_X86_64_RELATIVE, R_X86_64_RELATIVE, }, { BFD_RELOC_X86_64_GOTPCREL, R_X86_64_GOTPCREL, }, { BFD_RELOC_32, R_X86_64_32, }, --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -378,7 +378,7 @@ _bfd_sparc_elf_reloc_type_lookup (bfd *a case BFD_RELOC_GLOB_DAT: return &_bfd_sparc_elf_howto_table[R_SPARC_GLOB_DAT]; - case BFD_RELOC_SPARC_JMP_SLOT: + case BFD_RELOC_JMP_SLOT: return &_bfd_sparc_elf_howto_table[R_SPARC_JMP_SLOT]; case BFD_RELOC_SPARC_RELATIVE: --- a/bfd/elfxx-tilegx.c +++ b/bfd/elfxx-tilegx.c @@ -652,6 +652,7 @@ static const reloc_map tilegx_reloc_map TH_REMAP (BFD_RELOC_8_PCREL, R_TILEGX_8_PCREL) TH_REMAP (BFD_RELOC_COPY, R_TILEGX_COPY) TH_REMAP (BFD_RELOC_GLOB_DAT, R_TILEGX_GLOB_DAT) + TH_REMAP (BFD_RELOC_JMP_SLOT, R_TILEGX_JMP_SLOT) #define SIMPLE_REMAP(t) TH_REMAP (BFD_RELOC_##t, R_##t) @@ -663,7 +664,6 @@ static const reloc_map tilegx_reloc_map SIMPLE_REMAP (TILEGX_HW0_LAST) SIMPLE_REMAP (TILEGX_HW1_LAST) SIMPLE_REMAP (TILEGX_HW2_LAST) - SIMPLE_REMAP (TILEGX_JMP_SLOT) SIMPLE_REMAP (TILEGX_RELATIVE) SIMPLE_REMAP (TILEGX_BROFF_X1) SIMPLE_REMAP (TILEGX_JUMPOFF_X1) --- a/bfd/elfn32-mips.c +++ b/bfd/elfn32-mips.c @@ -3687,7 +3687,7 @@ bfd_elf32_bfd_reloc_type_lookup (bfd *ab return &elf_mips_eh_howto; case BFD_RELOC_COPY: return &elf_mips_copy_howto; - case BFD_RELOC_MIPS_JUMP_SLOT: + case BFD_RELOC_JMP_SLOT: return &elf_mips_jump_slot_howto; default: bfd_set_error (bfd_error_bad_value); --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -1101,10 +1101,10 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_8_PLTOFF", "BFD_RELOC_COPY", "BFD_RELOC_GLOB_DAT", + "BFD_RELOC_JMP_SLOT", "BFD_RELOC_IRELATIVE", "BFD_RELOC_SIZE32", "BFD_RELOC_SIZE64", - "BFD_RELOC_68K_JMP_SLOT", "BFD_RELOC_68K_RELATIVE", "BFD_RELOC_68K_TLS_GD32", "BFD_RELOC_68K_TLS_GD16", @@ -1146,7 +1146,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_SPARC_PC10", "BFD_RELOC_SPARC_PC22", "BFD_RELOC_SPARC_WPLT30", - "BFD_RELOC_SPARC_JMP_SLOT", "BFD_RELOC_SPARC_RELATIVE", "BFD_RELOC_SPARC_UA16", "BFD_RELOC_SPARC_UA32", @@ -1344,7 +1343,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_MIPS_TLS_TPREL_LO16", "BFD_RELOC_MICROMIPS_TLS_TPREL_LO16", "BFD_RELOC_MIPS_EH", - "BFD_RELOC_MIPS_JUMP_SLOT", "BFD_RELOC_MOXIE_10_PCREL", "BFD_RELOC_FT32_10", "BFD_RELOC_FT32_20", @@ -1398,7 +1396,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_MN10300_GOT32", "BFD_RELOC_MN10300_GOT24", "BFD_RELOC_MN10300_GOT16", - "BFD_RELOC_MN10300_JMP_SLOT", "BFD_RELOC_MN10300_RELATIVE", "BFD_RELOC_MN10300_SYM_DIFF", "BFD_RELOC_MN10300_ALIGN", @@ -1415,7 +1412,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_MN10300_16_PCREL", "BFD_RELOC_386_GOT32", "BFD_RELOC_386_PLT32", - "BFD_RELOC_386_JUMP_SLOT", "BFD_RELOC_386_RELATIVE", "BFD_RELOC_386_GOTOFF", "BFD_RELOC_386_GOTPC", @@ -1436,7 +1432,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_386_TLS_DESC", "BFD_RELOC_386_GOT32X", "BFD_RELOC_X86_64_GOT32", - "BFD_RELOC_X86_64_JUMP_SLOT", "BFD_RELOC_X86_64_RELATIVE", "BFD_RELOC_X86_64_GOTPCREL", "BFD_RELOC_X86_64_32S", @@ -1501,7 +1496,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_PPC_BA16", "BFD_RELOC_PPC_BA16_BRTAKEN", "BFD_RELOC_PPC_BA16_BRNTAKEN", - "BFD_RELOC_PPC_JMP_SLOT", "BFD_RELOC_PPC_RELATIVE", "BFD_RELOC_PPC_LOCAL24PC", "BFD_RELOC_PPC_EMB_NADDR32", @@ -1695,7 +1689,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_ARM_TLS_GD32_FDPIC", "BFD_RELOC_ARM_TLS_LDM32_FDPIC", "BFD_RELOC_ARM_TLS_IE32_FDPIC", - "BFD_RELOC_ARM_JUMP_SLOT", "BFD_RELOC_ARM_GOT32", "BFD_RELOC_ARM_RELATIVE", "BFD_RELOC_ARM_GOTOFF", @@ -1803,7 +1796,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_SH_LABEL", "BFD_RELOC_SH_LOOP_START", "BFD_RELOC_SH_LOOP_END", - "BFD_RELOC_SH_JMP_SLOT", "BFD_RELOC_SH_RELATIVE", "BFD_RELOC_SH_GOTPC", "BFD_RELOC_SH_GOT_LOW16", @@ -1910,7 +1902,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_ARC_32_PCREL", "BFD_RELOC_ARC_GOT32", "BFD_RELOC_ARC_GOTPC32", - "BFD_RELOC_ARC_JMP_SLOT", "BFD_RELOC_ARC_RELATIVE", "BFD_RELOC_ARC_GOTOFF", "BFD_RELOC_ARC_GOTPC", @@ -2009,7 +2000,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_M32R_SDA16", "BFD_RELOC_M32R_GOT24", "BFD_RELOC_M32R_26_PLTREL", - "BFD_RELOC_M32R_JMP_SLOT", "BFD_RELOC_M32R_RELATIVE", "BFD_RELOC_M32R_GOTOFF", "BFD_RELOC_M32R_GOTOFF_HI_ULO", @@ -2045,7 +2035,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_NDS32_GOT20", "BFD_RELOC_NDS32_9_PLTREL", "BFD_RELOC_NDS32_25_PLTREL", - "BFD_RELOC_NDS32_JMP_SLOT", "BFD_RELOC_NDS32_RELATIVE", "BFD_RELOC_NDS32_GOTOFF", "BFD_RELOC_NDS32_GOTOFF_HI20", @@ -2185,7 +2174,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_V850_32_GOT", "BFD_RELOC_V850_22_PLT_PCREL", "BFD_RELOC_V850_32_PLT_PCREL", - "BFD_RELOC_V850_JMP_SLOT", "BFD_RELOC_V850_RELATIVE", "BFD_RELOC_V850_16_GOTOFF", "BFD_RELOC_V850_32_GOTOFF", @@ -2219,7 +2207,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_C6000_SBR_GOT_H16_W", "BFD_RELOC_C6000_DSBT_INDEX", "BFD_RELOC_C6000_PREL31", - "BFD_RELOC_C6000_JUMP_SLOT", "BFD_RELOC_C6000_EHTYPE", "BFD_RELOC_C6000_PCR_H16", "BFD_RELOC_C6000_PCR_L16", @@ -2279,7 +2266,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_METAG_RELBRANCH_PLT", "BFD_RELOC_METAG_GOTOFF", "BFD_RELOC_METAG_PLT", - "BFD_RELOC_METAG_JMP_SLOT", "BFD_RELOC_METAG_RELATIVE", "BFD_RELOC_METAG_TLS_GD", "BFD_RELOC_METAG_TLS_LDM", @@ -2464,7 +2450,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_RX_RELAX", "BFD_RELOC_390_12", "BFD_RELOC_390_GOT12", - "BFD_RELOC_390_JMP_SLOT", "BFD_RELOC_390_RELATIVE", "BFD_RELOC_390_GOTPC", "BFD_RELOC_390_GOT16", @@ -2707,7 +2692,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_CRIS_UNSIGNED_16", "BFD_RELOC_CRIS_LAPCQ_OFFSET", "BFD_RELOC_CRIS_UNSIGNED_4", - "BFD_RELOC_CRIS_JUMP_SLOT", "BFD_RELOC_CRIS_RELATIVE", "BFD_RELOC_CRIS_32_GOT", "BFD_RELOC_CRIS_16_GOT", @@ -2742,7 +2726,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_OR1K_PLT26", "BFD_RELOC_OR1K_PLTA26", "BFD_RELOC_OR1K_GOTOFF_SLO16", - "BFD_RELOC_OR1K_JMP_SLOT", "BFD_RELOC_OR1K_RELATIVE", "BFD_RELOC_OR1K_TLS_GD_HI16", "BFD_RELOC_OR1K_TLS_GD_LO16", @@ -2777,7 +2760,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_XSTORMY16_24", "BFD_RELOC_XSTORMY16_FPTR16", "BFD_RELOC_RELC", - "BFD_RELOC_VAX_JMP_SLOT", "BFD_RELOC_VAX_RELATIVE", "BFD_RELOC_MT_PC16", "BFD_RELOC_MT_HI16", @@ -2825,7 +2807,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_IQ2000_OFFSET_21", "BFD_RELOC_IQ2000_UHI16", "BFD_RELOC_XTENSA_RTLD", - "BFD_RELOC_XTENSA_JMP_SLOT", "BFD_RELOC_XTENSA_RELATIVE", "BFD_RELOC_XTENSA_PLT", "BFD_RELOC_XTENSA_DIFF8", @@ -2895,7 +2876,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_LM32_16_GOT", "BFD_RELOC_LM32_GOTOFF_HI16", "BFD_RELOC_LM32_GOTOFF_LO16", - "BFD_RELOC_LM32_JMP_SLOT", "BFD_RELOC_LM32_RELATIVE", "BFD_RELOC_MACH_O_SECTDIFF", "BFD_RELOC_MACH_O_LOCAL_SECTDIFF", @@ -3147,7 +3127,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_LO12_NC", "BFD_RELOC_AARCH64_TLSDESC_LD_LO12_NC", "BFD_RELOC_AARCH64_BRANCH9", - "BFD_RELOC_TILEPRO_JMP_SLOT", "BFD_RELOC_TILEPRO_RELATIVE", "BFD_RELOC_TILEPRO_BROFF_X1", "BFD_RELOC_TILEPRO_JOFFLONG_X1", @@ -3231,7 +3210,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_TILEGX_HW0_LAST", "BFD_RELOC_TILEGX_HW1_LAST", "BFD_RELOC_TILEGX_HW2_LAST", - "BFD_RELOC_TILEGX_JMP_SLOT", "BFD_RELOC_TILEGX_RELATIVE", "BFD_RELOC_TILEGX_BROFF_X1", "BFD_RELOC_TILEGX_JUMPOFF_X1", --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -1475,6 +1475,8 @@ ENUMX ENUMX BFD_RELOC_GLOB_DAT ENUMX + BFD_RELOC_JMP_SLOT +ENUMX BFD_RELOC_IRELATIVE ENUMDOC For ELF. @@ -1487,8 +1489,6 @@ ENUMDOC Size relocations. ENUM - BFD_RELOC_68K_JMP_SLOT -ENUMX BFD_RELOC_68K_RELATIVE ENUMX BFD_RELOC_68K_TLS_GD32 @@ -1598,8 +1598,6 @@ ENUMX ENUMX BFD_RELOC_SPARC_WPLT30 ENUMX - BFD_RELOC_SPARC_JMP_SLOT -ENUMX BFD_RELOC_SPARC_RELATIVE ENUMX BFD_RELOC_SPARC_UA16 @@ -2164,11 +2162,6 @@ ENUMDOC MIPS ELF relocations. ENUM - BFD_RELOC_MIPS_JUMP_SLOT -ENUMDOC - MIPS ELF relocations (VxWorks and PLT extensions). - -ENUM BFD_RELOC_MOXIE_10_PCREL ENUMDOC Moxie ELF relocations. @@ -2295,10 +2288,6 @@ ENUMDOC This is a 16bit GOT-relative reloc for the mn10300, offset by two bytes in the instruction. ENUM - BFD_RELOC_MN10300_JMP_SLOT -ENUMDOC - Create PLT entry. -ENUM BFD_RELOC_MN10300_RELATIVE ENUMDOC Adjust by program base. @@ -2349,8 +2338,6 @@ ENUM ENUMX BFD_RELOC_386_PLT32 ENUMX - BFD_RELOC_386_JUMP_SLOT -ENUMX BFD_RELOC_386_RELATIVE ENUMX BFD_RELOC_386_GOTOFF @@ -2394,8 +2381,6 @@ ENUMDOC ENUM BFD_RELOC_X86_64_GOT32 ENUMX - BFD_RELOC_X86_64_JUMP_SLOT -ENUMX BFD_RELOC_X86_64_RELATIVE ENUMX BFD_RELOC_X86_64_GOTPCREL @@ -2536,8 +2521,6 @@ ENUMX ENUMX BFD_RELOC_PPC_BA16_BRNTAKEN ENUMX - BFD_RELOC_PPC_JMP_SLOT -ENUMX BFD_RELOC_PPC_RELATIVE ENUMX BFD_RELOC_PPC_LOCAL24PC @@ -3002,8 +2985,6 @@ ENUMDOC ARM FDPIC specific relocations. ENUM - BFD_RELOC_ARM_JUMP_SLOT -ENUMX BFD_RELOC_ARM_GOT32 ENUMX BFD_RELOC_ARM_RELATIVE @@ -3237,8 +3218,6 @@ ENUMX ENUMX BFD_RELOC_SH_LOOP_END ENUMX - BFD_RELOC_SH_JMP_SLOT -ENUMX BFD_RELOC_SH_RELATIVE ENUMX BFD_RELOC_SH_GOTPC @@ -3454,8 +3433,6 @@ ENUMX ENUMX BFD_RELOC_ARC_GOTPC32 ENUMX - BFD_RELOC_ARC_JMP_SLOT -ENUMX BFD_RELOC_ARC_RELATIVE ENUMX BFD_RELOC_ARC_GOTOFF @@ -3799,8 +3776,6 @@ ENUM ENUMX BFD_RELOC_M32R_26_PLTREL ENUMX - BFD_RELOC_M32R_JMP_SLOT -ENUMX BFD_RELOC_M32R_RELATIVE ENUMX BFD_RELOC_M32R_GOTOFF @@ -3932,8 +3907,6 @@ ENUMX ENUMX BFD_RELOC_NDS32_25_PLTREL ENUMX - BFD_RELOC_NDS32_JMP_SLOT -ENUMX BFD_RELOC_NDS32_RELATIVE ENUMX BFD_RELOC_NDS32_GOTOFF @@ -4313,8 +4286,6 @@ ENUMX ENUMX BFD_RELOC_V850_32_PLT_PCREL ENUMX - BFD_RELOC_V850_JMP_SLOT -ENUMX BFD_RELOC_V850_RELATIVE ENUMX BFD_RELOC_V850_16_GOTOFF @@ -4416,8 +4387,6 @@ ENUMX ENUMX BFD_RELOC_C6000_PREL31 ENUMX - BFD_RELOC_C6000_JUMP_SLOT -ENUMX BFD_RELOC_C6000_EHTYPE ENUMX BFD_RELOC_C6000_PCR_H16 @@ -4569,8 +4538,6 @@ ENUMX ENUMX BFD_RELOC_METAG_PLT ENUMX - BFD_RELOC_METAG_JMP_SLOT -ENUMX BFD_RELOC_METAG_RELATIVE ENUMX BFD_RELOC_METAG_TLS_GD @@ -5086,10 +5053,6 @@ ENUM ENUMDOC 12 bit GOT offset. ENUM - BFD_RELOC_390_JMP_SLOT -ENUMDOC - Create PLT entry. -ENUM BFD_RELOC_390_RELATIVE ENUMDOC Adjust by program base. @@ -5800,8 +5763,6 @@ ENUMDOC These relocs are only used within the CRIS assembler. They are not (at present) written to any object files. ENUM - BFD_RELOC_CRIS_JUMP_SLOT -ENUMX BFD_RELOC_CRIS_RELATIVE ENUMDOC Relocs used in ELF shared libraries for CRIS. @@ -5891,8 +5852,6 @@ ENUMX ENUMX BFD_RELOC_OR1K_GOTOFF_SLO16 ENUMX - BFD_RELOC_OR1K_JMP_SLOT -ENUMX BFD_RELOC_OR1K_RELATIVE ENUMX BFD_RELOC_OR1K_TLS_GD_HI16 @@ -5973,8 +5932,6 @@ ENUMDOC Self-describing complex relocations. ENUM - BFD_RELOC_VAX_JMP_SLOT -ENUMX BFD_RELOC_VAX_RELATIVE ENUMDOC Relocations used by VAX ELF. @@ -6119,8 +6076,6 @@ ENUMDOC objects to indicate that the runtime linker should set the value to one of its own internal functions or data structures. ENUM - BFD_RELOC_XTENSA_JMP_SLOT -ENUMX BFD_RELOC_XTENSA_RELATIVE ENUMDOC Xtensa relocations for ELF shared objects. @@ -6331,8 +6286,6 @@ ENUMX ENUMX BFD_RELOC_LM32_GOTOFF_LO16 ENUMX - BFD_RELOC_LM32_JMP_SLOT -ENUMX BFD_RELOC_LM32_RELATIVE ENUMDOC Lattice Mico32 relocations. @@ -7283,8 +7236,6 @@ ENUMDOC The lowest two bits must be zero and are not stored in the instruction, giving an 11 bit signed byte offset. ENUM - BFD_RELOC_TILEPRO_JMP_SLOT -ENUMX BFD_RELOC_TILEPRO_RELATIVE ENUMX BFD_RELOC_TILEPRO_BROFF_X1 @@ -7453,8 +7404,6 @@ ENUMX ENUMX BFD_RELOC_TILEGX_HW2_LAST ENUMX - BFD_RELOC_TILEGX_JMP_SLOT -ENUMX BFD_RELOC_TILEGX_RELATIVE ENUMX BFD_RELOC_TILEGX_BROFF_X1 --- a/include/elf/cris.h +++ b/include/elf/cris.h @@ -48,7 +48,7 @@ START_RELOC_NUMBERS (elf_cris_reloc_type RELOC_NUMBER (R_CRIS_GLOB_DAT, 10) /* Create PLT entry. Generated by the linker. - The BFD equivalent is BFD_RELOC_CRIS_JUMP_SLOT. */ + The BFD equivalent is BFD_RELOC_JMP_SLOT. */ RELOC_NUMBER (R_CRIS_JUMP_SLOT, 11) /* Adjust by program base. Generated by the linker.