aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2009-08-23 19:10:25 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2009-08-23 19:10:25 +0000
commit1237f8f1c435bfa6cf9c5002b831be3f72cc7b54 (patch)
treeae677d00ff7f2b924be3eac08a76804187427dd1
parent2eba9355e08c800aecc157a2297ab874f7f12828 (diff)
downloadgcc-1237f8f1c435bfa6cf9c5002b831be3f72cc7b54.zip
gcc-1237f8f1c435bfa6cf9c5002b831be3f72cc7b54.tar.gz
gcc-1237f8f1c435bfa6cf9c5002b831be3f72cc7b54.tar.bz2
cshift0.c: Update license to GPL3+exception.
2009-08-23 Steven G. Kargl <kargl@gcc.gnu.org> * intrinsics/cshift0.c: Update license to GPL3+exception. * runtime/fpu.c: Add a GPL3+exception statement. From-SVN: r151038
-rw-r--r--libgfortran/ChangeLog5
-rw-r--r--libgfortran/intrinsics/cshift0.c25
-rw-r--r--libgfortran/runtime/fpu.c25
3 files changed, 40 insertions, 15 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 18c1b2b..a8e7766 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-23 Steven G. Kargl <kargl@gcc.gnu.org>
+
+ * intrinsics/cshift0.c: Update license to GPL3+exception.
+ * runtime/fpu.c: Add a GPL3+exception statement.
+
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.am (install-html, install-pdf): Remove.
diff --git a/libgfortran/intrinsics/cshift0.c b/libgfortran/intrinsics/cshift0.c
index 6adea76..b765803 100644
--- a/libgfortran/intrinsics/cshift0.c
+++ b/libgfortran/intrinsics/cshift0.c
@@ -2,31 +2,26 @@
Copyright 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
Contributed by Feng Wang <wf_cs@yahoo.com>
-This file is part of the GNU Fortran 95 runtime library (libgfortran).
+This file is part of the GNU Fortran runtime library (libgfortran).
Libgfortran 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 of the License, or (at your option) any later version.
-
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file into combinations with other programs,
-and to distribute those combinations without any restriction coming
-from the use of this file. (The General Public License restrictions
-do apply in other respects; for example, they cover modification of
-the file, and distribution when not linked into a combine
-executable.)
+version 3 of the License, or (at your option) any later version.
Libgfortran 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 libgfortran; see the file COPYING. If not,
-write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+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/>. */
#include "libgfortran.h"
#include <stdlib.h>
diff --git a/libgfortran/runtime/fpu.c b/libgfortran/runtime/fpu.c
index f81a3b0..ce745dd 100644
--- a/libgfortran/runtime/fpu.c
+++ b/libgfortran/runtime/fpu.c
@@ -1,3 +1,28 @@
+/* Set FPU mask.
+ Copyright 2005 Free Software Foundation, Inc.
+ Contributed by Francois-Xavier Coudert <coudert@clipper.ens.fr>
+
+This file is part of the GNU Fortran runtime library (libgfortran).
+
+Libgfortran 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 of the License, or (at your option) any later version.
+
+Libgfortran 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.
+
+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/>. */
+
#include "libgfortran.h"
/* We include the platform-dependent code. */