From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id D4D073858400; Mon, 18 Oct 2021 13:11:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D4D073858400 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-11] Fix merge of: amdgcn: fix up offload debug linking with LLVM 13 X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-11 X-Git-Oldrev: aa27a4619f987b722c3e33db2433a80f6ece53ad X-Git-Newrev: dd409835f568358a8f159edce94ad06a471dc59b Message-Id: <20211018131147.D4D073858400@sourceware.org> Date: Mon, 18 Oct 2021 13:11:47 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Oct 2021 13:11:47 -0000 https://gcc.gnu.org/g:dd409835f568358a8f159edce94ad06a471dc59b commit dd409835f568358a8f159edce94ad06a471dc59b Author: Tobias Burnus 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++) {