Fix gas crash on missing seh_endproc.

gas/
	* testsuite/gas/pe/seh-x64-err-2.s: New test.
	* testsuite/gas/pe/seh-x64-err-2.l: New stderr output.
	* testsuite/gas/pe/pe.exp: Add test.
	* config/obj-coff-seh.c (obj_coff_seh_do_final): Don't try to end
	seh part.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index bd3333b45399f564fa44aa9a7dfe9b2ecb9220fd..c53ac9ad1f4ca3cac1dd99e6f3050d6244dbf605 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2017-07-19  Tristan Gingold  <gingold@adacore.com>
+
+       * testsuite/gas/pe/seh-x64-err-2.s: New test.
+       * testsuite/gas/pe/seh-x64-err-2.l: New stderr output.
+       * testsuite/gas/pe/pe.exp: Add test.
+       * config/obj-coff-seh.c (obj_coff_seh_do_final): Don't try to end
+       seh part.
+
 2017-07-18  Nick Clifton  <nickc@redhat.com>
 
        PR 21775

diff --git a/gas/config/obj-coff-seh.c b/gas/config/obj-coff-seh.c
index 5c028f1a03cda3712d57066ad45328460f03d323..88ce0fcea4ec2cf507ce7c05c5ead02a54fefc63 100644 (file)
--- a/gas/config/obj-coff-seh.c
+++ b/gas/config/obj-coff-seh.c
@@ -483,10 +483,7 @@ void
 obj_coff_seh_do_final (void)
 {
   if (seh_ctx_cur != NULL)
-    {
-      as_bad (_("open SEH entry at end of file (missing .cfi_endproc)"));
-      do_seh_endproc ();
-    }
+    as_bad (_("open SEH entry at end of file (missing .seh_endproc)"));
 }
 
 /* Enter a prologue element into current context (x64).  */

diff --git a/gas/testsuite/gas/pe/pe.exp b/gas/testsuite/gas/pe/pe.exp
index 9293b8583461616a3722d79958d2bce2cc817bbf..8a6c0d906a6a61316d63bad9e617d489aa485d51 100644 (file)
--- a/gas/testsuite/gas/pe/pe.exp
+++ b/gas/testsuite/gas/pe/pe.exp
@@ -43,6 +43,7 @@ run_dump_test "set"
 # These tests are only for x86_64 targets
 if ([istarget "x86_64-*-mingw*"]) then {
        run_list_test "seh-x64-err-1" ""
+       run_list_test "seh-x64-err-2" ""
        run_dump_test "peseh-x64"
        run_dump_test "peseh-x64-2"
        run_dump_test "peseh-x64-3"

diff --git a/gas/testsuite/gas/pe/seh-x64-err-2.l b/gas/testsuite/gas/pe/seh-x64-err-2.l
new file mode 100644 (file)
index 0000000..48019ec
--- /dev/null
+++ b/gas/testsuite/gas/pe/seh-x64-err-2.l
@@ -0,0 +1,3 @@
+.*: Assembler messages:
+
+.*: Error: open SEH entry at end of file \(missing .seh_endproc\)

diff --git a/gas/testsuite/gas/pe/seh-x64-err-2.s b/gas/testsuite/gas/pe/seh-x64-err-2.s
new file mode 100644 (file)
index 0000000..2feff04
--- /dev/null
+++ b/gas/testsuite/gas/pe/seh-x64-err-2.s
@@ -0,0 +1,9 @@
+       .file   "t2.c"
+       .text
+
+# missing endproc
+       .seh_proc test_missing_endproc
+test_missing_endproc:
+        .seh_setframe   %rbp, 0
+        .seh_endprologue
+       ret