From: Jakub Jelinek Date: Mon, 19 Apr 2004 14:25:49 +0000 (+0000) Subject: bfd/ X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4dc570c2f5d73c82196fc6e99191c140b03f8bbe;p=binutils-gdb.git bfd/ * elf32-sparc.c (elf32_sparc_relocate_section): Handle relocs against hidden/protected undefweak symbols properly. * elf64-sparc.c (sparc64_elf_relocate_section): Likewise. gas/testsuite/ * gas/cfi/cfi-sparc64-1.d: Update. ld/testsuite/ * ld-elfvsb/elfvsb.exp: XFAIL some tests on sparc64. * ld-shared/shared.exp: Likewise. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a4544334d80..dda65cd5503 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2004-04-19 Jakub Jelinek + + * elf32-sparc.c (elf32_sparc_relocate_section): Handle + relocs against hidden/protected undefweak symbols properly. + * elf64-sparc.c (sparc64_elf_relocate_section): Likewise. + 2004-04-18 Mark Kettenis * libaout.h (enum machine_type): Add M_POWERPC_NETBSD. diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c index 0f94f5f31bb..6e1c40b98c1 100644 --- a/bfd/elf32-sparc.c +++ b/bfd/elf32-sparc.c @@ -2374,6 +2374,9 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section, break; if ((info->shared + && (h == NULL + || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT + || h->root.type != bfd_link_hash_undefweak) && (! howto->pc_relative || (h != NULL && h->dynindx != -1 diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c index 4568a22d643..4f2832512a1 100644 --- a/bfd/elf64-sparc.c +++ b/bfd/elf64-sparc.c @@ -2213,6 +2213,13 @@ sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section, break; } + /* FIXME: Dynamic reloc handling really needs to be rewritten. */ + if (!skip + && h != NULL + && ELF_ST_VISIBILITY (h->other) != STV_DEFAULT + && h->root.type == bfd_link_hash_undefweak) + skip = TRUE, relocate = TRUE; + if (skip) memset (&outrel, 0, sizeof outrel); /* h->dynindx may be -1 if the symbol was marked to diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 1e262f1f7eb..c99e91f5d94 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2004-04-19 Jakub Jelinek + + * gas/cfi/cfi-sparc64-1.d: Update. + 2004-04-14 Richard Sandiford * gas/mips/vr4122.[sd]: Change option to -mfix-vr4120. diff --git a/gas/testsuite/gas/cfi/cfi-sparc64-1.d b/gas/testsuite/gas/cfi/cfi-sparc64-1.d index ffe62392b1d..10d3ea9a4f5 100644 --- a/gas/testsuite/gas/cfi/cfi-sparc64-1.d +++ b/gas/testsuite/gas/cfi/cfi-sparc64-1.d @@ -4,7 +4,7 @@ The section .eh_frame contains: -00000000 00000011 00000000 CIE +00000000 00000014 00000000 CIE Version: 1 Augmentation: "zR" Code alignment factor: 4 @@ -13,13 +13,13 @@ The section .eh_frame contains: Augmentation data: 1b DW_CFA_def_cfa: r14 ofs 2047 + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop -00000015 00000017 00000019 FDE cie=00000000 pc=0000001d..0000004d - DW_CFA_advance_loc: 4 to 00000021 +00000018 00000014 0000001c FDE cie=00000000 pc=00000020..00000050 + DW_CFA_advance_loc: 4 to 00000024 DW_CFA_def_cfa_reg: r30 DW_CFA_GNU_window_save DW_CFA_register: r15 in r31 - DW_CFA_nop - DW_CFA_nop - DW_CFA_nop diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 9f9fab8db74..1849b2070a0 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-04-19 Jakub Jelinek + + * ld-elfvsb/elfvsb.exp: XFAIL some tests on sparc64. + * ld-shared/shared.exp: Likewise. + 2004-04-14 H.J. Lu * ld-scripts/assert.s: Add a newline. diff --git a/ld/testsuite/ld-elfvsb/elfvsb.exp b/ld/testsuite/ld-elfvsb/elfvsb.exp index f1f3f1fdf39..cd7c15fdb3c 100644 --- a/ld/testsuite/ld-elfvsb/elfvsb.exp +++ b/ld/testsuite/ld-elfvsb/elfvsb.exp @@ -1,5 +1,5 @@ # Expect script for ld-visibility tests -# Copyright 2000, 2001, 2003 Free Software Foundation, Inc. +# Copyright 2000, 2001, 2003, 2004 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -261,6 +261,9 @@ proc visibility_run {visibility} { && ![ string match $visibility "hidden_undef_def" ] && ![ string match $visibility "protected_undef" ] } { setup_xfail "s390x-*-linux*" + if { [istarget sparc*-*-linux*] && [is_elf64 $tmpdir/mainnp.o] } { + setup_xfail "sparc*-*-linux*" + } } setup_xfail "x86_64-*-linux*" if { ![istarget hppa*64*-*-linux*] } { @@ -289,6 +292,9 @@ proc visibility_run {visibility} { || [ string match $visibility "protected_weak" ] || [ string match $visibility "normal" ] } { setup_xfail "powerpc-*-linux*" + if { [istarget sparc*-*-linux*] && [is_elf64 $tmpdir/mainnp.o] } { + setup_xfail "sparc*-*-linux*" + } } if { ![ string match $visibility "hidden_undef" ] && ![ string match $visibility "protected_undef" ] } { @@ -358,6 +364,9 @@ proc visibility_run {visibility} { && ![ string match $visibility "hidden_undef_def" ] && ![ string match $visibility "protected_undef" ] } { setup_xfail "s390x-*-linux*" + if { [istarget sparc*-*-linux*] && [is_elf64 $tmpdir/mainp.o] } { + setup_xfail "sparc*-*-linux*" + } } setup_xfail "x86_64-*-linux*" if { ![istarget hppa*64*-*-linux*] } { diff --git a/ld/testsuite/ld-shared/shared.exp b/ld/testsuite/ld-shared/shared.exp index 339d3a3abe9..a88cd1c8c8d 100644 --- a/ld/testsuite/ld-shared/shared.exp +++ b/ld/testsuite/ld-shared/shared.exp @@ -203,6 +203,9 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o] if { ![istarget hppa*64*-*-linux*] } { setup_xfail "hppa*-*-linux*" } + if { [istarget sparc*-*-linux*] && [is_elf64 $tmpdir/mainnp.o] } { + setup_xfail "sparc*-*-linux*" + } setup_xfail "x86_64-*-linux*" setup_xfail "s390x-*-linux*" shared_test shnp "shared (non PIC)" mainnp.o sh1np.o sh2np.o shared @@ -220,6 +223,9 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $srcdir/$subdir/main.c $tmpdir/mainnp.o] if { ![istarget hppa*64*-*-linux*] } { setup_xfail "hppa*-*-linux*" } + if { [istarget sparc*-*-linux*] && [is_elf64 $tmpdir/mainnp.o] } { + setup_xfail "sparc*-*-linux*" + } setup_xfail "x86_64-*-linux*" shared_test shnp "shared (non PIC, load offset)" \ mainnp.o sh1np.o sh2np.o shared \ @@ -265,6 +271,9 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG $picflag" $srcdir/$subdir/main.c $tmpdir/m if { ![istarget hppa*64*-*-linux*] } { setup_xfail "hppa*-*-linux*" } + if { [istarget sparc*-*-linux*] && [is_elf64 $tmpdir/mainp.o] } { + setup_xfail "sparc*-*-linux*" + } setup_xfail "x86_64-*-linux*" setup_xfail "s390x-*-linux*" shared_test shmpnp "shared (PIC main, non PIC so)" mainp.o sh1np.o sh2np.o shared