svn commit: r321049 - stable/11/sys/arm/arm

Ed Maste emaste at FreeBSD.org
Sun Jul 16 17:04:58 UTC 2017


Author: emaste
Date: Sun Jul 16 17:04:56 2017
New Revision: 321049
URL: https://svnweb.freebsd.org/changeset/base/321049

Log:
  MFC r320056: arm: set appropriate section flags for .init_pagetable
  
  The arm kernel linker scripts place the .init_pagetable section in .bss,
  but .init_pagetable had no section flags set, and so did not match the
  expected flags for .bss.
  
  GNU ld silently ignores this case, but lld reports an error:
  
  ld: error: incompatible section flags for .bss
  >>> locore.o:(.init_pagetable): 0x0
  >>> output section .bss: 0x3
  
  PR:		220055
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/sys/arm/arm/locore-v4.S
  stable/11/sys/arm/arm/locore-v6.S
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/arm/locore-v4.S
==============================================================================
--- stable/11/sys/arm/arm/locore-v4.S	Sun Jul 16 16:54:03 2017	(r321048)
+++ stable/11/sys/arm/arm/locore-v4.S	Sun Jul 16 17:04:56 2017	(r321049)
@@ -355,7 +355,7 @@ svcstk:
  * Memory for the initial pagetable. We are unable to place this in
  * the bss as this will be cleared after the table is loaded.
  */
-	.section ".init_pagetable"
+	.section ".init_pagetable", "aw", %nobits
 	.align	14 /* 16KiB aligned */
 pagetable:
 	.space	L1_TABLE_SIZE

Modified: stable/11/sys/arm/arm/locore-v6.S
==============================================================================
--- stable/11/sys/arm/arm/locore-v6.S	Sun Jul 16 16:54:03 2017	(r321048)
+++ stable/11/sys/arm/arm/locore-v6.S	Sun Jul 16 17:04:56 2017	(r321049)
@@ -429,7 +429,7 @@ svcstk:
  * Memory for the initial pagetable. We are unable to place this in
  * the bss as this will be cleared after the table is loaded.
  */
-	.section ".init_pagetable"
+	.section ".init_pagetable", "aw", %nobits
 	.align	14 /* 16KiB aligned */
 	.globl	boot_pt1
 boot_pt1:


More information about the svn-src-stable-11 mailing list