forked from pool/binutils
161 lines
4.8 KiB
Diff
161 lines
4.8 KiB
Diff
--- bfd/elf32-s390.c
|
|
+++ bfd/elf32-s390.c
|
|
@@ -2546,13 +2546,34 @@ elf_s390_relocate_section (output_bfd, i
|
|
unresolved_reloc = FALSE;
|
|
break;
|
|
|
|
- case R_390_8:
|
|
- case R_390_16:
|
|
- case R_390_32:
|
|
case R_390_PC16:
|
|
case R_390_PC16DBL:
|
|
case R_390_PC32DBL:
|
|
case R_390_PC32:
|
|
+ /* This is strictly required only for PC32DBL, which
|
|
+ is not handled by ld.so, but let's be helpful to the user also
|
|
+ in the other cases. */
|
|
+ if (info->shared
|
|
+ && !SYMBOL_REFERENCES_LOCAL (info, h)
|
|
+ && (input_section->flags & SEC_ALLOC) != 0
|
|
+ && (input_section->flags & SEC_READONLY) != 0
|
|
+ && (!h->def_regular
|
|
+ || r_type != R_390_PC32DBL
|
|
+ || h->type != STT_FUNC
|
|
+ || ELF_ST_VISIBILITY (h->other) != STV_PROTECTED))
|
|
+ {
|
|
+ (*_bfd_error_handler)
|
|
+ (_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
|
|
+ input_bfd, elf_howto_table[r_type].name,
|
|
+ h->root.root.string);
|
|
+ bfd_set_error (bfd_error_bad_value);
|
|
+ return FALSE;
|
|
+ }
|
|
+ /* Fall through. */
|
|
+
|
|
+ case R_390_8:
|
|
+ case R_390_16:
|
|
+ case R_390_32:
|
|
if ((input_section->flags & SEC_ALLOC) == 0)
|
|
break;
|
|
|
|
--- bfd/elf64-s390.c
|
|
+++ bfd/elf64-s390.c
|
|
@@ -2525,15 +2525,36 @@ elf_s390_relocate_section (output_bfd, i
|
|
unresolved_reloc = FALSE;
|
|
break;
|
|
|
|
- case R_390_8:
|
|
- case R_390_16:
|
|
- case R_390_32:
|
|
- case R_390_64:
|
|
case R_390_PC16:
|
|
case R_390_PC16DBL:
|
|
case R_390_PC32:
|
|
case R_390_PC32DBL:
|
|
case R_390_PC64:
|
|
+ /* This is strictly required only for PC32DBL, which
|
|
+ is not handled by ld.so, but let's be helpful to the user also
|
|
+ in the other cases. */
|
|
+ if (info->shared
|
|
+ && !SYMBOL_REFERENCES_LOCAL (info, h)
|
|
+ && (input_section->flags & SEC_ALLOC) != 0
|
|
+ && (input_section->flags & SEC_READONLY) != 0
|
|
+ && (!h->def_regular
|
|
+ || r_type != R_390_PC32DBL
|
|
+ || h->type != STT_FUNC
|
|
+ || ELF_ST_VISIBILITY (h->other) != STV_PROTECTED))
|
|
+ {
|
|
+ (*_bfd_error_handler)
|
|
+ (_("%B: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"),
|
|
+ input_bfd, elf_howto_table[r_type].name,
|
|
+ h->root.root.string);
|
|
+ bfd_set_error (bfd_error_bad_value);
|
|
+ return FALSE;
|
|
+ }
|
|
+ /* Fall through. */
|
|
+
|
|
+ case R_390_8:
|
|
+ case R_390_16:
|
|
+ case R_390_32:
|
|
+ case R_390_64:
|
|
if ((input_section->flags & SEC_ALLOC) == 0)
|
|
break;
|
|
|
|
--- ld/testsuite/ld-elfvers/vers.exp
|
|
+++ ld/testsuite/ld-elfvers/vers.exp
|
|
@@ -97,6 +97,7 @@ if [istarget mips*-*-*] {
|
|
|
|
case $target_triplet in {
|
|
{ ia64-*-* } { set as_options "-x" }
|
|
+ { s390-*-linux-* } { set as_options "-march=z900" }
|
|
default { set as_options "" }
|
|
}
|
|
|
|
@@ -767,8 +768,9 @@ proc build_exec { test source execname f
|
|
pass $test
|
|
}
|
|
|
|
-if [istarget x86_64-*-linux*] {
|
|
- # x86_64 doesn't like non-pic shared libraries
|
|
+if { [istarget x86_64-*-linux*] \
|
|
+ || [istarget s390*-*-linux*] } {
|
|
+ # x86_64 and s390 don't like non-pic shared libraries
|
|
set pic "yes"
|
|
} else {
|
|
set pic "no"
|
|
--- ld/testsuite/ld-elfvsb/elfvsb.exp
|
|
+++ ld/testsuite/ld-elfvsb/elfvsb.exp
|
|
@@ -268,6 +268,7 @@ proc visibility_run {visibility} {
|
|
setup_xfail "sparc*-*-linux*"
|
|
}
|
|
}
|
|
+ setup_xfail "s390*-*-linux*"
|
|
setup_xfail "x86_64-*-linux*"
|
|
if { ![istarget hppa*64*-*-linux*] } {
|
|
setup_xfail "hppa*-*-linux*"
|
|
@@ -306,6 +307,7 @@ proc visibility_run {visibility} {
|
|
setup_xfail "alpha*-*-linux*"
|
|
setup_xfail "mips*-*-linux*"
|
|
}
|
|
+ setup_xfail "s390*-*-linux*"
|
|
setup_xfail "x86_64-*-linux*"
|
|
if { ![istarget hppa*64*-*-linux*] } {
|
|
setup_xfail "hppa*-*-linux*"
|
|
@@ -372,6 +374,7 @@ proc visibility_run {visibility} {
|
|
setup_xfail "sparc*-*-linux*"
|
|
}
|
|
}
|
|
+ setup_xfail "s390*-*-linux*"
|
|
setup_xfail "x86_64-*-linux*"
|
|
if { ![istarget hppa*64*-*-linux*] } {
|
|
setup_xfail "hppa*-*-linux*"
|
|
--- ld/testsuite/ld-shared/shared.exp
|
|
+++ ld/testsuite/ld-shared/shared.exp
|
|
@@ -211,7 +211,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $
|
|
setup_xfail "sparc*-*-linux*"
|
|
}
|
|
setup_xfail "x86_64-*-linux*"
|
|
- setup_xfail "s390x-*-linux*"
|
|
+ setup_xfail "s390*-*-linux*"
|
|
shared_test shnp "shared (non PIC)" mainnp.o sh1np.o sh2np.o shared
|
|
|
|
# Test ELF shared library relocations with a non-zero load
|
|
@@ -231,7 +231,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $
|
|
setup_xfail "sparc*-*-linux*"
|
|
}
|
|
setup_xfail "x86_64-*-linux*"
|
|
- setup_xfail "s390x-*-linux*"
|
|
+ setup_xfail "s390*-*-linux*"
|
|
shared_test shnp "shared (non PIC, load offset)" \
|
|
mainnp.o sh1np.o sh2np.o shared \
|
|
"-T $srcdir/$subdir/elf-offset.ld"
|
|
@@ -280,7 +280,7 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG $p
|
|
setup_xfail "sparc*-*-linux*"
|
|
}
|
|
setup_xfail "x86_64-*-linux*"
|
|
- setup_xfail "s390x-*-linux*"
|
|
+ setup_xfail "s390*-*-linux*"
|
|
shared_test shmpnp "shared (PIC main, non PIC so)" mainp.o sh1np.o sh2np.o shared
|
|
}
|
|
} else {
|