diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2-2.c b/gdb/testsuite/gdb.opt/clobbered-registers-O2-2.c
new file mode 100644
index 00000000000..c709c043677
--- /dev/null
+++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2-2.c
@@ -0,0 +1,24 @@
+/* This file is part of GDB, the GNU debugger.
+
+   Copyright 2007-2022 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+extern unsigned *start_sequence (unsigned *x, unsigned *y);
+
+unsigned
+gen_movsd (unsigned *operand0, unsigned *operand1)
+{
+  return *start_sequence (operand0, operand1);
+}
diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2-3.c b/gdb/testsuite/gdb.opt/clobbered-registers-O2-3.c
new file mode 100644
index 00000000000..664d5f20d24
--- /dev/null
+++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2-3.c
@@ -0,0 +1,22 @@
+/* This file is part of GDB, the GNU debugger.
+
+   Copyright 2007-2022 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
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+unsigned *
+start_sequence (unsigned *x, unsigned *y)
+{
+  return (unsigned *)0xdeadbeef;
+}
diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2.c b/gdb/testsuite/gdb.opt/clobbered-registers-O2.c
index 83cf2267d1e..8201d99763f 100644
--- a/gdb/testsuite/gdb.opt/clobbered-registers-O2.c
+++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2.c
@@ -15,21 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef __GNUC__
-#define __attribute__(x)
-#endif
-
-unsigned * __attribute__((noinline))
-start_sequence (unsigned * x, unsigned * y)
-{
-	return (unsigned *)0xdeadbeef;
-};
-
-unsigned __attribute__((noinline))
-gen_movsd (unsigned * operand0, unsigned * operand1)
-{
-	return *start_sequence(operand0, operand1);
-}
+extern unsigned gen_movsd (unsigned *operand0, unsigned *operand1);
 
 int main(void)
 {
diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
index e01f445688d..b38f3642840 100644
--- a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
+++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
@@ -18,7 +18,7 @@
 # Test displaying call clobbered registers in optimized binaries.
 # GDB should not show incorrect values.
 
-standard_testfile
+standard_testfile .c -2.c -3.c
 
 # What compiler are we using?
 #
@@ -26,7 +26,8 @@ if [get_compiler_info] {
     return -1
 }
 
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
+if {[prepare_for_testing "failed to prepare" $testfile \
+	 [list $srcfile $srcfile2 $srcfile3] \
 	 {debug optimize=-O2 nowarnings}]} {
     return -1
 }