diff mbox

Allow building GCC with PTX offloading even without CUDA being installed (gcc and nvptx-tools patches)

Message ID 20170113182829.GB1867@tucnak
State New
Headers show

Commit Message

Jakub Jelinek Jan. 13, 2017, 6:28 p.m. UTC 
On Fri, Jan 13, 2017 at 06:19:02PM +0000, Joseph Myers wrote:
> > --- libgomp/plugin/cuda/cuda.h.jj	2017-01-13 15:58:00.966544147 +0100
> > +++ libgomp/plugin/cuda/cuda.h	2017-01-13 17:02:47.355817896 +0100
> > @@ -0,0 +1,174 @@
> > +/* CUDA API description.
> > +   Copyright (C) 2017 Free Software Foundation, Inc.
> > +
> > +This file is part of GCC.
> > +
> > +GCC is free software; you can redistribute it and/or modify
> > +it under the terms of the GNU General Public License as published by
> > +the Free Software Foundation; either version 3, or (at your option)
> > +any later version.
> > +
> > +GCC is distributed in the hope that it will be useful,
> > +but WITHOUT ANY WARRANTY; without even the implied warranty of
> > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > +GNU General Public License for more details.
> > +
> > +You should have received a copy of the GNU General Public License
> > +along with GCC; see the file COPYING3.  If not see
> > +<http://www.gnu.org/licenses/>.
> 
> The new file should presumably have the runtime license exception.

Agreed (though, most likely the file isn't copyrightable anyway, but
we use copyright boilerplate for various files that might not be
copyrightable).  But we should use it not just for cuda.h, but also
for hsa.h and hsa_ext_finalize.h (CCing Martin who has added those).

2017-01-13  Jakub Jelinek  <jakub@redhat.com>

	* plugin/cuda/cuda.h: Add GCC runtime library exception.
	* plugin/hsa.h: Likewise.
	* plugin/hsa_ext_finalize.h: Likewise.



	Jakub

Comments

Jeff Law Jan. 16, 2017, 7:23 p.m. UTC | #1 
On 01/13/2017 11:28 AM, Jakub Jelinek wrote:
> On Fri, Jan 13, 2017 at 06:19:02PM +0000, Joseph Myers wrote:
>>> --- libgomp/plugin/cuda/cuda.h.jj	2017-01-13 15:58:00.966544147 +0100
>>> +++ libgomp/plugin/cuda/cuda.h	2017-01-13 17:02:47.355817896 +0100
>>> @@ -0,0 +1,174 @@
>>> +/* CUDA API description.
>>> +   Copyright (C) 2017 Free Software Foundation, Inc.
>>> +
>>> +This file is part of GCC.
>>> +
>>> +GCC is free software; you can redistribute it and/or modify
>>> +it under the terms of the GNU General Public License as published by
>>> +the Free Software Foundation; either version 3, or (at your option)
>>> +any later version.
>>> +
>>> +GCC is distributed in the hope that it will be useful,
>>> +but WITHOUT ANY WARRANTY; without even the implied warranty of
>>> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>>> +GNU General Public License for more details.
>>> +
>>> +You should have received a copy of the GNU General Public License
>>> +along with GCC; see the file COPYING3.  If not see
>>> +<http://www.gnu.org/licenses/>.
>>
>> The new file should presumably have the runtime license exception.
>
> Agreed (though, most likely the file isn't copyrightable anyway, but
> we use copyright boilerplate for various files that might not be
> copyrightable).  But we should use it not just for cuda.h, but also
> for hsa.h and hsa_ext_finalize.h (CCing Martin who has added those).
>
> 2017-01-13  Jakub Jelinek  <jakub@redhat.com>
>
> 	* plugin/cuda/cuda.h: Add GCC runtime library exception.
> 	* plugin/hsa.h: Likewise.
> 	* plugin/hsa_ext_finalize.h: Likewise.
Yea, seems like an oversight.  Certainly the intention is that using 
cuda & hsa in and of itself doesn't require the resulting executable to 
be GPL licensed.

jeff
diff mbox

Patch

--- libgomp/plugin/cuda/cuda.h.jj	2017-01-13 17:02:47.000000000 +0100
+++ libgomp/plugin/cuda/cuda.h	2017-01-13 19:21:06.307547518 +0100
@@ -13,8 +13,13 @@  but WITHOUT ANY WARRANTY; without even t
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 <http://www.gnu.org/licenses/>.
 
 This header provides the minimum amount of typedefs, enums and function
--- libgomp/plugin/hsa.h.jj	2017-01-13 12:07:56.000000000 +0100
+++ libgomp/plugin/hsa.h	2017-01-13 19:21:37.230153569 +0100
@@ -13,8 +13,13 @@  but WITHOUT ANY WARRANTY; without even t
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 <http://www.gnu.org/licenses/>.
 
 The contents of the file was created by extracting data structures, enum,
--- libgomp/plugin/hsa_ext_finalize.h.jj	2017-01-13 12:07:56.000000000 +0100
+++ libgomp/plugin/hsa_ext_finalize.h	2017-01-13 19:22:05.388794833 +0100
@@ -13,8 +13,13 @@  but WITHOUT ANY WARRANTY; without even t
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 <http://www.gnu.org/licenses/>.
 
 The contents of the file was created by extracting data structures, enum,