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

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

25 files changed, 50 insertions, 75 deletions

diff --git a/libc/dlfcn/Makefile b/libc/dlfcn/Makefile
index edd297f7f..ea6f26509 100644
--- a/libc/dlfcn/Makefile
+++ b/libc/dlfcn/Makefile
@@ -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/>.
 
 include ../option-groups.mak
 
diff --git a/libc/dlfcn/dladdr.c b/libc/dlfcn/dladdr.c
index d0462b94f..d7eb169fa 100644
--- a/libc/dlfcn/dladdr.c
+++ b/libc/dlfcn/dladdr.c
@@ -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 <dlfcn.h>
 
diff --git a/libc/dlfcn/dladdr1.c b/libc/dlfcn/dladdr1.c
index 0f2b603f7..fec508335 100644
--- a/libc/dlfcn/dladdr1.c
+++ b/libc/dlfcn/dladdr1.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 <dlfcn.h>
 
diff --git a/libc/dlfcn/dlclose.c b/libc/dlfcn/dlclose.c
index 5a344f31c..b92611d3a 100644
--- a/libc/dlfcn/dlclose.c
+++ b/libc/dlfcn/dlclose.c
@@ -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 <dlfcn.h>
 #include <ldsodefs.h>
diff --git a/libc/dlfcn/dlerror.c b/libc/dlfcn/dlerror.c
index 7ea31d439..8138cc278 100644
--- a/libc/dlfcn/dlerror.c
+++ b/libc/dlfcn/dlerror.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 <dlfcn.h>
 #include <libintl.h>
diff --git a/libc/dlfcn/dlfcn.c b/libc/dlfcn/dlfcn.c
index 1ee225ba4..3ee447e0b 100644
--- a/libc/dlfcn/dlfcn.c
+++ b/libc/dlfcn/dlfcn.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 <dlfcn.h>
 
diff --git a/libc/dlfcn/dlfcn.h b/libc/dlfcn/dlfcn.h
index 6fab44fac..fc32dd4c6 100644
--- a/libc/dlfcn/dlfcn.h
+++ b/libc/dlfcn/dlfcn.h
@@ -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/>.  */
 
 #ifndef	_DLFCN_H
 #define	_DLFCN_H 1
diff --git a/libc/dlfcn/dlinfo.c b/libc/dlfcn/dlinfo.c
index e8585ea98..d26ebd9ee 100644
--- a/libc/dlfcn/dlinfo.c
+++ b/libc/dlfcn/dlinfo.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 <dlfcn.h>
 #include <link.h>
diff --git a/libc/dlfcn/dlmopen.c b/libc/dlfcn/dlmopen.c
index 0c6915493..a411cd8a1 100644
--- a/libc/dlfcn/dlmopen.c
+++ b/libc/dlfcn/dlmopen.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 <dlfcn.h>
 #include <errno.h>
diff --git a/libc/dlfcn/dlopen.c b/libc/dlfcn/dlopen.c
index e93a584e8..4b5517700 100644
--- a/libc/dlfcn/dlopen.c
+++ b/libc/dlfcn/dlopen.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 <dlfcn.h>
 #include <libintl.h>
diff --git a/libc/dlfcn/dlopenold.c b/libc/dlfcn/dlopenold.c
index 8dae1c40c..670119f00 100644
--- a/libc/dlfcn/dlopenold.c
+++ b/libc/dlfcn/dlopenold.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 <dlfcn.h>
 #include <stddef.h>
diff --git a/libc/dlfcn/dlsym.c b/libc/dlfcn/dlsym.c
index a656ca63c..71a54af43 100644
--- a/libc/dlfcn/dlsym.c
+++ b/libc/dlfcn/dlsym.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 <dlfcn.h>
 #include <stddef.h>
diff --git a/libc/dlfcn/dlvsym.c b/libc/dlfcn/dlvsym.c
index 9f12764e8..7aa1063a4 100644
--- a/libc/dlfcn/dlvsym.c
+++ b/libc/dlfcn/dlvsym.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 <dlfcn.h>
 #include <stddef.h>
diff --git a/libc/dlfcn/errmsg1.c b/libc/dlfcn/errmsg1.c
index f4a9a49e9..1dea8b892 100644
--- a/libc/dlfcn/errmsg1.c
+++ b/libc/dlfcn/errmsg1.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/>.  */
 
 #include <dlfcn.h>
 #include <stdio.h>
diff --git a/libc/dlfcn/errmsg1mod.c b/libc/dlfcn/errmsg1mod.c
index 8aa5166ce..fc21cf5c9 100644
--- a/libc/dlfcn/errmsg1mod.c
+++ b/libc/dlfcn/errmsg1mod.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/>.  */
 
 extern int bar (void);
 extern int foo (void);
diff --git a/libc/dlfcn/eval.c b/libc/dlfcn/eval.c
index e0b56624f..f40f5eab2 100644
--- a/libc/dlfcn/eval.c
+++ b/libc/dlfcn/eval.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 <assert.h>
 #include <ctype.h>
diff --git a/libc/dlfcn/glreflib1.c b/libc/dlfcn/glreflib1.c
index 44ad52572..e6bf7961f 100644
--- a/libc/dlfcn/glreflib1.c
+++ b/libc/dlfcn/glreflib1.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/>.  */
 
 extern int ref1 (void);
 int
diff --git a/libc/dlfcn/glreflib2.c b/libc/dlfcn/glreflib2.c
index b5630f1f0..dba8d5c28 100644
--- a/libc/dlfcn/glreflib2.c
+++ b/libc/dlfcn/glreflib2.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/>.  */
 
 extern int ref1 (void);
 
diff --git a/libc/dlfcn/glrefmain.c b/libc/dlfcn/glrefmain.c
index e113ef662..be024cf99 100644
--- a/libc/dlfcn/glrefmain.c
+++ b/libc/dlfcn/glrefmain.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 <dlfcn.h>
 #include <error.h>
diff --git a/libc/dlfcn/modatexit.c b/libc/dlfcn/modatexit.c
index 710953406..43c5aa48b 100644
--- a/libc/dlfcn/modatexit.c
+++ b/libc/dlfcn/modatexit.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/>.  */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libc/dlfcn/modcxaatexit.c b/libc/dlfcn/modcxaatexit.c
index 6bb1ddff6..bf4388ffc 100644
--- a/libc/dlfcn/modcxaatexit.c
+++ b/libc/dlfcn/modcxaatexit.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/>.  */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libc/dlfcn/tst-dladdr.c b/libc/dlfcn/tst-dladdr.c
index 35f40700f..1301b0d0f 100644
--- a/libc/dlfcn/tst-dladdr.c
+++ b/libc/dlfcn/tst-dladdr.c
@@ -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 <dlfcn.h>
 #include <errno.h>
diff --git a/libc/dlfcn/tst-dlinfo.c b/libc/dlfcn/tst-dlinfo.c
index 16355a1aa..931851b4c 100644
--- a/libc/dlfcn/tst-dlinfo.c
+++ b/libc/dlfcn/tst-dlinfo.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 <dlfcn.h>
 #include <stdio.h>
diff --git a/libc/dlfcn/tstatexit.c b/libc/dlfcn/tstatexit.c
index 710d222ea..ea590206a 100644
--- a/libc/dlfcn/tstatexit.c
+++ b/libc/dlfcn/tstatexit.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/>.  */
 
 #include <dlfcn.h>
 #include <stdio.h>
diff --git a/libc/dlfcn/tstcxaatexit.c b/libc/dlfcn/tstcxaatexit.c
index c8dd3b537..3bcca48a0 100644
--- a/libc/dlfcn/tstcxaatexit.c
+++ b/libc/dlfcn/tstcxaatexit.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/>.  */
 
 #include <dlfcn.h>
 #include <stdio.h>