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

ld/

Browse source 
* configure.host (HOSTING_LIBS): Two dollars on shell variable
	expansion to suit make.
ld/testsuite
	* config/default.exp (get_link_files): Replace double dollars with
	single dollars.
This commit is contained in:
Alan Modra 2009-03-17 05:33:00 +00:00
parent 6b251945f5
commit bba21f1561
4 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ld/ChangeLog
View file

@ -1,3 +1,8 @@
2009-03-17 Alan Modra <amodra@bigpond.net.au>
* configure.host (HOSTING_LIBS): Two dollars on shell variable
expansion to suit make.
2009-03-17 Alan Modra <amodra@bigpond.net.au>
* configure.in: Invoke ACX_PROG_CMP_IGNORE_INITIAL.

2
ld/configure.host
View file

@ -10,7 +10,7 @@
HDEFINES=
HOSTING_CRT0=/lib/crt0.o
HOSTING_LIBS='`if [ -f ../gcc/libgcc.a ]; then libgcc=../gcc/libgcc.a; else libgcc=\`${CC} -print-libgcc-file-name\`; fi; if [ -f ../gcc/libgcc_eh.a ]; then libgcc="$libgcc ../gcc/libgcc_eh.a"; else libgcc_eh=\`${CC} -print-file-name=libgcc_eh.a\`; if [ x"$libgcc_eh" != xlibgcc_eh.a ]; then libgcc="$libgcc $libgcc_eh"; fi; fi; if [ -f ../gcc/libunwind.a ]; then libgcc="$libgcc ../gcc/libunwind.a"; else libunwind=\`${CC} -print-file-name=libunwind.a\`; if [ x"$libunwind" != xlibunwind.a ]; then libgcc="$libgcc $libunwind"; fi; fi; echo --start-group $libgcc -lc --end-group`'
HOSTING_LIBS='`if [ -f ../gcc/libgcc.a ]; then libgcc=../gcc/libgcc.a; else libgcc=\`${CC} -print-libgcc-file-name\`; fi; if [ -f ../gcc/libgcc_eh.a ]; then libgcc="$$libgcc ../gcc/libgcc_eh.a"; else libgcc_eh=\`${CC} -print-file-name=libgcc_eh.a\`; if [ x"$$libgcc_eh" != xlibgcc_eh.a ]; then libgcc="$$libgcc $$libgcc_eh"; fi; fi; if [ -f ../gcc/libunwind.a ]; then libgcc="$$libgcc ../gcc/libunwind.a"; else libunwind=\`${CC} -print-file-name=libunwind.a\`; if [ x"$$libunwind" != xlibunwind.a ]; then libgcc="$$libgcc $$libunwind"; fi; fi; echo --start-group $$libgcc -lc --end-group`'
#
# Generic configurations:

5
ld/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2009-03-17 Alan Modra <amodra@bigpond.net.au>
* config/default.exp (get_link_files): Replace double dollars with
single dollars.
2009-03-17 Alan Modra <amodra@bigpond.net.au>
* ld-bootstrap/bootstrap.exp: Use DO_COMPARE. Remove unnecessary

10
ld/testsuite/config/default.exp
View file

@ -115,9 +115,17 @@ proc get_link_files {varname} {
global srcdir
global CC
if ![info exists $varname] {
set status [catch "exec sh -c \"host='$target_triplet' && CC='$CC' && . $srcdir/../configure.host && eval echo \\$$varname\"" result]
#configure.host returns variables that can be substituted into
#makefile rules, with embedded shell variable expansions.
#make wants $$shell_var, we want $shell_var ...
set cmd "host='$target_triplet' && . $srcdir/../configure.host && sed -e 's,\\\$\\\$,\$,g' <<EOF\n\$$varname\nEOF"
set status [catch "exec sh -c [list $cmd]" result]
if $status { error "Error getting native link files: $result" }
set cmd "CC='$CC' && eval echo \"$result\""
set status [catch "exec sh -c [list $cmd]" result]
if $status { error "Error getting native link files: $result" }
set $varname $result
send_log "$varname = $result\n"
}
}