diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-01-17 09:45:23 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-01-17 09:45:23 +0000 |
| commit | 4bd9a7f66699610e4f48322b4480387ffab89f44 (patch) | |
| tree | d6c8718a274ecd5e6876f38f9dada0ac13331eb1 /libgomp | |
| parent | e7d2a44099188b7912c7c10f27f8d24881c584b0 (diff) | |
| download | gcc-4bd9a7f66699610e4f48322b4480387ffab89f44.tar.gz | |
* plugin/hsa.h: Add GCC runtime library exception.
* plugin/hsa_ext_finalize.h: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244523 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 3 | ||||
| -rw-r--r-- | libgomp/plugin/hsa.h | 9 | ||||
| -rw-r--r-- | libgomp/plugin/hsa_ext_finalize.h | 9 |
3 files changed, 17 insertions, 4 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 0e04c7416d1..3708c3e7593 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,8 @@ 2017-01-17 Jakub Jelinek <jakub@redhat.com> + * plugin/hsa.h: Add GCC runtime library exception. + * plugin/hsa_ext_finalize.h: Likewise. + * plugin/configfrag.ac: For --without-cuda-driver don't initialize CUDA_DRIVER_INCLUDE nor CUDA_DRIVER_LIB. If both CUDA_DRIVER_INCLUDE and CUDA_DRIVER_LIB are empty and linking small diff --git a/libgomp/plugin/hsa.h b/libgomp/plugin/hsa.h index 077cafb6208..9b9c826520f 100644 --- a/libgomp/plugin/hsa.h +++ b/libgomp/plugin/hsa.h @@ -13,8 +13,13 @@ 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 +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, diff --git a/libgomp/plugin/hsa_ext_finalize.h b/libgomp/plugin/hsa_ext_finalize.h index 2ad9dfb7475..0b681579895 100644 --- a/libgomp/plugin/hsa_ext_finalize.h +++ b/libgomp/plugin/hsa_ext_finalize.h @@ -13,8 +13,13 @@ 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 +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, |