Merge changes between r17050 and r17194 from /fsf/trunk.

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

9 files changed, 18 insertions, 27 deletions

diff --git a/libc/sysdeps/i386/i686/fpu/s_fdim.S b/libc/sysdeps/i386/i686/fpu/s_fdim.S
index 30ecff4e7..04b5aa6be 100644
--- a/libc/sysdeps/i386/i686/fpu/s_fdim.S
+++ b/libc/sysdeps/i386/i686/fpu/s_fdim.S
@@ -14,9 +14,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 <sysdep.h>
 
diff --git a/libc/sysdeps/i386/i686/fpu/s_fdimf.S b/libc/sysdeps/i386/i686/fpu/s_fdimf.S
index 888df14b6..71a6159a2 100644
--- a/libc/sysdeps/i386/i686/fpu/s_fdimf.S
+++ b/libc/sysdeps/i386/i686/fpu/s_fdimf.S
@@ -14,9 +14,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 <sysdep.h>
 
diff --git a/libc/sysdeps/i386/i686/fpu/s_fdiml.S b/libc/sysdeps/i386/i686/fpu/s_fdiml.S
index cb0e26e36..d119cae56 100644
--- a/libc/sysdeps/i386/i686/fpu/s_fdiml.S
+++ b/libc/sysdeps/i386/i686/fpu/s_fdiml.S
@@ -14,9 +14,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 <sysdep.h>
 
diff --git a/libc/sysdeps/i386/i686/fpu/s_fmax.S b/libc/sysdeps/i386/i686/fpu/s_fmax.S
index b28226987..6c7060ced 100644
--- a/libc/sysdeps/i386/i686/fpu/s_fmax.S
+++ b/libc/sysdeps/i386/i686/fpu/s_fmax.S
@@ -14,9 +14,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 <sysdep.h>
 
diff --git a/libc/sysdeps/i386/i686/fpu/s_fmaxf.S b/libc/sysdeps/i386/i686/fpu/s_fmaxf.S
index fbf3e5bff..0054c78d7 100644
--- a/libc/sysdeps/i386/i686/fpu/s_fmaxf.S
+++ b/libc/sysdeps/i386/i686/fpu/s_fmaxf.S
@@ -14,9 +14,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 <sysdep.h>
 
diff --git a/libc/sysdeps/i386/i686/fpu/s_fmaxl.S b/libc/sysdeps/i386/i686/fpu/s_fmaxl.S
index 229febf52..5dcb9704a 100644
--- a/libc/sysdeps/i386/i686/fpu/s_fmaxl.S
+++ b/libc/sysdeps/i386/i686/fpu/s_fmaxl.S
@@ -14,9 +14,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 <sysdep.h>
 
diff --git a/libc/sysdeps/i386/i686/fpu/s_fmin.S b/libc/sysdeps/i386/i686/fpu/s_fmin.S
index d821cda2f..23cd233c6 100644
--- a/libc/sysdeps/i386/i686/fpu/s_fmin.S
+++ b/libc/sysdeps/i386/i686/fpu/s_fmin.S
@@ -14,9 +14,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 <sysdep.h>
 
diff --git a/libc/sysdeps/i386/i686/fpu/s_fminf.S b/libc/sysdeps/i386/i686/fpu/s_fminf.S
index 8ef12035e..19c85ff3e 100644
--- a/libc/sysdeps/i386/i686/fpu/s_fminf.S
+++ b/libc/sysdeps/i386/i686/fpu/s_fminf.S
@@ -14,9 +14,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 <sysdep.h>
 
diff --git a/libc/sysdeps/i386/i686/fpu/s_fminl.S b/libc/sysdeps/i386/i686/fpu/s_fminl.S
index e158ff895..b2cffc03f 100644
--- a/libc/sysdeps/i386/i686/fpu/s_fminl.S
+++ b/libc/sysdeps/i386/i686/fpu/s_fminl.S
@@ -14,9 +14,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 <sysdep.h>