From nobody Tue Jan 24 22:13:48 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1h7x0tzxz3bgdX; Tue, 24 Jan 2023 22:13:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h7w5swmz3JM8; Tue, 24 Jan 2023 22:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jyjA1TDc1n3ooEih1u61QIH1v6mYmPODhTg9LOhe8ks=; b=HqR71VIxLPWRQ1uyM+YumaBv/yr3mSbBtWZJNrtICt0a+TxhLSYTCxKP6Zsu/mspOoGO4l uIVt0pGcndSkx2tCQXoPqXwNFv5sQrDlG22em3LfjMBpcLEZ1ZQW3ahdGWa7Gp0+BGN+61 1E2BXsYjAzOPTRYSRm1QQWIG/bjUfy5XVocgLtF6SU/uqSCXkbD4j5yPj6cJFcofZzxIcy Tpm/3Uih2rGxkT6Hb7e2bMPl7i2EZ/DkhNVSiX4XodxL1A3AFJl7pLz8aOTi/tr7LpH+ko tBlovWiGgUVtHSQyAWd4dYsNYpJX0unVrBXIr/1ejWa+LDPtmO7kJWQnmbLmlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jyjA1TDc1n3ooEih1u61QIH1v6mYmPODhTg9LOhe8ks=; b=R9jXB+vVzlGl8ZCcREnUZKDE3j1k8T+TEy+lVybEXGPO2f678elSCKlOn8M+v9kaW2NNAN rLreS97r2RFeYQ+4+ObgSZu3yK6of0ZQ51Ab5iInU6WVwfvMa9fgapwtqAeCxgOQy94dRN Tf4/NSVafFVo5B8nZtbSF+98oRJUGunNHlP8DcUSSqyTLkZFaUtx5hQBns+zeB1FfK0att pl2QNwEm7A7dc+ZCWDb34yMBrFFfP5nDaw10FrbENwh5OYIQvmNYOLeOL72Ig52djZ4eyk JBBAU2AVDHBuICaLG2l9cGOvrRxw5C0h8cEsViHwOlsW4yJ08Be74aXhNE6qXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598428; a=rsa-sha256; cv=none; b=DfrsHqXn4BUzJCHgwlq8x+FrIEPAAYBgGCZeudBmiSsyoNhvDVcles8LiS5IJAqVsWWlpY gF+3zzWUictZpY/MgjiWqrX6o7VVxdxT2TTyVSyw+X/jE9zYKg86dSitCT93URH3MYUfER 91hdno1JW6uGesfiMaAKA9R2lE3MireIagdivncVofYRuU3NmkyPdu/iwdEvh64en4TqhP E4HWy9/b5y/UAc1ZGTfrYEVE3EQjJgomwylqiVEzSdGnbqHxwTLU+BlkuiS9WYWnoOs9Pl ukRJiYcQArxBM/zuzj0K22Oeefv990an5UbW5Y6lYverq2zSE4n2uDFoBGkmoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h7w4t5bzQVy; Tue, 24 Jan 2023 22:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMDmPQ088935; Tue, 24 Jan 2023 22:13:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDmbp088934; Tue, 24 Jan 2023 22:13:48 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:48 GMT Message-Id: <202301242213.30OMDmbp088934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 743ee03d7289 - stable/13 - kboot: powerpc ldscript catchup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 743ee03d7289ec1296c78eff5c3b10215dca132f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=743ee03d7289ec1296c78eff5c3b10215dca132f commit 743ee03d7289ec1296c78eff5c3b10215dca132f Author: Warner Losh AuthorDate: 2022-12-04 04:41:05 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:42 +0000 kboot: powerpc ldscript catchup Catch up with the latest ldscript for powerpc. Make it match others in the tree. Sponsored by: Netflix (cherry picked from commit e3b74ec119a7d98a0f340674e28923707b7166b4) --- stand/kboot/arch/powerpc64/ldscript.powerpc | 48 +++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/stand/kboot/arch/powerpc64/ldscript.powerpc b/stand/kboot/arch/powerpc64/ldscript.powerpc index 729113695105..662871eb7c09 100644 --- a/stand/kboot/arch/powerpc64/ldscript.powerpc +++ b/stand/kboot/arch/powerpc64/ldscript.powerpc @@ -10,15 +10,7 @@ SECTIONS { /* Read-only sections, merged into text segment: */ . = 0x100000; - .text : - { - *(.text) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - *(.gnu.linkonce.t*) - } =0 - _etext = .; - .interp : { *(.interp) } + .interp : { *(.interp) } :text .hash : { *(.hash) } .dynsym : { *(.dynsym) } .dynstr : { *(.dynstr) } @@ -40,7 +32,9 @@ SECTIONS .rela.fini : { *(.rela.fini) } .rela.bss : { *(.rela.bss) } .rela.plt : { *(.rela.plt) } + .rela.sdata : { *(.rela.sdata) } .rela.sbss : { *(.rela.sbss) } + .rela.sdata2 : { *(.rela.sdata2) } .rela.sbss2 : { *(.rela.sbss2) } .text : { @@ -55,9 +49,11 @@ SECTIONS .fini : { *(.fini) } =0 .rodata : { *(.rodata) *(.gnu.linkonce.r*) } .rodata1 : { *(.rodata1) } + .sdata2 : { *(.sdata2) } .sbss2 : { *(.sbss2) } /* Adjust the address for the data segment to the next page up. */ . = ((. + 0x1000) & ~(0x1000 - 1)); + .data.rel.ro : { *(.data.rel.ro*) } .data : { *(.data) @@ -86,6 +82,10 @@ SECTIONS .got : { *(.got) } .got.plt : { *(.got.plt) } PROVIDE (_GOT_END_ = .); + /* We want the small data sections together, so single-instruction offsets + can access them all, and initialized data all before uninitialized, so + we can shorten the on-disk segment size. */ + .sdata : { *(.sdata) } _edata = .; PROVIDE (edata = .); .sbss : @@ -107,5 +107,33 @@ SECTIONS . = ALIGN(4096); _end = . ; PROVIDE (end = .); + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + /* These must appear regardless of . */ } -