* arm.cc (Target_arm<big_endian>::gc_process_relocs): Add template

paramter to the call to gold::gc_process_relocs.
	* i386.cc (Target_i386<big_endian>::gc_process_relocs): Add template
	paramter to the call to gold::gc_process_relocs.
	* x86_64.cc (Target_x86_64<big_endian>::gc_process_relocs): Add template
	parameter to the call to gold::gc_process_relocs.
	* powerpc.cc (Target_powerpc<big_endian>::gc_process_relocs): Add
	template parameter to the call to gold::gc_process_relocs.
	* sparc.cc (Target_sparc<big_endian>::gc_process_relocs): Add template
	paramter to the call to gold::gc_process_relocs.
	* gc.h (get_embedded_addend_size): New function.
	(gc_process_relocs): Save the size of the reloc for use by ICF.
	* icf.cc (get_section_contents): Get the addend from the text section
	for SHT_REL relocation sections.
	* icf.h (Icf::Reloc_addend_size_info): New typedef.
	(Icf::Reloc_info): Add new member reloc_addend_size_info.
	* int_encoding.h (read_from_pointer): New overloaded function.
	* testsuite/Makefile.am (icf_sht_rel_addend_test): New test.
	* testsuite/icf_sht_rel_addend_test.sh: New file.
	* testsuite/icf_sht_rel_addend_test_1.cc: New file.
	* testsuite/icf_sht_rel_addend_test_2.cc: New file.
This commit is contained in:
Sriraman Tallam 2010-07-29 18:57:28 +00:00
parent f9c7014e9c
commit 41cbeecc3c
15 changed files with 263 additions and 7 deletions

View File

@ -1,3 +1,27 @@
2010-07-29 Sriraman Tallam <tmsriram@google.com>
* arm.cc (Target_arm<big_endian>::gc_process_relocs): Add template
paramter to the call to gold::gc_process_relocs.
* i386.cc (Target_i386<big_endian>::gc_process_relocs): Add template
paramter to the call to gold::gc_process_relocs.
* x86_64.cc (Target_x86_64<big_endian>::gc_process_relocs): Add template
parameter to the call to gold::gc_process_relocs.
* powerpc.cc (Target_powerpc<big_endian>::gc_process_relocs): Add
template parameter to the call to gold::gc_process_relocs.
* sparc.cc (Target_sparc<big_endian>::gc_process_relocs): Add template
paramter to the call to gold::gc_process_relocs.
* gc.h (get_embedded_addend_size): New function.
(gc_process_relocs): Save the size of the reloc for use by ICF.
* icf.cc (get_section_contents): Get the addend from the text section
for SHT_REL relocation sections.
* icf.h (Icf::Reloc_addend_size_info): New typedef.
(Icf::Reloc_info): Add new member reloc_addend_size_info.
* int_encoding.h (read_from_pointer): New overloaded function.
* testsuite/Makefile.am (icf_sht_rel_addend_test): New test.
* testsuite/icf_sht_rel_addend_test.sh: New file.
* testsuite/icf_sht_rel_addend_test_1.cc: New file.
* testsuite/icf_sht_rel_addend_test_2.cc: New file.
2010-07-28 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac (AM_INIT_AUTOMAKE): Use parallel-tests option.

View File

@ -8213,7 +8213,8 @@ Target_arm<big_endian>::gc_process_relocs(Symbol_table* symtab,
typedef Target_arm<big_endian> Arm;
typedef typename Target_arm<big_endian>::Scan Scan;
gold::gc_process_relocs<32, big_endian, Arm, elfcpp::SHT_REL, Scan>(
gold::gc_process_relocs<32, big_endian, Arm, elfcpp::SHT_REL, Scan,
Target_arm::Relocatable_size_for_reloc>(
symtab,
layout,
this,

View File

@ -151,6 +151,20 @@ struct Symbols_data
section_size_type symbol_names_size;
};
// Relocations of type SHT_REL store the addend value in their bytes.
// This function returns the size of the embedded addend which is
// nothing but the size of the relocation.
template<typename Classify_reloc>
inline unsigned int
get_embedded_addend_size(int sh_type, int r_type, Relobj* obj)
{
if (sh_type != elfcpp::SHT_REL)
return 0;
Classify_reloc classify_reloc;
return classify_reloc.get_size_for_reloc(r_type, obj);
}
// This function implements the generic part of reloc
// processing to map a section to all the sections it
// references through relocs. It is called only during
@ -158,7 +172,7 @@ struct Symbols_data
// folding (--icf).
template<int size, bool big_endian, typename Target_type, int sh_type,
typename Scan>
typename Scan, typename Classify_reloc>
inline void
gc_process_relocs(
Symbol_table* symtab,
@ -185,6 +199,7 @@ gc_process_relocs(
Icf::Symbol_info* symvec = NULL;
Icf::Addend_info* addendvec = NULL;
Icf::Offset_info* offsetvec = NULL;
Icf::Reloc_addend_size_info* reloc_addend_size_vec = NULL;
bool is_icf_tracked = false;
const char* cident_section_name = NULL;
@ -205,6 +220,7 @@ gc_process_relocs(
symvec = &reloc_info->symbol_info;
addendvec = &reloc_info->addend_info;
offsetvec = &reloc_info->offset_info;
reloc_addend_size_vec = &reloc_info->reloc_addend_size_info;
}
check_section_for_function_pointers =
@ -243,6 +259,9 @@ gc_process_relocs(
uint64_t reloc_offset =
convert_to_section_size_type(reloc.get_r_offset());
(*offsetvec).push_back(reloc_offset);
(*reloc_addend_size_vec).push_back(
get_embedded_addend_size<Classify_reloc>(sh_type, r_type,
src_obj));
}
// When doing safe folding, check to see if this relocation is that
@ -316,6 +335,9 @@ gc_process_relocs(
uint64_t reloc_offset =
convert_to_section_size_type(reloc.get_r_offset());
(*offsetvec).push_back(reloc_offset);
(*reloc_addend_size_vec).push_back(
get_embedded_addend_size<Classify_reloc>(sh_type, r_type,
src_obj));
}
if (gsym->source() != Symbol::FROM_OBJECT)

View File

@ -1624,7 +1624,8 @@ Target_i386::gc_process_relocs(Symbol_table* symtab,
const unsigned char* plocal_symbols)
{
gold::gc_process_relocs<32, false, Target_i386, elfcpp::SHT_REL,
Target_i386::Scan>(
Target_i386::Scan,
Target_i386::Relocatable_size_for_reloc>(
symtab,
layout,
this,

View File

@ -145,6 +145,8 @@
#include "symtab.h"
#include "libiberty.h"
#include "demangle.h"
#include "elfcpp.h"
#include "int_encoding.h"
namespace gold
{
@ -269,12 +271,16 @@ get_section_contents(bool first_iteration,
Icf::Addend_info a = (it_reloc_info_list->second).addend_info;
// Stores the offset of the reloc.
Icf::Offset_info o = (it_reloc_info_list->second).offset_info;
Icf::Reloc_addend_size_info reloc_addend_size_info =
(it_reloc_info_list->second).reloc_addend_size_info;
Icf::Sections_reachable_info::iterator it_v = v.begin();
Icf::Symbol_info::iterator it_s = s.begin();
Icf::Addend_info::iterator it_a = a.begin();
Icf::Offset_info::iterator it_o = o.begin();
Icf::Reloc_addend_size_info::iterator it_addend_size =
reloc_addend_size_info.begin();
for (; it_v != v.end(); ++it_v, ++it_s, ++it_a, ++it_o)
for (; it_v != v.end(); ++it_v, ++it_s, ++it_a, ++it_o, ++it_addend_size)
{
// ADDEND_STR stores the symbol value and addend and offset,
// each atmost 16 hex digits long. it_a points to a pair
@ -372,6 +378,46 @@ get_section_contents(bool first_iteration,
if (addend < 0xffffff00)
offset = offset + addend;
// For SHT_REL relocation sections, the addend is stored in the
// text section at the relocation offset.
uint64_t reloc_addend_value = 0;
const unsigned char* reloc_addend_ptr =
contents + static_cast<unsigned long long>(*it_o);
switch(*it_addend_size)
{
case 0:
{
break;
}
case 1:
{
reloc_addend_value =
read_from_pointer<8>(reloc_addend_ptr);
break;
}
case 2:
{
reloc_addend_value =
read_from_pointer<16>(reloc_addend_ptr);
break;
}
case 4:
{
reloc_addend_value =
read_from_pointer<32>(reloc_addend_ptr);
break;
}
case 8:
{
reloc_addend_value =
read_from_pointer<64>(reloc_addend_ptr);
break;
}
default:
gold_unreachable();
}
offset = offset + reloc_addend_value;
section_size_type secn_len;
const unsigned char* str_contents =
(it_v->first)->section_contents(it_v->second,

View File

@ -43,6 +43,7 @@ class Icf
typedef std::vector<Symbol*> Symbol_info;
typedef std::vector<std::pair<long long, long long> > Addend_info;
typedef std::vector<uint64_t> Offset_info;
typedef std::vector<unsigned int> Reloc_addend_size_info;
typedef Unordered_map<Section_id,
unsigned int,
Section_id_hash> Uniq_secn_id_map;
@ -57,6 +58,7 @@ class Icf
// This stores the symbol value and the addend for a reloc.
Addend_info addend_info;
Offset_info offset_info;
Reloc_addend_size_info reloc_addend_size_info;
} Reloc_info;
typedef Unordered_map<Section_id, Reloc_info,

View File

@ -77,6 +77,20 @@ void insert_into_vector(std::vector<unsigned char>* destination,
destination->insert(destination->end(), buffer, buffer + valsize / 8);
}
// Read a possibly unaligned integer of SIZE from SOURCE.
template <int valsize>
typename elfcpp::Valtype_base<valsize>::Valtype
read_from_pointer(const unsigned char* source)
{
typename elfcpp::Valtype_base<valsize>::Valtype return_value;
if (parameters->target().is_big_endian())
return_value = elfcpp::Swap_unaligned<valsize, true>::readval(source);
else
return_value = elfcpp::Swap_unaligned<valsize, false>::readval(source);
return return_value;
}
// Read a possibly unaligned integer of SIZE. Update SOURCE after read.
template <int valsize>

View File

@ -1493,7 +1493,8 @@ Target_powerpc<size, big_endian>::gc_process_relocs(
typedef Target_powerpc<size, big_endian> Powerpc;
typedef typename Target_powerpc<size, big_endian>::Scan Scan;
gold::gc_process_relocs<size, big_endian, Powerpc, elfcpp::SHT_RELA, Scan>(
gold::gc_process_relocs<size, big_endian, Powerpc, elfcpp::SHT_RELA, Scan,
Target_powerpc::Relocatable_size_for_reloc>(
symtab,
layout,
this,

View File

@ -2330,7 +2330,8 @@ Target_sparc<size, big_endian>::gc_process_relocs(
typedef Target_sparc<size, big_endian> Sparc;
typedef typename Target_sparc<size, big_endian>::Scan Scan;
gold::gc_process_relocs<size, big_endian, Sparc, elfcpp::SHT_RELA, Scan>(
gold::gc_process_relocs<size, big_endian, Sparc, elfcpp::SHT_RELA, Scan,
Target_sparc::Relocatable_size_for_reloc>(
symtab,
layout,
this,

View File

@ -232,6 +232,18 @@ icf_string_merge_test: icf_string_merge_test.o gcctestdir/ld
icf_string_merge_test.stdout: icf_string_merge_test
$(TEST_NM) icf_string_merge_test > icf_string_merge_test.stdout
check_SCRIPTS += icf_sht_rel_addend_test.sh
check_DATA += icf_sht_rel_addend_test.stdout
MOSTLYCLEANFILES += icf_sht_rel_addend_test
icf_sht_rel_addend_test_1.o: icf_sht_rel_addend_test_1.cc
$(CXXCOMPILE) -O0 -c -ffunction-sections -fPIC -g -o $@ $<
icf_sht_rel_addend_test_2.o: icf_sht_rel_addend_test_2.cc
$(CXXCOMPILE) -O0 -c -ffunction-sections -fPIC -g -o $@ $<
icf_sht_rel_addend_test: icf_sht_rel_addend_test_1.o icf_sht_rel_addend_test_2.o gcctestdir/ld
$(CXXLINK) -Bgcctestdir/ -Wl,--icf=all icf_sht_rel_addend_test_1.o icf_sht_rel_addend_test_2.o
icf_sht_rel_addend_test.stdout: icf_sht_rel_addend_test
$(TEST_NM) icf_sht_rel_addend_test > icf_sht_rel_addend_test.stdout
check_PROGRAMS += basic_test
check_PROGRAMS += basic_static_test
check_PROGRAMS += basic_pic_test

View File

@ -65,6 +65,7 @@ check_PROGRAMS = object_unittest$(EXEEXT) binary_unittest$(EXEEXT) \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ final_layout.sh \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ icf_preemptible_functions_test.sh \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ icf_string_merge_test.sh \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ icf_sht_rel_addend_test.sh \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_shared.sh weak_plt.sh \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ debug_msg.sh undef_symbol.sh \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ ver_test_1.sh ver_test_2.sh \
@ -98,6 +99,7 @@ check_PROGRAMS = object_unittest$(EXEEXT) binary_unittest$(EXEEXT) \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ final_layout.stdout \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ icf_preemptible_functions_test.stdout \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ icf_string_merge_test.stdout \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ icf_sht_rel_addend_test.stdout \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_shared.dbg \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ weak_plt_shared.so debug_msg.err \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ debug_msg_so.err \
@ -124,6 +126,7 @@ check_PROGRAMS = object_unittest$(EXEEXT) binary_unittest$(EXEEXT) \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ icf_virtual_function_folding_test \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ icf_preemptible_functions_test \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ icf_string_merge_test \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ icf_sht_rel_addend_test \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ two_file_shared.dbg \
@GCC_TRUE@@NATIVE_LINKER_TRUE@ alt/weak_undef_lib.so
@GCC_TRUE@@NATIVE_LINKER_TRUE@am__append_4 = icf_virtual_function_folding_test \
@ -2589,6 +2592,8 @@ icf_preemptible_functions_test.sh.log: icf_preemptible_functions_test.sh
@p='icf_preemptible_functions_test.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
icf_string_merge_test.sh.log: icf_string_merge_test.sh
@p='icf_string_merge_test.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
icf_sht_rel_addend_test.sh.log: icf_sht_rel_addend_test.sh
@p='icf_sht_rel_addend_test.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
two_file_shared.sh.log: two_file_shared.sh
@p='two_file_shared.sh'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
weak_plt.sh.log: weak_plt.sh
@ -3090,6 +3095,14 @@ uninstall-am:
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ -Wl,--icf=all icf_string_merge_test.o
@GCC_TRUE@@NATIVE_LINKER_TRUE@icf_string_merge_test.stdout: icf_string_merge_test
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_NM) icf_string_merge_test > icf_string_merge_test.stdout
@GCC_TRUE@@NATIVE_LINKER_TRUE@icf_sht_rel_addend_test_1.o: icf_sht_rel_addend_test_1.cc
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -O0 -c -ffunction-sections -fPIC -g -o $@ $<
@GCC_TRUE@@NATIVE_LINKER_TRUE@icf_sht_rel_addend_test_2.o: icf_sht_rel_addend_test_2.cc
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -O0 -c -ffunction-sections -fPIC -g -o $@ $<
@GCC_TRUE@@NATIVE_LINKER_TRUE@icf_sht_rel_addend_test: icf_sht_rel_addend_test_1.o icf_sht_rel_addend_test_2.o gcctestdir/ld
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ -Wl,--icf=all icf_sht_rel_addend_test_1.o icf_sht_rel_addend_test_2.o
@GCC_TRUE@@NATIVE_LINKER_TRUE@icf_sht_rel_addend_test.stdout: icf_sht_rel_addend_test
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_NM) icf_sht_rel_addend_test > icf_sht_rel_addend_test.stdout
@GCC_TRUE@@NATIVE_LINKER_TRUE@basic_test.o: basic_test.cc
@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -O0 -c -o $@ $<
@GCC_TRUE@@NATIVE_LINKER_TRUE@basic_test: basic_test.o gcctestdir/ld

View File

@ -0,0 +1,35 @@
# icf_sht_rel_addend_test.sh -- test --icf=all
# Copyright 2010 Free Software Foundation, Inc.
# Written by Sriraman Tallam <tmsriram@google.com>.
# This file is part of gold.
# 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.
check()
{
func_addr_1=`grep $2 $1 | awk '{print $1}'`
func_addr_2=`grep $3 $1 | awk '{print $1}'`
if [ $func_addr_1 = $func_addr_2 ]
then
echo "Identical Code Folding should not fold" $2 "and" $3
exit 1
fi
}
check icf_sht_rel_addend_test.stdout "name1" "name2"

View File

@ -0,0 +1,44 @@
// icf_sht_rel_addend_test_1.cc -- a test case for gold
// Copyright 2010 Free Software Foundation, Inc.
// Written by Sriraman Tallam <tmsriram@google.com>.
// This file is part of gold.
// 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.
// The goal of this program is to verify is strings are handled correctly
// by ICF when the relocation types are SHT_REL. ICF inlines strings that
// can be merged. To do this, it must get the addend of the relocation
// pointing to the string. For SHT_REL relocations, the addend is encoded
// in the text section at the offset of the relocation. If ICF fails to
// get the addend correctly, function name1 will be incorrectly folded with
// function name2 in icf_sht_rel_addend_test_2.cc.
const char* bar()
{
return "AAAAAA";
}
const char* name1()
{
return "Name1";
}
int main()
{
return 0;
}

View File

@ -0,0 +1,39 @@
// icf_sht_rel_addend_test_2.cc -- a test case for gold
// Copyright 2010 Free Software Foundation, Inc.
// Written by Sriraman Tallam <tmsriram@google.com>.
// This file is part of gold.
// 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.
// The goal of this program is to verify is strings are handled correctly
// by ICF when the relocation types are SHT_REL. ICF inlines strings that
// can be merged. To do this, it must get the addend of the relocation
// pointing to the string. For SHT_REL relocations, the addend is encoded
// in the text section at the offset of the relocation. If ICF fails to
// get the addend correctly, function name1 in icf_sht_rel_addend_test_1.cc
// will be incorrectly folded with name2.
const char* foo()
{
return "AAAAAA";
}
const char* name2()
{
return "Name2";
}

View File

@ -1781,7 +1781,8 @@ Target_x86_64::gc_process_relocs(Symbol_table* symtab,
}
gold::gc_process_relocs<64, false, Target_x86_64, elfcpp::SHT_RELA,
Target_x86_64::Scan>(
Target_x86_64::Scan,
Target_x86_64::Relocatable_size_for_reloc>(
symtab,
layout,
this,