Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker

Conflicts:
	configure
	configure.in
	posix/glob/configure
	sysdeps/i386/sysdep.h
	sysdeps/ia64/configure
	sysdeps/mach/hurd/socket.c

18 files changed, 37 insertions, 55 deletions

diff --git a/mach/Machrules b/mach/Machrules
index 37693aec43..d211bce057 100644
--- a/mach/Machrules
+++ b/mach/Machrules
@@ -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/>.
 
 # Makefiles may define these variable before including this file:
 #	user-interfaces		Names of interfaces to put user stubs in for.
diff --git a/mach/Makefile b/mach/Makefile
index 314f2efcd9..ec33fa72d4 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -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/>.
 
 subdir := mach
 
diff --git a/mach/devstream.c b/mach/devstream.c
index 325e0ff898..0f515c2925 100644
--- a/mach/devstream.c
+++ b/mach/devstream.c
@@ -1,6 +1,6 @@
 /* stdio on a Mach device port.
    Translates \n to \r\n on output, echos and translates \r to \n on input.
-   Copyright (C) 1992,93,94,96,97,2000,2011 Free Software Foundation, Inc.
+   Copyright (C) 1992-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -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 <stdio.h>
 #include <mach.h>
diff --git a/mach/lock-intern.h b/mach/lock-intern.h
index a854ddcc59..84196b52cc 100644
--- a/mach/lock-intern.h
+++ b/mach/lock-intern.h
@@ -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/>.  */
 
 #ifndef _LOCK_INTERN_H
 #define	_LOCK_INTERN_H
diff --git a/mach/mach.h b/mach/mach.h
index 502db5ab29..61a8c1ffea 100644
--- a/mach/mach.h
+++ b/mach/mach.h
@@ -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/>.  */
 
 #ifndef	_MACH_H
 
diff --git a/mach/mach/mach_traps.h b/mach/mach/mach_traps.h
index 2d97baa88f..29ebbe9ba2 100644
--- a/mach/mach/mach_traps.h
+++ b/mach/mach/mach_traps.h
@@ -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/>.  */
 
 /* Declare the few Mach system calls (except mach_msg, in <mach/message.h>).
    This does not include the kernel RPC shortcut calls (in <mach-shortcuts.h>).
diff --git a/mach/mach/mig_support.h b/mach/mach/mig_support.h
index fdd43a67c7..83ea742bf8 100644
--- a/mach/mach/mig_support.h
+++ b/mach/mach/mig_support.h
@@ -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/>.  */
 
 /* Useful declarations and support functions for MiG-generated stubs.  */
 
diff --git a/mach/mach_init.c b/mach/mach_init.c
index 552d2685ff..6e69f12830 100644
--- a/mach/mach_init.c
+++ b/mach/mach_init.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 <mach.h>
 #include <mach/mig_support.h>
diff --git a/mach/mach_init.h b/mach/mach_init.h
index 38823d4180..5b015a6387 100644
--- a/mach/mach_init.h
+++ b/mach/mach_init.h
@@ -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/>.  */
 
 #ifndef	_MACH_INIT_H
 
diff --git a/mach/mig-alloc.c b/mach/mig-alloc.c
index 7324c659b4..ec465a1ccb 100644
--- a/mach/mig-alloc.c
+++ b/mach/mig-alloc.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 <mach.h>
 
diff --git a/mach/mig-dealloc.c b/mach/mig-dealloc.c
index 99c990636e..635db5ab74 100644
--- a/mach/mig-dealloc.c
+++ b/mach/mig-dealloc.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 <mach.h>
 
diff --git a/mach/mig-reply.c b/mach/mig-reply.c
index 3b02028858..3bfd9c16f0 100644
--- a/mach/mig-reply.c
+++ b/mach/mig-reply.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 <mach.h>
 
diff --git a/mach/msgserver.c b/mach/msgserver.c
index 9478ae1914..915a08868a 100644
--- a/mach/msgserver.c
+++ b/mach/msgserver.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/>.  */
 
 /* Based on CMU's mach_msg_server.c revision 2.4 of 91/05/14, and thus
    under the following copyright.  Rewritten by Roland McGrath (FSF)
diff --git a/mach/mutex-init.c b/mach/mutex-init.c
index 94b0332495..46ec114f79 100644
--- a/mach/mutex-init.c
+++ b/mach/mutex-init.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 <lock-intern.h>
 #include <cthreads.h>
diff --git a/mach/mutex-solid.c b/mach/mutex-solid.c
index 13f911fd32..025b3914e6 100644
--- a/mach/mutex-solid.c
+++ b/mach/mutex-solid.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 <lock-intern.h>
 #include <cthreads.h>
diff --git a/mach/setup-thread.c b/mach/setup-thread.c
index bf0bfa9e94..4422f7c3fc 100644
--- a/mach/setup-thread.c
+++ b/mach/setup-thread.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 <mach.h>
 #include <thread_state.h>
diff --git a/mach/spin-lock.h b/mach/spin-lock.h
index 1e9acf2c4d..624ee275bd 100644
--- a/mach/spin-lock.h
+++ b/mach/spin-lock.h
@@ -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/>.  */
 
 #ifndef _SPIN_LOCK_H
 #define _SPIN_LOCK_H
diff --git a/mach/spin-solid.c b/mach/spin-solid.c
index 3e3fbd4db2..0bd0a50350 100644
--- a/mach/spin-solid.c
+++ b/mach/spin-solid.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 <spin-lock.h>
 #include <mach/mach_traps.h>