Tweaked to run under either version of expect.

gas/testsuite/gas/sun4/addend.exp

@@ -0,0 +1,36 @@
+#
+# SunOS4 on SPARC tests
+#
+
+if [istarget sparc-*-sunos4*] then {
+    set x1 0
+    set x2 0
+    set x3 0
+    set x4 0
+    set x5 0
+    set x6 0
+    set testname "addends (part 2)"
+    if [gas_test_old "addend.s" "" "addends (part 1)"] then {
+	objdump_start_no_subdir "a.out" "-r"
+	while 1 {
+	    # These are what we get using the SunOS assembler.
+	    expect {
+		-re "08 WDISP22 +foo1\[+\]+0xf+fc\r\n"		{ incr x1 }
+		-re "0c WDISP22 +foo1\[+\]+0xf+f8\r\n"		{ incr x2 }
+		-re "10 WDISP22 +foo1\[+\]+0xf+f0\r\n"		{ incr x3 }
+		-re "14 WDISP22 +foo1\[+\]+0xf+ec\r\n"		{ incr x4 }
+		-re "1c 32 +foo1\r\n"				{ incr x5 }
+		-re "20 32 +foo1\[+\]+0x0*04\r\n"			{ incr x6 }
+		-re "\[^\n\]*\n"				{ }
+		timeout				{ error "timeout\n"; break }
+		eof				{ break }
+	    }
+	}
+	objdump_finish
+	if [all_ones $x1 $x2 $x3 $x4 $x5 $x6] then {
+	    pass $testname
+	} else {
+	    fail $testname
+	}
+    }
+}