Centralize printing "<optimized out>".

	gdb/
	* valprint.h (val_print_optimized_out): Declare.
	* cp-valprint.c (cp_print_value_fields): Use
	val_print_optimized_out.
	* jv-valprint.c (java_print_value_fields): Ditto.
	* p-valprint.c (pascal_object_print_value_fields): Ditto.
	* printcmd.c (print_formatted): Ditto.
	* valprint.c (valprint_check_validity): Ditto.
	(value_check_printable): Ditto.
	(val_print_optimized_out): New.

	gdb/doc/
	* gdb.texinfo: s/value optimized out/optimized out/g

	gdb/testsuite/
	* gdb.base/frame-args.exp: Adjust.
	* gdb.dwarf2/dw2-noloc.exp: Adjust.
	* gdb.dwarf2/dw2-inline-param.exp: Adjust.
	* gdb.dwarf2/pieces.exp: Adjust.
	* gdb.opt/clobbered-registers-O2.exp: Adjust.
	* gdb.opt/inline-locals.exp: Adjust.
	* gdb.threads/fork-child-threads.exp: Adjust.

8 files changed, 31 insertions, 21 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f1d5911..5219de1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-25  Pedro Alves  <pedro@codesourcery.com>
+
+	* gdb.base/frame-args.exp: Adjust.
+	* gdb.dwarf2/dw2-noloc.exp: Adjust.
+	* gdb.dwarf2/dw2-inline-param.exp: Adjust.
+	* gdb.dwarf2/pieces.exp: Adjust.
+	* gdb.opt/clobbered-registers-O2.exp: Adjust.
+	* gdb.opt/inline-locals.exp: Adjust.
+	* gdb.threads/fork-child-threads.exp: Adjust.
+
 2011-01-25  Ken Werner  <ken.werner@de.ibm.com>
 
 	* gdb.opencl/convs_casts.cl: Move program scope variables into the
diff --git a/gdb/testsuite/gdb.base/frame-args.exp b/gdb/testsuite/gdb.base/frame-args.exp
index 6cd56c1..f17998c 100644
--- a/gdb/testsuite/gdb.base/frame-args.exp
+++ b/gdb/testsuite/gdb.base/frame-args.exp
@@ -40,7 +40,7 @@ if ![runto break_me] then {
 gdb_test_no_output "set print frame-arguments all" \
          "set print frame-arguments all"
 gdb_test "frame 1" \
-         ".*in call_me \\(i=3, f=5, s=({a = 3, b = 5}|<value optimized out>), ss=0x\[0-9a-f\]\+, u=({.*}|<value optimized out>), e=green\\) at .*frame-args\\.c:.*" \
+         ".*in call_me \\(i=3, f=5, s=({a = 3, b = 5}|<optimized out>), ss=0x\[0-9a-f\]\+, u=({.*}|<optimized out>), e=green\\) at .*frame-args\\.c:.*" \
          "frame 1 with print frame-arguments set to all"
 
 # Test with "print frame-arguments" set to "scalars"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
index 1dcdbfb..c356ab1 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
@@ -57,4 +57,4 @@ if ![runto "*${break_at}"] {
     return -1
 }
 
-gdb_test "bt" "#0  (0x\[0-9a-f\]+ in )?func \\(funcparam=<value optimized out>\\)\r\n#1  main \\(mainparam=<value optimized out>\\)\[^\r\n\]*"
+gdb_test "bt" "#0  (0x\[0-9a-f\]+ in )?func \\(funcparam=<optimized out>\\)\r\n#1  main \\(mainparam=<optimized out>\\)\[^\r\n\]*"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
index 10e3659..07fde0e 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
@@ -46,16 +46,16 @@ proc file_symbols {type} {
     gdb_test "print file_locaddr_unresolvable" "= 1234567890"
     gdb_test "ptype file_locaddr_unresolvable" "type = int"
 
-    gdb_test "print file_locempty_resolvable" "= <value optimized out>"
+    gdb_test "print file_locempty_resolvable" "= <optimized out>"
     gdb_test "ptype file_locempty_resolvable" "type = int"
 
-    gdb_test "print file_locempty_unresolvable" "= <value optimized out>"
+    gdb_test "print file_locempty_unresolvable" "= <optimized out>"
     gdb_test "ptype file_locempty_unresolvable" "type = int"
 
-    gdb_test "print file_locno_resolvable" "= <value optimized out>"
+    gdb_test "print file_locno_resolvable" "= <optimized out>"
     gdb_test "ptype file_locno_resolvable" "type = int"
 
-    gdb_test "print file_locno_unresolvable" "= <value optimized out>"
+    gdb_test "print file_locno_unresolvable" "= <optimized out>"
     gdb_test "ptype file_locno_unresolvable" "type = int"
 
     gdb_test "print file_extern_locaddr_resolvable" "= 1234567890"
@@ -64,10 +64,10 @@ proc file_symbols {type} {
     gdb_test "print file_extern_locaddr_unresolvable" "= 1234567890"
     gdb_test "ptype file_extern_locaddr_unresolvable" "type = int"
 
-    gdb_test "print file_extern_locempty_resolvable" "= <value optimized out>"
+    gdb_test "print file_extern_locempty_resolvable" "= <optimized out>"
     gdb_test "ptype file_extern_locempty_resolvable" "type = int"
 
-    gdb_test "print file_extern_locempty_unresolvable" "= <value optimized out>"
+    gdb_test "print file_extern_locempty_unresolvable" "= <optimized out>"
     gdb_test "ptype file_extern_locempty_unresolvable" "type = int"
 
     gdb_test "print file_extern_locno_resolvable" "= 1234567890"
@@ -76,7 +76,7 @@ proc file_symbols {type} {
     # `print file_extern_locno_unresolvable' currently prints
     # Address of symbol "file_extern_locno_unresolvable" is unknown.
     # As DW_AT_declaration is not present in this DIE
-    # it should print <value optimized out>.  As usefulness of such DIE is not
+    # it should print <optimized out>.  As usefulness of such DIE is not
     # clear its resolution is not being tested.
 
     set pf_prefix $old_prefix
@@ -97,16 +97,16 @@ gdb_test "ptype main_local_locaddr_resolvable" "type = int"
 gdb_test "print main_local_locaddr_unresolvable" "= 1234567890"
 gdb_test "ptype main_local_locaddr_unresolvable" "type = int"
 
-gdb_test "print main_local_locempty_resolvable" "= <value optimized out>"
+gdb_test "print main_local_locempty_resolvable" "= <optimized out>"
 gdb_test "ptype main_local_locempty_resolvable" "type = int"
 
-gdb_test "print main_local_locempty_unresolvable" "= <value optimized out>"
+gdb_test "print main_local_locempty_unresolvable" "= <optimized out>"
 gdb_test "ptype main_local_locempty_unresolvable" "type = int"
 
-gdb_test "print main_local_locno_resolvable" "= <value optimized out>"
+gdb_test "print main_local_locno_resolvable" "= <optimized out>"
 gdb_test "ptype main_local_locno_resolvable" "type = int"
 
-gdb_test "print main_local_locno_unresolvable" "= <value optimized out>"
+gdb_test "print main_local_locno_unresolvable" "= <optimized out>"
 gdb_test "ptype main_local_locno_unresolvable" "type = int"
 
 gdb_test "print main_extern_locaddr_resolvable" "= 1234567890"
@@ -115,10 +115,10 @@ gdb_test "ptype main_extern_locaddr_resolvable" "type = int"
 gdb_test "print main_extern_locaddr_unresolvable" "= 1234567890"
 gdb_test "ptype main_extern_locaddr_unresolvable" "type = int"
 
-gdb_test "print main_extern_locempty_resolvable" "= <value optimized out>"
+gdb_test "print main_extern_locempty_resolvable" "= <optimized out>"
 gdb_test "ptype main_extern_locempty_resolvable" "type = int"
 
-gdb_test "print main_extern_locempty_unresolvable" "= <value optimized out>"
+gdb_test "print main_extern_locempty_unresolvable" "= <optimized out>"
 gdb_test "ptype main_extern_locempty_unresolvable" "type = int"
 
 gdb_test "print main_extern_locno_resolvable" "= 1234567890"
diff --git a/gdb/testsuite/gdb.dwarf2/pieces.exp b/gdb/testsuite/gdb.dwarf2/pieces.exp
index a8fe30b..73780d8 100644
--- a/gdb/testsuite/gdb.dwarf2/pieces.exp
+++ b/gdb/testsuite/gdb.dwarf2/pieces.exp
@@ -82,7 +82,7 @@ proc pieces_test_f6 {} {
        "set f6 breakpoint for pieces"
     gdb_continue_to_breakpoint "continue to f6 breakpoint for pieces"
     gdb_test "print a" \
-	" = {i = 7, j = 8, q = .value optimized out.}" \
+	" = {i = 7, j = 8, q = .optimized out.}" \
 	"print a with optimized out piece"
     # Note: no warning for this case.
     gdb_test_multiple "print a.i" \
diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
index 56485c8..65149e3 100644
--- a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
+++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
@@ -53,12 +53,12 @@ if { ![runto start_sequence] } then {
 gdb_test "frame 1" "#1.*in gen_movsd.*" "Backtracing"
 
 gdb_test_multiple "print operand0" "print operand0" {
-    -re "\\\$$decimal = <value optimized out>\r\n$gdb_prompt $" { pass "print operand0"}
+    -re "\\\$$decimal = <optimized out>\r\n$gdb_prompt $" { pass "print operand0"}
     -re "$hex\r\n$gdb_prompt $" { gdb_test "print *operand0" "13" "print operand0" }
 }
 
 gdb_test_multiple "print operand1" "print operand1" {
-    -re "\\\$$decimal = <value optimized out>\r\n$gdb_prompt $" { pass "print operand1"}
+    -re "\\\$$decimal = <optimized out>\r\n$gdb_prompt $" { pass "print operand1"}
     -re "$hex\r\n$gdb_prompt $" { gdb_test "print *operand1" "14" "print operand1" }
 }
 
diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp
index 5c5cf31..f758f33 100644
--- a/gdb/testsuite/gdb.opt/inline-locals.exp
+++ b/gdb/testsuite/gdb.opt/inline-locals.exp
@@ -62,7 +62,7 @@ if { ! $no_frames } {
 	-re "arg1 = $decimal\r\n$gdb_prompt $" {
 	    pass $msg
 	}
-	-re "arg1 = <value optimized out>\r\n$gdb_prompt $" {
+	-re "arg1 = <optimized out>\r\n$gdb_prompt $" {
 	    # GCC 4.3 and later lose location information for arg1.  GCC 4.2 is OK.
 	    if { [test_compiler_info "gcc-4-3-*"]  || [test_compiler_info "gcc-4-4-*"]} {
 		setup_xfail *-*-*
@@ -101,7 +101,7 @@ if { ! $no_frames } {
 	-re "arg1 = $decimal\r\n$gdb_prompt $" {
 	    pass $msg
 	}
-	-re "arg1 = <value optimized out>\r\n$gdb_prompt $" {
+	-re "arg1 = <optimized out>\r\n$gdb_prompt $" {
 	    # GCC 4.3 and later lose location information for arg1.  GCC 4.2 is OK.
 	    if { [test_compiler_info "gcc-4-3-*"]  || [test_compiler_info "gcc-4-4-*"]} {
 		setup_xfail *-*-*
diff --git a/gdb/testsuite/gdb.threads/fork-child-threads.exp b/gdb/testsuite/gdb.threads/fork-child-threads.exp
index 19a193b..facc2eb 100644
--- a/gdb/testsuite/gdb.threads/fork-child-threads.exp
+++ b/gdb/testsuite/gdb.threads/fork-child-threads.exp
@@ -52,6 +52,6 @@ gdb_test "continue" "Breakpoint 2, start.*" "get to the spawned thread"
 # * 2 LWP 4466  start (arg=0x0) at fork-child-threads.c:28
 # Correct:
 # * 3 Thread 0x40a00950 (LWP 5553)  start (arg=0x0) at ../.././gdb/testsuite/gdb.threads/fork-child-threads.c:28
-#   2 Thread 0x2aaaaaac3000 (LWP 5552)  0x00000031674076dd in pthread_join (threadid=<value optimized out>, thread_return=<value optimized out>) at pthread_join.c:89
+#   2 Thread 0x2aaaaaac3000 (LWP 5552)  0x00000031674076dd in pthread_join (threadid=<optimized out>, thread_return=<optimized out>) at pthread_join.c:89
 
 gdb_test "info threads" " Thread .* Thread .*" "two threads found"