6 files changed, 60 insertions, 12 deletions
diff --git a/binutils/testsuite/binutils-all/nm-coff-1.s b/binutils/testsuite/binutils-all/nm-coff-1.s
new file mode 100644
index 0000000..3efc10e
--- /dev/null
+++ b/binutils/testsuite/binutils-all/nm-coff-1.s
@@ -0,0 +1,26 @@
+	.globl text_symbol1
+	.globl text_symbol2
+	.globl text_symbol3
+	.macro ENDFN name:req
+	.def \name
+	.type 0x20	/* DT_FUNC */
+	.scl 2		/* C_EXT */
+	.endef
+	.def \name
+	.scl 0xff	/* C_EFCN */
+	.val .
+	.endef
+	.endm
+	.text
+text_symbol1:
+	.long 0
+	.long 0
+	.long 0
+	ENDFN text_symbol1
+text_symbol2:
+	.long 0
+	.long 0
+	ENDFN text_symbol2
+text_symbol3:
+	.long 0
+	ENDFN text_symbol3
diff --git a/binutils/testsuite/binutils-all/nm-coff-sdef-1.s b/binutils/testsuite/binutils-all/nm-coff-sdef-1.s
new file mode 100644
index 0000000..f1a10bb
--- /dev/null
+++ b/binutils/testsuite/binutils-all/nm-coff-sdef-1.s
@@ -0,0 +1,26 @@
+	.globl text_symbol1
+	.globl text_symbol2
+	.globl text_symbol3
+	.macro ENDFN name:req
+	.sdef \name
+	.type 0x20	/* DT_FUNC */
+	.scl 2		/* C_EXT */
+	.endef
+	.sdef \name
+	.scl 0xff	/* C_EFCN */
+	.val .
+	.endef
+	.endm
+	.text
+text_symbol1:
+	.byte 0,0,0,0
+	.byte 0,0,0,0
+	.byte 0,0,0,0
+	ENDFN text_symbol1
+text_symbol2:
+	.byte 0,0,0,0
+	.byte 0,0,0,0
+	ENDFN text_symbol2
+text_symbol3:
+	.byte 0,0,0,0
+	ENDFN text_symbol3
diff --git a/binutils/testsuite/binutils-all/nm.exp b/binutils/testsuite/binutils-all/nm.exp
index e1b2d16..b81126b 100644
--- a/binutils/testsuite/binutils-all/nm.exp
+++ b/binutils/testsuite/binutils-all/nm.exp
@@ -163,6 +163,12 @@ if {   [is_elf_format]
     || [istarget wasm32-*-*]
     || [istarget bpf-*-*]} {
     set nm_1_src "nm-elf-1.s"
+} elseif {[is_coff_format] && ![istarget arm*-*-*]} {
+    if {[istarget *c4x-*-*] || [istarget *c54x-*-*]} {
+	set nm_1_src "nm-coff-sdef-1.s"
+    } else {
+	set nm_1_src "nm-coff-1.s"
+    }
 } else {
     set nm_1_src "nm-1.s"
 }
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index a706efb..ff93fea 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -1463,7 +1463,6 @@ if [is_elf_format] {
 run_dump_test "pr23633"
 
 run_dump_test "set-section-alignment"
-run_dump_test "section-alignment"
 
 setup_xfail "hppa*-*-*"
 setup_xfail "spu-*-*"
diff --git a/binutils/testsuite/binutils-all/section-alignment.d b/binutils/testsuite/binutils-all/section-alignment.d
deleted file mode 100644
index d62528c..0000000
--- a/binutils/testsuite/binutils-all/section-alignment.d
+++ /dev/null
@@ -1,9 +0,0 @@
-#source: pr23633.s
-#PROG: objcopy
-#objcopy: --section-alignment=512
-#objdump: -P sections
-#target: [is_pecoff_format]
-
-#...
-.* Align: 512.*
-#pass
diff --git a/binutils/testsuite/binutils-all/set-section-alignment.d b/binutils/testsuite/binutils-all/set-section-alignment.d
index a193bb7..2f6379a 100644
--- a/binutils/testsuite/binutils-all/set-section-alignment.d
+++ b/binutils/testsuite/binutils-all/set-section-alignment.d
@@ -2,8 +2,8 @@
 #PROG: objcopy
 #objcopy: --set-section-alignment .text=16
 #objdump: --section-headers
-#target: [is_elf_format]
-#xfail: rx-*-*
+#target: [is_elf_format] || [is_coff_format]
+#xfail: rx-*-* *c30-*-* z8k-*-*
 
 #...
 .*\.text.*2\*\*4