diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d35cfa1ab10..2408c335e28 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,65 @@
+2006-02-05  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* g++.dg/charset/extern2.cc (foo): Declare as of type cost char*.
+	* g++.dg/charset/string.c (foo): Likewise.
+	* g++.dg/ext/builtin1.C (printf): Change first parameter type to
+	const char*
+	* g++.dg/ext/builtin2.C (printf): Likewise.
+	* g++.dg/init/new15.C (printf): Likewise.
+	* g++.dg/opt/pr17697-1.C (foo): Likewise.
+	* g++.dg/opt/pr17697-2.C (foo): Likewise.
+	* g++.dg/opt/pr17697-3.C (foo): Likewise.
+	* g++.dg/template/non-dependent4.C (temp): Likewise.
+	* g++.dg/opt/strength-reduce.C (C::a): Change type to const char*.
+	* g++.old-deja/g++.brendan/crash66.C (getopt): Change last
+	parameter type to const char*.
+	* g++.old-deja/g++.brendan/ptolemy1.C (InterpTableEntry::name):
+	Change type to const char*.
+	* g++.old-deja/g++.brendan/ptolemy2.C (InterpTableEntry::name):
+	Likewise. 
+	* g++.old-deja/g++.jason/default2.C (bar::memberfunction): Change
+	second parameter type to const char*.
+	* g++.old-deja/g++.jason/opeq.C (X::X): Likewise.
+	(Y::Y): Change parameter type to const char*.
+	* g++.old-deja/g++.jason/ref12.C (f): Likewise.
+	* g++.old-deja/g++.jason/report.C: Apply const correctness.
+	* g++.old-deja/g++.jason/rfg6.C (single, array): Likewise.
+	* g++.old-deja/g++.jason/rvalue1.C (main): Cast string literal to
+	(char*).
+	* g++.old-deja/g++.jason/scoping4.C (A::Ptr): Make a typedef to
+	const char*.
+	* g++.old-deja/g++.law/ctors17.C (X::X): Change last parameter
+	type to const char*.
+	* g++.old-deja/g++.law/ctors7.C (base_t::name, d1_t, d2_t): Change
+	return type to const char*.
+	* g++.old-deja/g++.law/dtors2.C (bla::bla): Change parameter type
+	to const char*.
+	* g++.old-deja/g++.law/operators3.C: Adjust for const correctness.
+	* g++.old-deja/g++.law/refs1.C: Likewise.
+	* g++.old-deja/g++.law/visibility1.C: Likewise.
+	* g++.old-deja/g++.law/visibility2.C: Likewise.
+	* g++.old-deja/g++.law/union1.C (op_to_charp::s): Change type to
+	const char*.
+	* g++.old-deja/g++.mike/bool2.C: Adjust for const correctness..
+	* g++.old-deja/g++.mike/net48.C: Likewise.
+	* g++.old-deja/g++.mike/p646.C: Likewise.
+	* g++.old-deja/g++.mike/p6746.C: Likewise.
+	* g++.old-deja/g++.mike/p700.C (mystrcpy): Change last parameter
+	type to const char*.
+	* g++.old-deja/g++.mike/p811.C (X::stringify): Match for
+	deprecated conversion warning.
+	* g++.old-deja/g++.other/init15.C (A::name): Change type to const
+	char*. 
+	* g++.old-deja/g++.other/inline12.C: Adjust for const correctness.
+	* g++.old-deja/g++.other/sibcall1.C (foo): Likewise.
+	* g++.old-deja/g++.pt/explicit8.C: Likewise.
+	* g++.old-deja/g++.pt/m6.C (xx): Likewise.
+	* g++.old-deja/g++.pt/m7.C (xx): Likewise.
+	* g++.old-deja/g++.pt/nontype3.C: Likewise.
+	* g++.old-deja/g++.pt/t39.C: Likewise.
+	* g++.old-deja/g++.robertl/eb106.C: Likewise.
+	* g++.old-deja/g++.robertl/ice990323-2.C: Likewise.
+
 2006-02-04  Thomas Koenig  <Thomas.Koenig@online.de>
 
 	PR fortran/25075
diff --git a/gcc/testsuite/g++.dg/charset/extern2.cc b/gcc/testsuite/g++.dg/charset/extern2.cc
index 3a8f4e82d7e..9a0c8503956 100644
--- a/gcc/testsuite/g++.dg/charset/extern2.cc
+++ b/gcc/testsuite/g++.dg/charset/extern2.cc
@@ -2,4 +2,4 @@
 /* { dg-do compile }
    { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "foobar" } } */
-extern "C" { char *foo = "foobar"; }
+extern "C" { const char* foo = "foobar"; }
diff --git a/gcc/testsuite/g++.dg/charset/string.c b/gcc/testsuite/g++.dg/charset/string.c
index f720773dd57..a09d39a2055 100644
--- a/gcc/testsuite/g++.dg/charset/string.c
+++ b/gcc/testsuite/g++.dg/charset/string.c
@@ -2,4 +2,4 @@
 /* { dg-do compile }
    { dg-require-iconv "IBM1047" }
    { dg-final { scan-assembler-not "string foobar" } } */
-char *foo = "string foobar";
+const char* foo = "string foobar";
diff --git a/gcc/testsuite/g++.dg/ext/builtin1.C b/gcc/testsuite/g++.dg/ext/builtin1.C
index 8a53fd6a315..9947c85bf79 100644
--- a/gcc/testsuite/g++.dg/ext/builtin1.C
+++ b/gcc/testsuite/g++.dg/ext/builtin1.C
@@ -5,6 +5,6 @@
 // { dg-options "" }
 // { dg-final { scan-assembler "fancy_printf" } }
 
-extern "C" int printf(char*, ...) __asm("_fancy_printf");
+extern "C" int printf(const char*, ...) __asm("_fancy_printf");
 
 void foo() { printf("abc"); }
diff --git a/gcc/testsuite/g++.dg/ext/builtin2.C b/gcc/testsuite/g++.dg/ext/builtin2.C
index c741c0ba98f..ffa25285b59 100644
--- a/gcc/testsuite/g++.dg/ext/builtin2.C
+++ b/gcc/testsuite/g++.dg/ext/builtin2.C
@@ -6,7 +6,7 @@
 // { dg-options "" }
 // { dg-final { scan-assembler "fancy_printf" } }
 
-extern "C" int printf(char*, ...) __asm("_fancy_printf");
+extern "C" int printf(const char*, ...) __asm("_fancy_printf");
 
 namespace std { using ::printf; }
 
diff --git a/gcc/testsuite/g++.dg/init/new15.C b/gcc/testsuite/g++.dg/init/new15.C
index 17cf8a80b68..b93b43c833f 100644
--- a/gcc/testsuite/g++.dg/init/new15.C
+++ b/gcc/testsuite/g++.dg/init/new15.C
@@ -1,6 +1,6 @@
 // PR c++/9782
 
-extern "C" void printf(char *, ...);
+extern "C" void printf(const char*, ...);
 
 template <int>
 struct A {
diff --git a/gcc/testsuite/g++.dg/opt/pr17697-1.C b/gcc/testsuite/g++.dg/opt/pr17697-1.C
index 0e2f671c629..50a75b84530 100644
--- a/gcc/testsuite/g++.dg/opt/pr17697-1.C
+++ b/gcc/testsuite/g++.dg/opt/pr17697-1.C
@@ -20,7 +20,7 @@ A::strcmp (const char *s, const char *t)
 }
 
 int
-foo (char *x) throw ()
+foo (const char *x) throw ()
 {
   return A::strcmp ("", x);
 }
diff --git a/gcc/testsuite/g++.dg/opt/pr17697-2.C b/gcc/testsuite/g++.dg/opt/pr17697-2.C
index 11def66acd5..4a746be3d01 100644
--- a/gcc/testsuite/g++.dg/opt/pr17697-2.C
+++ b/gcc/testsuite/g++.dg/opt/pr17697-2.C
@@ -20,7 +20,7 @@ A::strcmp (const char *s, const char *t) throw ()
 }
 
 int
-foo (char *x) throw ()
+foo (const char *x) throw ()
 {
   return A::strcmp ("", x);
 }
diff --git a/gcc/testsuite/g++.dg/opt/pr17697-3.C b/gcc/testsuite/g++.dg/opt/pr17697-3.C
index b1369d1a427..fa7cff0a49f 100644
--- a/gcc/testsuite/g++.dg/opt/pr17697-3.C
+++ b/gcc/testsuite/g++.dg/opt/pr17697-3.C
@@ -16,7 +16,7 @@ A::strcmp (const char *s, const char *t)
 }
 
 int
-foo (char *x)
+foo (const char *x)
 {
   return A::strcmp ("", x);
 }
diff --git a/gcc/testsuite/g++.dg/opt/strength-reduce.C b/gcc/testsuite/g++.dg/opt/strength-reduce.C
index 2dc6c01e853..3fee937f1c1 100644
--- a/gcc/testsuite/g++.dg/opt/strength-reduce.C
+++ b/gcc/testsuite/g++.dg/opt/strength-reduce.C
@@ -10,7 +10,7 @@ struct C
 {
   int foo (char ch, int offset = __INT_MAX__) const;
   int bar (int offset, char c) const;
-  char *a;
+   const char *a;
 };
 
 int C::bar (int offset, char c) const
diff --git a/gcc/testsuite/g++.dg/template/non-dependent4.C b/gcc/testsuite/g++.dg/template/non-dependent4.C
index 637aabae409..ff3a6eb2c90 100644
--- a/gcc/testsuite/g++.dg/template/non-dependent4.C
+++ b/gcc/testsuite/g++.dg/template/non-dependent4.C
@@ -1,4 +1,4 @@
-int temp(char *temp);
+int temp(const char *temp);
 
 template <int> int g() { return temp("Hi"); }
 int g1() { return temp("Hi"); }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash66.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash66.C
index 0f1d8919ebd..321c55130aa 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash66.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash66.C
@@ -93,7 +93,7 @@ ulong memsize;
 ulong compression_quality;		 
 char *compressfile;			 
 int debug_level;			 
-extern "C" int getopt (int, char**, char*);
+extern "C" int getopt (int, char**, const char*);
 int
 main(int argc, char** argv)
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy1.C b/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy1.C
index 4c7afeb2a43..c5987fce03c 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy1.C
@@ -12,7 +12,7 @@ public:
 typedef int (PTcl::*InterpFuncP)(int,char**);
 
 struct InterpTableEntry {
-	char* name;
+	const char* name;
 	InterpFuncP func;
 };
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C b/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C
index a8a0623210b..669bd791421 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C
@@ -17,7 +17,7 @@ public:
 typedef int (PTcl::*InterpFuncP)(int,char**);
 
 struct InterpTableEntry {
-	char* name;
+	const char* name;
 	InterpFuncP func;
 };
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/default2.C b/gcc/testsuite/g++.old-deja/g++.jason/default2.C
index 079ffab32a4..167ac635dbf 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/default2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/default2.C
@@ -15,7 +15,7 @@ class bar
 {
  public:
   bar();
-  int memberfunction(int i, char *j, double k, foo foo1 = foo(0));
+  int memberfunction(int i, const char *j, double k, foo foo1 = foo(0));
 };
 
 int
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/opeq.C b/gcc/testsuite/g++.old-deja/g++.jason/opeq.C
index 741b977489b..60fc5c1ae26 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/opeq.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/opeq.C
@@ -8,7 +8,7 @@ extern "C" int printf (const char *, ...);
 class Y 
 {
 public:
-    Y(char*) {}
+    Y(const char*) {}
     Y& operator = (const Y&) { return *this; }
 };
     
@@ -16,7 +16,7 @@ public:
 class X
 {
 public:
-    X(int v, char* m) : _v(v), _m (m) {}
+    X(int v, const char* m) : _v(v), _m (m) {}
     X () : _v(0), _m("Unknown") {}
     // Defining our own op= here makes things work correctly.
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/ref12.C b/gcc/testsuite/g++.old-deja/g++.jason/ref12.C
index 31b3f3c023e..a604055fc5f 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/ref12.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/ref12.C
@@ -1,5 +1,5 @@
 // { dg-do run  }
-void f (char *const &) { }
+void f (const char *const &) { }
 int main ()
 {
   f ("hi");
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/report.C b/gcc/testsuite/g++.old-deja/g++.jason/report.C
index c1b9a57bbb0..77fd7c32d8c 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/report.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/report.C
@@ -21,14 +21,14 @@ struct A
   operator int () { return a; }
 };
 
-extern "C" int atoi (char *);
+extern "C" int atoi (const char *);
 
-int (*fee)(char *) = atoi;
-int (**bar)(char *) = &fee;
+int (*fee)(const char *) = atoi;
+int (**bar)(const char *) = &fee;
 
-char *s = "4";
-char **sp = &s;
-char ***spp = &sp;
+const char* s = "4";
+const char** sp = &s;
+const char*** spp = &sp;
 
 int foo (int a = (**bar) (s))
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/rfg6.C b/gcc/testsuite/g++.old-deja/g++.jason/rfg6.C
index fa422d302b4..c2bca4554fa 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/rfg6.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/rfg6.C
@@ -1,4 +1,4 @@
 // { dg-do assemble  }
 
-wchar_t *single  =   L"xyz"  ;
-wchar_t *(array[]) = { L"xyz" };
+const wchar_t *single  =   L"xyz"  ;
+const wchar_t *(array[]) = { L"xyz" };
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/rvalue1.C b/gcc/testsuite/g++.old-deja/g++.jason/rvalue1.C
index c3afd36fb63..277d594b818 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/rvalue1.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/rvalue1.C
@@ -48,5 +48,5 @@ Class1 :: Class1 (const String & constStringRef)
 
 int main(void)
 {
-  Class1 *class1 = new Class1("Hi!");
+  Class1 *class1 = new Class1((char*) "Hi!");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/scoping4.C b/gcc/testsuite/g++.old-deja/g++.jason/scoping4.C
index 54f5b67b755..c32b4a66022 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/scoping4.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/scoping4.C
@@ -4,7 +4,7 @@
 
 class A {
 public:
-  typedef char * Ptr;
+  typedef const char * Ptr;
   Ptr s;
   Ptr get_string();
   A(Ptr string); // { s = string; };
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors17.C b/gcc/testsuite/g++.old-deja/g++.law/ctors17.C
index fb1d3f46686..1cee3082595 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors17.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors17.C
@@ -11,7 +11,7 @@
 
 class X : public std::ifstream { // { dg-error "" } candidate
     public:
-      X(int a, char *b) {} // { dg-error "" } candidate
+      X(int a, const char *b) {} // { dg-error "" } candidate
 };
 int main()
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors7.C b/gcc/testsuite/g++.old-deja/g++.law/ctors7.C
index 22f63db24c9..d2e0ef30999 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors7.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors7.C
@@ -8,7 +8,7 @@
 
 class base_t {
 public:
-   virtual char *name () { return "base_t"; }
+   virtual const char* name () { return "base_t"; }
 
    base_t ();
    virtual ~base_t ();
@@ -16,7 +16,7 @@ public:
 
 class d1_t : public base_t {
 public:
-   virtual char *name () { return "d1_t"; }
+   virtual const char* name () { return "d1_t"; }
 
    //   The const keyword on this constructor is an error,  but  it shouldn't
    // cause the compiler to crash.
@@ -27,7 +27,7 @@ public:
 
 class d2_t : public base_t {
 public:
-   virtual char *name () { return "d2_t"; }
+   virtual const char* name () { return "d2_t"; }
 
    d2_t (int);
    virtual ~d2_t ();
diff --git a/gcc/testsuite/g++.old-deja/g++.law/dtors2.C b/gcc/testsuite/g++.old-deja/g++.law/dtors2.C
index 7d8af475ba8..a630f9db4aa 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/dtors2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/dtors2.C
@@ -8,7 +8,7 @@ class bla {
 
 public:
 
-        inline bla(char * jim) { ; };
+        inline bla(const char * jim) { ; };
 
         inline ~bla() { destruct++; if (destruct == 2) printf ("PASS\n");};
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators3.C b/gcc/testsuite/g++.old-deja/g++.law/operators3.C
index d2e14d7477a..38c75b66341 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators3.C
@@ -10,13 +10,13 @@ class BUG1
 {
   public:
 
-    operator char*() const { return myData; }
-    char* myData;
+    operator const char*() const { return myData; }
+    const char* myData;
 };
 
 void bug1()
 {
   BUG1 bug1;
   bug1.myData = "0123456789";
-  char* s = bug1 + 1;
+  const char* s = bug1 + 1;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/refs1.C b/gcc/testsuite/g++.old-deja/g++.law/refs1.C
index 066c607045a..d6dd21c2724 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/refs1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/refs1.C
@@ -10,13 +10,13 @@
 
 class C {
 private:
-   char** list;
+   const char** list;
 public:
-   C(char** );
+   C(const char** );
    void count (int&);
 };
 
-C::C (char** l) {
+C::C (const char** l) {
    list = l;
 }
 
@@ -29,7 +29,7 @@ void C::count (int& total) {
    }
 }
 
-char * foo[] = {
+const char * foo[] = {
    "one", "two", "three", NULL};
 
 int main() {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/union1.C b/gcc/testsuite/g++.old-deja/g++.law/union1.C
index 5c97ae70e3b..9d700499dae 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/union1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/union1.C
@@ -10,7 +10,7 @@ typedef enum { BADBINOP = 0, PLUS, MINUS, MULT, DIV, POWR } binoptype;
 typedef enum { BADUNOP = 0, NEG = POWR+1, SIN, COS, TAN } unoptype;
 
 typedef struct {
-  char *s;
+  const char *s;
   union {
     binoptype bop;
     unoptype uop;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility1.C b/gcc/testsuite/g++.old-deja/g++.law/visibility1.C
index 66ce881c13f..02bfb2e5dfe 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility1.C
@@ -7,20 +7,20 @@
 class base {
 //==========
 
-    void base_priv(char * n) 		
+    void base_priv(const char * n) 		
 	{ std::cout << "base_priv called from: " << n << "\n";  };
 
 protected:
 
-    void base_prot(char * n) 
+    void base_prot(const char * n) 
 	{ std::cout << "base_prot called from: " << n << "\n"; };
 
 public:
 
-    void base_publ(char * n) 
+    void base_publ(const char * n) 
 	{ std::cout << "base_publ called from: " << n << "\n"; };
 
-    void test(char * n) { base_publ(n); base_prot(n); base_priv(n); }
+    void test(const char * n) { base_publ(n); base_prot(n); base_priv(n); }
 
 }; // class base
  
@@ -33,7 +33,7 @@ friend void derived_friend();
 
 public :
 
-    void test(char * n) { base_publ(n); base_prot(n);}
+    void test(const char * n) { base_publ(n); base_prot(n);}
 
 }; // class derived
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility2.C b/gcc/testsuite/g++.old-deja/g++.law/visibility2.C
index 781846f3b99..42d267368ce 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility2.C
@@ -7,20 +7,20 @@
 class base {
 //==========
 
-    void base_priv(char * n) 		
+    void base_priv(const char * n) 		
 	{ std::cout << "base_priv called from: " << n << "\n";  };
 
 protected:
 
-    void base_prot(char * n) 
+    void base_prot(const char * n) 
 	{ std::cout << "base_prot called from: " << n << "\n"; };
 
 public:
 
-    void base_publ(char * n) 
+    void base_publ(const char * n) 
 	{ std::cout << "base_publ called from: " << n << "\n"; };
 
-    void test(char * n) { base_publ(n); base_prot(n); base_priv(n); }
+    void test(const char * n) { base_publ(n); base_prot(n); base_priv(n); }
 
 }; // class base
  
@@ -33,7 +33,7 @@ friend void derived_friend();
 
 public :
 
-    void test(char * n) { base_publ(n); base_prot(n);}
+    void test(const char * n) { base_publ(n); base_prot(n);}
 
 }; // class derived
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/bool2.C b/gcc/testsuite/g++.old-deja/g++.mike/bool2.C
index 4bf13a2c4c0..3d8bc3c03eb 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/bool2.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/bool2.C
@@ -14,7 +14,7 @@ public:
 } a1;
 class A2 {
 public:
-  operator char * () {
+  operator const char * () {
     return "";
   }
 } a2;
@@ -26,7 +26,7 @@ public:
 } a3;
 class A4 {
 public:
-  operator char * () {
+  operator const char * () {
     return "";
   }
   operator unsigned long long int () {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net48.C b/gcc/testsuite/g++.old-deja/g++.mike/net48.C
index bc0220ab7e9..2553fab1dfc 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net48.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net48.C
@@ -1,14 +1,14 @@
 // { dg-do assemble  }
 
-char *a="aź";
+const char *a="aź";
 
 class A
 {
 public:
 	A()
 	{
-		char *b="aź";
+		const char *b="aź";
 	}
 };
 
-char *c="aź";
+const char *c="aź";
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p646.C b/gcc/testsuite/g++.old-deja/g++.mike/p646.C
index 3fdcd41aece..4f7807d1160 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p646.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p646.C
@@ -90,7 +90,7 @@ foo_parm_returns_foo (foo f)
 }
 
 void
-abort_because (char *str)
+abort_because (const char *str)
 {
   printf ("aborting because %s\n", str);
   abort ();
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p6746.C b/gcc/testsuite/g++.old-deja/g++.mike/p6746.C
index 11829f89f7d..09809a8017c 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p6746.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p6746.C
@@ -3,7 +3,7 @@
 
 class call_trace {
 public:
-  call_trace(char* fcn_name);
+  call_trace(const char* fcn_name);
   ~call_trace();
 };
 
@@ -11,7 +11,7 @@ static char * last_tree;
 extern "C" void prt();
 
 char * smt_mark_stree() {
-  char* _my_name = "smt_mark_stree" ; 
+  const char* _my_name = "smt_mark_stree" ; 
   call_trace _t(_my_name);
 
   return last_tree = 0 ? (char*)0 : (prt(), (char*)0);
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p700.C b/gcc/testsuite/g++.old-deja/g++.mike/p700.C
index 106a497d040..5541bec08d1 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p700.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p700.C
@@ -2097,7 +2097,7 @@ Enumeration Func1(CapitalLetter	CharPar1, CapitalLetter	CharPar2);
 boolean Func2(String30	StrParI1, String30	StrParI2);
 boolean Func3(Enumeration	EnumParIn);
 
-void mystrcpy(String30 s, char* t)
+void mystrcpy(String30 s, const char* t)
 {
   for (; *t != '\0'; ++s, ++t) *s = *t;
   *s = '\0';
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p811.C b/gcc/testsuite/g++.old-deja/g++.mike/p811.C
index 260c6459cb8..7097eeec03e 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p811.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p811.C
@@ -525,7 +525,7 @@ public:
 char *
 X::stringify() const  // { dg-error "does not match" }
 {
-    return "stringify";
+    return "stringify";         // { dg-warning "deprecated" }
 }
 
 const char *
diff --git a/gcc/testsuite/g++.old-deja/g++.other/init15.C b/gcc/testsuite/g++.old-deja/g++.other/init15.C
index a84bfa1d377..022f2ef9807 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/init15.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/init15.C
@@ -7,7 +7,7 @@
 // to fall over.
 
 struct A {
-  char *name;
+  const char *name;
   int reserved;
   int a;
   int b;
diff --git a/gcc/testsuite/g++.old-deja/g++.other/inline12.C b/gcc/testsuite/g++.old-deja/g++.other/inline12.C
index 064827dedf6..c91845c411e 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/inline12.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/inline12.C
@@ -62,10 +62,10 @@ class ShBop
  public:
   inline ShBop(const ShBe* theBe);
   void            shWw(bool,
-                                char* a1 = "",
-                                char* a2 = "",
+                                const char* a1 = "",
+                                const char* a2 = "",
                                 int   a3 = -1,
-                                char* a4 = "foo");
+                                const char* a4 = "foo");
   typedef enum { shOk,
                  shFailed,
                  shDone,
diff --git a/gcc/testsuite/g++.old-deja/g++.other/sibcall1.C b/gcc/testsuite/g++.old-deja/g++.other/sibcall1.C
index 7b5a82b78e7..fa9e37b378c 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/sibcall1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/sibcall1.C
@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-std::ostream& foo (char *x, std::ostream &y)
+std::ostream& foo (const char *x, std::ostream &y)
 {
   return y << "" << x;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/explicit8.C b/gcc/testsuite/g++.old-deja/g++.pt/explicit8.C
index 6fdb01d24d8..3a75aa0dbb5 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/explicit8.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/explicit8.C
@@ -8,6 +8,6 @@ void foo(double, U) {}
 
 void baz()
 {
-  foo<char*>(3.0, "abc");
-  foo<char*, double>("abc", 3.0);
+  foo<const char*>(3.0, "abc");
+  foo<const char*, double>("abc", 3.0);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/m6.C b/gcc/testsuite/g++.old-deja/g++.pt/m6.C
index 8de211c1220..24c65b22a4e 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/m6.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/m6.C
@@ -2,7 +2,7 @@
 
 struct B { struct A { A(); int a; } aa; };
 B::A::A () { a = 37; }
-char* xx[] = {
+const char* xx[] = {
 "../tests/m6.cc:1: warning: return type specification for constructor invalid",
 "../tests/m6.cc:2: semicolon missing after declaration of `A'",
 "../tests/m6.cc:2: warning: empty declaration",
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/m7.C b/gcc/testsuite/g++.old-deja/g++.pt/m7.C
index 1615a4916de..4c7fdd5e947 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/m7.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/m7.C
@@ -2,7 +2,7 @@
 
 struct B { struct A { A(); int a; }; A aa; };
 B::A::A () { a = 37; }
-char *xx[]= {"/*",
+const char *xx[]= {"/*",
 "../tests/m7.cc:1: warning: return type specification for constructor invalid",
 "../tests/m7.cc: In function struct A A ():",
 "../tests/m7.cc:2: `a' undeclared (first use this function)",
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/nontype3.C b/gcc/testsuite/g++.old-deja/g++.pt/nontype3.C
index 88904a84e56..f48d00010f4 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/nontype3.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/nontype3.C
@@ -5,7 +5,7 @@ enum E { e };
 template <const E* ep>
 struct S1
 {
-  static char* s;
+  static const char* s;
 };
 
 template <int D>
@@ -25,4 +25,4 @@ struct S3
 E S2<1>::es[1] = {e};
 
 template <>
-char* S1<S2<1>::es>::s = "abc";
+const char* S1<S2<1>::es>::s = "abc";
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/t39.C b/gcc/testsuite/g++.old-deja/g++.pt/t39.C
index 82b584c2fb1..8f9bead3a71 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/t39.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/t39.C
@@ -16,7 +16,7 @@ void frob<T>::print () {
 }
 
   static int x[10];
-  frob<char> fc ("hello");
+  frob<const char> fc ("hello");
   frob<int> fi (x);
 
 int main () {
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb106.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb106.C
index 9fa686e1313..b341cff5502 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb106.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb106.C
@@ -2,7 +2,7 @@
 // { dg-options "-O2 -fPIC " }
 struct T
 {
-	char*	f1;
+	const char*	f1;
 	int	f2;
 };
 
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/ice990323-2.C b/gcc/testsuite/g++.old-deja/g++.robertl/ice990323-2.C
index 6ba0f05485a..cefef775062 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/ice990323-2.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/ice990323-2.C
@@ -5,7 +5,7 @@ extern "C" void exit (int);
 
 template <class T, int n, class U> struct A {
 	A() {}
-	A(char*) {}
+	A(const char*) {}
 };
 
 void f1()