2003-05-07 H.J. Lu * ld-elfvers/vers.exp (build_binary): Support build exeutable. (build_binary): Renamed from ... (build_vers_lib): This. (build_vers_lib_no_pic): Updated. (build_vers_lib_pic): Likewise. Add vers27d1, vers27d2 and vers27d3 to test versioned definition for hidden symbol referenced by a DSO. * ld-elfvers/vers27d.dsym: New file. * ld-elfvers/vers27d.sym: Likewise. * ld-elfvers/vers27d.ver: Likewise. * ld-elfvers/vers27d1.c: Likewise. * ld-elfvers/vers27d2.c: Likewise. * ld-elfvers/vers27d3.c: Likewise. --- ld/testsuite/ld-elfvers/vers.exp.hidden 2003-05-07 21:16:30.000000000 -0700 +++ ld/testsuite/ld-elfvers/vers.exp 2003-05-07 21:59:18.000000000 -0700 @@ -497,7 +497,7 @@ proc objdump_versionstuff { objdump obje } } -proc build_vers_lib { pic test source libname other mapfile verexp versymexp symexp } { +proc build_binary { shared pic test source libname other mapfile verexp versymexp symexp } { global ld global srcdir global subdir @@ -508,7 +508,6 @@ proc build_vers_lib { pic test source li global objdump global CC global CFLAGS - global shared global script if ![ld_compile "$CC -S $pic $CFLAGS" $srcdir/$subdir/$source $tmpdir/$libname.s] { @@ -565,13 +564,19 @@ proc build_vers_lib { pic test source li } +proc build_executable { test source libname other mapfile verexp versymexp symexp } { + build_binary "" "" $test $source $libname $other $mapfile $verexp $versymexp $symexp +} + proc build_vers_lib_no_pic { test source libname other mapfile verexp versymexp symexp } { - build_vers_lib "" $test $source $libname $other $mapfile $verexp $versymexp $symexp + global shared + build_binary $shared "" $test $source $libname $other $mapfile $verexp $versymexp $symexp } proc build_vers_lib_pic { test source libname other mapfile verexp versymexp symexp } { global picflag - build_vers_lib $picflag $test $source $libname $other $mapfile $verexp $versymexp $symexp + global shared + build_binary $shared $picflag $test $source $libname $other $mapfile $verexp $versymexp $symexp } proc test_ldfail { test flag source execname other mapfile whyfail } { @@ -929,3 +934,6 @@ build_vers_lib_no_pic "vers27a" vers27a. build_vers_lib_no_pic "vers27b" vers27b.c vers27b "" "" vers27b.ver vers27b.dsym "" build_vers_lib_no_pic "vers27c1" vers27c.c vers27c1 "vers27b.o vers27a.so" "" vers27c.ver vers27c.dsym "" build_vers_lib_no_pic "vers27c2" vers27c.c vers27c2 "vers27a.so vers27b.o" "" vers27c.ver vers27c.dsym "" +build_vers_lib_pic "vers27d1" vers27d1.c vers27d1 "" vers27a.map vers27d.ver vers27d.dsym vers27d.sym +build_vers_lib_pic "vers27d2" vers27d2.c vers27d2 "" "" vers27b.ver vers27b.dsym "" +build_executable "vers27d3" vers27d3.c vers27d3 "vers27b.o vers27d2.so vers27d1.so" "" vers27b.ver vers27b.dsym "" --- ld/testsuite/ld-elfvers/vers27d.dsym.hidden 2003-05-07 22:00:12.000000000 -0700 +++ ld/testsuite/ld-elfvers/vers27d.dsym 2003-05-07 21:36:20.000000000 -0700 @@ -0,0 +1,2 @@ +[0]*[ ]+g[ ]+DO[ ]+\*ABS\*[ ]+[0]*[ ]+VERS.0[ ]+VERS.0 +[0-9a-f]*[ ]+g[ ]+DF[ ]+.text[ ]+[0-9a-f]*[ ]+\(VERS.0\)[ ]+(0x[0-9a-f]*|)[ ]*foo --- ld/testsuite/ld-elfvers/vers27d.sym.hidden 2003-05-07 22:00:12.000000000 -0700 +++ ld/testsuite/ld-elfvers/vers27d.sym 2003-05-07 21:37:47.000000000 -0700 @@ -0,0 +1 @@ +[0-9a-f]*[ ]+g[ ]+F[ ]+.text[ ]+[0-9a-f]* (0x[0-9a-f][0-9a-f] )?foo@VERS.0 --- ld/testsuite/ld-elfvers/vers27d.ver.hidden 2003-05-07 22:00:12.000000000 -0700 +++ ld/testsuite/ld-elfvers/vers27d.ver 2003-05-07 21:56:45.000000000 -0700 @@ -0,0 +1,4 @@ +Version definitions: +1 0x01 0x05ac0cff vers27d1.so +2 0x00 0x05aa7610 VERS.0 + --- ld/testsuite/ld-elfvers/vers27d1.c.hidden 2003-05-07 22:00:12.000000000 -0700 +++ ld/testsuite/ld-elfvers/vers27d1.c 2003-05-07 21:27:05.000000000 -0700 @@ -0,0 +1,6 @@ +void +foo () +{ +} + +asm (".symver foo,foo@VERS.0"); --- ld/testsuite/ld-elfvers/vers27d2.c.hidden 2003-05-07 22:00:12.000000000 -0700 +++ ld/testsuite/ld-elfvers/vers27d2.c 2003-05-07 21:27:35.000000000 -0700 @@ -0,0 +1,7 @@ +void foo (); + +void +ref () +{ + foo (); +} --- ld/testsuite/ld-elfvers/vers27d3.c.hidden 2003-05-07 22:00:12.000000000 -0700 +++ ld/testsuite/ld-elfvers/vers27d3.c 2003-05-07 21:29:22.000000000 -0700 @@ -0,0 +1,11 @@ +extern void ref (); +extern void foo (); + +void _start() __asm__("_start"); + +void +_start () +{ + foo (); + ref (); +}