Re: ld: Support customized output section type

"DO NOT EDIT!" says the comment at the top of bfd-in2.h.  Move the new
type field where it belongs.

	PR ld/28841
	* section.c (struct bfd_section): Add type.  Formatting.
	(BFD_FAKE_SECTION): Formatting.
	* bfd-in2.h: Regenerate.

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 78a0a1dea420f0a35752e7485eb549f8524293ab..db41e7eb7fe3b7ea1f65f1c8ad7729c250d7eb19 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1166,11 +1166,13 @@ typedef struct bfd_section
     struct bfd_section *s;
     const char *linked_to_symbol_name;
   } map_head, map_tail;
- /* Points to the output section this section is already assigned to, if any.
-    This is used when support for non-contiguous memory regions is enabled.  */
- struct bfd_section *already_assigned;
 
-  /* Explicitly specified section type, if non-zero. */
+  /* Points to the output section this section is already assigned to,
+     if any.  This is used when support for non-contiguous memory
+     regions is enabled.  */
+  struct bfd_section *already_assigned;
+
+  /* Explicitly specified section type, if non-zero.  */
   unsigned int type;
 
 } asection;
@@ -1356,7 +1358,7 @@ discarded_section (const asection *sec)
      (struct bfd_symbol *) SYM, &SEC.symbol,                           \
                                                                        \
   /* map_head, map_tail, already_assigned, type                     */ \
-     { NULL }, { NULL }, NULL, 0                                       \
+     { NULL }, { NULL }, NULL,             0                           \
                                                                        \
     }
 

diff --git a/bfd/section.c b/bfd/section.c
index 2de7dbf661ac7c99d0e11a5c1dab510a680fb3af..9a1071454f5aa4280c2296424bdf2220a963e7ff 100644 (file)
--- a/bfd/section.c
+++ b/bfd/section.c
@@ -551,9 +551,14 @@ CODE_FRAGMENT
 .    struct bfd_section *s;
 .    const char *linked_to_symbol_name;
 .  } map_head, map_tail;
-. {* Points to the output section this section is already assigned to, if any.
-.    This is used when support for non-contiguous memory regions is enabled.  *}
-. struct bfd_section *already_assigned;
+.
+.  {* Points to the output section this section is already assigned to,
+.     if any.  This is used when support for non-contiguous memory
+.     regions is enabled.  *}
+.  struct bfd_section *already_assigned;
+.
+.  {* Explicitly specified section type, if non-zero.  *}
+.  unsigned int type;
 .
 .} asection;
 .
@@ -738,7 +743,7 @@ CODE_FRAGMENT
 .     (struct bfd_symbol *) SYM, &SEC.symbol,                          \
 .                                                                      \
 .  {* map_head, map_tail, already_assigned, type                     *}        \
-.     { NULL }, { NULL }, NULL, 0                                              \
+.     { NULL }, { NULL }, NULL,             0                          \
 .                                                                      \
 .    }
 .