Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gcc7 for openSUSE:Factory checked in at 2023-05-24 20:23:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc7 (Old) and /work/SRC/openSUSE:Factory/.gcc7.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcc7" Wed May 24 20:23:07 2023 rev:39 rq:1088819 version:7.5.0+r278197 Changes: -------- --- /work/SRC/openSUSE:Factory/gcc7/gcc7.changes 2023-05-10 16:17:42.406684481 +0200 +++ /work/SRC/openSUSE:Factory/.gcc7.new.1533/gcc7.changes 2023-05-24 20:23:25.192557846 +0200 @@ -1,0 +2,7 @@ +Tue May 23 13:29:37 UTC 2023 - Andreas Schwab <sch...@suse.de> + +- Disable multilib and go on riscv64 +- libgcc-riscv-div.patch: Backport of r12-5799-g45116f342057b7 to fix + build with current binutils + +------------------------------------------------------------------- New: ---- libgcc-riscv-div.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-aarch64-gcc7.spec ++++++ --- /var/tmp/diff_new_pack.4W4Aro/_old 2023-05-24 20:23:27.156569556 +0200 +++ /var/tmp/diff_new_pack.4W4Aro/_new 2023-05-24 20:23:27.160569580 +0200 @@ -149,6 +149,7 @@ Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch Patch40: gcc7-pr72764.patch Patch41: gcc7-pr89124.patch +Patch42: libgcc-riscv-div.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -343,6 +344,7 @@ %patch39 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 %patch51 %patch60 %patch61 @@ -670,6 +672,9 @@ %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ %endif +%if "%{TARGET_ARCH}" == "riscv64" + --disable-multilib \ +%endif --build=%{GCCDIST} \ --host=%{GCCDIST} cross-arm-gcc7.spec: same change cross-arm-none-gcc7-bootstrap.spec: same change cross-arm-none-gcc7.spec: same change cross-avr-gcc7-bootstrap.spec: same change cross-avr-gcc7.spec: same change cross-epiphany-gcc7-bootstrap.spec: same change cross-epiphany-gcc7.spec: same change cross-hppa-gcc7.spec: same change cross-i386-gcc7.spec: same change cross-m68k-gcc7.spec: same change cross-mips-gcc7.spec: same change cross-nvptx-gcc7.spec: same change cross-ppc64-gcc7.spec: same change cross-ppc64le-gcc7.spec: same change cross-rx-gcc7-bootstrap.spec: same change cross-rx-gcc7.spec: same change cross-s390x-gcc7.spec: same change cross-sparc-gcc7.spec: same change cross-sparc64-gcc7.spec: same change cross-x86_64-gcc7.spec: same change ++++++ gcc7-testresults.spec ++++++ --- /var/tmp/diff_new_pack.4W4Aro/_old 2023-05-24 20:23:27.868573802 +0200 +++ /var/tmp/diff_new_pack.4W4Aro/_new 2023-05-24 20:23:27.884573897 +0200 @@ -59,7 +59,7 @@ %define tsan_arch x86_64 aarch64 ppc ppc64 ppc64le %define asan_arch x86_64 %ix86 ppc ppc64 ppc64le s390 s390x %sparc %arm aarch64 %define itm_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc -%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k ia64 +%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k ia64 riscv64 %define lsan_arch x86_64 aarch64 ppc ppc64 ppc64le %define ubsan_arch x86_64 %ix86 ppc ppc64 ppc64le s390 s390x %arm aarch64 %if 0%{?build_libvtv:1} @@ -74,7 +74,11 @@ %define build_fortran 1 %define build_objc 1 %define build_objcp 1 +%ifarch riscv64 +%define build_go 0 +%else %define build_go 1 +%endif %if %{build_objcp} %define build_cp 1 @@ -346,6 +350,7 @@ Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch Patch40: gcc7-pr72764.patch Patch41: gcc7-pr89124.patch +Patch42: libgcc-riscv-div.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -525,6 +530,7 @@ %patch39 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 %patch51 %patch60 %patch61 @@ -852,6 +858,9 @@ %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ %endif +%if "%{TARGET_ARCH}" == "riscv64" + --disable-multilib \ +%endif --build=%{GCCDIST} \ --host=%{GCCDIST} ++++++ gcc7.spec ++++++ --- /var/tmp/diff_new_pack.4W4Aro/_old 2023-05-24 20:23:27.912574064 +0200 +++ /var/tmp/diff_new_pack.4W4Aro/_new 2023-05-24 20:23:27.920574111 +0200 @@ -38,7 +38,7 @@ %define tsan_arch x86_64 aarch64 ppc ppc64 ppc64le %define asan_arch x86_64 %ix86 ppc ppc64 ppc64le s390 s390x %sparc %arm aarch64 %define itm_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc -%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k ia64 +%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k ia64 riscv64 %define lsan_arch x86_64 aarch64 ppc ppc64 ppc64le %define ubsan_arch x86_64 %ix86 ppc ppc64 ppc64le s390 s390x %arm aarch64 %if 0%{?build_libvtv:1} @@ -53,7 +53,11 @@ %define build_fortran 1 %define build_objc 1 %define build_objcp 1 +%ifarch riscv64 +%define build_go 0 +%else %define build_go 1 +%endif %if %{build_objcp} %define build_cp 1 @@ -325,6 +329,7 @@ Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch Patch40: gcc7-pr72764.patch Patch41: gcc7-pr89124.patch +Patch42: libgcc-riscv-div.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1862,6 +1867,7 @@ %patch39 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 %patch51 %patch60 %patch61 @@ -2189,6 +2195,9 @@ %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ %endif +%if "%{TARGET_ARCH}" == "riscv64" + --disable-multilib \ +%endif --build=%{GCCDIST} \ --host=%{GCCDIST} ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.4W4Aro/_old 2023-05-24 20:23:28.096575161 +0200 +++ /var/tmp/diff_new_pack.4W4Aro/_new 2023-05-24 20:23:28.100575185 +0200 @@ -40,7 +40,7 @@ %define tsan_arch x86_64 aarch64 ppc ppc64 ppc64le %define asan_arch x86_64 %ix86 ppc ppc64 ppc64le s390 s390x %sparc %arm aarch64 %define itm_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc -%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k ia64 +%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k ia64 riscv64 %define lsan_arch x86_64 aarch64 ppc ppc64 ppc64le %define ubsan_arch x86_64 %ix86 ppc ppc64 ppc64le s390 s390x %arm aarch64 %if 0%{?build_libvtv:1} @@ -55,7 +55,11 @@ %define build_fortran 1 %define build_objc 1 %define build_objcp 1 +%ifarch riscv64 +%define build_go 0 +%else %define build_go 1 +%endif %if %{build_objcp} %define build_cp 1 @@ -332,6 +336,7 @@ Patch39: gcc7-libgo-don-t-include-linux-fs.h-when-building-gen-sys.patch Patch40: gcc7-pr72764.patch Patch41: gcc7-pr89124.patch +Patch42 : libgcc-riscv-div.patch # A set of patches from the RH srpm Patch51: gcc41-ppc32-retaddr.patch # Some patches taken from Debian @@ -1136,6 +1141,7 @@ %patch39 -p1 %patch40 -p1 %patch41 -p1 +%patch42 -p1 %patch51 %patch60 %patch61 @@ -1463,6 +1469,9 @@ %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ %endif +%if "%{TARGET_ARCH}" == "riscv64" + --disable-multilib \ +%endif --build=%{GCCDIST} \ --host=%{GCCDIST} ++++++ libgcc-riscv-div.patch ++++++ >From 485b0a0039a29cf046fe97c7d72aefe49275b141 Mon Sep 17 00:00:00 2001 From: Nelson Chu <nelson....@sifive.com> Date: Mon, 29 Nov 2021 04:48:20 -0800 Subject: [PATCH] RISC-V: jal cannot refer to a default visibility symbol for shared object. This is the original binutils bugzilla report, https://sourceware.org/bugzilla/show_bug.cgi?id=28509 And this is the first version of the proposed binutils patch, https://sourceware.org/pipermail/binutils/2021-November/118398.html After applying the binutils patch, I get the the unexpected error when building libgcc, /scratch/nelsonc/riscv-gnu-toolchain/riscv-gcc/libgcc/config/riscv/div.S:42: /scratch/nelsonc/build-upstream/rv64gc-linux/build-install/riscv64-unknown-linux-gnu/bin/ld: relocation R_RISCV_JAL against `__udivdi3' which may bind externally can not be used when making a shared object; recompile with -fPIC Therefore, this patch add an extra hidden alias symbol for __udivdi3, and then use HIDDEN_JUMPTARGET to target a non-preemptible symbol instead. The solution is similar to glibc as follows, https://sourceware.org/git/?p=glibc.git;a=commit;h=68389203832ab39dd0dbaabbc4059e7fff51c29b libgcc/ChangeLog: * config/riscv/div.S: Add the hidden alias symbol for __udivdi3, and then use HIDDEN_JUMPTARGET to target it since it is non-preemptible. * config/riscv/riscv-asm.h: Added new macros HIDDEN_JUMPTARGET and HIDDEN_DEF. --- libgcc/config/riscv/div.S | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/libgcc/config/riscv/div.S b/libgcc/config/riscv/div.S index 63d542e846c..2d43a48a302 100644 --- a/libgcc/config/riscv/div.S +++ b/libgcc/config/riscv/div.S @@ -23,6 +23,14 @@ a copy of the GCC Runtime Library Exception along with this program; see the files COPYING3 and COPYING.RUNTIME respectively. If not, see <http://www.gnu.org/licenses/>. */ +#define FUNC_ALIAS(X,Y) \ + .globl X; \ + X = Y +#define CONCAT1(a, b) CONCAT2(a, b) +#define CONCAT2(a, b) a ## b +#define HIDDEN_JUMPTARGET(X) CONCAT1(__hidden_, X) +#define HIDDEN_DEF(X) FUNC_ALIAS(HIDDEN_JUMPTARGET(X), X); \ + .hidden HIDDEN_JUMPTARGET(X) .text .align 2 @@ -39,7 +47,7 @@ __udivsi3: sll a0, a0, 32 sll a1, a1, 32 move t0, ra - jal __udivdi3 + jal HIDDEN_JUMPTARGET(__udivdi3) sext.w a0, a0 jr t0 @@ -51,7 +59,7 @@ __umodsi3: srl a0, a0, 32 srl a1, a1, 32 move t0, ra - jal __udivdi3 + jal HIDDEN_JUMPTARGET(__udivdi3) sext.w a0, a1 jr t0 @@ -96,12 +104,13 @@ __udivdi3: bnez a3, .L3 .L5: ret +HIDDEN_DEF (__udivdi3) .globl __umoddi3 __umoddi3: /* Call __udivdi3(a0, a1), then return the remainder, which is in a1. */ move t0, ra - jal __udivdi3 + jal HIDDEN_JUMPTARGET(__udivdi3) move a0, a1 jr t0 @@ -110,12 +119,12 @@ __umoddi3: neg a0, a0 bgez a1, .L12 /* Compute __udivdi3(-a0, a1), then negate the result. */ neg a1, a1 - j __udivdi3 /* Compute __udivdi3(-a0, -a1). */ + j HIDDEN_JUMPTARGET(__udivdi3) /* Compute __udivdi3(-a0, -a1). */ .L11: /* Compute __udivdi3(a0, -a1), then negate the result. */ neg a1, a1 .L12: move t0, ra - jal __udivdi3 + jal HIDDEN_JUMPTARGET(__udivdi3) neg a0, a0 jr t0 @@ -125,7 +134,7 @@ __moddi3: bltz a1, .L31 bltz a0, .L32 .L30: - jal __udivdi3 /* The dividend is not negative. */ + jal HIDDEN_JUMPTARGET(__udivdi3) /* The dividend is not negative. */ move a0, a1 jr t0 .L31: @@ -133,7 +142,7 @@ __moddi3: bgez a0, .L30 .L32: neg a0, a0 - jal __udivdi3 /* The dividend is hella negative. */ + jal HIDDEN_JUMPTARGET(__udivdi3) /* The dividend is hella negative. */ neg a0, a1 jr t0 -- 2.40.1