diff options
| author | Diego Novillo <dnovillo@google.com> | 2009-04-13 17:42:10 +0000 |
|---|---|---|
| committer | Diego Novillo <dnovillo@google.com> | 2009-04-13 17:42:10 +0000 |
| commit | e804d7c97ca701a06eff974372105a503b2dc0a6 (patch) | |
| tree | a052b653fc9aa6811abc801c4590c2de6f5709e5 /gcc/gthr-rtems.h | |
| parent | 1c1cc17bfce799b0b1885604dd59d343c4f36cc2 (diff) | |
Mainline merge @146001.
* configure.ac (ACX_PKGVERSION): Update revision merge string.
* configure: Regenerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/lto@146005 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/gthr-rtems.h')
| -rw-r--r-- | gcc/gthr-rtems.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gcc/gthr-rtems.h b/gcc/gthr-rtems.h index d15ad5e1976..c5bd52292cf 100644 --- a/gcc/gthr-rtems.h +++ b/gcc/gthr-rtems.h @@ -8,7 +8,7 @@ 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 2, or (at your option) any later +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 @@ -16,17 +16,14 @@ 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 COPYING. If not, write to the Free -Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301, USA. */ - -/* As a special exception, if you link this library with other files, - some of which are compiled with GCC, to produce an executable, - this library does not by itself cause the resulting executable - to be covered by the GNU General Public License. - This exception does not however invalidate any other reasons why - the executable file might be covered by the GNU General Public License. */ +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/>. */ #ifndef GCC_GTHR_RTEMS_H #define GCC_GTHR_RTEMS_H |