This patch adds a new pseudo-op - .seh_code - to structured exception handling

suite of ops.  It changes the current section back to the code section of the
current function.  This is helpful because the code section may not be .text.

	* config/obj-coff-seh.c (obj_coff_seh_code): New function -
	switches the current segment back to the code segment recorded
	when seh_proc was last invoked.
	* config/obj-coff-seh.h (SEH_CMDS): Add seh_code.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d8d89f056a6ea2547830170a9a64af99417f6fdf..24a3c1510fc3e8c41a0f87a8ef6dc524c62402e3 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2014-03-25  Nick Clifton  <nickc@redhat.com>
+
+       * config/obj-coff-seh.c (obj_coff_seh_code): New function -
+       switches the current segment back to the code segment recorded
+       when seh_proc was last invoked.
+       * config/obj-coff-seh.h (SEH_CMDS): Add seh_code.
+
 2014-03-25  Alan Modra  <amodra@gmail.com>
 
        * config/tc-ppc.c (ppc_is_toc_sym): Revert 2014-03-05.

diff --git a/gas/config/obj-coff-seh.c b/gas/config/obj-coff-seh.c
index 88c4a87dc38cc326446380f00902a940552cc3e8..ad3fc8757a8baabc29e9c84b9ef55b95067a8eca 100644 (file)
--- a/gas/config/obj-coff-seh.c
+++ b/gas/config/obj-coff-seh.c
@@ -169,6 +169,13 @@ seh_validate_seg (const char *directive)
   return 0;
 }
 
+/* Switch back to the code section, whatever that may be.  */
+static void
+obj_coff_seh_code (int ignored ATTRIBUTE_UNUSED)
+{
+  subseg_set (seh_ctx_cur->code_seg, 0);
+}
+
 static void
 switch_xdata (int subseg, segT code_seg)
 {

diff --git a/gas/config/obj-coff-seh.h b/gas/config/obj-coff-seh.h
index cf4d216e675b7328952ff1034b35be9feacbb927..cf494851635aa6c62cf95582507e30b22c429acb 100644 (file)
--- a/gas/config/obj-coff-seh.h
+++ b/gas/config/obj-coff-seh.h
@@ -56,6 +56,7 @@
   .seh_savereg
   .seh_savexmm
   .seh_pushframe
+  .seh_code
 */
 
 /* architecture specific pdata/xdata handling.  */
@@ -73,6 +74,7 @@
        {"seh_32", obj_coff_seh_32, 1}, \
        {"seh_no32", obj_coff_seh_32, 0}, \
        {"seh_handler", obj_coff_seh_handler, 0}, \
+       {"seh_code", obj_coff_seh_code, 0}, \
        {"seh_handlerdata", obj_coff_seh_handlerdata, 0},
 
 /* Type definitions.  */
@@ -148,6 +150,7 @@ static void obj_coff_seh_32 (int);
 static void obj_coff_seh_proc  (int);
 static void obj_coff_seh_handler (int);
 static void obj_coff_seh_handlerdata (int);
+static void obj_coff_seh_code (int);
 
 #define UNDSEC bfd_und_section_ptr
 
@@ -201,4 +204,3 @@ static void obj_coff_seh_handlerdata (int);
    PEX64_SCOPE_ENTRY_SIZE * (IDX))
 
 #endif
-