Compare commits

...

7 Commits

Author SHA1 Message Date
c423fd1764 Remove doc files 2023-10-13 13:16:13 +03:00
e31fc967bc Add zlib-devel as BR 2023-10-13 13:06:11 +03:00
bb2755784e Fix %exclude %{_libdir}/libctf.a 2023-10-13 12:47:40 +03:00
0aa4bfe9df Remove annobin-plugin-gcc 2023-10-13 12:20:42 +03:00
edaab53afd Fix annotate_build 2023-10-13 12:15:35 +03:00
d0e6e91825 Bootstrap 2023-10-13 11:45:33 +03:00
eabdullin
34fb62d516 import CS gcc-toolset-13-binutils-2.40-14.el8 2023-10-13 08:28:19 +00:00
2 changed files with 133 additions and 18 deletions

View File

@ -1125,3 +1125,109 @@ diff -rup binutils.orig/ld/testsuite/ld-elf/tls.exp binutils-2.40/ld/testsuite/l
# Check to see if the C compiler works.
if { ![check_compiler_available] } {
return
--- binutils.orig/ld/testsuite/ld-elf/indirect.exp 2023-04-25 09:59:06.491645786 +0100
+++ binutils-2.40/ld/testsuite/ld-elf/indirect.exp 2023-04-25 10:00:53.347435547 +0100
@@ -160,12 +160,6 @@ set run_tests {
{"Run with libindirect4c.so 4"
"-Wl,--no-as-needed tmpdir/libindirect4c.so tmpdir/indirect4b.o tmpdir/indirect4a.o" ""
{dummy.c} "indirect4d" "indirect4.out"}
- {"Run indirect5 1"
- "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" ""
- {indirect5a.c} "indirect5a" "indirect5.out" "$NOPIE_CFLAGS"}
- {"Run indirect5 2"
- "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" ""
- {dummy.c} "indirect5b" "indirect5.out" "$NOPIE_CFLAGS"}
{"Run indirect6 1"
"$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" ""
{indirect6a.c} "indirect6a" "indirect5.out" "$NOPIE_CFLAGS"}
@@ -217,15 +211,6 @@ proc check_dynamic_syms { test } {
return 1
}
-foreach t [list indirect5a indirect5b indirect6a indirect6b] {
- set testname [concat $t "dynsym"]
- if { [check_dynamic_syms tmpdir/$t] } {
- pass $testname
- } else {
- fail $testname
- }
-}
-
send_log "$CC_FOR_TARGET -fPIE -pie $srcdir/$subdir/main.c -o tmpdir/pie"
catch "exec $CC_FOR_TARGET -fPIE -pie $srcdir/$subdir/main.c -o tmpdir/pie" exec_output
send_log "$exec_output"
@@ -234,12 +219,6 @@ if { ! [string match "" $exec_output] }
}
set pie_tests {
- {"Run indirect5 3"
- "-pie -Wl,--no-as-needed tmpdir/libindirect5.so" ""
- {indirect5a.c} "indirect5c" "indirect5.out" "-fPIE"}
- {"Run indirect5 4"
- "-pie -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" ""
- {dummy.c} "indirect5d" "indirect5.out" "-fPIE"}
{"Run indirect6 3"
"-pie -Wl,--no-as-needed tmpdir/libindirect5.so" ""
{indirect6a.c} "indirect6c" "indirect5.out" "-fPIE"}
@@ -250,7 +229,7 @@ set pie_tests {
run_ld_link_exec_tests $pie_tests
-foreach t [list indirect5c indirect5d indirect6c indirect6d] {
+foreach t [list indirect6c indirect6d] {
set testname [concat $t "dynsym"]
if { [check_dynamic_syms tmpdir/$t] } {
pass $testname
--- binutils.orig/ld/testsuite/ld-vsb/vsb.exp 2023-04-25 09:59:06.671645424 +0100
+++ binutils-2.40/ld/testsuite/ld-vsb/vsb.exp 2023-04-25 10:40:56.526332345 +0100
@@ -513,6 +513,11 @@ if { [istarget mips*-*-*] && ! [at_least
set picflag "-KPIC"
}
}
+
+if { [istarget s390x*-*-linux*] } {
+ return
+}
+
verbose "Using $picflag to compile PIC code"
visibility_run hidden
--- binutils.orig/ld/testsuite/ld-shared/shared.exp 2023-04-25 09:59:06.652645462 +0100
+++ binutils-2.40/ld/testsuite/ld-shared/shared.exp 2023-04-25 11:00:01.019876693 +0100
@@ -263,7 +263,7 @@ if ![ld_compile "$CC_FOR_TARGET $SHCFLAG
setup_xfail "x86_64-*-linux*"
}
setup_xfail "x86_64-*-linux-gnux32"
- setup_xfail "s390x-*-linux*"
+
if [ string match $shared_needs_pic "yes" ] {
setup_xfail "arm*-*-linux*"
}
--- binutils.orig/ld/testsuite/ld-ctf/slice.d 2023-08-03 10:14:42.141231721 +0100
+++ binutils-2.40/ld/testsuite/ld-ctf/slice.d 2023-08-03 10:17:52.161503327 +0100
@@ -24,10 +24,10 @@ Contents of CTF section .ctf:
Types:
#...
0x[0-9a-f]*: \(kind 6\) struct slices \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\)
- *\[0x0\] one: ID 0x[0-9a-f]*: \(kind 1\) int:1 \[slice 0x0:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\)
- *\[0x1\] two: ID 0x[0-9a-f]*: \(kind 1\) int:2 \[slice 0x0:0x2\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\)
- *\[0x3\] six: ID 0x[0-9a-f]*: \(kind 1\) int:6 \[slice 0x0:0x6\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\)
- *\[0x9\] ten: ID 0x[0-9a-f]*: \(kind 1\) int:10 \[slice 0x0:0xa\] \(format 0x1\) \(size 0x2\) \(aligned at 0x2\)
- *\[0x13\] bar: ID 0x[0-9a-f]*: \(kind 8\) enum foo:1 \[slice 0x0:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\)
+ *\[0x0\] one: ID 0x[0-9a-f]*: \(kind 1\) int:1 \[slice 0x.:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\)
+ *\[0x.\] two: ID 0x[0-9a-f]*: \(kind 1\) int:2 \[slice 0x.:0x2\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\)
+ *\[0x.\] six: ID 0x[0-9a-f]*: \(kind 1\) int:6 \[slice 0x.:0x6\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\)
+ *\[0x.\] ten: ID 0x[0-9a-f]*: \(kind 1\) int:10 \[slice 0x.:0xa\] \(format 0x1\) \(size 0x2\) \(aligned at 0x2\)
+ *\[0x.*\] bar: ID 0x[0-9a-f]*: \(kind 8\) enum foo:1 \[slice 0x.*:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\)
#...
--- binutils.orig/ld/testsuite/ld-shared/shared.exp 2023-08-03 16:29:35.541625154 +0100
+++ binutils-2.40/ld/testsuite/ld-shared/shared.exp 2023-08-03 16:38:09.990388416 +0100
@@ -270,6 +270,7 @@ if ![ld_compile "$CC_FOR_TARGET $SHCFLAG
setup_xfail "aarch64*-*-linux*"
# Solaris defaults to -z text.
setup_xfail "*-*-solaris2*"
+ setup_xfail "s390*-*-*"
shared_test shnp "shared (non PIC, load offset)" \
mainnp.o sh1np.o sh2np.o shared \
"-Wl,-T,$srcdir/$subdir/elf-offset.ld,--hash-style=sysv"

View File

@ -9,7 +9,7 @@ BuildRequires: scl-utils-build
Summary: A GNU collection of binary utilities
Name: %{?scl_prefix}binutils
Version: 2.40
Release: 12%{?dist}
Release: 14%{?dist}.bootstrap
License: GPLv3+
URL: https://sourceware.org/binutils
@ -84,7 +84,7 @@ URL: https://sourceware.org/binutils
%endif
# Default: Not bootstrapping.
%bcond_with bootstrap
%bcond_without bootstrap
# Default: Not debug
%bcond_with debug
# Default: Always build documentation.
@ -299,19 +299,16 @@ BuildRequires: clang compiler-rt
# (libfd.a, libopcodes.a libiberty.a libsframe.a) use the same LTO version as the one
# that will be used by consumers of GTS binutils.
# Note - during GTS bootstrap these have to be changed to the systemOS versions.
BuildRequires: %{?scl_prefix}gcc
BuildRequires: %{?scl_prefix}gcc-c++
%define gcc_for_libraries %{?_scl_root}/usr/bin/gcc
%define gxx_for_libraries %{?_scl_root}/usr/bin/g++
BuildRequires: gcc
# BuildRequires: annobin-plugin-gcc
BuildRequires: gcc-c++
%define gcc_for_libraries gcc
%define gxx_for_libraries g++
BuildRequires: zlib-devel
%define gcc_for_libraries /usr/bin/gcc
%define gxx_for_libraries /usr/bin/g++
# Note - during GTS bootstrap it may be necessary to build the binutils without
# annobin annotations.
# %%undefine _annotated_build
%undefine _annotated_build
%endif
@ -996,7 +993,7 @@ install_binutils()
rm -f $local_mandir/{dlltool,nlmconv,windres,windmc}*
%if %{without docs}
rm -f $local_mandir/{addr2line,ar,as,c++filt,elfedit,gprof,ld,nm,objcopy,objdump,ranlib,readelf,size,strings,strip}*
rm -f $local_infodir/{as,bfd,binutils,gprof,ld}*
rm -f $local_infodir/{as,bfd,binutils,gprof,ld,ctf-spec,sframe-spec}*
%endif
%if %{enable_shared}
@ -1280,18 +1277,30 @@ exit 0
#----------------------------------------------------------------------------
%changelog
* Thu Aug 03 2023 Nick Clifton <nickc@redhat.com> - 2.40-14
- Add expected linker test failure for s390x. (#2228870)
* Thu Aug 03 2023 Nick Clifton <nickc@redhat.com> - 2.40-13
- Spec File: Really fix building with GTS-13 gcc. (#2217911)
* Mon Jun 26 2023 Nick Clifton <nickc@redhat.com> - 2.40-12
- Spec File: Enable building with GTS-13 gcc. (#2217819)
- Spec File: Sync version number with c8s.
- Spec File: Enable building with GTS-13 gcc. (#2217911)
- Spec File: Build static libraries with -fno-lto.
* Mon Jun 12 2023 Nick Clifton <nickc@redhat.com> - 2.40-9
- Spec File: Use the correct alternatives. (#2209148 and #2213913)
* Mon Jun 12 2023 Nick Clifton <nickc@redhat.com> - 2.40-11
- Spec File: Use the correct alternatives. (#2209151 and #2213913)
* Mon May 22 2023 Marek Polacek <polacek@redhat.com> - 2.40-8
- Spec File: Use the correct alternatives. (#2209148)
* Mon May 22 2023 Marek Polacek <polacek@redhat.com> - 2.40-9
- Spec File: Use the correct alternatives. (#2209151)
* Tue Apr 25 2023 Nick Clifton <nickc@redhat.com> - 2.40-8
- Suppress some s390x linker tests. (#2186396)
* Mon Apr 24 2023 Nick Clifton <nickc@redhat.com> - 2.40-7
- Rebase to 2.40.
- Spec File: Fix typo. (#2186396)
* Mon Apr 17 2023 Nick Clifton <nickc@redhat.com> - 2.40-7
- Spec File: Fix typo. (#2186396)
- BFD library: Fix illegal memory access when loading corrupt symbol version info. (#2186579)
* Thu Mar 30 2023 Nick Clifton <nickc@redhat.com> - 2.40-6