diff options
| author | Doug Kwan <dougkwan@google.com> | 2010-09-17 23:51:42 +0000 |
|---|---|---|
| committer | Doug Kwan <dougkwan@google.com> | 2010-09-17 23:51:42 +0000 |
| commit | bca7fb637f653f086fcf935585eb6395b3893cf6 (patch) | |
| tree | 3875149227fb042bdee85b99c29c47fa431ba015 /gold/testsuite | |
| parent | eab4f823f7793e025759fb47748b4b71bb88dac9 (diff) | |
| download | gdb-bca7fb637f653f086fcf935585eb6395b3893cf6.zip gdb-bca7fb637f653f086fcf935585eb6395b3893cf6.tar.gz gdb-bca7fb637f653f086fcf935585eb6395b3893cf6.tar.bz2 | |
2010-09-17 Doug Kwan <dougkwan@google.com>
* arm.cc (Target_arm::Relocate::relocate): Ignore symbol type and
defintion if relocation uses GOT entries of the symbol.
* testsuite/icf_safe_test.sh: Fix test.
* testsuite/icf_safe_so_test.sh: Fix test.
Diffstat (limited to 'gold/testsuite')
| -rwxr-xr-x | gold/testsuite/icf_safe_so_test.sh | 16 | ||||
| -rwxr-xr-x | gold/testsuite/icf_safe_test.sh | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gold/testsuite/icf_safe_so_test.sh b/gold/testsuite/icf_safe_so_test.sh index 47ad390..315a016 100755 --- a/gold/testsuite/icf_safe_so_test.sh +++ b/gold/testsuite/icf_safe_so_test.sh @@ -84,9 +84,9 @@ arch_specific_safe_fold() fi } -X86_32_specific_safe_fold() +X86_32_or_ARM_specific_safe_fold() { - grep -e "Intel 80386" $1 > /dev/null 2>&1 + grep -e "Intel 80386" -e "ARM" $1 > /dev/null 2>&1 arch_specific_safe_fold $? $2 $3 $4 } @@ -96,10 +96,10 @@ X86_64_specific_safe_fold() arch_specific_safe_fold $? $2 $3 $4 } -X86_32_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_prot" "foo_hidden" -X86_32_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_prot" "foo_internal" -X86_32_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_prot" "foo_static" -X86_32_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_hidden" "foo_internal" -X86_32_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_hidden" "foo_static" -X86_32_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_internal" "foo_static" +X86_32_or_ARM_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_prot" "foo_hidden" +X86_32_or_ARM_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_prot" "foo_internal" +X86_32_or_ARM_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_prot" "foo_static" +X86_32_or_ARM_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_hidden" "foo_internal" +X86_32_or_ARM_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_hidden" "foo_static" +X86_32_or_ARM_specific_safe_fold icf_safe_so_test_2.stdout icf_safe_so_test_1.stdout "foo_internal" "foo_static" check_nofold icf_safe_so_test_1.stdout "foo_glob" "bar_glob" diff --git a/gold/testsuite/icf_safe_test.sh b/gold/testsuite/icf_safe_test.sh index 23e4e29..d26d40b 100755 --- a/gold/testsuite/icf_safe_test.sh +++ b/gold/testsuite/icf_safe_test.sh @@ -49,7 +49,7 @@ check_fold() arch_specific_safe_fold() { - grep_x86=`grep -q -e "Advanced Micro Devices X86-64" -e "Intel 80386" $2` + grep_x86=`grep -q -e "Advanced Micro Devices X86-64" -e "Intel 80386" -e "ARM" $2` if [ $? == 0 ]; then check_fold $1 $3 $4 |