[gcc/devel/omp/gcc-11] Fix merge of: amdgcn: fix up offload debug linking with LLVM 13
Tobias Burnus
burnus@gcc.gnu.org
Mon Oct 18 13:11:47 GMT 2021
https://gcc.gnu.org/g:dd409835f568358a8f159edce94ad06a471dc59b
commit dd409835f568358a8f159edce94ad06a471dc59b
Author: Tobias Burnus <tobias@codesourcery.com>
Date: Mon Oct 18 15:07:19 2021 +0200
Fix merge of: amdgcn: fix up offload debug linking with LLVM 13
For some odd reasons (probably wrong merge conflict resolution),
one of the changes to config/gcn/mkoffload.c of
commit r11-9168-gcc84160c5f470b23b7aed4633f887df113b2675d
disappeared when merging origin/releases/gcc-11 into OG11.
Thus, apply I (re)applied it manually:
gcc/
* config/gcn/mkoffload.c (main): Just let the attribute flags
pass through.
Diff:
---
gcc/config/gcn/mkoffload.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/gcc/config/gcn/mkoffload.c b/gcc/config/gcn/mkoffload.c
index 8d2ff4bc129..2b8350e1653 100644
--- a/gcc/config/gcn/mkoffload.c
+++ b/gcc/config/gcn/mkoffload.c
@@ -1008,12 +1008,6 @@ main (int argc, char **argv)
obstack_ptr_grow (&cc_argv_obstack, "-xlto");
if (fopenmp)
obstack_ptr_grow (&cc_argv_obstack, "-mgomp");
- obstack_ptr_grow (&cc_argv_obstack,
- (elf_flags & EF_AMDGPU_XNACK
- ? "-mxnack" : "-mno-xnack"));
- obstack_ptr_grow (&cc_argv_obstack,
- (elf_flags & EF_AMDGPU_SRAM_ECC
- ? "-msram-ecc=on" : "-msram-ecc=off"));
for (int ix = 1; ix != argc; ix++)
{
More information about the Gcc-cvs
mailing list