Accepting request 1059629 from hardware👢staging

OBS-URL: https://build.opensuse.org/request/show/1059629
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=178
This commit is contained in:
Guillaume GARDET 2023-01-19 16:12:05 +00:00 committed by Git OBS Bridge
parent a74d4379f7
commit 73324bbcc8
2 changed files with 5 additions and 23 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jan 19 14:17:33 UTC 2023 - Andreas Schwab <schwab@suse.de>
- Remove obsolete riscv64 libgcc hack
-------------------------------------------------------------------
Thu Jan 19 10:53:37 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>

View File

@ -439,29 +439,6 @@ export DEVICE_TREE=zynqmp-zcu102-rev1.0
export DEVICE_TREE=zynq-zturn-v5
%endif
%ifarch riscv64
# Hack to allow enabling btrfs on riscv64. CONFIG_CMD_BTRFS implies
# CONFIG_ZSTD, which needs __clzsi2 from libgcc. The system libgcc has
# been built with -mabi=lp64d (double-float ABI), but U-Boot is built with
# -mabi=lp64 (soft-float ABI). The linker does not allow mixing objects
# with differing float ABIs. Since __clzsi2 does not use any floating
# point, there is actually no compatibilty problem, so pretend that is was
# built with the soft-float ABI. Create a private libgcc.a that contains
# the rebranded object files.
libgcc=$(gcc -print-libgcc-file-name)
mkdir arch/riscv/libgcc
pushd arch/riscv/libgcc
ar x $libgcc _clz.o _clzsi2.o
# Change the header flags from 0x05 (RVC, double-float ABI) to 0x01 (RVC,
# soft-float ABI)
printf '\1' | dd of=_clz.o bs=1 seek=48 conv=notrunc status=none
printf '\1' | dd of=_clzsi2.o bs=1 seek=48 conv=notrunc status=none
ar cr libgcc.a _clz.o _clzsi2.o
rm -f _clz.o _clzsi2.o
popd
extra_makeflags=PLATFORM_LIBGCC="$PWD/arch/riscv/libgcc/libgcc.a"
%endif
make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="%{optflags}" $confname
echo "Attempting to enable fdt apply command (.dtbo) support."
echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config