From patchwork Fri Nov 28 11:46:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 125509 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 313993858D1E for ; Fri, 28 Nov 2025 11:48:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 313993858D1E 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=GiOILVH0 X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 76F9C3858D20 for ; Fri, 28 Nov 2025 11:46:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 76F9C3858D20 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 76F9C3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::329 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1764330418; cv=none; b=MeDVd1xC+TEAKICsNn6IJH1ifGawFsuYdjLIjc8s/SDhBRmDR7rGIuhOjUWbr+hER6PcTRb5wNn/CRASjc2W3vNHvmqiqUKDw/IdOoB4mCYLWpdYkuXzx0gz2Cnc4TGrCi19GmNEq2evwIufVkwtmLhKrGgzbuOMNeXIKBd+fkw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1764330418; c=relaxed/simple; bh=Miz5FncX4rNFUXFTNT0z6OG/exswYR/n3Ou9Fm2A7ao=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=EN6DFymYES22mYoAvPxSP7gQp/VZo2X3TmxCuYlcKMHCn0TibjrX+ftAicvGf1NL4hUR+5FCFvtDTfKWckNb6okCPssbOzq9rqc6TjCMPhA00m9ivKwuhC+7joJd3Ua4nFwXALxgHyMyLSBZW0HDgju0h0CajuoPX7q4v+UO9Ro= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 76F9C3858D20 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-47775fb6cb4so11890015e9.0 for ; Fri, 28 Nov 2025 03:46:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1764330417; x=1764935217; 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=57jy2EbFA+WRehBGu1cSYp+kBpMIiYWuBJZaDvkcK6k=; b=GiOILVH0dm6DCFgPQw5+2wqcjWIFxceB31MP/5Nz6VRnzZT2Xr56npUVejSSqt85FZ BCUcuYI/szHumJpPsnNZWVpE5lC6Pt08yHCvd78TQCUIJ1goftWuclbuyd7ZluzgMyIC n5EkYlbJxhgLvgcgtYzlyA35B0CduL/VZ8Si8AHTmVteJVlxWTlkQb0v5RS0PVhpeEM8 Ulx5CojqUQ0wiDXHR/4zRfCyQKw9BGs4Q0uBOb5G7SV+aWdMWBVcgGznlGYn51WVSl9c uXhjf8PBRuKv6lGcRdiWF22nUVAJVbXOeuSIi1kQrfw2QmDkA0IkznjyQRwOr/Eh5M2D 7jtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764330417; x=1764935217; 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=57jy2EbFA+WRehBGu1cSYp+kBpMIiYWuBJZaDvkcK6k=; b=icozuOxGakTFDVhk40O/r46xJFOFO+i2NsBIsEJfC+OzseDwnvNXIbSWVhMf8cm8cq AyEE8Hk/zAWNyN/hE3qSsYQIPWRaJEXAkZu8ez9gbbzUDrEbmLfM5UF6BwappiA9wof3 BPcRw0TsRvT/hGBH5Rc2Px4n/+tIaS+GXrcF0W4Fog3R/6F2cny7ynL2dQ55MX7c5IRk brG+1pWLal/FTRBnIwLIOpFDEIW6TJGY2v3RwgZhKHAbmobBE6ErYPBBiL35rksK8oiv SiXUi720Nv3WWzjBFVN/2gzbf9yEot163Dg7S5InNDyRPEEv6ZYNlgH0/RdF4/bv42Ft vb7Q== X-Gm-Message-State: AOJu0YzK+coDTuIbHe+ogG5med+YTKKHjffiGuXXwj7iQPL/3M9EI25Z 4OchwS4PLClyi+cFhCBCS6w5cKAl+DUe9EoXrj1AJoksnVkHxHHjtPEm0fzM62fK97iNooR24I2 PS10= X-Gm-Gg: ASbGncucF9g1Vyh2nFbyaRINaDwEbSLhu+gAxuMAQEA2FQ2cY6PSvIQQEbvVtvsEQwa LI6iVfmC8QYJ3mJkr1AH2GW+VcoXT88+ut66sVESySydpbjNpxi9hBHumuTNgHycdDAtz06m4wA fPXLPpbCeuKlL/DhG7tIxmjcnV7Y/mpSzLLU6AJ+9FKvRGAxSY8koYrbkZ/JrUSZ1A0jvL6B4n1 QcIenW/q5aSh+SgNeY6ODTtgUTQZ1Et47b0nhXgArlMFXOwiN1/LffXr36r8nh9lEP06gv1pUVO JY1eotnn3067E9BSHkPetBpF0e0aZmsnXA+psMU/THIjFaon4yioon1i/N/6jSBqFl4UvE7O+I+ tc06iZlYOtu0cHnbyYmR4nf5tUO3VZsTLr6CNpoPRAH0GKULIH9cXIA3E/gzV2J4E/Ni7vnu2n8 K/OYqGg6o0Xk9ezyN21rj/ROCvvuqIubZXKkrC+H+zJot3Cns6IXxEKgwr+AYTOFmpb4tf3o8u+ ks= X-Google-Smtp-Source: AGHT+IFAqs6HQynRFXhAr6brUF0wuWX5LH/e6iCZlAHjqteF/l6tXg6T3c5CEBFWxvixEE256WaXQg== X-Received: by 2002:a05:600c:6296:b0:479:1348:c65b with SMTP id 5b1f17b1804b1-4791348ccf2mr57048335e9.26.1764330416948; Fri, 28 Nov 2025 03:46:56 -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 5b1f17b1804b1-4790b0c3a1dsm151078995e9.10.2025.11.28.03.46.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 28 Nov 2025 03:46:56 -0800 (PST) Message-ID: <5e4d1d97-9eef-4356-99c4-3f1fa02406cd@suse.com> Date: Fri, 28 Nov 2025 12:46:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 11/14] bfd/ELF: fold BFD_RELOC__GLOB_DAT 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 , Kuan-Lin Chen , Wei-Cheng Wang , Christian Svensson , Stefan Kristiansson , Stafford Horne , Peter Bergner , Surya Kumari Jangala , Andreas Krebbel , 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=-3018.7 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, 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. --- Why do KVX and PPC assemblers deal with GLOB_DAT relocs? --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -3334,6 +3334,7 @@ enum bfd_reloc_code_real BFD_RELOC_HI16_S_PLTOFF, BFD_RELOC_8_PLTOFF, BFD_RELOC_COPY, + BFD_RELOC_GLOB_DAT, BFD_RELOC_IRELATIVE, /* Size relocations. */ @@ -3341,7 +3342,6 @@ enum bfd_reloc_code_real BFD_RELOC_SIZE64, /* Relocations used by 68K ELF. */ - BFD_RELOC_68K_GLOB_DAT, BFD_RELOC_68K_JMP_SLOT, BFD_RELOC_68K_RELATIVE, BFD_RELOC_68K_TLS_GD32, @@ -3406,7 +3406,6 @@ enum bfd_reloc_code_real BFD_RELOC_SPARC_PC10, BFD_RELOC_SPARC_PC22, BFD_RELOC_SPARC_WPLT30, - BFD_RELOC_SPARC_GLOB_DAT, BFD_RELOC_SPARC_JMP_SLOT, BFD_RELOC_SPARC_RELATIVE, BFD_RELOC_SPARC_UA16, @@ -3809,9 +3808,6 @@ enum bfd_reloc_code_real bytes in the instruction. */ BFD_RELOC_MN10300_GOT16, - /* Create GOT entry. */ - BFD_RELOC_MN10300_GLOB_DAT, - /* Create PLT entry. */ BFD_RELOC_MN10300_JMP_SLOT, @@ -3849,7 +3845,6 @@ enum bfd_reloc_code_real /* i386/elf relocations. */ BFD_RELOC_386_GOT32, BFD_RELOC_386_PLT32, - BFD_RELOC_386_GLOB_DAT, BFD_RELOC_386_JUMP_SLOT, BFD_RELOC_386_RELATIVE, BFD_RELOC_386_GOTOFF, @@ -3873,7 +3868,6 @@ enum bfd_reloc_code_real /* x86-64/elf relocations. */ BFD_RELOC_X86_64_GOT32, - BFD_RELOC_X86_64_GLOB_DAT, BFD_RELOC_X86_64_JUMP_SLOT, BFD_RELOC_X86_64_RELATIVE, BFD_RELOC_X86_64_GOTPCREL, @@ -3947,7 +3941,6 @@ enum bfd_reloc_code_real BFD_RELOC_PPC_BA16, BFD_RELOC_PPC_BA16_BRTAKEN, BFD_RELOC_PPC_BA16_BRNTAKEN, - BFD_RELOC_PPC_GLOB_DAT, BFD_RELOC_PPC_JMP_SLOT, BFD_RELOC_PPC_RELATIVE, BFD_RELOC_PPC_LOCAL24PC, @@ -4206,7 +4199,6 @@ enum bfd_reloc_code_real /* Relocations for setting up GOTs and PLTs for shared libraries. */ BFD_RELOC_ARM_JUMP_SLOT, - BFD_RELOC_ARM_GLOB_DAT, BFD_RELOC_ARM_GOT32, BFD_RELOC_ARM_RELATIVE, BFD_RELOC_ARM_GOTOFF, @@ -4327,7 +4319,6 @@ enum bfd_reloc_code_real BFD_RELOC_SH_LABEL, BFD_RELOC_SH_LOOP_START, BFD_RELOC_SH_LOOP_END, - BFD_RELOC_SH_GLOB_DAT, BFD_RELOC_SH_JMP_SLOT, BFD_RELOC_SH_RELATIVE, BFD_RELOC_SH_GOTPC, @@ -4437,7 +4428,6 @@ enum bfd_reloc_code_real BFD_RELOC_ARC_32_PCREL, BFD_RELOC_ARC_GOT32, BFD_RELOC_ARC_GOTPC32, - BFD_RELOC_ARC_GLOB_DAT, BFD_RELOC_ARC_JMP_SLOT, BFD_RELOC_ARC_RELATIVE, BFD_RELOC_ARC_GOTOFF, @@ -4678,7 +4668,6 @@ enum bfd_reloc_code_real /* For PIC. */ BFD_RELOC_M32R_GOT24, BFD_RELOC_M32R_26_PLTREL, - BFD_RELOC_M32R_GLOB_DAT, BFD_RELOC_M32R_JMP_SLOT, BFD_RELOC_M32R_RELATIVE, BFD_RELOC_M32R_GOTOFF, @@ -4774,7 +4763,6 @@ enum bfd_reloc_code_real BFD_RELOC_NDS32_GOT20, BFD_RELOC_NDS32_9_PLTREL, BFD_RELOC_NDS32_25_PLTREL, - BFD_RELOC_NDS32_GLOB_DAT, BFD_RELOC_NDS32_JMP_SLOT, BFD_RELOC_NDS32_RELATIVE, BFD_RELOC_NDS32_GOTOFF, @@ -5013,7 +5001,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_GLOB_DAT, BFD_RELOC_V850_JMP_SLOT, BFD_RELOC_V850_RELATIVE, BFD_RELOC_V850_16_GOTOFF, @@ -5167,7 +5154,6 @@ enum bfd_reloc_code_real BFD_RELOC_METAG_PLT, BFD_RELOC_METAG_JMP_SLOT, BFD_RELOC_METAG_RELATIVE, - BFD_RELOC_METAG_GLOB_DAT, BFD_RELOC_METAG_TLS_GD, BFD_RELOC_METAG_TLS_LDM, BFD_RELOC_METAG_TLS_LDO_HI16, @@ -5491,9 +5477,6 @@ enum bfd_reloc_code_real /* 12 bit GOT offset. */ BFD_RELOC_390_GOT12, - /* Create GOT entry. */ - BFD_RELOC_390_GLOB_DAT, - /* Create PLT entry. */ BFD_RELOC_390_JMP_SLOT, @@ -5919,7 +5902,6 @@ enum bfd_reloc_code_real BFD_RELOC_CR16_SWITCH32, BFD_RELOC_CR16_GOT_REGREL20, BFD_RELOC_CR16_GOTC_REGREL20, - BFD_RELOC_CR16_GLOB_DAT, /* NS CRX Relocations. */ BFD_RELOC_CRX_REL4, @@ -5957,7 +5939,6 @@ enum bfd_reloc_code_real BFD_RELOC_CRIS_UNSIGNED_4, /* Relocs used in ELF shared libraries for CRIS. */ - BFD_RELOC_CRIS_GLOB_DAT, BFD_RELOC_CRIS_JUMP_SLOT, BFD_RELOC_CRIS_RELATIVE, @@ -6012,7 +5993,6 @@ enum bfd_reloc_code_real BFD_RELOC_OR1K_PLT26, BFD_RELOC_OR1K_PLTA26, BFD_RELOC_OR1K_GOTOFF_SLO16, - BFD_RELOC_OR1K_GLOB_DAT, BFD_RELOC_OR1K_JMP_SLOT, BFD_RELOC_OR1K_RELATIVE, BFD_RELOC_OR1K_TLS_GD_HI16, @@ -6056,7 +6036,6 @@ enum bfd_reloc_code_real BFD_RELOC_RELC, /* Relocations used by VAX ELF. */ - BFD_RELOC_VAX_GLOB_DAT, BFD_RELOC_VAX_JMP_SLOT, BFD_RELOC_VAX_RELATIVE, @@ -6150,7 +6129,6 @@ enum bfd_reloc_code_real BFD_RELOC_XTENSA_RTLD, /* Xtensa relocations for ELF shared objects. */ - BFD_RELOC_XTENSA_GLOB_DAT, BFD_RELOC_XTENSA_JMP_SLOT, BFD_RELOC_XTENSA_RELATIVE, @@ -6290,7 +6268,6 @@ enum bfd_reloc_code_real BFD_RELOC_LM32_16_GOT, BFD_RELOC_LM32_GOTOFF_HI16, BFD_RELOC_LM32_GOTOFF_LO16, - BFD_RELOC_LM32_GLOB_DAT, BFD_RELOC_LM32_JMP_SLOT, BFD_RELOC_LM32_RELATIVE, @@ -6986,7 +6963,6 @@ enum bfd_reloc_code_real BFD_RELOC_AARCH64_BRANCH9, /* Tilera TILEPro Relocations. */ - BFD_RELOC_TILEPRO_GLOB_DAT, BFD_RELOC_TILEPRO_JMP_SLOT, BFD_RELOC_TILEPRO_RELATIVE, BFD_RELOC_TILEPRO_BROFF_X1, @@ -7073,7 +7049,6 @@ enum bfd_reloc_code_real BFD_RELOC_TILEGX_HW0_LAST, BFD_RELOC_TILEGX_HW1_LAST, BFD_RELOC_TILEGX_HW2_LAST, - BFD_RELOC_TILEGX_GLOB_DAT, BFD_RELOC_TILEGX_JMP_SLOT, BFD_RELOC_TILEGX_RELATIVE, BFD_RELOC_TILEGX_BROFF_X1, --- a/bfd/elf-m10300.c +++ b/bfd/elf-m10300.c @@ -663,7 +663,7 @@ static const struct mn10300_reloc_map mn { BFD_RELOC_MN10300_GOT24, R_MN10300_GOT24 }, { BFD_RELOC_MN10300_GOT16, R_MN10300_GOT16 }, { BFD_RELOC_COPY, R_MN10300_COPY }, - { BFD_RELOC_MN10300_GLOB_DAT, R_MN10300_GLOB_DAT }, + { BFD_RELOC_GLOB_DAT, R_MN10300_GLOB_DAT }, { BFD_RELOC_MN10300_JMP_SLOT, R_MN10300_JMP_SLOT }, { BFD_RELOC_MN10300_RELATIVE, R_MN10300_RELATIVE }, { BFD_RELOC_MN10300_TLS_GD, R_MN10300_TLS_GD }, --- a/bfd/elf32-arc.c +++ b/bfd/elf32-arc.c @@ -386,6 +386,7 @@ arc_elf_link_hash_table_create (bfd *abf #define BFD_RELOC_ARC_PC32 BFD_RELOC_32_PCREL #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 static const struct arc_reloc_map arc_reloc_map[] = { --- a/bfd/elf32-arm.c +++ b/bfd/elf32-arm.c @@ -2016,7 +2016,7 @@ static const struct elf32_arm_reloc_map {BFD_RELOC_THUMB_PCREL_BRANCH20, R_ARM_THM_JUMP19}, {BFD_RELOC_THUMB_PCREL_BRANCH9, R_ARM_THM_JUMP8}, {BFD_RELOC_THUMB_PCREL_BRANCH7, R_ARM_THM_JUMP6}, - {BFD_RELOC_ARM_GLOB_DAT, R_ARM_GLOB_DAT}, + {BFD_RELOC_GLOB_DAT, R_ARM_GLOB_DAT}, {BFD_RELOC_ARM_JUMP_SLOT, R_ARM_JUMP_SLOT}, {BFD_RELOC_ARM_RELATIVE, R_ARM_RELATIVE}, {BFD_RELOC_ARM_GOTOFF, R_ARM_GOTOFF32}, --- a/bfd/elf32-cr16.c +++ b/bfd/elf32-cr16.c @@ -109,7 +109,7 @@ static const struct cr16_reloc_map cr16_ {BFD_RELOC_CR16_SWITCH32, R_CR16_SWITCH32}, {BFD_RELOC_CR16_GOT_REGREL20, R_CR16_GOT_REGREL20}, {BFD_RELOC_CR16_GOTC_REGREL20, R_CR16_GOTC_REGREL20}, - {BFD_RELOC_CR16_GLOB_DAT, R_CR16_GLOB_DAT} + {BFD_RELOC_GLOB_DAT, R_CR16_GLOB_DAT} }; static reloc_howto_type cr16_elf_howto_table[] = --- a/bfd/elf32-cris.c +++ b/bfd/elf32-cris.c @@ -399,7 +399,7 @@ static const struct cris_reloc_map cris_ { BFD_RELOC_VTABLE_INHERIT, R_CRIS_GNU_VTINHERIT }, { BFD_RELOC_VTABLE_ENTRY, R_CRIS_GNU_VTENTRY }, { BFD_RELOC_COPY, R_CRIS_COPY }, - { BFD_RELOC_CRIS_GLOB_DAT, R_CRIS_GLOB_DAT }, + { BFD_RELOC_GLOB_DAT, R_CRIS_GLOB_DAT }, { BFD_RELOC_CRIS_JUMP_SLOT, R_CRIS_JUMP_SLOT }, { BFD_RELOC_CRIS_RELATIVE, R_CRIS_RELATIVE }, { BFD_RELOC_CRIS_16_GOT, R_CRIS_16_GOT }, --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -220,8 +220,8 @@ elf_i386_reloc_type_lookup (bfd *abfd, TRACE ("BFD_RELOC_COPY"); return &elf_howto_table[R_386_COPY]; - case BFD_RELOC_386_GLOB_DAT: - TRACE ("BFD_RELOC_386_GLOB_DAT"); + case BFD_RELOC_GLOB_DAT: + TRACE ("BFD_RELOC_GLOB_DAT"); return &elf_howto_table[R_386_GLOB_DAT]; case BFD_RELOC_386_JUMP_SLOT: --- a/bfd/elf32-lm32.c +++ b/bfd/elf32-lm32.c @@ -445,7 +445,7 @@ static const struct lm32_reloc_map lm32_ { BFD_RELOC_LM32_GOTOFF_HI16, R_LM32_GOTOFF_HI16 }, { BFD_RELOC_LM32_GOTOFF_LO16, R_LM32_GOTOFF_LO16 }, { BFD_RELOC_COPY, R_LM32_COPY }, - { BFD_RELOC_LM32_GLOB_DAT, R_LM32_GLOB_DAT }, + { BFD_RELOC_GLOB_DAT, R_LM32_GLOB_DAT }, { BFD_RELOC_LM32_JMP_SLOT, R_LM32_JMP_SLOT }, { BFD_RELOC_LM32_RELATIVE, R_LM32_RELATIVE }, }; --- a/bfd/elf32-m32r.c +++ b/bfd/elf32-m32r.c @@ -1212,7 +1212,7 @@ static const struct m32r_reloc_map m32r_ { BFD_RELOC_M32R_GOT24, R_M32R_GOT24 }, { BFD_RELOC_M32R_26_PLTREL, R_M32R_26_PLTREL }, { BFD_RELOC_COPY, R_M32R_COPY }, - { BFD_RELOC_M32R_GLOB_DAT, R_M32R_GLOB_DAT }, + { BFD_RELOC_GLOB_DAT, R_M32R_GLOB_DAT }, { BFD_RELOC_M32R_JMP_SLOT, R_M32R_JMP_SLOT }, { BFD_RELOC_M32R_RELATIVE, R_M32R_RELATIVE }, { BFD_RELOC_M32R_GOTOFF, R_M32R_GOTOFF }, --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -389,7 +389,7 @@ static const struct { BFD_RELOC_16_PLTOFF, R_68K_PLT16O }, { BFD_RELOC_8_PLTOFF, R_68K_PLT8O }, { BFD_RELOC_NONE, R_68K_COPY }, - { BFD_RELOC_68K_GLOB_DAT, R_68K_GLOB_DAT }, + { BFD_RELOC_GLOB_DAT, R_68K_GLOB_DAT }, { BFD_RELOC_68K_JMP_SLOT, R_68K_JMP_SLOT }, { BFD_RELOC_68K_RELATIVE, R_68K_RELATIVE }, { BFD_RELOC_CTOR, R_68K_32 }, --- a/bfd/elf32-metag.c +++ b/bfd/elf32-metag.c @@ -723,7 +723,7 @@ static const struct metag_reloc_map meta { BFD_RELOC_COPY, R_METAG_COPY }, { BFD_RELOC_METAG_JMP_SLOT, R_METAG_JMP_SLOT }, { BFD_RELOC_METAG_RELATIVE, R_METAG_RELATIVE }, - { BFD_RELOC_METAG_GLOB_DAT, R_METAG_GLOB_DAT }, + { BFD_RELOC_GLOB_DAT, R_METAG_GLOB_DAT }, { BFD_RELOC_METAG_TLS_GD, R_METAG_TLS_GD }, { BFD_RELOC_METAG_TLS_LDM, R_METAG_TLS_LDM }, { BFD_RELOC_METAG_TLS_LDO_HI16, R_METAG_TLS_LDO_HI16 }, --- a/bfd/elf32-nds32.c +++ b/bfd/elf32-nds32.c @@ -3114,7 +3114,7 @@ static const struct nds32_reloc_map_entr {BFD_RELOC_NDS32_9_PLTREL, R_NDS32_9_PLTREL}, {BFD_RELOC_NDS32_25_PLTREL, R_NDS32_25_PLTREL}, {BFD_RELOC_COPY, R_NDS32_COPY}, - {BFD_RELOC_NDS32_GLOB_DAT, R_NDS32_GLOB_DAT}, + {BFD_RELOC_GLOB_DAT, R_NDS32_GLOB_DAT}, {BFD_RELOC_NDS32_JMP_SLOT, R_NDS32_JMP_SLOT}, {BFD_RELOC_NDS32_RELATIVE, R_NDS32_RELATIVE}, {BFD_RELOC_NDS32_GOTOFF, R_NDS32_GOTOFF}, --- a/bfd/elf32-or1k.c +++ b/bfd/elf32-or1k.c @@ -875,7 +875,7 @@ static const struct or1k_reloc_map or1k_ { BFD_RELOC_OR1K_GOTPC_LO16, R_OR1K_GOTPC_LO16 }, { BFD_RELOC_OR1K_GOT16, R_OR1K_GOT16 }, { BFD_RELOC_OR1K_PLT26, R_OR1K_PLT26 }, - { BFD_RELOC_OR1K_GLOB_DAT, R_OR1K_GLOB_DAT }, + { 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_OR1K_RELATIVE, R_OR1K_RELATIVE }, --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -754,7 +754,7 @@ ppc_elf_reloc_type_lookup (bfd *abfd ATT case BFD_RELOC_HI16_S_GOTOFF: r = R_PPC_GOT16_HA; break; case BFD_RELOC_24_PLT_PCREL: r = R_PPC_PLTREL24; break; case BFD_RELOC_COPY: r = R_PPC_COPY; break; - case BFD_RELOC_PPC_GLOB_DAT: r = R_PPC_GLOB_DAT; break; + case BFD_RELOC_GLOB_DAT: r = R_PPC_GLOB_DAT; break; case BFD_RELOC_PPC_LOCAL24PC: r = R_PPC_LOCAL24PC; break; case BFD_RELOC_32_PCREL: r = R_PPC_REL32; break; case BFD_RELOC_32_PLTOFF: r = R_PPC_PLT32; break; --- a/bfd/elf32-s390.c +++ b/bfd/elf32-s390.c @@ -205,7 +205,7 @@ elf_s390_reloc_type_lookup (bfd *abfd AT return &elf_howto_table[(int) R_390_PLT32]; case BFD_RELOC_COPY: return &elf_howto_table[(int) R_390_COPY]; - case BFD_RELOC_390_GLOB_DAT: + case BFD_RELOC_GLOB_DAT: return &elf_howto_table[(int) R_390_GLOB_DAT]; case BFD_RELOC_390_JMP_SLOT: return &elf_howto_table[(int) R_390_JMP_SLOT]; --- a/bfd/elf32-sh.c +++ b/bfd/elf32-sh.c @@ -356,7 +356,7 @@ static const struct elf_reloc_map sh_rel { BFD_RELOC_32_GOT_PCREL, R_SH_GOT32 }, { BFD_RELOC_32_PLT_PCREL, R_SH_PLT32 }, { BFD_RELOC_COPY, R_SH_COPY }, - { BFD_RELOC_SH_GLOB_DAT, R_SH_GLOB_DAT }, + { BFD_RELOC_GLOB_DAT, R_SH_GLOB_DAT }, { BFD_RELOC_SH_JMP_SLOT, R_SH_JMP_SLOT }, { BFD_RELOC_SH_RELATIVE, R_SH_RELATIVE }, { BFD_RELOC_32_GOTOFF, R_SH_GOTOFF }, --- a/bfd/elf32-tilepro.c +++ b/bfd/elf32-tilepro.c @@ -584,7 +584,7 @@ static const reloc_map tilepro_reloc_map /* Custom relocations. */ TH_REMAP (BFD_RELOC_COPY, R_TILEPRO_COPY) - TH_REMAP (BFD_RELOC_TILEPRO_GLOB_DAT, R_TILEPRO_GLOB_DAT) + 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_TILEPRO_RELATIVE, R_TILEPRO_RELATIVE) TH_REMAP (BFD_RELOC_TILEPRO_BROFF_X1, R_TILEPRO_BROFF_X1) --- a/bfd/elf32-v850.c +++ b/bfd/elf32-v850.c @@ -1737,7 +1737,7 @@ static const struct v850_elf_reloc_map v { BFD_RELOC_V850_22_PLT_PCREL, R_V850_22_PLT }, { BFD_RELOC_V850_32_PLT_PCREL, R_V850_32_PLT }, { BFD_RELOC_COPY, R_V850_COPY }, - { BFD_RELOC_V850_GLOB_DAT, R_V850_GLOB_DAT }, + { BFD_RELOC_GLOB_DAT, R_V850_GLOB_DAT }, { BFD_RELOC_V850_JMP_SLOT, R_V850_JMP_SLOT }, { BFD_RELOC_V850_RELATIVE, R_V850_RELATIVE }, { BFD_RELOC_V850_16_GOTOFF, R_V850_16_GOTOFF }, --- a/bfd/elf32-vax.c +++ b/bfd/elf32-vax.c @@ -311,7 +311,7 @@ static const struct { BFD_RELOC_32_GOT_PCREL, R_VAX_GOT32 }, { BFD_RELOC_32_PLT_PCREL, R_VAX_PLT32 }, { BFD_RELOC_NONE, R_VAX_COPY }, - { BFD_RELOC_VAX_GLOB_DAT, R_VAX_GLOB_DAT }, + { BFD_RELOC_GLOB_DAT, R_VAX_GLOB_DAT }, { BFD_RELOC_VAX_JMP_SLOT, R_VAX_JMP_SLOT }, { BFD_RELOC_VAX_RELATIVE, R_VAX_RELATIVE }, { BFD_RELOC_CTOR, R_VAX_32 }, --- a/bfd/elf32-xtensa.c +++ b/bfd/elf32-xtensa.c @@ -414,8 +414,8 @@ elf_xtensa_reloc_type_lookup (bfd *abfd TRACE ("BFD_RELOC_XTENSA_RTLD"); return &elf_howto_table[(unsigned) R_XTENSA_RTLD ]; - case BFD_RELOC_XTENSA_GLOB_DAT: - TRACE ("BFD_RELOC_XTENSA_GLOB_DAT"); + case BFD_RELOC_GLOB_DAT: + TRACE ("BFD_RELOC_GLOB_DAT"); return &elf_howto_table[(unsigned) R_XTENSA_GLOB_DAT ]; case BFD_RELOC_XTENSA_JMP_SLOT: --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -1079,7 +1079,7 @@ ppc64_elf_reloc_type_lookup (bfd *abfd, break; case BFD_RELOC_COPY: r = R_PPC64_COPY; break; - case BFD_RELOC_PPC_GLOB_DAT: r = R_PPC64_GLOB_DAT; + case BFD_RELOC_GLOB_DAT: r = R_PPC64_GLOB_DAT; break; case BFD_RELOC_32_PCREL: r = R_PPC64_REL32; break; --- a/bfd/elf64-s390.c +++ b/bfd/elf64-s390.c @@ -219,7 +219,7 @@ elf_s390_reloc_type_lookup (bfd *abfd, return &elf_howto_table[(int) R_390_PLT32]; case BFD_RELOC_COPY: return &elf_howto_table[(int) R_390_COPY]; - case BFD_RELOC_390_GLOB_DAT: + case BFD_RELOC_GLOB_DAT: return &elf_howto_table[(int) R_390_GLOB_DAT]; case BFD_RELOC_390_JMP_SLOT: return &elf_howto_table[(int) R_390_JMP_SLOT]; --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -235,7 +235,7 @@ static const struct elf_reloc_map x86_64 { BFD_RELOC_X86_64_GOT32, R_X86_64_GOT32,}, { BFD_RELOC_32_PLT_PCREL, R_X86_64_PLT32,}, { BFD_RELOC_COPY, R_X86_64_COPY, }, - { BFD_RELOC_X86_64_GLOB_DAT, R_X86_64_GLOB_DAT, }, + { BFD_RELOC_GLOB_DAT, R_X86_64_GLOB_DAT, }, { BFD_RELOC_X86_64_JUMP_SLOT, R_X86_64_JUMP_SLOT, }, { BFD_RELOC_X86_64_RELATIVE, R_X86_64_RELATIVE, }, { BFD_RELOC_X86_64_GOTPCREL, R_X86_64_GOTPCREL, }, --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -375,7 +375,7 @@ _bfd_sparc_elf_reloc_type_lookup (bfd *a case BFD_RELOC_COPY: return &_bfd_sparc_elf_howto_table[R_SPARC_COPY]; - case BFD_RELOC_SPARC_GLOB_DAT: + case BFD_RELOC_GLOB_DAT: return &_bfd_sparc_elf_howto_table[R_SPARC_GLOB_DAT]; case BFD_RELOC_SPARC_JMP_SLOT: --- a/bfd/elfxx-tilegx.c +++ b/bfd/elfxx-tilegx.c @@ -651,6 +651,7 @@ static const reloc_map tilegx_reloc_map TH_REMAP (BFD_RELOC_16_PCREL, R_TILEGX_16_PCREL) 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) #define SIMPLE_REMAP(t) TH_REMAP (BFD_RELOC_##t, R_##t) @@ -662,7 +663,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_GLOB_DAT) SIMPLE_REMAP (TILEGX_JMP_SLOT) SIMPLE_REMAP (TILEGX_RELATIVE) SIMPLE_REMAP (TILEGX_BROFF_X1) --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -1100,10 +1100,10 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_HI16_S_PLTOFF", "BFD_RELOC_8_PLTOFF", "BFD_RELOC_COPY", + "BFD_RELOC_GLOB_DAT", "BFD_RELOC_IRELATIVE", "BFD_RELOC_SIZE32", "BFD_RELOC_SIZE64", - "BFD_RELOC_68K_GLOB_DAT", "BFD_RELOC_68K_JMP_SLOT", "BFD_RELOC_68K_RELATIVE", "BFD_RELOC_68K_TLS_GD32", @@ -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_GLOB_DAT", "BFD_RELOC_SPARC_JMP_SLOT", "BFD_RELOC_SPARC_RELATIVE", "BFD_RELOC_SPARC_UA16", @@ -1399,7 +1398,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_MN10300_GOT32", "BFD_RELOC_MN10300_GOT24", "BFD_RELOC_MN10300_GOT16", - "BFD_RELOC_MN10300_GLOB_DAT", "BFD_RELOC_MN10300_JMP_SLOT", "BFD_RELOC_MN10300_RELATIVE", "BFD_RELOC_MN10300_SYM_DIFF", @@ -1417,7 +1415,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_MN10300_16_PCREL", "BFD_RELOC_386_GOT32", "BFD_RELOC_386_PLT32", - "BFD_RELOC_386_GLOB_DAT", "BFD_RELOC_386_JUMP_SLOT", "BFD_RELOC_386_RELATIVE", "BFD_RELOC_386_GOTOFF", @@ -1439,7 +1436,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_GLOB_DAT", "BFD_RELOC_X86_64_JUMP_SLOT", "BFD_RELOC_X86_64_RELATIVE", "BFD_RELOC_X86_64_GOTPCREL", @@ -1505,7 +1501,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_GLOB_DAT", "BFD_RELOC_PPC_JMP_SLOT", "BFD_RELOC_PPC_RELATIVE", "BFD_RELOC_PPC_LOCAL24PC", @@ -1701,7 +1696,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_ARM_TLS_LDM32_FDPIC", "BFD_RELOC_ARM_TLS_IE32_FDPIC", "BFD_RELOC_ARM_JUMP_SLOT", - "BFD_RELOC_ARM_GLOB_DAT", "BFD_RELOC_ARM_GOT32", "BFD_RELOC_ARM_RELATIVE", "BFD_RELOC_ARM_GOTOFF", @@ -1809,7 +1803,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_GLOB_DAT", "BFD_RELOC_SH_JMP_SLOT", "BFD_RELOC_SH_RELATIVE", "BFD_RELOC_SH_GOTPC", @@ -1917,7 +1910,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_ARC_32_PCREL", "BFD_RELOC_ARC_GOT32", "BFD_RELOC_ARC_GOTPC32", - "BFD_RELOC_ARC_GLOB_DAT", "BFD_RELOC_ARC_JMP_SLOT", "BFD_RELOC_ARC_RELATIVE", "BFD_RELOC_ARC_GOTOFF", @@ -2017,7 +2009,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_M32R_SDA16", "BFD_RELOC_M32R_GOT24", "BFD_RELOC_M32R_26_PLTREL", - "BFD_RELOC_M32R_GLOB_DAT", "BFD_RELOC_M32R_JMP_SLOT", "BFD_RELOC_M32R_RELATIVE", "BFD_RELOC_M32R_GOTOFF", @@ -2054,7 +2045,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_GLOB_DAT", "BFD_RELOC_NDS32_JMP_SLOT", "BFD_RELOC_NDS32_RELATIVE", "BFD_RELOC_NDS32_GOTOFF", @@ -2195,7 +2185,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_GLOB_DAT", "BFD_RELOC_V850_JMP_SLOT", "BFD_RELOC_V850_RELATIVE", "BFD_RELOC_V850_16_GOTOFF", @@ -2292,7 +2281,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_METAG_PLT", "BFD_RELOC_METAG_JMP_SLOT", "BFD_RELOC_METAG_RELATIVE", - "BFD_RELOC_METAG_GLOB_DAT", "BFD_RELOC_METAG_TLS_GD", "BFD_RELOC_METAG_TLS_LDM", "BFD_RELOC_METAG_TLS_LDO_HI16", @@ -2476,7 +2464,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_RX_RELAX", "BFD_RELOC_390_12", "BFD_RELOC_390_GOT12", - "BFD_RELOC_390_GLOB_DAT", "BFD_RELOC_390_JMP_SLOT", "BFD_RELOC_390_RELATIVE", "BFD_RELOC_390_GOTPC", @@ -2690,7 +2677,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_CR16_SWITCH32", "BFD_RELOC_CR16_GOT_REGREL20", "BFD_RELOC_CR16_GOTC_REGREL20", - "BFD_RELOC_CR16_GLOB_DAT", "BFD_RELOC_CRX_REL4", "BFD_RELOC_CRX_REL8", "BFD_RELOC_CRX_REL8_CMP", @@ -2721,7 +2707,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_GLOB_DAT", "BFD_RELOC_CRIS_JUMP_SLOT", "BFD_RELOC_CRIS_RELATIVE", "BFD_RELOC_CRIS_32_GOT", @@ -2757,7 +2742,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_OR1K_PLT26", "BFD_RELOC_OR1K_PLTA26", "BFD_RELOC_OR1K_GOTOFF_SLO16", - "BFD_RELOC_OR1K_GLOB_DAT", "BFD_RELOC_OR1K_JMP_SLOT", "BFD_RELOC_OR1K_RELATIVE", "BFD_RELOC_OR1K_TLS_GD_HI16", @@ -2793,7 +2777,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_XSTORMY16_24", "BFD_RELOC_XSTORMY16_FPTR16", "BFD_RELOC_RELC", - "BFD_RELOC_VAX_GLOB_DAT", "BFD_RELOC_VAX_JMP_SLOT", "BFD_RELOC_VAX_RELATIVE", "BFD_RELOC_MT_PC16", @@ -2842,7 +2825,6 @@ static const char *const bfd_reloc_code_ "BFD_RELOC_IQ2000_OFFSET_21", "BFD_RELOC_IQ2000_UHI16", "BFD_RELOC_XTENSA_RTLD", - "BFD_RELOC_XTENSA_GLOB_DAT", "BFD_RELOC_XTENSA_JMP_SLOT", "BFD_RELOC_XTENSA_RELATIVE", "BFD_RELOC_XTENSA_PLT", @@ -2913,7 +2895,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_GLOB_DAT", "BFD_RELOC_LM32_JMP_SLOT", "BFD_RELOC_LM32_RELATIVE", "BFD_RELOC_MACH_O_SECTDIFF", @@ -3166,7 +3147,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_GLOB_DAT", "BFD_RELOC_TILEPRO_JMP_SLOT", "BFD_RELOC_TILEPRO_RELATIVE", "BFD_RELOC_TILEPRO_BROFF_X1", @@ -3251,7 +3231,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_GLOB_DAT", "BFD_RELOC_TILEGX_JMP_SLOT", "BFD_RELOC_TILEGX_RELATIVE", "BFD_RELOC_TILEGX_BROFF_X1", --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -1473,6 +1473,8 @@ ENUMX ENUMX BFD_RELOC_COPY ENUMX + BFD_RELOC_GLOB_DAT +ENUMX BFD_RELOC_IRELATIVE ENUMDOC For ELF. @@ -1485,8 +1487,6 @@ ENUMDOC Size relocations. ENUM - BFD_RELOC_68K_GLOB_DAT -ENUMX BFD_RELOC_68K_JMP_SLOT ENUMX BFD_RELOC_68K_RELATIVE @@ -1598,8 +1598,6 @@ ENUMX ENUMX BFD_RELOC_SPARC_WPLT30 ENUMX - BFD_RELOC_SPARC_GLOB_DAT -ENUMX BFD_RELOC_SPARC_JMP_SLOT ENUMX BFD_RELOC_SPARC_RELATIVE @@ -2297,10 +2295,6 @@ ENUMDOC This is a 16bit GOT-relative reloc for the mn10300, offset by two bytes in the instruction. ENUM - BFD_RELOC_MN10300_GLOB_DAT -ENUMDOC - Create GOT entry. -ENUM BFD_RELOC_MN10300_JMP_SLOT ENUMDOC Create PLT entry. @@ -2355,8 +2349,6 @@ ENUM ENUMX BFD_RELOC_386_PLT32 ENUMX - BFD_RELOC_386_GLOB_DAT -ENUMX BFD_RELOC_386_JUMP_SLOT ENUMX BFD_RELOC_386_RELATIVE @@ -2402,8 +2394,6 @@ ENUMDOC ENUM BFD_RELOC_X86_64_GOT32 ENUMX - BFD_RELOC_X86_64_GLOB_DAT -ENUMX BFD_RELOC_X86_64_JUMP_SLOT ENUMX BFD_RELOC_X86_64_RELATIVE @@ -2546,8 +2536,6 @@ ENUMX ENUMX BFD_RELOC_PPC_BA16_BRNTAKEN ENUMX - BFD_RELOC_PPC_GLOB_DAT -ENUMX BFD_RELOC_PPC_JMP_SLOT ENUMX BFD_RELOC_PPC_RELATIVE @@ -3016,8 +3004,6 @@ ENUMDOC ENUM BFD_RELOC_ARM_JUMP_SLOT ENUMX - BFD_RELOC_ARM_GLOB_DAT -ENUMX BFD_RELOC_ARM_GOT32 ENUMX BFD_RELOC_ARM_RELATIVE @@ -3251,8 +3237,6 @@ ENUMX ENUMX BFD_RELOC_SH_LOOP_END ENUMX - BFD_RELOC_SH_GLOB_DAT -ENUMX BFD_RELOC_SH_JMP_SLOT ENUMX BFD_RELOC_SH_RELATIVE @@ -3470,8 +3454,6 @@ ENUMX ENUMX BFD_RELOC_ARC_GOTPC32 ENUMX - BFD_RELOC_ARC_GLOB_DAT -ENUMX BFD_RELOC_ARC_JMP_SLOT ENUMX BFD_RELOC_ARC_RELATIVE @@ -3817,8 +3799,6 @@ ENUM ENUMX BFD_RELOC_M32R_26_PLTREL ENUMX - BFD_RELOC_M32R_GLOB_DAT -ENUMX BFD_RELOC_M32R_JMP_SLOT ENUMX BFD_RELOC_M32R_RELATIVE @@ -3952,8 +3932,6 @@ ENUMX ENUMX BFD_RELOC_NDS32_25_PLTREL ENUMX - BFD_RELOC_NDS32_GLOB_DAT -ENUMX BFD_RELOC_NDS32_JMP_SLOT ENUMX BFD_RELOC_NDS32_RELATIVE @@ -4335,8 +4313,6 @@ ENUMX ENUMX BFD_RELOC_V850_32_PLT_PCREL ENUMX - BFD_RELOC_V850_GLOB_DAT -ENUMX BFD_RELOC_V850_JMP_SLOT ENUMX BFD_RELOC_V850_RELATIVE @@ -4597,8 +4573,6 @@ ENUMX ENUMX BFD_RELOC_METAG_RELATIVE ENUMX - BFD_RELOC_METAG_GLOB_DAT -ENUMX BFD_RELOC_METAG_TLS_GD ENUMX BFD_RELOC_METAG_TLS_LDM @@ -5112,10 +5086,6 @@ ENUM ENUMDOC 12 bit GOT offset. ENUM - BFD_RELOC_390_GLOB_DAT -ENUMDOC - Create GOT entry. -ENUM BFD_RELOC_390_JMP_SLOT ENUMDOC Create PLT entry. @@ -5760,8 +5730,6 @@ ENUMX BFD_RELOC_CR16_GOT_REGREL20 ENUMX BFD_RELOC_CR16_GOTC_REGREL20 -ENUMX - BFD_RELOC_CR16_GLOB_DAT ENUMDOC NS CR16 Relocations. @@ -5832,8 +5800,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_GLOB_DAT -ENUMX BFD_RELOC_CRIS_JUMP_SLOT ENUMX BFD_RELOC_CRIS_RELATIVE @@ -5925,8 +5891,6 @@ ENUMX ENUMX BFD_RELOC_OR1K_GOTOFF_SLO16 ENUMX - BFD_RELOC_OR1K_GLOB_DAT -ENUMX BFD_RELOC_OR1K_JMP_SLOT ENUMX BFD_RELOC_OR1K_RELATIVE @@ -6009,8 +5973,6 @@ ENUMDOC Self-describing complex relocations. ENUM - BFD_RELOC_VAX_GLOB_DAT -ENUMX BFD_RELOC_VAX_JMP_SLOT ENUMX BFD_RELOC_VAX_RELATIVE @@ -6157,8 +6119,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_GLOB_DAT -ENUMX BFD_RELOC_XTENSA_JMP_SLOT ENUMX BFD_RELOC_XTENSA_RELATIVE @@ -6371,8 +6331,6 @@ ENUMX ENUMX BFD_RELOC_LM32_GOTOFF_LO16 ENUMX - BFD_RELOC_LM32_GLOB_DAT -ENUMX BFD_RELOC_LM32_JMP_SLOT ENUMX BFD_RELOC_LM32_RELATIVE @@ -7325,8 +7283,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_GLOB_DAT -ENUMX BFD_RELOC_TILEPRO_JMP_SLOT ENUMX BFD_RELOC_TILEPRO_RELATIVE @@ -7497,8 +7453,6 @@ ENUMX ENUMX BFD_RELOC_TILEGX_HW2_LAST ENUMX - BFD_RELOC_TILEGX_GLOB_DAT -ENUMX BFD_RELOC_TILEGX_JMP_SLOT ENUMX BFD_RELOC_TILEGX_RELATIVE --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -2089,7 +2089,7 @@ ppc_elf_suffix (char **str_p, expression MAP ("plt@h", BFD_RELOC_HI16_PLTOFF), MAP ("plt@ha", BFD_RELOC_HI16_S_PLTOFF), MAP ("copy", BFD_RELOC_COPY), - MAP ("globdat", BFD_RELOC_PPC_GLOB_DAT), + MAP ("globdat", BFD_RELOC_GLOB_DAT), MAP ("sectoff", BFD_RELOC_16_BASEREL), MAP ("sectoff@l", BFD_RELOC_LO16_BASEREL), MAP ("sectoff@h", BFD_RELOC_HI16_BASEREL), @@ -3167,7 +3167,7 @@ fixup_size (bfd_reloc_code_real_type rel case BFD_RELOC_COPY: case BFD_RELOC_PPC_DTPMOD: case BFD_RELOC_PPC_DTPREL: - case BFD_RELOC_PPC_GLOB_DAT: + case BFD_RELOC_GLOB_DAT: case BFD_RELOC_PPC_TPREL: size = ppc_obj64 ? 8 : 4; break; @@ -7313,7 +7313,7 @@ md_apply_fix (fixS *fixP, valueT *valP, case BFD_RELOC_PPC_TPREL: case BFD_RELOC_PPC_DTPREL: case BFD_RELOC_COPY: - case BFD_RELOC_PPC_GLOB_DAT: + case BFD_RELOC_GLOB_DAT: case BFD_RELOC_32_PLT_PCREL: case BFD_RELOC_PPC_EMB_NADDR32: case BFD_RELOC_PPC64_TOC: @@ -7480,7 +7480,7 @@ md_apply_fix (fixS *fixP, valueT *valP, case BFD_RELOC_HI16_PLTOFF: case BFD_RELOC_HI16_S_PLTOFF: case BFD_RELOC_COPY: - case BFD_RELOC_PPC_GLOB_DAT: + case BFD_RELOC_GLOB_DAT: case BFD_RELOC_16_BASEREL: case BFD_RELOC_LO16_BASEREL: case BFD_RELOC_HI16_BASEREL: --- a/include/elf/cris.h +++ b/include/elf/cris.h @@ -44,7 +44,7 @@ START_RELOC_NUMBERS (elf_cris_reloc_type RELOC_NUMBER (R_CRIS_COPY, 9) /* Create GOT entry. Generated by the linker. - The BFD equivalent is BFD_RELOC_CRIS_GLOB_DAT. */ + The BFD equivalent is BFD_RELOC_GLOB_DAT. */ RELOC_NUMBER (R_CRIS_GLOB_DAT, 10) /* Create PLT entry. Generated by the linker.