public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
From: "Jan Beulich" <JBeulich@novell.com>
To: <binutils@sources.redhat.com>
Subject: [PATCH] ELF: make .struct interact with .previous
Date: Wed, 13 Apr 2005 13:41:00 -0000	[thread overview]
Message-ID: <s25d2f7b.023@emea1-mh.id2.novell.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 2863 bytes --]

struct did not interact correctly with ELF's .previous.

Built and tested on i686-pc-linux-gnu.

Jan

gas/
2005-04-13  Jan Beulich  <jbeulich@novell.com>

	* config/obj-elf.c (obj_elf_struct): New.
	(elf_pseudo_table). Use it for .offset and .struct.

gas/testsuite/
2005-04-13  Jan Beulich  <jbeulich@novell.com>

	* gas/elf/struct.[sd]: New.
	* gas/elf/elf.exp: Run new test.

--- /home/jbeulich/src/binutils/mainline/2005-04-11/gas/config/obj-elf.c	2005-02-28 08:27:13.000000000 +0100
+++ 2005-04-11/gas/config/obj-elf.c	2005-04-13 15:25:24.000000000 +0200
@@ -65,6 +65,7 @@ static void obj_elf_subsection (int);
 static void obj_elf_popsection (int);
 static void obj_elf_tls_common (int);
 static void obj_elf_lcomm (int);
+static void obj_elf_struct (int);
 
 static const pseudo_typeS elf_pseudo_table[] =
 {
@@ -113,6 +114,8 @@ static const pseudo_typeS elf_pseudo_tab
 
   /* We need to trap the section changing calls to handle .previous.  */
   {"data", obj_elf_data, 0},
+  {"offset", obj_elf_struct, 0},
+  {"struct", obj_elf_struct, 0},
   {"text", obj_elf_text, 0},
 
   {"tls_common", obj_elf_tls_common, 0},
@@ -1036,6 +1039,24 @@ obj_elf_text (int i)
 #endif
 }
 
+/* Change to the *ABS* section.  */
+
+void
+obj_elf_struct (int i)
+{
+#ifdef md_flush_pending_output
+  md_flush_pending_output ();
+#endif
+
+  previous_section = now_seg;
+  previous_subsection = now_subseg;
+  s_struct (i);
+
+#ifdef md_elf_section_change_hook
+  md_elf_section_change_hook ();
+#endif
+}
+
 static void
 obj_elf_subsection (int ignore ATTRIBUTE_UNUSED)
 {
--- /home/jbeulich/src/binutils/mainline/2005-04-11/gas/testsuite/gas/elf/elf.exp	2005-01-18 10:43:34.000000000 +0100
+++ 2005-04-11/gas/testsuite/gas/elf/elf.exp	2005-04-13 15:26:20.000000000 +0200
@@ -61,6 +61,7 @@ if { ([istarget "*-*-*elf*"]		
     run_dump_test "section3" 
     run_dump_test "section4"
     run_list_test "section5" "" "-al" "-SW" "| grep \" \\\\.test\\\[0-9\\\]\"" 
+    run_dump_test "struct" 
     run_dump_test "symver" 
     run_list_test "type" "" "" "-s" "| grep \"1 \\\[FONT\\\]\"" 
 }
--- /home/jbeulich/src/binutils/mainline/2005-04-11/gas/testsuite/gas/elf/struct.d	1970-01-01 01:00:00.000000000 +0100
+++ 2005-04-11/gas/testsuite/gas/elf/struct.d	2005-04-12 11:48:51.000000000 +0200
@@ -0,0 +1,10 @@
+#nm: --extern-only
+#name: struct
+
+# Test the .struct pseudo-op.
+
+0+0 D l1
+0+4 D l2
+0+1 A w1
+0+3 A w2
+0+5 A w3
--- /home/jbeulich/src/binutils/mainline/2005-04-11/gas/testsuite/gas/elf/struct.s	1970-01-01 01:00:00.000000000 +0100
+++ 2005-04-11/gas/testsuite/gas/elf/struct.s	2005-04-12 11:45:06.000000000 +0200
@@ -0,0 +1,9 @@
+	.globl	w1, w2, w3, l1, l2
+	.data
+l1:	.long	0
+	.struct 1
+w1:	.short	0
+w2:	.short	0
+w3:	.short	0
+	.previous
+l2:	.long	0



[-- Attachment #2: binutils-mainline-elf-struct.patch --]
[-- Type: text/plain, Size: 2760 bytes --]

struct did not interact correctly with ELF's .previous.

Built and tested on i686-pc-linux-gnu.

Jan

gas/
2005-04-13  Jan Beulich  <jbeulich@novell.com>

	* config/obj-elf.c (obj_elf_struct): New.
	(elf_pseudo_table). Use it for .offset and .struct.

gas/testsuite/
2005-04-13  Jan Beulich  <jbeulich@novell.com>

	* gas/elf/struct.[sd]: New.
	* gas/elf/elf.exp: Run new test.

--- /home/jbeulich/src/binutils/mainline/2005-04-11/gas/config/obj-elf.c	2005-02-28 08:27:13.000000000 +0100
+++ 2005-04-11/gas/config/obj-elf.c	2005-04-13 15:25:24.000000000 +0200
@@ -65,6 +65,7 @@ static void obj_elf_subsection (int);
 static void obj_elf_popsection (int);
 static void obj_elf_tls_common (int);
 static void obj_elf_lcomm (int);
+static void obj_elf_struct (int);
 
 static const pseudo_typeS elf_pseudo_table[] =
 {
@@ -113,6 +114,8 @@ static const pseudo_typeS elf_pseudo_tab
 
   /* We need to trap the section changing calls to handle .previous.  */
   {"data", obj_elf_data, 0},
+  {"offset", obj_elf_struct, 0},
+  {"struct", obj_elf_struct, 0},
   {"text", obj_elf_text, 0},
 
   {"tls_common", obj_elf_tls_common, 0},
@@ -1036,6 +1039,24 @@ obj_elf_text (int i)
 #endif
 }
 
+/* Change to the *ABS* section.  */
+
+void
+obj_elf_struct (int i)
+{
+#ifdef md_flush_pending_output
+  md_flush_pending_output ();
+#endif
+
+  previous_section = now_seg;
+  previous_subsection = now_subseg;
+  s_struct (i);
+
+#ifdef md_elf_section_change_hook
+  md_elf_section_change_hook ();
+#endif
+}
+
 static void
 obj_elf_subsection (int ignore ATTRIBUTE_UNUSED)
 {
--- /home/jbeulich/src/binutils/mainline/2005-04-11/gas/testsuite/gas/elf/elf.exp	2005-01-18 10:43:34.000000000 +0100
+++ 2005-04-11/gas/testsuite/gas/elf/elf.exp	2005-04-13 15:26:20.000000000 +0200
@@ -61,6 +61,7 @@ if { ([istarget "*-*-*elf*"]		
     run_dump_test "section3" 
     run_dump_test "section4"
     run_list_test "section5" "" "-al" "-SW" "| grep \" \\\\.test\\\[0-9\\\]\""
+    run_dump_test "struct" 
     run_dump_test "symver" 
     run_list_test "type" "" "" "-s" "| grep \"1 \\\[FONT\\\]\""
 }
--- /home/jbeulich/src/binutils/mainline/2005-04-11/gas/testsuite/gas/elf/struct.d	1970-01-01 01:00:00.000000000 +0100
+++ 2005-04-11/gas/testsuite/gas/elf/struct.d	2005-04-12 11:48:51.000000000 +0200
@@ -0,0 +1,10 @@
+#nm: --extern-only
+#name: struct
+
+# Test the .struct pseudo-op.
+
+0+0 D l1
+0+4 D l2
+0+1 A w1
+0+3 A w2
+0+5 A w3
--- /home/jbeulich/src/binutils/mainline/2005-04-11/gas/testsuite/gas/elf/struct.s	1970-01-01 01:00:00.000000000 +0100
+++ 2005-04-11/gas/testsuite/gas/elf/struct.s	2005-04-12 11:45:06.000000000 +0200
@@ -0,0 +1,9 @@
+	.globl	w1, w2, w3, l1, l2
+	.data
+l1:	.long	0
+	.struct 1
+w1:	.short	0
+w2:	.short	0
+w3:	.short	0
+	.previous
+l2:	.long	0

             reply	other threads:[~2005-04-13 13:41 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-04-13 13:41 Jan Beulich [this message]
2005-04-15 10:52 ` Nick Clifton
2005-04-15 17:31   ` H. J. Lu
2005-04-15 18:37     ` H. J. Lu
2005-04-15 22:00       ` Alan Modra
2005-04-16  0:36         ` H. J. Lu
2005-04-16  0:44           ` H. J. Lu
2005-04-17 23:34             ` Alan Modra
2005-04-18  1:15               ` H. J. Lu
2005-04-18  7:57 Jan Beulich
2005-04-18 13:47 ` H. J. Lu
2005-04-18 20:12 ` James E Wilson
2005-04-19 21:27   ` H. J. Lu
2005-04-18 14:13 Jan Beulich
2005-04-20  7:12 Jan Beulich
2005-04-20  9:31 ` Nick Clifton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s25d2f7b.023@emea1-mh.id2.novell.com \
    --to=jbeulich@novell.com \
    --cc=binutils@sources.redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).