Adjust the order of 32bit-linux.xml and 32bit-sse.xml in i386/i386-linux.xml

Exchange the order of 32bit-linux.xml and 32bit-sse.xml in
i386/i386-linux.xml, to align with other i386 linux .xml files.

gdb:

2017-06-20  Yao Qi  <yao.qi@linaro.org>

	* features/i386/i386-linux.xml: Exchange the order of including
	32bit-linux.xml and 32bit-sse.xml.
	* features/i386/i386-linux.c: Regenerated.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c1998bb2ea476a143334f66289a592d2eeaaee44..79d0f3c2c07852ed1d00b15f62dee4849f219edf 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-20  Yao Qi  <yao.qi@linaro.org>
+
+       * features/i386/i386-linux.xml: Exchange the order of including
+       32bit-linux.xml and 32bit-sse.xml.
+       * features/i386/i386-linux.c: Regenerated.
+
 2017-06-20  Yao Qi  <yao.qi@linaro.org>
 
        * target-descriptions.c (tdesc_reg): Add ctor, dtor.

diff --git a/gdb/features/i386/i386-linux.c b/gdb/features/i386/i386-linux.c
index 42c406b34243a654276a9dc56868b6baf917a329..c7796c3452dcd5359969bb5fa307787cbcfc33f9 100644 (file)
--- a/gdb/features/i386/i386-linux.c
+++ b/gdb/features/i386/i386-linux.c
@@ -71,9 +71,6 @@ initialize_tdesc_i386_linux (void)
   tdesc_create_reg (feature, "fooff", 30, 1, "float", 32, "int");
   tdesc_create_reg (feature, "fop", 31, 1, "float", 32, "int");
 
-  feature = tdesc_create_feature (result, "org.gnu.gdb.i386.linux");
-  tdesc_create_reg (feature, "orig_eax", 41, 1, NULL, 32, "int");
-
   feature = tdesc_create_feature (result, "org.gnu.gdb.i386.sse");
   field_type = tdesc_named_type (feature, "ieee_single");
   tdesc_create_vector (feature, "v4f", field_type, 4);
@@ -135,5 +132,8 @@ initialize_tdesc_i386_linux (void)
   tdesc_create_reg (feature, "xmm7", 39, 1, NULL, 128, "vec128");
   tdesc_create_reg (feature, "mxcsr", 40, 1, "vector", 32, "i386_mxcsr");
 
+  feature = tdesc_create_feature (result, "org.gnu.gdb.i386.linux");
+  tdesc_create_reg (feature, "orig_eax", 41, 1, NULL, 32, "int");
+
   tdesc_i386_linux = result;
 }

diff --git a/gdb/features/i386/i386-linux.xml b/gdb/features/i386/i386-linux.xml
index f9aa311ff3498d7a99f575dc2c4888d00e7257e7..17f9a1af764b8a125333f40d18e4455b8dca1e34 100644 (file)
--- a/gdb/features/i386/i386-linux.xml
+++ b/gdb/features/i386/i386-linux.xml
@@ -12,6 +12,6 @@
   <architecture>i386</architecture>
   <osabi>GNU/Linux</osabi>
   <xi:include href="32bit-core.xml"/>
-  <xi:include href="32bit-linux.xml"/>
   <xi:include href="32bit-sse.xml"/>
+  <xi:include href="32bit-linux.xml"/>
 </target>