4 files changed, 47 insertions, 1 deletions
diff --git a/gas/testsuite/gas/mips/aent-2.d b/gas/testsuite/gas/mips/aent-2.d
new file mode 100644
index 0000000..4115919
--- /dev/null
+++ b/gas/testsuite/gas/mips/aent-2.d
@@ -0,0 +1,19 @@
+#PROG: readelf
+#readelf: -s
+#name: MIPS .aent directive 2
+#as: -32
+#source: aent.s
+
+# Verify that the .aent directive retains function symbol type annotation,
+# e.g.:
+#    Num:    Value  Size Type    Bind   Vis      Ndx Name
+#      8: 00000000    16 FUNC    GLOBAL DEFAULT    1 foo
+#      9: 00000008     0 FUNC    GLOBAL DEFAULT    1 bar
+# vs:
+#    Num:    Value  Size Type    Bind   Vis      Ndx Name
+#      8: 00000000    16 FUNC    GLOBAL DEFAULT    1 foo
+#      9: 00000008     0 OBJECT  GLOBAL DEFAULT    1 bar
+#...
+ *[0-9]+: +[0-9]+ +[0-9]+ +FUNC +GLOBAL +DEFAULT(?: +\[[^]]*\])? +[0-9]+ foo
+ *[0-9]+: +[0-9]+ +[0-9]+ +FUNC +GLOBAL +DEFAULT(?: +\[[^]]*\])? +[0-9]+ bar
+#pass
diff --git a/gas/testsuite/gas/mips/aent-mdebug-2.d b/gas/testsuite/gas/mips/aent-mdebug-2.d
new file mode 100644
index 0000000..eea4115
--- /dev/null
+++ b/gas/testsuite/gas/mips/aent-mdebug-2.d
@@ -0,0 +1,16 @@
+#PROG: readelf
+#readelf: -s
+#name: MIPS .aent directive with ECOFF debug 2
+#as: -32 -mdebug
+#source: aent.s
+#dump: aent-2.d
+
+# Verify that the .aent directive retains function symbol type annotation,
+# e.g.:
+#    Num:    Value  Size Type    Bind   Vis      Ndx Name
+#      8: 00000000    16 FUNC    GLOBAL DEFAULT    1 foo
+#      9: 00000008     0 FUNC    GLOBAL DEFAULT    1 bar
+# vs:
+#    Num:    Value  Size Type    Bind   Vis      Ndx Name
+#      8: 00000000    16 FUNC    GLOBAL DEFAULT    1 foo
+#      9: 00000008     0 OBJECT  GLOBAL DEFAULT    1 bar
diff --git a/gas/testsuite/gas/mips/aent-mdebug.d b/gas/testsuite/gas/mips/aent-mdebug.d
new file mode 100644
index 0000000..1a373c6
--- /dev/null
+++ b/gas/testsuite/gas/mips/aent-mdebug.d
@@ -0,0 +1,7 @@
+#objdump: -dr --prefix-addresses
+#name: MIPS .aent directive with ECOFF debug
+#as: -32 -mdebug
+#source: aent.s
+#dump: aent.d
+
+# Test the .aent directive retains function symbol type annotation.
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 5a69542..8a9f9f1 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -1191,7 +1191,11 @@ if { [istarget mips*-*-vxworks*] } {
 					    !micromips]
     }
 
-    run_dump_test_arches "aent"	[mips_arch_list_matching mips1]
+    run_dump_test_arches "aent"		[mips_arch_list_matching mips1]
+    run_dump_test_arches "aent-2"	[mips_arch_list_matching mips1]
+    run_dump_test_arches "aent-mdebug"	[mips_arch_list_matching mips1]
+    run_dump_test_arches "aent-mdebug-2" \
+					[mips_arch_list_matching mips1]
 
     run_dump_test_arches "loc-swap"	[mips_arch_list_all]
     run_dump_test_arches "loc-swap-dis"	[mips_arch_list_all]