This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
Quoting Daniel Jacobowitz <drow@false.org>: > > Here goes the revised patch. Wishing that it will not get mangled any > > more. Please review and comments. > > > > 2005-05-01 Paul Gilliam <pgilliam@us.ibm.com> > > Wu Zhou <woodzltc@cn.ibm.com> > > > > * gdb.base/shreloc.exp: Use gdb_compile_shlib. Add support for > > IBM's xlc compiler. > > * gdb.base/shreloc1.c: Refer variable static_var_1 in fn_1. > > * gdb.base/shreloc2.c: Refer variable static_var_2 in fn_2. > > Sorry about the delay. This patch is OK, but please change two things > for me before you commit it: the correct term here is "reference" > rather than "refer", and the ChangeLog entry should show where the > changes take place. Like so: > > * gdb.base/shreloc.exp: Use gdb_compile_shlib. Add support for > IBM's xlc compiler. > * gdb.base/shreloc1.c (fn_1): Reference variable static_var_1. > * gdb.base/shreloc2.c (fn_2): Reference variable static_var_2. > > So with that changelog, and "refered" changed to "referenced" in the > patch, it is OK to commit. > Hi Daniel, Thanks for pointing out these errors for me. Followed is the re-worked patch. 2005-05-17 Paul Gilliam <pgilliam@us.ibm.com> Wu Zhou <woodzltc@cn.ibm.com> * gdb.base/shreloc.exp: Use gdb_compile_shlib. Add support for IBM's xlc compiler. * gdb.base/shreloc1.c (fn_1): Reference variable static_var_1. * gdb.base/shreloc2.c (fn_2): Reference variable static_var_2. Index: gdb.base/shreloc.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/shreloc.exp,v retrieving revision 1.2 diff -c -p -r1.2 shreloc.exp *** gdb.base/shreloc.exp 11 Nov 2003 17:58:28 -0000 1.2 --- gdb.base/shreloc.exp 17 May 2005 10:01:35 -0000 *************** *** 1,4 **** ! # Copyright (C) 2003 Free Software Foundation, Inc. # # 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 --- 1,4 ---- ! # Copyright (C) 2003, 2005 Free Software Foundation, Inc. # # 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 *************** *** 15,23 **** # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # - # Please email any bugs, comments, and/or additions to this file to: - # bug-gdb@prep.ai.mit.edu - # Tests for shared object file relocation. If two shared objects have # the same load address (actually, overlapping load spaces), one of # them gets relocated at load-time. Check that gdb gets the right --- 15,20 ---- *************** set prms_id 0 *** 40,71 **** set bug_id 0 set workdir ${objdir}/${subdir} ! foreach module [list "shreloc" "shreloc1" "shreloc2"] { ! if {[gdb_compile "${srcdir}/${subdir}/${module}.c" "${workdir}/${module}.o" object {debug}] != ""} { ! untested "Couldn't compile ${module}.c" ! return -1 ! } } ! set additional_flags "additional_flags=-shared" if {([istarget "*pc-cygwin"] || [istarget "*pc-mingw32"]) } { ! set additional_flags "${additional_flags} -Wl,--image-base,0x04000000" } ! foreach module [list "shreloc1" "shreloc2"] { ! if {[gdb_compile "${workdir}/${module}.o" "${workdir}/${module}.dll" executable [list debug $additional_flags]] != ""} { ! untested "Couldn't link ${module}.dll" ! return -1 ! } } ! if {[gdb_compile [list "${workdir}/shreloc.o" "${workdir}/shreloc1.dll" "${workdir}/shreloc2.dll"] "${workdir}/shreloc" executable debug] != ""} { ! untested "Couldn't link shreloc executable" return -1 } gdb_exit gdb_start gdb_reinitialize_dir $srcdir/$subdir --- 37,86 ---- set bug_id 0 set workdir ${objdir}/${subdir} + set testfile "shreloc" + set libfile1 "shreloc1" + set libfile2 "shreloc2" + set srcfile $srcdir/$subdir/$testfile.c + set lib1src $srcdir/$subdir/$libfile1.c + set lib2src $srcdir/$subdir/$libfile2.c + set binfile $objdir/$subdir/$testfile + set lib1_sl $objdir/$subdir/$libfile1.sl + set lib2_sl $objdir/$subdir/$libfile2.sl ! if [get_compiler_info ${binfile}] { ! return -1 } ! set lib_opts "debug" ! set exec_opts [list debug shlib=$lib1_sl shlib=$lib2_sl] if {([istarget "*pc-cygwin"] || [istarget "*pc-mingw32"]) } { ! lappend lib_opts "additional_flags=-Wl,--image-base,0x04000000" } ! if [test_compiler_info "xlc-*"] { ! ! # IBM's xlc compiler does not add static variables to the ELF symbol ! # table by default. We need this option to make the variables show ! # up in "maint print msymbols". ! ! lappend lib_opts "additional_flags=-qstatsym" ! } ! if { [gdb_compile_shlib $lib1src $lib1_sl $lib_opts] != ""} { ! untested "Could not build $lib1_sl." ! return -1 ! } elseif { [gdb_compile_shlib $lib2src $lib2_sl $lib_opts] != ""} { ! untested "Could not build $lib1_s2." ! return -1 ! } elseif { [gdb_compile $srcfile $binfile executable $exec_opts] != ""} { ! untested "Could not build $binfile." return -1 } + # Start with a fresh gdb. + gdb_exit gdb_start gdb_reinitialize_dir $srcdir/$subdir Index: gdb.base/shreloc1.c =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/shreloc1.c,v retrieving revision 1.1 diff -c -p -r1.1 shreloc1.c *** gdb.base/shreloc1.c 9 Jun 2003 21:23:53 -0000 1.1 --- gdb.base/shreloc1.c 17 May 2005 10:01:35 -0000 *************** *** 6,10 **** static int static_var_1; ! ATTRIBUTES void fn_1 (int unused) { } ATTRIBUTES int extern_var_1 = 0; --- 6,10 ---- static int static_var_1; ! ATTRIBUTES void fn_1 (int referenced) { static_var_1 = referenced; } ATTRIBUTES int extern_var_1 = 0; Index: gdb.base/shreloc2.c =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/shreloc2.c,v retrieving revision 1.1 diff -c -p -r1.1 shreloc2.c *** gdb.base/shreloc2.c 9 Jun 2003 21:23:53 -0000 1.1 --- gdb.base/shreloc2.c 17 May 2005 10:01:35 -0000 *************** *** 6,10 **** static int static_var_2; ! ATTRIBUTES void fn_2 (int unused) { } ATTRIBUTES int extern_var_2 = 0; --- 6,10 ---- static int static_var_2; ! ATTRIBUTES void fn_2 (int referenced) { static_var_2 = referenced; } ATTRIBUTES int extern_var_2 = 0; ===========================End of the patch========================= Cheers - Wu Zhou
Attachment:
shreloc_v3.patch
Description: Binary data
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |