4 files changed, 11 insertions, 8 deletions
diff --git a/gdb/regformats/reg-x86-64.dat b/gdb/regformats/i386/amd64-linux.dat
index dd1f78fa71b..02a2c786d1c 100644
--- a/gdb/regformats/reg-x86-64.dat
+++ b/gdb/regformats/i386/amd64-linux.dat
@@ -1,4 +1,6 @@
-name:x86_64
+# DO NOT EDIT: generated from i386/amd64-linux.xml
+name:amd64_linux
+xmltarget:amd64-linux.xml
 expedite:rbp,rsp,rip
 64:rax
 64:rbx
@@ -57,3 +59,4 @@ expedite:rbp,rsp,rip
 128:xmm14
 128:xmm15
 32:mxcsr
+64:orig_rax
diff --git a/gdb/regformats/reg-x86-64-linux.dat b/gdb/regformats/i386/amd64.dat
index 6121db9844c..d58921884b3 100644
--- a/gdb/regformats/reg-x86-64-linux.dat
+++ b/gdb/regformats/i386/amd64.dat
@@ -1,6 +1,6 @@
-name:x86_64_linux
-xmlarch:i386:x86-64
-osabi:GNU/Linux
+# DO NOT EDIT: generated from i386/amd64.xml
+name:amd64
+xmltarget:amd64.xml
 expedite:rbp,rsp,rip
 64:rax
 64:rbx
@@ -59,4 +59,3 @@ expedite:rbp,rsp,rip
 128:xmm14
 128:xmm15
 32:mxcsr
-64:orig_rax
diff --git a/gdb/regformats/reg-i386-linux.dat b/gdb/regformats/i386/i386-linux.dat
index 33452ac3f74..6fef8d9506d 100644
--- a/gdb/regformats/reg-i386-linux.dat
+++ b/gdb/regformats/i386/i386-linux.dat
@@ -1,6 +1,6 @@
+# DO NOT EDIT: generated from i386/i386-linux.xml
 name:i386_linux
-xmlarch:i386
-osabi:GNU/Linux
+xmltarget:i386-linux.xml
 expedite:ebp,esp,eip
 32:eax
 32:ecx
diff --git a/gdb/regformats/reg-i386.dat b/gdb/regformats/i386/i386.dat
index 6e3097143e1..923d879ebe9 100644
--- a/gdb/regformats/reg-i386.dat
+++ b/gdb/regformats/i386/i386.dat
@@ -1,5 +1,6 @@
+# DO NOT EDIT: generated from i386/i386.xml
 name:i386
-xmlarch:i386
+xmltarget:i386.xml
 expedite:ebp,esp,eip
 32:eax
 32:ecx