Remove MULTI_OBJFILE_P

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.arch / i386-gnu-cfi.exp

diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
index 910a22493136d4f5ed52868e3ae06b80ed74e323..4b6ebda450d61974d55a1d95fe5db50609f54585 100644 (file)
--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
+++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
@@ -1,4 +1,4 @@
-# Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright 2007-2019 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,16 +20,10 @@
 
 # Unwinding of DW_CFA_GNU_negative_offset_extended test program.
 
-if $tracelevel {
-    strace $tracelevel
-}
-
 # Test i386 unwinder.
 
-set prms_id 0
-set bug_id 0
 
-if ![istarget "i?86-*-*"] then {
+if { ![is_x86_like_target] } then {
     verbose "Skipping i386 unwinder tests."
     return
 }
@@ -37,17 +31,13 @@ if ![istarget "i?86-*-*"] then {
 set testfile "i386-gnu-cfi"
 set srcfilec ${testfile}.c
 set srcfileasm ${testfile}-asm.S
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile [standard_output_file ${testfile}]
 
 # some targets have leading underscores on assembly symbols.
-# TODO: detect this automatically
-set additional_flags ""
-if { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } then {
-  set additional_flags "additional_flags=-DSYMBOL_PREFIX=\"_\""
-}
+set additional_flags [gdb_target_symbol_prefix_flags]
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfilec} ${srcdir}/${subdir}/${srcfileasm}" "${binfile}" executable [list debug $additional_flags]] != "" } {
-    untested i386-gnu-cfi.exp
+    untested "failed to compile"
     return -1
 }
 
@@ -81,13 +71,13 @@ gdb_test "up 3" \
          "gate \\(\[^()\]*\\) at .*gate.c.*" \
          "shift up to the modified frame"
 
-gdb_test_multiple "info frame" "Existence of the CFI inserted register" {
+gdb_test_multiple "info frame" "existence of the CFI inserted register" {
     -re "Stack level 3, frame at (0x\[0-9a-f\]+):.*Saved registers:.* ecx at (0x\[0-9a-f\]+),.*" {
-       pass "Existence of the CFI inserted register"
+       pass "existence of the CFI inserted register"
        if { [string compare $expect_out(1,string) $expect_out(2,string)] } then {
-           fail "Value of the CFI inserted register"
+           fail "value of the CFI inserted register"
        } else {
-           pass "Value of the CFI inserted register"
+           pass "value of the CFI inserted register"
        }
     }
 }