ld: Change -z one-rosegment to --rosegment in comments

There is no such linker command-line option, -z one-rosegment.  Replace
it with --rosegment in comments.

	* genscripts.sh: Change -z one-rosegment to --rosegment in
	comments.

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
This commit is contained in:
H.J. Lu
2024-09-20 11:00:59 +08:00
parent c0f2499785
commit c588e37496

View File

@@ -64,50 +64,50 @@
# following suffixes might be generated as well: # following suffixes might be generated as well:
# #
# xdwe: -pie -z combreloc -z separate-code -z relro -z now # xdwe: -pie -z combreloc -z separate-code -z relro -z now
# xdwer: -pie -z combreloc -z separate-code -z relro -z now -z one-rosegment # xdwer: -pie -z combreloc -z separate-code -z relro -z now --rosegment
# xdw: -pie -z combreloc -z relro -z now # xdw: -pie -z combreloc -z relro -z now
# xdceo: -pie -z combreloc -z separate-code -z relro # xdceo: -pie -z combreloc -z separate-code -z relro
# xdceor: -pie -z combreloc -z separate-code -z relro -z one-rosegment # xdceor: -pie -z combreloc -z separate-code -z relro --rosegment
# xdce: -pie -z combreloc -z separate-code # xdce: -pie -z combreloc -z separate-code
# xdcer: -pie -z combreloc -z separate-code -z one-rosegment # xdcer: -pie -z combreloc -z separate-code --rosegment
# xdco: -pie -z combreloc -z relro # xdco: -pie -z combreloc -z relro
# xdc: -pie -z combreloc # xdc: -pie -z combreloc
# xdeo: -pie -z separate-code -z relro # xdeo: -pie -z separate-code -z relro
# xdeor: -pie -z separate-code -z relro -z one-rosegment # xdeor: -pie -z separate-code -z relro --rosegment
# xde: -pie -z separate-code # xde: -pie -z separate-code
# xder: -pie -z separate-code -z one-rosegment # xder: -pie -z separate-code --rosegment
# xdo: -pie -z relro # xdo: -pie -z relro
# xd: -pie # xd: -pie
# #
# xswe: -shared -z combreloc -z separate-code -z relro -z now # xswe: -shared -z combreloc -z separate-code -z relro -z now
# xswer: -shared -z combreloc -z separate-code -z relro -z now -z one-rosegment # xswer: -shared -z combreloc -z separate-code -z relro -z now --rosegment
# xsw: -shared -z combreloc -z relro -z now # xsw: -shared -z combreloc -z relro -z now
# xsceo: -shared -z combreloc -z separate-code -z relro # xsceo: -shared -z combreloc -z separate-code -z relro
# xsceor: -shared -z combreloc -z separate-code -z relro -z one-rosegment # xsceor: -shared -z combreloc -z separate-code -z relro --rosegment
# xsce: -shared -z combreloc -z separate-code # xsce: -shared -z combreloc -z separate-code
# xscer: -shared -z combreloc -z separate-code -z one-rosegment # xscer: -shared -z combreloc -z separate-code --rosegment
# xsco: -shared -z combreloc -z relro # xsco: -shared -z combreloc -z relro
# xsc: -shared -z combreloc # xsc: -shared -z combreloc
# xseo: -shared -z separate-code -z relro # xseo: -shared -z separate-code -z relro
# xseor: -shared -z separate-code -z relro -z one-rosegment # xseor: -shared -z separate-code -z relro --rosegment
# xse: -shared -z separate-code # xse: -shared -z separate-code
# xser: -shared -z separate-code -z one-rosegment # xser: -shared -z separate-code --rosegment
# xso: -shared -z relro # xso: -shared -z relro
# xs: -shared # xs: -shared
# #
# xwe: -z combreloc -z separate-code -z relro -z now -z one-rosegment # xwe: -z combreloc -z separate-code -z relro -z now --rosegment
# xwer: -z combreloc -z separate-code -z relro -z now # xwer: -z combreloc -z separate-code -z relro -z now
# xw: -z combreloc -z relro -z now # xw: -z combreloc -z relro -z now
# xceo: -z combreloc -z separate-code -z relro # xceo: -z combreloc -z separate-code -z relro
# xceor: -z combreloc -z separate-code -z relro -z one-rosegment # xceor: -z combreloc -z separate-code -z relro --rosegment
# xce: -z combreloc -z separate-code # xce: -z combreloc -z separate-code
# xcer: -z combreloc -z separate-code -z one-rosegment # xcer: -z combreloc -z separate-code --rosegment
# xco: -z combreloc -z relro # xco: -z combreloc -z relro
# xc: -z combreloc # xc: -z combreloc
# xeo: -z separate-code -z relro # xeo: -z separate-code -z relro
# xeor: -z separate-code -z relro -z one-rosegment # xeor: -z separate-code -z relro --rosegment
# xe: -z separate-code # xe: -z separate-code
# xer: -z separate-code -z one-rosegment # xer: -z separate-code --rosegment
# xo: -z relro # xo: -z relro
# #
# #
@@ -343,7 +343,7 @@ LD_FLAG=textonly
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xe ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xe
LD_FLAG=rotextonly LD_FLAG=rotextonly
( echo "/* Script for -z separate-code -z one-rosegment */" ( echo "/* Script for -z separate-code --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xer ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xer
@@ -364,7 +364,7 @@ if test -n "$GENERATE_RELRO_SCRIPT"; then
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xeo ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xeo
LD_FLAG=rotextonly LD_FLAG=rotextonly
( echo "/* Script for -z separate-code -z relro -z one-rosegment */" ( echo "/* Script for -z separate-code -z relro --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xeor ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xeor
@@ -406,7 +406,7 @@ if test -n "$GENERATE_COMBRELOC_SCRIPT"; then
LD_FLAG=roctextonly LD_FLAG=roctextonly
COMBRELOC=ldscripts/${EMULATION_NAME}.xcer.tmp COMBRELOC=ldscripts/${EMULATION_NAME}.xcer.tmp
( echo "/* Script for -z combreloc -z separate-code -z one-rosegment */" ( echo "/* Script for -z combreloc -z separate-code --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xcer ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xcer
@@ -433,7 +433,7 @@ if test -n "$GENERATE_COMBRELOC_SCRIPT"; then
LD_FLAG=rowtextonly LD_FLAG=rowtextonly
COMBRELOC=ldscripts/${EMULATION_NAME}.xwer.tmp COMBRELOC=ldscripts/${EMULATION_NAME}.xwer.tmp
( echo "/* Script for -z combreloc -z separate-code -z relro -z now -z one-rosegment */" ( echo "/* Script for -z combreloc -z separate-code -z relro -z now --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xwer ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xwer
@@ -464,7 +464,7 @@ if test -n "$GENERATE_COMBRELOC_SCRIPT"; then
LD_FLAG=roctextonly LD_FLAG=roctextonly
COMBRELOC=ldscripts/${EMULATION_NAME}.xceor.tmp COMBRELOC=ldscripts/${EMULATION_NAME}.xceor.tmp
( echo "/* Script for -z combreloc -z separate-code -z relro -z one-rosegment */" ( echo "/* Script for -z combreloc -z separate-code -z relro --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xceor ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xceor
@@ -492,7 +492,7 @@ if test -n "$GENERATE_SHLIB_SCRIPT"; then
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xse ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xse
LD_FLAG=rosharedtextonly LD_FLAG=rosharedtextonly
( echo "/* Script for -shared -z separate-code -z one-rosegment */" ( echo "/* Script for -shared -z separate-code --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xser ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xser
@@ -513,7 +513,7 @@ if test -n "$GENERATE_SHLIB_SCRIPT"; then
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xseo ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xseo
LD_FLAG=rosharedtextonly LD_FLAG=rosharedtextonly
( echo "/* Script for -shared -z separate-code -z relro -z one-rosegment */" ( echo "/* Script for -shared -z separate-code -z relro --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xseor ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xseor
@@ -541,7 +541,7 @@ if test -n "$GENERATE_SHLIB_SCRIPT"; then
LD_FLAG=rocsharedtextonly LD_FLAG=rocsharedtextonly
COMBRELOC=ldscripts/${EMULATION_NAME}.xscer.tmp COMBRELOC=ldscripts/${EMULATION_NAME}.xscer.tmp
( echo "/* Script for -shared -z combreloc -z separate-code -z one-rosegment */" ( echo "/* Script for -shared -z combreloc -z separate-code --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xscer ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xscer
@@ -567,7 +567,7 @@ if test -n "$GENERATE_SHLIB_SCRIPT"; then
LD_FLAG=rowsharedtextonly LD_FLAG=rowsharedtextonly
COMBRELOC=ldscripts/${EMULATION_NAME}.xswe.tmp COMBRELOC=ldscripts/${EMULATION_NAME}.xswe.tmp
( echo "/* Script for -shared -z combreloc -z separate-code -z relro -z now -z one-rosegment */" ( echo "/* Script for -shared -z combreloc -z separate-code -z relro -z now --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xswer ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xswer
@@ -596,7 +596,7 @@ if test -n "$GENERATE_SHLIB_SCRIPT"; then
LD_FLAG=rowsharedtextonly LD_FLAG=rowsharedtextonly
COMBRELOC=ldscripts/${EMULATION_NAME}.xsceor.tmp COMBRELOC=ldscripts/${EMULATION_NAME}.xsceor.tmp
( echo "/* Script for -shared -z combreloc -z separate-code -z relro -z one-rosegment */" ( echo "/* Script for -shared -z combreloc -z separate-code -z relro --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xsceor ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xsceor
@@ -628,7 +628,7 @@ if test -n "$GENERATE_PIE_SCRIPT"; then
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xde ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xde
LD_FLAG=ropietextonly LD_FLAG=ropietextonly
( echo "/* Script for -pie -z separate-code -z one-rosegment */" ( echo "/* Script for -pie -z separate-code --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xder ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xder
@@ -649,7 +649,7 @@ if test -n "$GENERATE_PIE_SCRIPT"; then
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xdeo ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xdeo
LD_FLAG=ropietextonly LD_FLAG=ropietextonly
( echo "/* Script for -pie -z separate-code -z relro -z one-rosegment */" ( echo "/* Script for -pie -z separate-code -z relro --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xdeor ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xdeor
@@ -677,7 +677,7 @@ if test -n "$GENERATE_PIE_SCRIPT"; then
LD_FLAG=rocpietextonly LD_FLAG=rocpietextonly
COMBRELOC=ldscripts/${EMULATION_NAME}.xdcer.tmp COMBRELOC=ldscripts/${EMULATION_NAME}.xdcer.tmp
( echo "/* Script for -pie -z combreloc -z separate-code -z one-rosegment */" ( echo "/* Script for -pie -z combreloc -z separate-code --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xdcer ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xdcer
@@ -703,7 +703,7 @@ if test -n "$GENERATE_PIE_SCRIPT"; then
LD_FLAG=rowpietextonly LD_FLAG=rowpietextonly
COMBRELOC=ldscripts/${EMULATION_NAME}.xdwer.tmp COMBRELOC=ldscripts/${EMULATION_NAME}.xdwer.tmp
( echo "/* Script for -pie -z combreloc -z separate-code -z relro -z now -z one-rosegment */" ( echo "/* Script for -pie -z combreloc -z separate-code -z relro -z now --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xdwer ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xdwer
@@ -732,7 +732,7 @@ if test -n "$GENERATE_PIE_SCRIPT"; then
LD_FLAG=rowpietextonly LD_FLAG=rowpietextonly
COMBRELOC=ldscripts/${EMULATION_NAME}.xdceor.tmp COMBRELOC=ldscripts/${EMULATION_NAME}.xdceor.tmp
( echo "/* Script for -pie -z combreloc -z separate-code -z relro -z one-rosegment */" ( echo "/* Script for -pie -z combreloc -z separate-code -z relro --rosegment */"
source_sh ${CUSTOMIZER_SCRIPT} source_sh ${CUSTOMIZER_SCRIPT}
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xdceor ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xdceor