commit: 1d2ff0e8d3c0e012ed57743adb869797782f1a26 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jun 17 02:58:40 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jun 17 02:58:41 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d2ff0e8
sys-libs/newlib: backport arm setjmp fix It looked like a new upstream release/snapshot was going to be made so I'd forgot about it, but got reminded of this today, so let's backport the patch. Closes: https://bugs.gentoo.org/891589 Signed-off-by: Sam James <sam <AT> gentoo.org> ...0120-libc-arm-setjmp-gcc-backwards-compat.patch | 57 ++++++++ sys-libs/newlib/newlib-4.3.0.20230120-r2.ebuild | 154 +++++++++++++++++++++ 2 files changed, 211 insertions(+) diff --git a/sys-libs/newlib/files/newlib-4.3.0.20230120-libc-arm-setjmp-gcc-backwards-compat.patch b/sys-libs/newlib/files/newlib-4.3.0.20230120-libc-arm-setjmp-gcc-backwards-compat.patch new file mode 100644 index 000000000000..3eab820db787 --- /dev/null +++ b/sys-libs/newlib/files/newlib-4.3.0.20230120-libc-arm-setjmp-gcc-backwards-compat.patch @@ -0,0 +1,57 @@ +https://bugs.gentoo.org/891589 +https://sourceware.org/pipermail/newlib/2022/020035.html +https://sourceware.org/git/?p=newlib-cygwin.git;a=commit;h=c6e601de84ea9f2be2b026c609cc3c1fe82a3103 + +From c6e601de84ea9f2be2b026c609cc3c1fe82a3103 Mon Sep 17 00:00:00 2001 +From: "Victor L. Do Nascimento" <[email protected]> +Date: Fri, 3 Feb 2023 11:15:26 +0000 +Subject: [PATCH] libc: arm: Implement setjmp GCC backwards compatibility. + +When compiling Newlib for arm targets with GCC 12.1 onward, the +passing of architecture extension information to the assembler is +automatic, making the use of .fpu and .arch_extension directives +in assembly files redundant. + +With older versions of GCC, however, these directives must be +hard-coded into the `arm/setjmp.S' file to allow the assembly of +instructions concerning the storage and subsequent reloading of the +floating point registers to/from the jump buffer, respectively. + +This patch conditionally adds the `.fpu vfpxd' and `.arch_extension +mve' directives based on compile-time preprocessor macros concerning +GCC version and target architectural features, such that both the +assembly and linking of setjmp.S succeeds for older versions of +Newlib. +--- a/newlib/libc/machine/arm/setjmp.S ++++ b/newlib/libc/machine/arm/setjmp.S +@@ -64,6 +64,28 @@ + + .syntax unified + ++/* GCC 12.1 and later will tell the assembler exactly which floating ++ point (or MVE) unit is required and we don't want to override ++ that. Conversely, older versions of the compiler don't pass this ++ information so we need to enable the VFP version that is most ++ appropriate. The choice here should support all suitable VFP ++ versions that the older toolchains can handle. */ ++#if __GNUC__ && __GNUC__ < 12 ++/* Ensure that FPU instructions are correctly compiled and, likewise, ++ the appropriate build attributes are added to the resulting object ++ file. Check whether the MVE extension is present and whether ++ we have support for hardware floating point-operations. VFPxd ++ covers all the cases we need in this file for hardware ++ floating-point and should be compatible with all required FPUs ++ that we need to support. */ ++# if __ARM_FP ++ .fpu vfpxd ++# endif ++# if __ARM_FEATURE_MVE ++ .arch_extension mve ++# endif ++#endif ++ + #if __ARM_ARCH_ISA_THUMB == 1 && !__ARM_ARCH_ISA_ARM + /* ARMv6-M-like has to be implemented in Thumb mode. */ + +-- +2.39.3 diff --git a/sys-libs/newlib/newlib-4.3.0.20230120-r2.ebuild b/sys-libs/newlib/newlib-4.3.0.20230120-r2.ebuild new file mode 100644 index 000000000000..942c2fe4601b --- /dev/null +++ b/sys-libs/newlib/newlib-4.3.0.20230120-r2.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://sourceware.org/git/newlib-cygwin.git"; + inherit git-r3 +else + SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz"; + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +DESCRIPTION="Newlib is a C library intended for use on embedded systems" +HOMEPAGE="https://sourceware.org/newlib/"; + +LICENSE="NEWLIB LIBGLOSS GPL-2" +SLOT="0" +IUSE="nls threads unicode headers-only nano" +RESTRICT="strip" + +PATCHES=( + "${FILESDIR}"/${PN}-3.3.0-no-nano-cxx.patch + "${FILESDIR}"/${P}-libc-arm-setjmp-gcc-backwards-compat.patch +) + +NEWLIBBUILD="${WORKDIR}/build" +NEWLIBNANOBUILD="${WORKDIR}/build.nano" +NEWLIBNANOTMPINSTALL="${WORKDIR}/nano_tmp_install" + +CFLAGS_FULL="-ffunction-sections -fdata-sections" +CFLAGS_NANO="-Os -ffunction-sections -fdata-sections" + +pkg_setup() { + # Reject newlib-on-glibc type installs + if [[ ${CTARGET} == ${CHOST} ]] ; then + case ${CHOST} in + *-newlib|*-elf) ;; + *) die "Use sys-devel/crossdev to build a newlib toolchain" ;; + esac + fi + + case ${CTARGET} in + msp430*) + if ver_test $(gcc-version ${CTARGET}) -lt 10.1; then + # bug #717610 + die "gcc for ${CTARGET} has to be 10.1 or above" + fi + ;; + esac +} + +src_configure() { + # TODO: we should fix this + unset LDFLAGS + CHOST=${CTARGET} strip-unsupported-flags + CCASFLAGS_ORIG="${CCASFLAGS}" + CFLAGS_ORIG="${CFLAGS}" + + local myconf=( + # The top-level configure doesn't utilize this flag, but subdirs do, + # so autodetection for econf doesn't work. Add ourselves. + --disable-silent-rules + # Disable legacy syscall stub code in newlib. These have been + # moved to libgloss for a long time now, so the code in newlib + # itself just gets in the way. + --disable-newlib-supplied-syscalls + ) + [[ ${CTARGET} == "spu" ]] \ + && myconf+=( --disable-newlib-multithread ) \ + || myconf+=( $(use_enable threads newlib-multithread) ) + + mkdir -p "${NEWLIBBUILD}" + cd "${NEWLIBBUILD}" + + export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}" + export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}" + ECONF_SOURCE=${S} \ + econf \ + $(use_enable unicode newlib-mb) \ + $(use_enable nls) \ + "${myconf[@]}" + + # Build newlib-nano beside newlib (original) + # Based on https://tracker.debian.org/media/packages/n/newlib/rules-2.1.0%2Bgit20140818.1a8323b-2 + if use nano ; then + mkdir -p "${NEWLIBNANOBUILD}" || die + cd "${NEWLIBNANOBUILD}" || die + export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}" + export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}" + ECONF_SOURCE=${S} \ + econf \ + $(use_enable unicode newlib-mb) \ + $(use_enable nls) \ + --enable-newlib-reent-small \ + --disable-newlib-fvwrite-in-streamio \ + --disable-newlib-fseek-optimization \ + --disable-newlib-wide-orient \ + --enable-newlib-nano-malloc \ + --disable-newlib-unbuf-stream-opt \ + --enable-lite-exit \ + --enable-newlib-global-atexit \ + --enable-newlib-nano-formatted-io \ + "${myconf[@]}" + fi +} + +src_compile() { + export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_FULL}" + export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_FULL}" + emake -C "${NEWLIBBUILD}" + + if use nano ; then + export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAGS_NANO}" + export "CCASFLAGS=${CCASFLAGS_ORIG} ${CFLAGS_NANO}" + emake -C "${NEWLIBNANOBUILD}" + fi +} + +src_install() { + cd "${NEWLIBBUILD}" || die + emake DESTDIR="${D}" install + + if use nano ; then + cd "${NEWLIBNANOBUILD}" || die + emake DESTDIR="${NEWLIBNANOTMPINSTALL}" install + # Rename nano lib* files to lib*_nano and move to the real ${D} + local nanolibfiles="" + nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex ".*/lib\(c\|g\|m\|rdimon\|gloss\)\.a" -print) + for f in ${nanolibfiles}; do + local l="${f##${NEWLIBNANOTMPINSTALL}}" + mv -v "${f}" "${D}/${l%%\.a}_nano.a" || die + done + + # Move newlib-nano's version of newlib.h to newlib-nano/newlib.h + mkdir -p "${ED}/usr/${CTARGET}/include/newlib-nano" || die + mv "${NEWLIBNANOTMPINSTALL}/${EPREFIX}/usr/${CTARGET}/include/newlib.h" \ + "${ED}/usr/${CTARGET}/include/newlib-nano/newlib.h" || die + fi + + # minor hack to keep things clean + rm -rf "${D}"/usr/share/info || die + rm -rf "${D}"/usr/info || die +}
