darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* ld.texinfo (File Commands): Document that INCLUDE can be used in

Browse source 
several different places.
	* ldgram.y (statement, memory_spec, section): Allow INCLUDE.
	(memory, memory_spec_list): Simplify BNF
	(memory_spec_list_opt): New rule.
	* ldlex.l (INCLUDE): Recognize in EXPRESSION.
testsuite/
	* ld-scripts/include-1.d: New.
	* ld-scripts/include-1.t: New.
	* ld-scripts/include-data.t: New.
	* ld-scripts/include-mem.t: New.
	* ld-scripts/include-ram.t: New.
	* ld-scripts/include-sections.t: New.
	* ld-scripts/include-subdata.t: New.
	* ld-scripts/include.exp: New.
	* ld-scripts/include.s: New.
This commit is contained in:
Nathan Sidwell 2008-07-06 13:38:37 +00:00
parent b56e7235bb
commit 4006703d71
14 changed files with 117 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ld/ChangeLog
View file

@ -1,3 +1,12 @@
2008-07-06 Nathan Sidwell <nathan@codesourcery.com>
* ld.texinfo (File Commands): Document that INCLUDE can be used in
several different places.
* ldgram.y (statement, memory_spec, section): Allow INCLUDE.
(memory, memory_spec_list): Simplify BNF
(memory_spec_list_opt): New rule.
* ldlex.l (INCLUDE): Recognize in EXPRESSION.
2008-06-20 Alan Modra <amodra@bigpond.net.au>
* emultempl/spuelf.em (gld${EMULATION_NAME}_finish): Make "can not

3
ld/ld.texinfo
View file

@ -2764,6 +2764,9 @@ be searched for in the current directory, and in any directory specified
with the @option{-L} option. You can nest calls to @code{INCLUDE} up to
10 levels deep.
You can place @code{INCLUDE} directives at the top level, in @code{MEMORY} or
@code{SECTIONS} commands, or in output section descriptions.
@item INPUT(@var{file}, @var{file}, @dots{})
@itemx INPUT(@var{file} @var{file} @dots{})
@kindex INPUT(@var{files})

21
ld/ldgram.y
View file

@ -577,6 +577,10 @@ statement:
| ASSERT_K {ldlex_expression ();} '(' exp ',' NAME ')' end
{ ldlex_popstate ();
lang_add_assignment (exp_assert ($4, $6)); }
| INCLUDE filename
{ ldlex_script (); ldfile_open_command_file($2); }
statement_list_opt END
{ ldlex_popstate (); }
;
statement_list:
@ -668,13 +672,14 @@ opt_comma:
memory:
MEMORY '{' memory_spec memory_spec_list '}'
MEMORY '{' memory_spec_list_opt '}'
;
memory_spec_list_opt: memory_spec_list | ;
memory_spec_list:
memory_spec_list memory_spec
| memory_spec_list ',' memory_spec
|
memory_spec_list opt_comma memory_spec
| memory_spec
;
@ -683,6 +688,10 @@ memory_spec: NAME
attributes_opt ':'
origin_spec opt_comma length_spec
{}
| INCLUDE filename
{ ldlex_script (); ldfile_open_command_file($2); }
memory_spec_list_opt END
{ ldlex_popstate (); }
;
origin_spec:
@ -966,6 +975,10 @@ section: NAME { ldlex_expression(); }
lang_add_assignment (exp_assop ('=', ".", $3));
}
'{' sec_or_group_p1 '}'
| INCLUDE filename
{ ldlex_script (); ldfile_open_command_file($2); }
sec_or_group_p1 END
{ ldlex_popstate (); }
;
type:

2
ld/ldlex.l
View file

@ -307,7 +307,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
<BOTH,SCRIPT>"org" { RTOKEN(ORIGIN);}
<BOTH,SCRIPT>"l" { RTOKEN( LENGTH);}
<BOTH,SCRIPT>"len" { RTOKEN( LENGTH);}
<BOTH,SCRIPT>"INCLUDE" { RTOKEN(INCLUDE);}
<EXPRESSION,BOTH,SCRIPT>"INCLUDE" { RTOKEN(INCLUDE);}
<BOTH,SCRIPT>"PHDRS" { RTOKEN (PHDRS); }
<EXPRESSION,BOTH,SCRIPT>"AT" { RTOKEN(AT);}
<EXPRESSION,BOTH,SCRIPT>"SUBALIGN" { RTOKEN(SUBALIGN);}

12
ld/testsuite/ChangeLog
View file

@ -1,3 +1,15 @@
2008-07-06 Nathan Sidwell <nathan@codesourcery.com>
* ld-scripts/include-1.d: New.
* ld-scripts/include-1.t: New.
* ld-scripts/include-data.t: New.
* ld-scripts/include-mem.t: New.
* ld-scripts/include-ram.t: New.
* ld-scripts/include-sections.t: New.
* ld-scripts/include-subdata.t: New.
* ld-scripts/include.exp: New.
* ld-scripts/include.s: New.
2008-06-29 Andreas Schwab <schwab@suse.de>
* ld-m68k/got-1.s: New file.

11
ld/testsuite/ld-scripts/include-1.d Normal file
View file

@ -0,0 +1,11 @@
# name: include-1
# source: include.s
# ld: -T include-1.t
# objdump: -w -h
.*: file format .*
Sections:
Idx +Name +Size +VMA +LMA +File off +Algn +Flags
0 .text 0+000000c 0+0000000 0+0000000 [0-9a-f]+ 2\*\*[0-9]+ CONTENTS, ALLOC, LOAD, READONLY, CODE
1 .data 0+000000c 0+0100000 0+0100000 [0-9a-f]+ 2\*\*[0-9]+ CONTENTS, ALLOC, LOAD, DATA

4
ld/testsuite/ld-scripts/include-1.t Normal file
View file

@ -0,0 +1,4 @@
INCLUDE include-mem.t
_start = 0x1000;
INCLUDE include-sections.t

4
ld/testsuite/ld-scripts/include-data.t Normal file
View file

@ -0,0 +1,4 @@
.data : {
INCLUDE include-subdata.t
__end = .;
}>ram

5
ld/testsuite/ld-scripts/include-mem.t Normal file
View file

@ -0,0 +1,5 @@
MEMORY {
rom (rwx) : ORIGIN = 0, LENGTH = 0x1000
INCLUDE include-ram.t
}

1
ld/testsuite/ld-scripts/include-ram.t Normal file
View file

@ -0,0 +1 @@
ram (rw) : ORIGIN = 0x100000, LENGTH = 512

4
ld/testsuite/ld-scripts/include-sections.t Normal file
View file

@ -0,0 +1,4 @@
SECTIONS {
.text : { *(.text) } >rom
INCLUDE include-data.t
}

2
ld/testsuite/ld-scripts/include-subdata.t Normal file
View file

@ -0,0 +1,2 @@
*(.data)

35
ld/testsuite/ld-scripts/include.exp Normal file
View file

@ -0,0 +1,35 @@
# Test for proper diagnosis of overflowed memory regions.
# Copyright 2008 Free Software Foundation, Inc.
#
# This file is part of the GNU Binutils.
#
# This program 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 3 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.
load_lib ld-lib.exp
set old_ldflags $LDFLAGS
if { [istarget spu*-*-*] } {
set LDFLAGS "$LDFLAGS --no-overlays"
}
set test_list [lsort [glob -nocomplain $srcdir/$subdir/include*.d]]
foreach test_file $test_list {
set test_name [file rootname $test_file]
set map_file "tmpdir/[file tail $test_name].map"
verbose $test_name
run_dump_test $test_name
}
set LDFLAGS $old_ldflags

9
ld/testsuite/ld-scripts/include.s Normal file
View file

@ -0,0 +1,9 @@
.section .text, "ax", "progbits"
.4byte 0x11223344
.4byte 0x55667788
.4byte 0x99aabbcc
.section .data, "aw", "progbits"
.4byte 0x01020304
.4byte 0x05060708
.4byte 0x090a0b0c