[gomp4] [nvptx] Don't explicitly pass "-lgomp" to the offload compiler (was: nvptx offloading linking)

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On Wed, 13 May 2015 22:11:36 +0200, I wrote:
> On Wed, 22 Apr 2015 17:08:26 +0200, Bernd Schmidt <bernds@codesourcery.com> wrote:
> > On 04/21/2015 05:58 PM, Jakub Jelinek wrote:
> > 
> > > suggests that while it is nice that when building nvptx accel compiler
> > > we build libgcc.a, libc.a, libm.a, libgfortran.a (and in the future hopefully libgomp.a),
> > > nothing attempts to link those in :(.
> > 
> > I have that fixed; I expect I'll get around to posting this at some 
> > point now that stage1 is open.
> 
> I have committed the following to gomp-4_0-branch in r223176.  [...]

>     	gcc/
>     	* config/nvptx/mkoffload.c [...]
>     	(main): [...] Add -lgomp.  [...]

> --- gcc/config/nvptx/mkoffload.c
> +++ gcc/config/nvptx/mkoffload.c

> @@ -983,47 +400,74 @@ main (int argc, char **argv)
>    obstack_ptr_grow (&argv_obstack, driver);
>    obstack_ptr_grow (&argv_obstack, "-xlto");
>    obstack_ptr_grow (&argv_obstack, target_ilp32 ? "-m32" : "-m64");
> -[...]
> +  obstack_ptr_grow (&argv_obstack, "-lgomp");

As argued in
<http://news.gmane.org/find-root.php?message_id=%3C87h9m9e1qj.fsf%40schwinge.name%3E>
(-fopenacc/-fopenmp in combination with the libgomp spec file), and now
verified, we don't actually need that (and I had omitted it from the
earlier trunk commit); now reflected on gomp-4_0-branch in r228495:

commit aee77cda31ea36c95020ea12da3d379d859a851b
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Mon Oct 5 16:04:23 2015 +0000

    [nvptx] Don't explicitly pass "-lgomp" to the offload compiler
    
    	gcc/
    	* config/nvptx/mkoffload.c (main): Don't explicitly pass "-lgomp"
    	to the offload compiler.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@228495 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog.gomp           |    5 +++++
 gcc/config/nvptx/mkoffload.c |    1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp
index 8a32190..a65e652 100644
--- gcc/ChangeLog.gomp
+++ gcc/ChangeLog.gomp
@@ -1,3 +1,8 @@
+2015-10-05  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* config/nvptx/mkoffload.c (main): Don't explicitly pass "-lgomp"
+	to the offload compiler.
+
 2015-10-01  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* builtins.c: Don't include gomp-constants.h.
diff --git gcc/config/nvptx/mkoffload.c gcc/config/nvptx/mkoffload.c
index c8ea8b1..e398b44 100644
--- gcc/config/nvptx/mkoffload.c
+++ gcc/config/nvptx/mkoffload.c
@@ -488,7 +488,6 @@ main (int argc, char **argv)
     default:
       gcc_unreachable ();
     }
-  obstack_ptr_grow (&argv_obstack, "-lgomp");
   char *collect_mkoffload_opts = getenv ("COLLECT_MKOFFLOAD_OPTIONS");
   if (collect_mkoffload_opts)
     {


GrÃÃe,
 Thomas

Attachment: signature.asc
Description: PGP signature