* ldlex.l, ldgram.y: Add ALIGNOF.

* ldexp.c (exp_print_token, foldname): Likewise.
	* ld.texinfo: Likewise.

	ld/testsuite/
	* ld-scripts/alignof.s: New.
	* ld-scripts/alignof.t: New
	* ld-scripts/alignof.exp: New.
This commit is contained in:
Nathan Sidwell 2007-06-18 12:38:22 +00:00
parent 42ba7415cc
commit 362c1d1a04
8 changed files with 125 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2007-06-18 Nathan Sidwell <nathan@codesourcery.com>
* ldlex.l, ldgram.y: Add ALIGNOF.
* ldexp.c (exp_print_token, foldname): Likewise.
* ld.texinfo: Likewise.
2007-06-18 Alan Modra <amodra@bigpond.net.au>
* Makefile.am: Add eelf32_spu.o rule.

View file

@ -4995,6 +4995,25 @@ of @code{ALIGN} is used to defines the value of a symbol.
The builtin function @code{NEXT} is closely related to @code{ALIGN}.
@item ALIGNOF(@var{section})
@kindex ALIGNOF(@var{section})
@cindex section alignment
Return the alignment in bytes of the named @var{section}, if that section has
been allocated. If the section has not been allocated when this is
evaluated, the linker will report an error. In the following example,
the alignment of the @code{.output} section is stored as the first
value in that section.
@smallexample
@group
SECTIONS@{ @dots{}
.output @{
LONG (ALIGNOF (.output))
@dots{}
@}
@dots{} @}
@end group
@end smallexample
@item BLOCK(@var{exp})
@kindex BLOCK(@var{exp})
This is a synonym for @code{ALIGN}, for compatibility with older linker

View file

@ -97,6 +97,7 @@ exp_print_token (token_code_type code, int infix_p)
{ MAP, "MAP" },
{ ENTRY, "ENTRY" },
{ NEXT, "NEXT" },
{ ALIGNOF, "ALIGNOF" },
{ SIZEOF, "SIZEOF" },
{ ADDR, "ADDR" },
{ LOADADDR, "LOADADDR" },
@ -606,9 +607,9 @@ fold_name (etree_type *tree)
break;
case SIZEOF:
case ALIGNOF:
if (expld.phase != lang_first_phase_enum)
{
int opb = bfd_octets_per_byte (output_bfd);
lang_output_section_statement_type *os;
os = lang_output_section_find (tree->name.name);
@ -620,7 +621,16 @@ fold_name (etree_type *tree)
new_abs (0);
}
else if (os->processed_vma)
new_abs (os->bfd_section->size / opb);
{
bfd_vma val;
if (tree->type.node_code == SIZEOF)
val = os->bfd_section->size / bfd_octets_per_byte (output_bfd);
else
val = (bfd_vma)1 << os->bfd_section->alignment_power;
new_abs (val);
}
}
break;

View file

@ -254,6 +254,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
<EXPRESSION,BOTH,SCRIPT>"DATA_SEGMENT_END" { RTOKEN(DATA_SEGMENT_END);}
<EXPRESSION,BOTH,SCRIPT>"ADDR" { RTOKEN(ADDR);}
<EXPRESSION,BOTH,SCRIPT>"LOADADDR" { RTOKEN(LOADADDR);}
<EXPRESSION,BOTH,SCRIPT>"ALIGNOF" { RTOKEN(ALIGNOF); }
<EXPRESSION,BOTH>"MAX" { RTOKEN(MAX_K); }
<EXPRESSION,BOTH>"MIN" { RTOKEN(MIN_K); }
<EXPRESSION,BOTH,SCRIPT>"ASSERT" { RTOKEN(ASSERT_K); }

View file

@ -1,3 +1,9 @@
2007-06-18 Nathan Sidwell <nathan@codesourcery.com>
* ld-scripts/alignof.s: New.
* ld-scripts/alignof.t: New
* ld-scripts/alignof.exp: New.
2007-06-14 Alan Modra <alan@grove.modra.org>
* ld-spu/ovl.d: Update.

View file

@ -0,0 +1,57 @@
# Test ALIGNOF in a linker script.
# By Nathan Sidwell <nathan@codesourcery.com>
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
set testname "ALIGNOF"
if ![ld_assemble $as $srcdir/$subdir/alignof.s tmpdir/alignof.o] {
unresolved $testname
return
}
if ![ld_simple_link $ld tmpdir/alignof "-T $srcdir/$subdir/alignof.t tmpdir/alignof.o"] {
fail $testname
return
}
if ![ld_nm $nm "" tmpdir/alignof] {
unresolved $testname
return
}
if {![info exists nm_output(alignof_text)] \
|| ![info exists nm_output(alignof_data)]} {
send_log "bad output from nm\n"
verbose "bad output from nm"
fail $testname
return
}
if {$nm_output(alignof_text) != 64} {
send_log "alignof_text != 64\n"
verbose "alignof_text != 64"
fail $testname
return
}
if {$nm_output(alignof_data) != 16} {
send_log "alignof_data != 16\n"
verbose "alignof_data != 16"
fail $testname
return
}
pass $testname

View file

@ -0,0 +1,9 @@
.text
.p2align 6
.long 0
.data
.p2align 4
.long 0

View file

@ -0,0 +1,15 @@
SECTIONS {
.text :
{
tmpdir/alignof.o (.text)
}
.data :
{
tmpdir/alignof.o (.data)
LONG (ALIGNOF(.text))
LONG (ALIGNOF(.data))
}
}
alignof_text = ALIGNOF(.text);
alignof_data = ALIGNOF(.data);