+2016-08-19  Carl Love  <cel@us.ibm.com>
+
+       * gdb.arch/altivec-regs.exp: Use standard_testfile instead of
+       maintaining separate logic for constructing the output path.
+       * gdb.arch/powerpc-d128-regs.exp: Likewise.
+       * gdb.arch/ppc-dfp.exp: Likewise.
+       * gdb.arch/ppc-fp.exp: Likewise.
+       * gdb.arch/vsx-regs.exp: Likewise.
+       * gdb.arch/altivec-abi.exp: Likewise, plus added local variable
+       binprefix for generating the additional binary files.
+
 2016-08-19  Pedro Alves  <palves@redhat.com>
 
        * gdb.trace/mi-trace-frame-collected.exp
 
     return
 }
 
-set testfile "altivec-abi"
-set binfile ${objdir}/${subdir}/${testfile}
-set srcfile ${testfile}.c
+standard_testfile
 
 if [get_compiler_info] {
     warning "get_compiler failed"
 }
 
 if [test_compiler_info gcc*] {
+    set binprefix ${binfile}
+
     with_test_prefix "default ABI, auto" {
        altivec_abi_tests  "additional_flags=-maltivec" "auto"
     }
        # On 64-bit GNU/Linux with GCC 4.1 and 4.2, -mabi=no-altivec
        # was broken, so skip those tests there.
        if { ![is_lp64_target] || ![test_compiler_info "gcc-4-\[12\]-*"] } {
-           set binfile ${objdir}/${subdir}/${testfile}-ge-ge
+           set binfile ${binprefix}-ge-ge
            with_test_prefix "generic ABI, forced" {
                altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=no-altivec" "generic"
            }
 
-           set binfile ${objdir}/${subdir}/${testfile}-ge-auto
+           set binfile ${binprefix}-ge-auto
            with_test_prefix "generic ABI, auto" {
                altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=no-altivec" "auto"
            }
        }
 
-       set binfile ${objdir}/${subdir}/${testfile}-av-av
+       set binfile ${binprefix}-av-av
        with_test_prefix "AltiVec ABI, forced" {
            altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=altivec" "altivec"
        }
 
-       set binfile ${objdir}/${subdir}/${testfile}-av-auto
+       set binfile ${binprefix}-av-auto
        with_test_prefix "AltiVec ABI, auto" {
            altivec_abi_tests "additional_flags=-maltivec additional_flags=-mabi=altivec" "auto"
        }