From cf53a97bedd257aa6612129e4bdf8618f6a038cd Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Tue, 22 Feb 2022 09:20:31 +1030
Subject: [PATCH] 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.
---
 bfd/bfd-in2.h | 12 +++++++-----
 bfd/section.c | 13 +++++++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 78a0a1dea42..db41e7eb7fe 100644
--- 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 2de7dbf661a..9a1071454f5 100644
--- 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				\
 .									\
 .    }
 .
-- 
2.30.2