Merge changes between r17501 and r17530 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@17531 7b3dc134-2b1b-0410-93df-9e9f96275f8d

9 files changed, 18 insertions, 27 deletions

diff --git a/ports/sysdeps/m68k/coldfire/fpu/e_sqrt.c b/ports/sysdeps/m68k/coldfire/fpu/e_sqrt.c
index b6c67e89a..46934a969 100644
--- a/ports/sysdeps/m68k/coldfire/fpu/e_sqrt.c
+++ b/ports/sysdeps/m68k/coldfire/fpu/e_sqrt.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 double
 __ieee754_sqrt (double x)
diff --git a/ports/sysdeps/m68k/coldfire/fpu/e_sqrtf.c b/ports/sysdeps/m68k/coldfire/fpu/e_sqrtf.c
index e0481b805..6801b85b0 100644
--- a/ports/sysdeps/m68k/coldfire/fpu/e_sqrtf.c
+++ b/ports/sysdeps/m68k/coldfire/fpu/e_sqrtf.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 float
 __ieee754_sqrtf (float x)
diff --git a/ports/sysdeps/m68k/coldfire/fpu/fraiseexcpt.c b/ports/sysdeps/m68k/coldfire/fpu/fraiseexcpt.c
index c62ddaa01..8197545d8 100644
--- a/ports/sysdeps/m68k/coldfire/fpu/fraiseexcpt.c
+++ b/ports/sysdeps/m68k/coldfire/fpu/fraiseexcpt.c
@@ -13,9 +13,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <fenv.h>
 #include <float.h>
diff --git a/ports/sysdeps/m68k/coldfire/fpu/s_fabs.c b/ports/sysdeps/m68k/coldfire/fpu/s_fabs.c
index 45403cb17..e2f183777 100644
--- a/ports/sysdeps/m68k/coldfire/fpu/s_fabs.c
+++ b/ports/sysdeps/m68k/coldfire/fpu/s_fabs.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 double
 __fabs (double x)
diff --git a/ports/sysdeps/m68k/coldfire/fpu/s_fabsf.c b/ports/sysdeps/m68k/coldfire/fpu/s_fabsf.c
index 7622cc965..4a5928afd 100644
--- a/ports/sysdeps/m68k/coldfire/fpu/s_fabsf.c
+++ b/ports/sysdeps/m68k/coldfire/fpu/s_fabsf.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 float
 __fabsf (float x)
diff --git a/ports/sysdeps/m68k/coldfire/fpu/s_lrint.c b/ports/sysdeps/m68k/coldfire/fpu/s_lrint.c
index 81fae959b..b0d61e34f 100644
--- a/ports/sysdeps/m68k/coldfire/fpu/s_lrint.c
+++ b/ports/sysdeps/m68k/coldfire/fpu/s_lrint.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 long int
 __lrint (double x)
diff --git a/ports/sysdeps/m68k/coldfire/fpu/s_lrintf.c b/ports/sysdeps/m68k/coldfire/fpu/s_lrintf.c
index 87ae5e0b9..37c0e9652 100644
--- a/ports/sysdeps/m68k/coldfire/fpu/s_lrintf.c
+++ b/ports/sysdeps/m68k/coldfire/fpu/s_lrintf.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 long int
 __lrintf (float x)
diff --git a/ports/sysdeps/m68k/coldfire/fpu/s_rint.c b/ports/sysdeps/m68k/coldfire/fpu/s_rint.c
index 7be8bb6e2..5435798c1 100644
--- a/ports/sysdeps/m68k/coldfire/fpu/s_rint.c
+++ b/ports/sysdeps/m68k/coldfire/fpu/s_rint.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 double
 __rint (double x)
diff --git a/ports/sysdeps/m68k/coldfire/fpu/s_rintf.c b/ports/sysdeps/m68k/coldfire/fpu/s_rintf.c
index 2337d7440..4eae67857 100644
--- a/ports/sysdeps/m68k/coldfire/fpu/s_rintf.c
+++ b/ports/sysdeps/m68k/coldfire/fpu/s_rintf.c
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.  If not, see
+   <http://www.gnu.org/licenses/>.  */
 
 float
 __rintf (float x)