代码拉取完成，页面将自动刷新
同步操作将从 src-anolis-os/binutils 强制同步，此操作会覆盖自 Fork 仓库以来所做的任何修改，且无法恢复！！！
确定后同步将在后台操作，完成时将刷新页面，请耐心等待。
From 095ac9fd7c2128c0ad31f71cc9725d0a21500c2a Mon Sep 17 00:00:00 2001
From: Xing Li <lixing@loongson.cn>
Date: Tue, 18 Jul 2023 13:34:53 +0800
Subject: [PATCH 3/3] binutils: Delete warning of compile
---
bfd/elfnn-loongarch.c | 617 ++++++++++++++++++++---------------
gas/config/loongarch-lex.l | 3 +
gas/config/loongarch-parse.y | 9 +-
gas/config/tc-loongarch.c | 44 +--
opcodes/loongarch-dis.c | 8 +-
5 files changed, 385 insertions(+), 296 deletions(-)
diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c
index ca29aaea..5582107e 100644
--- a/bfd/elfnn-loongarch.c
+++ b/bfd/elfnn-loongarch.c
@@ -585,7 +585,7 @@ loongarch_elf_record_tls_and_got_reference (bfd *abfd,
/* no need for GOT */
break;
default:
- _bfd_error_handler (_("%pB: Interl error: unreachable."));
+ _bfd_error_handler (_("%pB: Interl error: unreachable."), abfd);
return FALSE;
}
@@ -1107,7 +1107,6 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
&& h->def_regular)
return TRUE;
- eh = (struct loongarch_elf_link_hash_entry *) h;
info = (struct bfd_link_info *) inf;
htab = loongarch_elf_hash_table (info);
BFD_ASSERT (htab != NULL);
@@ -1284,7 +1283,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
/* Allocate space in .plt, .got and associated reloc sections for
ifunc dynamic relocs. */
-static bfd_boolean
+static bfd_boolean
elfNN_allocate_ifunc_dynrelocs (struct elf_link_hash_entry *h, void *inf)
{
struct bfd_link_info *info;
@@ -1339,21 +1338,6 @@ elfNN_allocate_local_ifunc_dynrelocs (void **slot, void *inf)
return elfNN_allocate_ifunc_dynrelocs (h, inf);
}
-static bfd_boolean
-elfNN_loongarch_allocate_local_dynrelocs (void **slot, void *inf)
-{
- struct elf_link_hash_entry *h
- = (struct elf_link_hash_entry *) *slot;
-
- if (!h->def_regular
- || !h->ref_regular
- || !h->forced_local
- || h->root.type != bfd_link_hash_defined)
- abort ();
-
- return allocate_dynrelocs (h, inf);
-}
-
/* Set DF_TEXTREL if we find any dynamic relocs that apply to
read-only sections. */
@@ -2055,6 +2039,50 @@ loongarch_dump_reloc_record (void (*p) (const char *fmt, ...))
p ("\n" "-- Record dump end --\n\n");
}
+static bfd_boolean
+loongarch_reloc_is_fatal (struct bfd_link_info *info,
+ bfd *input_bfd,
+ asection *input_section,
+ Elf_Internal_Rela *rel,
+ reloc_howto_type *howto,
+ bfd_reloc_status_type rtype,
+ bfd_boolean is_undefweak,
+ const char *name,
+ const char *msg)
+{
+ bfd_boolean fatal = TRUE;
+
+ switch (rtype)
+ {
+ /* 'dangerous' means we do it but can't promise it's ok
+ 'unsupport' means out of ability of relocation type
+ 'undefined' means we can't deal with the undefined symbol. */
+ case bfd_reloc_undefined:
+ info->callbacks->undefined_symbol (info, name, input_bfd, input_section,
+ rel->r_offset, TRUE);
+ info->callbacks->info ("%X%pB(%pA+0x%v): error: %s against %s`%s':\n%s\n",
+ input_bfd, input_section, rel->r_offset,
+ howto->name,
+ is_undefweak ? "[undefweak] " : "", name, msg);
+ break;
+ case bfd_reloc_dangerous:
+ info->callbacks->info ("%pB(%pA+0x%v): warning: %s against %s`%s':\n%s\n",
+ input_bfd, input_section, rel->r_offset,
+ howto->name,
+ is_undefweak ? "[undefweak] " : "", name, msg);
+ fatal = FALSE;
+ break;
+ case bfd_reloc_notsupported:
+ info->callbacks->info ("%X%pB(%pA+0x%v): error: %s against %s`%s':\n%s\n",
+ input_bfd, input_section, rel->r_offset,
+ howto->name,
+ is_undefweak ? "[undefweak] " : "", name, msg);
+ break;
+ default:
+ break;
+ }
+ return fatal;
+}
static bfd_boolean
loongarch_elf_relocate_section (bfd *output_bfd,
@@ -2209,12 +2237,6 @@ loongarch_elf_relocate_section (bfd *output_bfd,
b. 此外，比如代码段的重定位无法动态改变其的引用位置，所以必须走plt
来实现IFUNC。
c. 因此，为方便实现，我们将plt stub的位置当作IFUNC符号的定义。 */
- if (h->plt.offset == MINUS_ONE)
- info->callbacks->info
- ("%X%pB(%pA+0x%v): error: %s against `%s':\n"
- "STT_GNU_IFUNC must have PLT stub" "\n",
- input_bfd, input_section, (bfd_vma) rel->r_offset,
- howto->name, name);
defined_local = TRUE;
resolved_local = TRUE;
resolved_dynly = FALSE;
@@ -2239,42 +2261,6 @@ loongarch_elf_relocate_section (bfd *output_bfd,
is_ie = FALSE;
switch (r_type)
{
-#define LARCH_ASSERT(cond, bfd_fail_state, message) \
- ({if (!(cond)) { \
- r = bfd_fail_state; \
- switch (r) { \
- /* 'dangerous' means we do it but can't promise it's ok \
- 'unsupport' means out of ability of relocation type \
- 'undefined' means we can't deal with the undefined symbol */ \
- case bfd_reloc_undefined: \
- info->callbacks->undefined_symbol \
- (info, name, input_bfd, input_section, rel->r_offset, TRUE); \
- default: \
- fatal = TRUE; \
- info->callbacks->info \
- ("%X%pB(%pA+0x%v): error: %s against %s`%s':\n" \
- message "\n", \
- input_bfd, input_section, (bfd_vma) rel->r_offset, \
- howto->name, is_undefweak? "[undefweak] " : "", name); \
- break; \
- case bfd_reloc_dangerous: \
- info->callbacks->info \
- ("%pB(%pA+0x%v): warning: %s against %s`%s':\n" \
- message "\n", \
- input_bfd, input_section, (bfd_vma) rel->r_offset, \
- howto->name, is_undefweak? "[undefweak] " : "", name); \
- break; \
- case bfd_reloc_ok: \
- case bfd_reloc_continue: \
- info->callbacks->info \
- ("%pB(%pA+0x%v): message: %s against %s`%s':\n" \
- message "\n", \
- input_bfd, input_section, (bfd_vma) rel->r_offset, \
- howto->name, is_undefweak? "[undefweak] " : "", name); \
- break; \
- } \
- if (fatal) break; \
- }})
case R_LARCH_MARK_PCREL:
case R_LARCH_MARK_LA:
case R_LARCH_NONE:
@@ -2377,11 +2363,18 @@ loongarch_elf_relocate_section (bfd *output_bfd,
case R_LARCH_SUB24:
case R_LARCH_SUB32:
case R_LARCH_SUB64:
- LARCH_ASSERT (!resolved_dynly, bfd_reloc_undefined,
-"Can't be resolved dynamically. If this procedure is hand-writing assemble,\n"
-"there must be something like '.dword sym1 - sym2' to generate these relocs\n"
-"and we can't get known link-time address of these symbols.");
- relocation += rel->r_addend;
+ if (resolved_dynly)
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_undefined, is_undefweak, name,
+ "Can't be resolved dynamically. "
+ "If this procedure is hand-written assembly,\n"
+ "there must be something like '.dword sym1 - sym2' "
+ "to generate these relocs\n"
+ "and we can't get known link-time address of "
+ "these symbols."));
+ else
+ relocation += rel->r_addend;
break;
case R_LARCH_TLS_DTPREL32:
@@ -2390,12 +2383,11 @@ loongarch_elf_relocate_section (bfd *output_bfd,
{
Elf_Internal_Rela outrel;
- outrel.r_offset =
- _bfd_elf_section_offset (output_bfd, info, input_section,
- rel->r_offset);
-
- unresolved_reloc = !((bfd_vma) -2 <= outrel.r_offset)
- && (input_section->flags & SEC_ALLOC);
+ outrel.r_offset = _bfd_elf_section_offset (output_bfd, info,
+ input_section,
+ rel->r_offset);
+ unresolved_reloc = (!((bfd_vma) -2 <= outrel.r_offset)
+ && (input_section->flags & SEC_ALLOC));
outrel.r_info = ELFNN_R_INFO (h->dynindx, r_type);
outrel.r_offset += sec_addr (input_section);
outrel.r_addend = rel->r_addend;
@@ -2404,28 +2396,67 @@ loongarch_elf_relocate_section (bfd *output_bfd,
break;
}
- LARCH_ASSERT (!resolved_to_const, bfd_reloc_notsupported,
- "Internal:");
+ if (resolved_to_const)
+ fatal = loongarch_reloc_is_fatal (info, input_bfd, input_section,
+ rel, howto,
+ bfd_reloc_notsupported,
+ is_undefweak, name,
+ "Internal:");
+ if (resolved_local)
+ {
+ if (!elf_hash_table (info)->tls_sec)
+ {
+ fatal = loongarch_reloc_is_fatal (info, input_bfd,
+ input_section, rel, howto, bfd_reloc_notsupported,
+ is_undefweak, name, "TLS section not be created");
+ }
+ else
+ relocation -= elf_hash_table (info)->tls_sec->vma;
+ }
+ else
+ {
+ fatal = loongarch_reloc_is_fatal (info, input_bfd,
+ input_section, rel, howto, bfd_reloc_undefined,
+ is_undefweak, name,
+ "TLS LE just can be resolved local only.");
+ }
+ break;
+
case R_LARCH_SOP_PUSH_TLS_TPREL:
if (resolved_local)
{
- LARCH_ASSERT (elf_hash_table (info)->tls_sec,
- bfd_reloc_notsupported, "TLS section not be created");
- relocation -= elf_hash_table (info)->tls_sec->vma;
+ if (!elf_hash_table (info)->tls_sec)
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_notsupported, is_undefweak, name,
+ "TLS section not be created"));
+ else
+ relocation -= elf_hash_table (info)->tls_sec->vma;
}
+ else
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_undefined, is_undefweak, name,
+ "TLS LE just can be resolved local only."));
- LARCH_ASSERT (resolved_local, bfd_reloc_undefined,
- "TLS LE just can be resolved local only.");
break;
case R_LARCH_SOP_PUSH_ABSOLUTE:
if (is_undefweak)
{
- LARCH_ASSERT (!resolved_dynly, bfd_reloc_dangerous,
-"Someone require us to resolve undefweak symbol dynamically.\n"
-"But this reloc can't be done. I think I can't throw error for this\n"
-"so I resolved it to 0. I suggest to re-compile with '-fpic'.");
+ if (resolved_dynly)
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_dangerous, is_undefweak, name,
+ "Someone require us to resolve undefweak "
+ "symbol dynamically. \n"
+ "But this reloc can't be done. "
+ "I think I can't throw error "
+ "for this\n"
+ "so I resolved it to 0. "
+ "I suggest to re-compile with '-fpic'."));
+
relocation = 0;
unresolved_reloc = FALSE;
break;
@@ -2437,17 +2468,36 @@ loongarch_elf_relocate_section (bfd *output_bfd,
break;
}
- LARCH_ASSERT (!is_pic, bfd_reloc_notsupported,
-"Under PIC we don't know load address. Re-compile src with '-fpic'?");
+ if (is_pic)
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_notsupported, is_undefweak, name,
+ "Under PIC we don't know load address. Re-compile "
+ "with '-fpic'?"));
+ break;
+ }
if (resolved_dynly)
{
- LARCH_ASSERT (plt && h && h->plt.offset != MINUS_ONE,
- bfd_reloc_undefined,
-"Can't be resolved dynamically. Try to re-compile src with '-fpic'?");
+ if (!(plt && h && h->plt.offset != MINUS_ONE))
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_undefined, is_undefweak, name,
+ "Can't be resolved dynamically. Try to re-compile "
+ "with '-fpic'?"));
+ break;
+ }
- LARCH_ASSERT (rel->r_addend == 0, bfd_reloc_notsupported,
- "Shouldn't be with r_addend.");
+ if (rel->r_addend != 0)
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_notsupported, is_undefweak, name,
+ "Shouldn't be with r_addend."));
+ break;
+ }
relocation = sec_addr (plt) + h->plt.offset;
unresolved_reloc = FALSE;
@@ -2466,12 +2516,12 @@ loongarch_elf_relocate_section (bfd *output_bfd,
case R_LARCH_SOP_PUSH_PLT_PCREL:
unresolved_reloc = FALSE;
- if (resolved_to_const)
- {
- relocation += rel->r_addend;
- break;
- }
- else if (is_undefweak)
+ if (resolved_to_const)
+ {
+ relocation += rel->r_addend;
+ break;
+ }
+ else if (is_undefweak)
{
i = 0, j = 0;
relocation = 0;
@@ -2480,24 +2530,36 @@ loongarch_elf_relocate_section (bfd *output_bfd,
if (h && h->plt.offset != MINUS_ONE)
i = 1, j = 2;
else
- LARCH_ASSERT (0, bfd_reloc_dangerous,
-"Undefweak need to be resolved dynamically, but PLT stub doesn't represent.");
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_dangerous, is_undefweak, name,
+ "Undefweak need to be resolved dynamically, "
+ "but PLT stub doesn't represent."));
}
}
else
{
- LARCH_ASSERT
- (defined_local || (h && h->plt.offset != MINUS_ONE),
- bfd_reloc_undefined,
- "PLT stub does not represent and symbol not defined.");
+ if (!(defined_local || (h && h->plt.offset != MINUS_ONE)))
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_undefined, is_undefweak, name,
+ "PLT stub does not represent and "
+ "symbol not defined."));
+ break;
+ }
if (resolved_local)
i = 0, j = 2;
else /* if (resolved_dynly) */
{
- LARCH_ASSERT
- (h && h->plt.offset != MINUS_ONE, bfd_reloc_dangerous,
-"Internal: PLT stub doesn't represent. Resolve it with pcrel");
+ if (!(h && h->plt.offset != MINUS_ONE))
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_dangerous, is_undefweak, name,
+ "Internal: PLT stub doesn't represent. "
+ "Resolve it with pcrel"));
+
i = 1, j = 3;
}
}
@@ -2513,8 +2575,15 @@ loongarch_elf_relocate_section (bfd *output_bfd,
if ((i & 1) && h && h->plt.offset != MINUS_ONE)
{
- LARCH_ASSERT (rel->r_addend == 0, bfd_reloc_notsupported,
- "PLT shouldn't be with r_addend.");
+ if (rel->r_addend != 0)
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_notsupported, is_undefweak, name,
+ "PLT shouldn't be with r_addend."));
+ break;
+ }
+
relocation = sec_addr (plt) + h->plt.offset - pc;
break;
}
@@ -2524,24 +2593,36 @@ loongarch_elf_relocate_section (bfd *output_bfd,
case R_LARCH_SOP_PUSH_GPREL:
unresolved_reloc = FALSE;
- LARCH_ASSERT (rel->r_addend == 0, bfd_reloc_notsupported,
- "Shouldn't be with r_addend.");
-
+ if (rel->r_addend != 0)
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_notsupported, is_undefweak, name,
+ "Shouldn't be with r_addend."));
+ break;
+ }
if (h != NULL)
{
off = h->got.offset & (~1);
- LARCH_ASSERT (!(h->got.offset == MINUS_ONE
- && h->type != STT_GNU_IFUNC),
- bfd_reloc_notsupported,
- "Internal: GOT entry doesn't represent.");
+ if (h->got.offset == MINUS_ONE && h->type != STT_GNU_IFUNC)
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_notsupported, is_undefweak, name,
+ "Internal: GOT entry doesn't represent."));
+ break;
+ }
/* Hidden symbol not has .got entry, only .got.plt entry
so gprel is (plt - got). */
if (h->got.offset == MINUS_ONE && h->type == STT_GNU_IFUNC)
{
- BFD_ASSERT(h->plt.offset != (bfd_vma) -1);
+ if (h->plt.offset == (bfd_vma) -1)
+ {
+ abort();
+ }
bfd_vma plt_index = h->plt.offset / PLT_ENTRY_SIZE;
off = plt_index * GOT_ENTRY_SIZE;
@@ -2580,17 +2661,37 @@ loongarch_elf_relocate_section (bfd *output_bfd,
relocation entry to initialize the value. This
is done in the finish_dynamic_symbol routine. */
- LARCH_ASSERT (!resolved_dynly || (defined_local || resolved_to_const),
- bfd_reloc_notsupported,
- "Internal: here shouldn't dynamic.");
-
+ if (resolved_dynly)
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_dangerous, is_undefweak, name,
+ "Internal: here shouldn't dynamic."));
+ }
+
+ if (!(defined_local || resolved_to_const))
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_undefined, is_undefweak, name,
+ "Internal: "));
+ break;
+ }
+
asection *s;
Elf_Internal_Rela outrel;
/* We need to generate a R_LARCH_RELATIVE reloc
for the dynamic linker. */
s = htab->elf.srelgot;
- LARCH_ASSERT (s, bfd_reloc_notsupported,
- "Internal: '.rel.got' not represent.");
+ if (!s)
+ {
+ fatal = loongarch_reloc_is_fatal
+ (info, input_bfd,
+ input_section, rel, howto,
+ bfd_reloc_notsupported, is_undefweak, name,
+ "Internal: '.rel.got' not represent");
+ break;
+ }
outrel.r_offset = sec_addr (got) + off;
outrel.r_info = ELFNN_R_INFO (0, R_LARCH_RELATIVE);
@@ -2603,15 +2704,26 @@ loongarch_elf_relocate_section (bfd *output_bfd,
}
else
{
- LARCH_ASSERT (local_got_offsets, bfd_reloc_notsupported,
- "Internal: local got offsets not reporesent.");
-
- LARCH_ASSERT (local_got_offsets[r_symndx] != MINUS_ONE,
- bfd_reloc_notsupported,
- "Internal: GOT entry doesn't represent.");
+ if (!local_got_offsets)
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_notsupported, is_undefweak, name,
+ "Internal: local got offsets not reporesent."));
+ break;
+ }
off = local_got_offsets[r_symndx] & (~1);
+ if (local_got_offsets[r_symndx] == MINUS_ONE)
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_notsupported, is_undefweak, name,
+ "Internal: GOT entry doesn't represent."));
+ break;
+ }
+
/* The offset must always be a multiple of the word size.
So, we can use the least significant bit to record
whether we have already processed this entry. */
@@ -2625,8 +2737,14 @@ loongarch_elf_relocate_section (bfd *output_bfd,
/* We need to generate a R_LARCH_RELATIVE reloc
for the dynamic linker. */
s = htab->elf.srelgot;
- LARCH_ASSERT (s, bfd_reloc_notsupported,
- "Internal: '.rel.got' not represent");
+ if (!s)
+ {
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_notsupported, is_undefweak, name,
+ "Internal: '.rel.got' not represent"));
+ break;
+ }
outrel.r_offset = sec_addr (got) + off;
outrel.r_info = ELFNN_R_INFO (0, R_LARCH_RELATIVE);
@@ -2644,124 +2762,109 @@ loongarch_elf_relocate_section (bfd *output_bfd,
case R_LARCH_SOP_PUSH_TLS_GOT:
is_ie = TRUE;
case R_LARCH_SOP_PUSH_TLS_GD:
- unresolved_reloc = FALSE;
- LARCH_ASSERT (rel->r_addend == 0, bfd_reloc_notsupported,
- "Shouldn't be with r_addend.");
-
- if (resolved_to_const && is_undefweak && h->dynindx != -1)
- {
- /* What if undefweak? Let rtld make a decision. */
- resolved_to_const = resolved_local = FALSE;
- resolved_dynly = TRUE;
- }
-
- LARCH_ASSERT (!resolved_to_const, bfd_reloc_notsupported,
- "Internal: Shouldn't be resolved to const.");
-
- if (h != NULL)
- {
- off = h->got.offset;
- h->got.offset |= 1;
- }
- else
- {
- off = local_got_offsets[r_symndx];
- local_got_offsets[r_symndx] |= 1;
- }
-
- LARCH_ASSERT (off != MINUS_ONE, bfd_reloc_notsupported,
- "Internal: TLS GOT entry doesn't represent.");
-
- tls_type = _bfd_loongarch_elf_tls_type (input_bfd, h, r_symndx);
-
- /* If this symbol is referenced by both GD and IE TLS, the IE
- reference's GOT slot follows the GD reference's slots. */
- ie_off = 0;
- if ((tls_type & GOT_TLS_GD) && (tls_type & GOT_TLS_IE))
- ie_off = 2 * GOT_ENTRY_SIZE;
-
- if ((off & 1) != 0)
- off &= ~1;
- else
- {
- bfd_vma tls_block_off = 0;
- Elf_Internal_Rela outrel;
-
- if (resolved_local)
- {
- LARCH_ASSERT
- (elf_hash_table (info)->tls_sec, bfd_reloc_notsupported,
- "Internal: TLS sec not represent.");
- tls_block_off = relocation
- - elf_hash_table (info)->tls_sec->vma;
- }
-
- if (tls_type & GOT_TLS_GD)
- {
- outrel.r_offset = sec_addr (got) + off;
- outrel.r_addend = 0;
- bfd_put_NN (output_bfd, 0, got->contents + off);
- if (resolved_local && bfd_link_executable (info))
- /* a. 第一个被装载模块的Module ID为1。$glibc/elf/rtld.c中
- 的dl_main有一句'main_map->l_tls_modid = 1'；
- b. 静态程序的Module ID不重要，但为了省事仍然是1。
- 详见$glibc/csu/libc-tls.c中的init_static_tls。 */
- bfd_put_NN (output_bfd, 1, got->contents + off);
- else if (resolved_local/* && !bfd_link_executable (info) */)
- {
- outrel.r_info = ELFNN_R_INFO (0, R_LARCH_TLS_DTPMODNN);
- loongarch_elf_append_rela
- (output_bfd, htab->elf.srelgot, &outrel);
- }
- else /* if (resolved_dynly) */
- {
- outrel.r_info =
- ELFNN_R_INFO (h->dynindx, R_LARCH_TLS_DTPMODNN);
- loongarch_elf_append_rela
- (output_bfd, htab->elf.srelgot, &outrel);
- }
+ {
+ unresolved_reloc = FALSE;
+ if (r_type == R_LARCH_SOP_PUSH_TLS_GOT)
+ is_ie = TRUE;
+
+ bfd_vma got_off = 0;
+ if (h != NULL)
+ {
+ got_off = h->got.offset;
+ h->got.offset |= 1;
+ }
+ else
+ {
+ got_off = local_got_offsets[r_symndx];
+ local_got_offsets[r_symndx] |= 1;
+ }
+
+ BFD_ASSERT (got_off != MINUS_ONE);
+
+ ie_off = 0;
+ tls_type = _bfd_loongarch_elf_tls_type (input_bfd, h, r_symndx);
+ if ((tls_type & GOT_TLS_GD) && (tls_type & GOT_TLS_IE))
+ ie_off = 2 * GOT_ENTRY_SIZE;
+
+ if ((got_off & 1) == 0)
+ {
+ Elf_Internal_Rela rela;
+ asection *srel = htab->elf.srelgot;
+ bfd_vma tls_block_off = 0;
+
+ if (SYMBOL_REFERENCES_LOCAL (info, h))
+ {
+ BFD_ASSERT (elf_hash_table (info)->tls_sec);
+ tls_block_off = relocation
+ - elf_hash_table (info)->tls_sec->vma;
+ }
- outrel.r_offset += GOT_ENTRY_SIZE;
- bfd_put_NN (output_bfd, tls_block_off,
- got->contents + off + GOT_ENTRY_SIZE);
- if (resolved_local)
- /* DTPREL known */;
- else /* if (resolved_dynly) */
- {
- outrel.r_info =
- ELFNN_R_INFO (h->dynindx, R_LARCH_TLS_DTPRELNN);
- loongarch_elf_append_rela
- (output_bfd, htab->elf.srelgot, &outrel);
- }
- }
+ if (tls_type & GOT_TLS_GD)
+ {
+ rela.r_offset = sec_addr (got) + got_off;
+ rela.r_addend = 0;
+ if (SYMBOL_REFERENCES_LOCAL (info, h))
+ {
+ /* Local sym, used in exec, set module id 1. */
+ if (bfd_link_executable (info))
+ bfd_put_NN (output_bfd, 1, got->contents + got_off);
+ else
+ {
+ rela.r_info = ELFNN_R_INFO (0,
+ R_LARCH_TLS_DTPMODNN);
+ loongarch_elf_append_rela (output_bfd, srel, &rela);
+ }
+
+ bfd_put_NN (output_bfd, tls_block_off,
+ got->contents + got_off + GOT_ENTRY_SIZE);
+ }
+ /* Dynamic resolved. */
+ else
+ {
+ /* Dynamic relocate module id. */
+ rela.r_info = ELFNN_R_INFO (h->dynindx,
+ R_LARCH_TLS_DTPMODNN);
+ loongarch_elf_append_rela (output_bfd, srel, &rela);
+
+ /* Dynamic relocate offset of block. */
+ rela.r_offset += GOT_ENTRY_SIZE;
+ rela.r_info = ELFNN_R_INFO (h->dynindx,
+ R_LARCH_TLS_DTPRELNN);
+ loongarch_elf_append_rela (output_bfd, srel, &rela);
+ }
+ }
+ if (tls_type & GOT_TLS_IE)
+ {
+ rela.r_offset = sec_addr (got) + got_off + ie_off;
+ if (SYMBOL_REFERENCES_LOCAL (info, h))
+ {
+ /* Local sym, used in exec, set module id 1. */
+ if (!bfd_link_executable (info))
+ {
+ rela.r_info = ELFNN_R_INFO (0, R_LARCH_TLS_TPRELNN);
+ rela.r_addend = tls_block_off;
+ loongarch_elf_append_rela (output_bfd, srel, &rela);
+ }
+
+ bfd_put_NN (output_bfd, tls_block_off,
+ got->contents + got_off + ie_off);
+ }
+ /* Dynamic resolved. */
+ else
+ {
+ /* Dynamic relocate offset of block. */
+ rela.r_info = ELFNN_R_INFO (h->dynindx,
+ R_LARCH_TLS_TPRELNN);
+ rela.r_addend = 0;
+ loongarch_elf_append_rela (output_bfd, srel, &rela);
+ }
+ }
+ }
- if (tls_type & GOT_TLS_IE)
- {
- outrel.r_offset = sec_addr (got) + off + ie_off;
- bfd_put_NN (output_bfd, tls_block_off,
- got->contents + off + ie_off);
- if (resolved_local && bfd_link_executable (info))
- /* TPREL known */;
- else if (resolved_local/* && !bfd_link_executable (info) */)
- {
- outrel.r_info = ELFNN_R_INFO (0, R_LARCH_TLS_TPRELNN);
- outrel.r_addend = tls_block_off;
- loongarch_elf_append_rela
- (output_bfd, htab->elf.srelgot, &outrel);
- }
- else /* if (resolved_dynly) */
- {
- outrel.r_info =
- ELFNN_R_INFO (h->dynindx, R_LARCH_TLS_TPRELNN);
- outrel.r_addend = 0;
- loongarch_elf_append_rela
- (output_bfd, htab->elf.srelgot, &outrel);
- }
- }
- }
- relocation = off + (is_ie ? ie_off : 0);
+ relocation = (got_off & (~(bfd_vma)1)) + (is_ie ? ie_off : 0);
+ }
break;
default:
@@ -2786,8 +2889,12 @@ loongarch_elf_relocate_section (bfd *output_bfd,
if (input_section->output_section->flags & SEC_DEBUGGING)
{
- LARCH_ASSERT (0, bfd_reloc_dangerous,
- "Seems dynamic linker not process sections 'SEC_DEBUGGING'.");
+ fatal = (loongarch_reloc_is_fatal
+ (info, input_bfd, input_section, rel, howto,
+ bfd_reloc_dangerous, is_undefweak, name,
+ "Seems dynamic linker not process "
+ "sections 'SEC_DEBUGGING'."));
+
break;
}
if (!is_dyn)
@@ -2798,7 +2905,6 @@ loongarch_elf_relocate_section (bfd *output_bfd,
info->flags |= DF_TEXTREL;
}
while (0);
-#undef LARCH_ASSERT
if (fatal)
break;
@@ -2997,7 +3103,6 @@ loongarch_elf_finish_dynamic_symbol (bfd *output_bfd,
}
else
{
- asection *plt;
/* For non-shared object, we can't use .got.plt, which
contains the real function address if we need pointer
equality. We load the GOT entry with the PLT entry. */
@@ -3447,15 +3552,17 @@ _loongarch_bfd_set_section_contents(bfd *abfd,
bfd_size_type conut)
{
- if (elf_elfheader(abfd)->e_flags ==0)
- if(abfd->arch_info->arch == bfd_arch_loongarch)
- if (abfd->arch_info->mach ==bfd_mach_loongarch32)
- elf_elfheader(abfd)->e_flags = EF_LARCH_ABI_LP32;
- else if (abfd->arch_info->mach ==bfd_mach_loongarch64)
- elf_elfheader(abfd)->e_flags = EF_LARCH_ABI_LP64;
- else
- return FALSE;
- return _bfd_elf_set_section_contents(abfd,section,location,offset,conut);
+ if (elf_elfheader(abfd)->e_flags == 0
+ && abfd->arch_info->arch == bfd_arch_loongarch)
+ {
+ if (abfd->arch_info->mach ==bfd_mach_loongarch32)
+ elf_elfheader(abfd)->e_flags = EF_LARCH_ABI_LP32;
+ else if (abfd->arch_info->mach ==bfd_mach_loongarch64)
+ elf_elfheader(abfd)->e_flags = EF_LARCH_ABI_LP64;
+ else
+ return FALSE;
+ }
+ return _bfd_elf_set_section_contents(abfd,section,location,offset,conut);
}
diff --git a/gas/config/loongarch-lex.l b/gas/config/loongarch-lex.l
index d88fc93a..55901dd6 100644
--- a/gas/config/loongarch-lex.l
+++ b/gas/config/loongarch-lex.l
@@ -2,6 +2,9 @@
%{
#include "as.h"
#include "loongarch-parse.h"
+/* Flex generates static functions "input" & "unput" which are not used. */
+#define YY_NO_INPUT
+#define YY_NO_UNPUT
%}
D [0-9]
diff --git a/gas/config/loongarch-parse.y b/gas/config/loongarch-parse.y
index aa7e51f5..51c862df 100644
--- a/gas/config/loongarch-parse.y
+++ b/gas/config/loongarch-parse.y
@@ -1,7 +1,7 @@
%{
#include "as.h"
#include "loongarch-parse.h"
-void yyerror(const char *s) {}
+static void yyerror(const char *s ATTRIBUTE_UNUSED) {}
extern int yylex (void);
extern void yy_scan_string (const char *);
extern void
@@ -25,6 +25,12 @@ is_const (struct reloc_info *info)
&& info->value.X_op == O_constant;
}
+int
+loongarch_parse_expr (const char *expr,
+ struct reloc_info *reloc_stack_top,
+ size_t max_reloc_num,
+ size_t *reloc_num,
+ offsetT *imm);
int
loongarch_parse_expr (const char *expr,
struct reloc_info *reloc_stack_top,
@@ -178,6 +184,7 @@ emit_unary (char op)
{
case '!':
top->type = BFD_RELOC_LARCH_SOP_NOT;
+ break;
default:
abort ();
}
diff --git a/gas/config/tc-loongarch.c b/gas/config/tc-loongarch.c
index fbcc7c1f..b8bf3510 100644
--- a/gas/config/tc-loongarch.c
+++ b/gas/config/tc-loongarch.c
@@ -274,32 +274,6 @@ my_getExpression (expressionS *ep, const char *str)
return ret;
}
-
-/* for compitable with MIPS pesudo insn like '.set reorder'
- but actually ignore them. */
-static void
-s_loongarch_set (int x ATTRIBUTE_UNUSED)
-{
- char *name = input_line_pointer, ch;
-
- while (!is_end_of_line[(unsigned char) *input_line_pointer])
- ++input_line_pointer;
- ch = *input_line_pointer;
- *input_line_pointer = '\0';
-
- if (strchr (name, ','))
- {
- /* Generic ".set" directive; use the generic handler. */
- *input_line_pointer = ch;
- input_line_pointer = name;
- s_set (0);
- return;
- }
-
- *input_line_pointer = ch;
- demand_empty_rest_of_line ();
-}
-
static void
s_loongarch_align (int arg)
{
@@ -419,7 +393,7 @@ extern int loongarch_parse_expr (const char *expr,
size_t max_reloc_num, size_t *reloc_num,
offsetT *imm_if_no_reloc);
-int
+static int
is_internal_label (const char *c_str)
{
do
@@ -1026,6 +1000,7 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
case BFD_RELOC_LARCH_SOP_PUSH_TLS_GOT:
if (fixP->fx_addsy)
S_SET_THREAD_LOCAL (fixP->fx_addsy);
+ /* Fall through. */
case BFD_RELOC_LARCH_SOP_PUSH_PCREL:
case BFD_RELOC_LARCH_SOP_PUSH_PLT_PCREL:
if (fixP->fx_addsy == NULL)
@@ -1326,17 +1301,10 @@ loongarch_handle_align (fragS *fragp)
and use zeroes otherwise. */
gas_assert (excess < 4);
fragp->fr_fix += excess;
- switch (excess)
- {
- case 3:
- *p++ = '\0';
- case 2:
- *p++ = '\0';
- case 1:
- *p++ = '\0';
- case 0:
- break;
- }
+
+
+ while (excess-- != 0)
+ *p++ = 0;
md_number_to_chars (p, opcode, size);
fragp->fr_var = size;
diff --git a/opcodes/loongarch-dis.c b/opcodes/loongarch-dis.c
index 888c55f5..a159bb68 100644
--- a/opcodes/loongarch-dis.c
+++ b/opcodes/loongarch-dis.c
@@ -2,6 +2,7 @@
#include "disassemble.h"
#include "opintl.h"
#include "opcode/loongarch.h"
+#include "libiberty.h"
#include <stdlib.h>
static const struct loongarch_opcode *
@@ -78,7 +79,8 @@ parse_loongarch_dis_options (const char *opts_in)
if (opts_in == NULL)
return 0;
- char opts[strlen (opts_in) + 1], *opt, *opt_end;
+ char *opts, *opt, *opt_end;
+ opts = xmalloc (strlen (opts_in) + 1);
strcpy (opts, opts_in);
for (opt = opt_end = opts; opt_end != NULL; opt = opt_end + 1)
@@ -88,6 +90,7 @@ parse_loongarch_dis_options (const char *opts_in)
if (parse_loongarch_dis_option (opt) != 0)
return -1;
}
+ free (opts);
return 0;
}
@@ -215,13 +218,14 @@ disassemble_one (insn_t insn, struct disassemble_info *info)
info->fprintf_func (info->stream, "%s", opc->name);
{
- char fake_args[strlen (opc->format) + 1];
+ char *fake_args = xmalloc (strlen (opc->format) + 1);
const char *fake_arg_strs[MAX_ARG_NUM_PLUS_2];
strcpy (fake_args, opc->format);
if (0 < loongarch_split_args_by_comma (fake_args, fake_arg_strs))
info->fprintf_func (info->stream, "\t");
info->private_data = &insn;
loongarch_foreach_args (opc->format, fake_arg_strs, dis_one_arg, info);
+ free (fake_args);
}
if (info->insn_type == dis_branch || info->insn_type == dis_condbranch
--
2.27.0
此处可能存在不合适展示的内容，页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容，可点击提交进行申诉，我们将尽快为您处理。
马建仓 AI 助手
