27 files changed, 54 insertions, 27 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index f594addfcca..796e8a594eb 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -17,7 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* High-level class interface. */
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 6ddbc840710..b4fb8d26236 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* High-level class interface. */
diff --git a/gcc/cp/class.h b/gcc/cp/class.h
index 6f31e15ee83..f2c21735cc4 100644
--- a/gcc/cp/class.h
+++ b/gcc/cp/class.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* The following structure is used when comparing various alternatives
    for overloading.  The unsigned quantity `strikes.i' is used
diff --git a/gcc/cp/cp-tree.def b/gcc/cp/cp-tree.def
index f8a2fc7a596..7e817875470 100644
--- a/gcc/cp/cp-tree.def
+++ b/gcc/cp/cp-tree.def
@@ -18,7 +18,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+	Boston, MA 02111-1307, USA.  */
 
  
 /* Reference to the contents of an offset
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index e0d1a64402d..5c8cf70eb4f 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #ifndef _CP_TREE_H
 #define _CP_TREE_H
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index ee7c6abab94..579065f2160 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* This file contains the functions for converting C expressions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 0c79da3aa90..9f186e04402 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Process declarations and symbol lookup for C front end.
diff --git a/gcc/cp/decl.h b/gcc/cp/decl.h
index d0dfe8aac87..349a1621846 100644
--- a/gcc/cp/decl.h
+++ b/gcc/cp/decl.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* In grokdeclarator, distinguish syntactic contexts of declarators.  */
 enum decl_context
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 4fed546989d..c0ea837d3b2 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* Process declarations and symbol lookup for C front end.
diff --git a/gcc/cp/errfn.c b/gcc/cp/errfn.c
index 2f78164b146..a1782c93307 100644
--- a/gcc/cp/errfn.c
+++ b/gcc/cp/errfn.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
    
 #include "config.h"
 #include "tree.h"
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 91857246580..ce7b6e4bb58 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "tree.h"
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 34cf738ee50..261bf5758cb 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -18,7 +18,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* High-level class interface. */
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 27da793b1a7..7a16ef7c550 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include "config.h"
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index a70e95f888a..d131759afc6 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* High-level class interface. */
diff --git a/gcc/cp/input.c b/gcc/cp/input.c
index 378521ec675..7d05cff2d08 100644
--- a/gcc/cp/input.c
+++ b/gcc/cp/input.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* G++ needs to do enough saving and re-parsing of text that it is
    necessary to abandon the simple FILE* model and use a mechanism where
diff --git a/gcc/cp/lang-options.h b/gcc/cp/lang-options.h
index a22ec1d8c02..d551357c09c 100644
--- a/gcc/cp/lang-options.h
+++ b/gcc/cp/lang-options.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* This is the contribution to the `lang_options' array in gcc.c for
    g++.  */
diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
index 109dcf63c0c..fbb72c9ed97 100644
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* This is the contribution to the `default_compilers' array in gcc.c for
    g++.  */
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 2d5b8b6977d..828520b3cea 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* This file is the lexical analyzer for GNU C++.  */
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 7d06b02ad55..1e81ebfdaca 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -17,7 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #ifndef PARM_CAN_BE_ARRAY_TYPE
diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y
index 400cf1f0b37..dc60c106c60 100644
--- a/gcc/cp/parse.y
+++ b/gcc/cp/parse.y
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* This grammar is based on the GNU CC grammar.  */
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 2bf8edd99b9..6a4d4378d5b 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Known bugs or deficiencies include:
    * templates for class static data don't work (methods only)
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index 38e3c77aad7..84da4c67d70 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include "config.h"
diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c
index fa04bcd1361..50fc9f8b727 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* My strategy here is as follows:
 
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 55846c3050c..fbe55d1f32c 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -17,7 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* High-level class interface. */
 
diff --git a/gcc/cp/sig.c b/gcc/cp/sig.c
index 08657d43225..2a12cd3e38e 100644
--- a/gcc/cp/sig.c
+++ b/gcc/cp/sig.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 #include "config.h"
diff --git a/gcc/cp/spew.c b/gcc/cp/spew.c
index 68915a4cedb..b44bd417ae9 100644
--- a/gcc/cp/spew.c
+++ b/gcc/cp/spew.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 
 /* This file is the type analyzer for GNU C++.  To debug it, define SPEW_DEBUG
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 110f41e8c8b..5217de52e8f 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -16,7 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include <stdio.h>