Le 24/12/2012 17:23, Bruce Dubbs a écrit :
[...]
075-binutils
Running /sources/binutils-2.23.1/ld/testsuite/ld-ifunc/ifunc.exp ...
FAIL: Common symbol override ifunc test 1b
This is new to me, but there are some mentions at
http://sourceware.org/bugzilla/show_bug.cgi?id=14778
but the changes mentioned are in 2.23.1. Perhaps more
research is needed to get a patch or jsut mention it in the text
of the book.
[...]
Actually, 2.23.1 was tagged just before the patch was included. See:
http://sourceware.org/cgi-bin/cvsweb.cgi/src/ld/testsuite/lib/ld-lib.exp?cvsroot=src
(look for Revision 1.92.2.3)
I have made a patch from out of the post mentioned by Bruce, which I join.
Not sure I packaged it right, sorry.
Regards
Pierre
Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr>
Date: 2012-12-28
Initial Package Version: 2.23.1
Upstream Status: Already included in 2.23 CVS branch
Origin: Upstream
Description: Fixes a failure in ld tests
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/shared.exp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- src/ld/testsuite/ld-elf/shared.exp 2012/07/10 04:51:53 1.21
+++ src/ld/testsuite/ld-elf/shared.exp 2012/09/17 19:51:25 1.22
@@ -336,14 +336,14 @@
{del.cc new.cc} {} "libnew1b.so" "c++"}
}
-set run_cxx_tests {
- {"Run with libdl3a.so"
- "-Wl,--no-as-needed tmpdir/libdl3a.so" ""
- {dl3main.cc} "dl3a" "dl3a.out" "" "c++"}
# "-shared -Bsymbolic" only works with gcc 4.5.0 and newer.
# {"Run with libdl3b.so"
# "tmpdir/libdl3b.so" ""
# {dl3main.cc} "dl3b" "dl3b.out" "" "c++"}
+set run_cxx_tests {
+ {"Run with libdl3a.so"
+ "-Wl,--no-as-needed tmpdir/libdl3a.so" ""
+ {dl3main.cc} "dl3a" "dl3a.out" "" "c++"}
{"Run with libdl3c.so"
"-Wl,--no-as-needed tmpdir/libdl3c.so" ""
{dl3main.cc} "dl3c" "dl3a.out" "" "c++"}
===================================================================
RCS file: /cvs/src/src/ld/testsuite/lib/ld-lib.exp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- src/ld/testsuite/lib/ld-lib.exp 2012/08/13 14:52:54 1.95
+++ src/ld/testsuite/lib/ld-lib.exp 2012/09/17 19:51:25 1.96
@@ -1244,7 +1244,6 @@
# verbose -log "ld_options is $ld_options"
# verbose -log "as_options is $as_options"
# verbose -log "src_files is $src_files"
-# verbose -log "actions is $actions"
# verbose -log "binfile is $binfile"
# Assemble each file in the test.
@@ -1261,68 +1260,68 @@
} else {
ld_compile "$CC -c $CFLAGS $cflags" $srcdir/$subdir/$src_file $objfile
}
+ }
+
+ # We have to use $CC to build PIE and shared library.
+ if { [ string match "c" $lang ] } {
+ set link_proc ld_simple_link
+ set link_cmd $CC
+ } elseif { [ string match "c++" $lang ] } {
+ set link_proc ld_simple_link
+ set link_cmd $CXX
+ } elseif { [ string match "-shared" $ld_options ] \
+ || [ string match "-pie" $ld_options ] } {
+ set link_proc ld_simple_link
+ set link_cmd $CC
+ } else {
+ set link_proc ld_link
+ set link_cmd $ld
+ }
+
+ if ![$link_proc $link_cmd $binfile "-L$srcdir/$subdir $ld_options $objfiles"] {
+ set failed 1
+ } else {
+ set failed 0
+ }
- # We have to use $CC to build PIE and shared library.
- if { [ string match "c" $lang ] } {
- set link_proc ld_simple_link
- set link_cmd $CC
- } elseif { [ string match "c++" $lang ] } {
- set link_proc ld_simple_link
- set link_cmd $CXX
- } elseif { [ string match "-shared" $ld_options ] \
- || [ string match "-pie" $ld_options ] } {
- set link_proc ld_simple_link
- set link_cmd $CC
+ # Check if exec_output is expected.
+ if { $warning != "" } then {
+ verbose -log "returned with: <$exec_output>, expected: <$warning>"
+ if { [regexp $warning $exec_output] } then {
+ set failed 0
} else {
- set link_proc ld_link
- set link_cmd $ld
+ set failed 1
}
+ }
- if ![$link_proc $link_cmd $binfile "-L$srcdir/$subdir $ld_options $objfiles"] {
+ if { $failed == 0 } {
+ send_log "Running: $binfile > $binfile.out\n"
+ verbose "Running: $binfile > $binfile.out"
+ catch "exec $binfile > $binfile.out" exec_output
+
+ if ![string match "" $exec_output] then {
+ send_log "$exec_output\n"
+ verbose "$exec_output" 1
set failed 1
} else {
- set failed 0
- }
-
- # Check if exec_output is expected.
- if { $warning != "" } then {
- verbose -log "returned with: <$exec_output>, expected: <$warning>"
- if { [regexp $warning $exec_output] } then {
- set failed 0
- } else {
- set failed 1
- }
- }
-
- if { $failed == 0 } {
- send_log "Running: $binfile > $binfile.out\n"
- verbose "Running: $binfile > $binfile.out"
- catch "exec $binfile > $binfile.out" exec_output
+ send_log "diff $binfile.out $srcdir/$subdir/$expfile\n"
+ verbose "diff $binfile.out $srcdir/$subdir/$expfile"
+ catch "exec diff $binfile.out $srcdir/$subdir/$expfile" exec_output
+ set exec_output [prune_warnings $exec_output]
if ![string match "" $exec_output] then {
send_log "$exec_output\n"
verbose "$exec_output" 1
set failed 1
- } else {
- send_log "diff $binfile.out $srcdir/$subdir/$expfile\n"
- verbose "diff $binfile.out $srcdir/$subdir/$expfile"
- catch "exec diff $binfile.out $srcdir/$subdir/$expfile" exec_output
- set exec_output [prune_warnings $exec_output]
-
- if ![string match "" $exec_output] then {
- send_log "$exec_output\n"
- verbose "$exec_output" 1
- set failed 1
- }
}
}
+ }
- if { $failed != 0 } {
- fail $testname
- } else {
- set errcnt 0
- pass $testname
- }
+ if { $failed != 0 } {
+ fail $testname
+ } else {
+ set errcnt 0
+ pass $testname
}
}
}
--
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
