1 files changed, 24 insertions, 24 deletions

diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index 19c0683..bc2bf60 100644
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -48,8 +48,8 @@ proc g++_version { } {
     # verify that the compiler exists
     if { [is_remote host] || [which $compiler] != 0 } then {
 	set tmp [remote_exec host "$compiler -v"]
-	set status [lindex $tmp 0];
-	set output [lindex $tmp 1];
+	set status [lindex $tmp 0]
+	set output [lindex $tmp 1]
 	regexp " version \[^\n\r\]*" $output version
 	if { $status == 0 && [info exists version] } then {
 	    if [is_remote host] {
@@ -145,25 +145,25 @@ proc g++_link_flags { paths } {
 	}
       }
     } else {
-      global tool_root_dir;
+      global tool_root_dir
 
-      set libgpp [lookfor_file ${tool_root_dir} libg++];
+      set libgpp [lookfor_file ${tool_root_dir} libg++]
       if { $libgpp != "" } {
-          append flags "-L${libgpp} ";
+          append flags "-L${libgpp} "
           append ld_library_path ":${libgpp}"
       }
-      set libstdcpp [lookfor_file ${tool_root_dir} libstdc++];
+      set libstdcpp [lookfor_file ${tool_root_dir} libstdc++]
       if { $libstdcpp != "" } {
-          append flags "-L${libstdcpp} ";
+          append flags "-L${libstdcpp} "
           append ld_library_path ":${libstdcpp}"
       }
-      set libiberty [lookfor_file ${tool_root_dir} libiberty];
+      set libiberty [lookfor_file ${tool_root_dir} libiberty]
       if { $libiberty != "" } {
-          append flags "-L${libiberty} ";
+          append flags "-L${libiberty} "
       }
-      set librx [lookfor_file ${tool_root_dir} librx];
+      set librx [lookfor_file ${tool_root_dir} librx]
       if { $librx != "" } {
-          append flags "-L${librx} ";
+          append flags "-L${librx} "
       }
     }
 
@@ -182,7 +182,7 @@ proc g++_init { args } {
     global base_dir
     global tmpdir
     global libdir
-    global gluefile wrap_flags;
+    global gluefile wrap_flags
     global objdir srcdir
     global ALWAYS_CXXFLAGS
     global TOOL_EXECUTABLE TOOL_OPTIONS
@@ -196,7 +196,7 @@ proc g++_init { args } {
 
     if ![info exists GXX_UNDER_TEST] then {
 	if [info exists TOOL_EXECUTABLE] {
-	    set GXX_UNDER_TEST $TOOL_EXECUTABLE;
+	    set GXX_UNDER_TEST $TOOL_EXECUTABLE
 	} else {
 	    if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
 		set GXX_UNDER_TEST [transform c++]
@@ -231,16 +231,16 @@ proc g++_init { args } {
 
     if ![is_remote host] {
 	if [info exists TOOL_OPTIONS] {
-	    lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs ${TOOL_OPTIONS}] ]";
-	    lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags [get_multilibs ${TOOL_OPTIONS}] ]";
+	    lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs ${TOOL_OPTIONS}] ]"
+	    lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags [get_multilibs ${TOOL_OPTIONS}] ]"
 	} else {
-	    lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs] ]";
-	    lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags [get_multilibs] ]";
+	    lappend ALWAYS_CXXFLAGS "additional_flags=[g++_include_flags [get_multilibs] ]"
+	    lappend ALWAYS_CXXFLAGS "ldflags=[g++_link_flags [get_multilibs] ]"
 	}
     }
 
     if [info exists TOOL_OPTIONS] {
-	lappend ALWAYS_CXXFLAGS "additional_flags=$TOOL_OPTIONS";
+	lappend ALWAYS_CXXFLAGS "additional_flags=$TOOL_OPTIONS"
     }
 
     # Make sure that lines are not wrapped.  That can confuse the
@@ -261,11 +261,11 @@ proc g++_init { args } {
 #
 
 proc g++_target_compile { source dest type options } {
-    global tmpdir;
+    global tmpdir
     global gpp_compile_options
     global gluefile wrap_flags
-    global ALWAYS_CXXFLAGS;
-    global GXX_UNDER_TEST;
+    global ALWAYS_CXXFLAGS
+    global GXX_UNDER_TEST
 
     if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
 	lappend options "libs=${gluefile}"
@@ -273,11 +273,11 @@ proc g++_target_compile { source dest type options } {
     }
 
     lappend options "additional_flags=[libio_include_flags]"
-    lappend options "compiler=$GXX_UNDER_TEST";
+    lappend options "compiler=$GXX_UNDER_TEST"
 
     set options [concat $gpp_compile_options $options]
 
-    set options [concat "$ALWAYS_CXXFLAGS" $options];
+    set options [concat "$ALWAYS_CXXFLAGS" $options]
 
     if { [regexp "(^| )-frepo( |$)" $options] && \
 	 [regexp "\.o(|bj)$" $dest] } then {
@@ -311,7 +311,7 @@ proc ${tool}_option_proc { option } {
 	foreach x [split $option ","] {
 	    lappend gpp_compile_options "additional_flags=$x"
 	}
-	return 1;
+	return 1
     } else {
 	return 0
     }