-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sys-devel/gcc-14.2.1_p20241221: version bump
Signed-off-by: Fabian Groffen <[email protected]>
- Loading branch information
Showing
3 changed files
with
292 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
144 changes: 144 additions & 0 deletions
144
...files/gcc-14.2.1_p20241221-arm-Revert-arm-MVE-intrinsics-Fix-support-for-predicate-.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| https://gcc.gnu.org/PR118176 | ||
|
|
||
| From ecd031a9470257324484c66b51c6baff943e01ab Mon Sep 17 00:00:00 2001 | ||
| Message-ID: <ecd031a9470257324484c66b51c6baff943e01ab.1734954594.git.sam@gentoo.org> | ||
| From: Christophe Lyon <[email protected]> | ||
| Date: Mon, 23 Dec 2024 08:11:34 +0000 | ||
| Subject: [PATCH] Revert "arm: [MVE intrinsics] Fix support for predicate | ||
| constants [PR target/114801]" | ||
|
|
||
| This reverts commit 0631c5770e8162dbe67c73dee0327313c19822c2. | ||
| --- | ||
| gcc/config/arm/arm-mve-builtins.cc | 32 +-------------- | ||
| .../gcc.target/arm/mve/pr108443-run.c | 2 +- | ||
| gcc/testsuite/gcc.target/arm/mve/pr108443.c | 4 +- | ||
| gcc/testsuite/gcc.target/arm/mve/pr114801.c | 39 ------------------- | ||
| 4 files changed, 4 insertions(+), 73 deletions(-) | ||
| delete mode 100644 gcc/testsuite/gcc.target/arm/mve/pr114801.c | ||
|
|
||
| diff --git a/gcc/config/arm/arm-mve-builtins.cc b/gcc/config/arm/arm-mve-builtins.cc | ||
| index ec856f7d6168..e1826ae40527 100644 | ||
| --- a/gcc/config/arm/arm-mve-builtins.cc | ||
| +++ b/gcc/config/arm/arm-mve-builtins.cc | ||
| @@ -2107,37 +2107,7 @@ function_expander::add_input_operand (insn_code icode, rtx x) | ||
| mode = GET_MODE (x); | ||
| } | ||
| else if (VALID_MVE_PRED_MODE (mode)) | ||
| - { | ||
| - if (CONST_INT_P (x)) | ||
| - { | ||
| - if (mode == V8BImode || mode == V4BImode) | ||
| - { | ||
| - /* In V8BI or V4BI each element has 2 or 4 bits, if those bits | ||
| - aren't all the same, gen_lowpart might ICE. Canonicalize all | ||
| - the 2 or 4 bits to all ones if any of them is non-zero. V8BI | ||
| - and V4BI multi-bit masks are interpreted byte-by-byte at | ||
| - instruction level, but such constants should describe lanes, | ||
| - rather than bytes. See the section on MVE intrinsics in the | ||
| - Arm ACLE specification. */ | ||
| - unsigned HOST_WIDE_INT xi = UINTVAL (x); | ||
| - xi |= ((xi & 0x5555) << 1) | ((xi & 0xaaaa) >> 1); | ||
| - if (mode == V4BImode) | ||
| - xi |= ((xi & 0x3333) << 2) | ((xi & 0xcccc) >> 2); | ||
| - if (xi != UINTVAL (x)) | ||
| - warning_at (location, 0, "constant predicate argument %d" | ||
| - " (%wx) does not map to %d lane numbers," | ||
| - " converted to %wx", | ||
| - opno, UINTVAL (x) & 0xffff, | ||
| - mode == V8BImode ? 8 : 4, | ||
| - xi & 0xffff); | ||
| - | ||
| - x = gen_int_mode (xi, HImode); | ||
| - } | ||
| - x = gen_lowpart (mode, x); | ||
| - } | ||
| - else | ||
| - x = force_lowpart_subreg (mode, x, GET_MODE (x)); | ||
| - } | ||
| + x = gen_lowpart (mode, x); | ||
|
|
||
| m_ops.safe_grow (m_ops.length () + 1, true); | ||
| create_input_operand (&m_ops.last (), x, mode); | ||
| diff --git a/gcc/testsuite/gcc.target/arm/mve/pr108443-run.c b/gcc/testsuite/gcc.target/arm/mve/pr108443-run.c | ||
| index b894f019b8bb..cb4b45bd3056 100644 | ||
| --- a/gcc/testsuite/gcc.target/arm/mve/pr108443-run.c | ||
| +++ b/gcc/testsuite/gcc.target/arm/mve/pr108443-run.c | ||
| @@ -16,7 +16,7 @@ __attribute__ ((noipa)) partial_write (uint32_t *a, uint32x4_t v, unsigned short | ||
|
|
||
| int main (void) | ||
| { | ||
| - unsigned short p = 0x00FF; | ||
| + unsigned short p = 0x00CC; | ||
| uint32_t a[] = {0, 0, 0, 0}; | ||
| uint32_t b[] = {0, 0, 0, 0}; | ||
| uint32x4_t v = vdupq_n_u32 (0xFFFFFFFFU); | ||
| diff --git a/gcc/testsuite/gcc.target/arm/mve/pr108443.c b/gcc/testsuite/gcc.target/arm/mve/pr108443.c | ||
| index 0c0e2dd6eb8f..c5fbfa4a1bb7 100644 | ||
| --- a/gcc/testsuite/gcc.target/arm/mve/pr108443.c | ||
| +++ b/gcc/testsuite/gcc.target/arm/mve/pr108443.c | ||
| @@ -7,8 +7,8 @@ | ||
| void | ||
| __attribute__ ((noipa)) partial_write_cst (uint32_t *a, uint32x4_t v) | ||
| { | ||
| - vstrwq_p_u32 (a, v, 0x00FF); | ||
| + vstrwq_p_u32 (a, v, 0x00CC); | ||
| } | ||
|
|
||
| -/* { dg-final { scan-assembler {mov\tr[0-9]+, #255} } } */ | ||
| +/* { dg-final { scan-assembler {mov\tr[0-9]+, #204} } } */ | ||
|
|
||
| diff --git a/gcc/testsuite/gcc.target/arm/mve/pr114801.c b/gcc/testsuite/gcc.target/arm/mve/pr114801.c | ||
| deleted file mode 100644 | ||
| index ab3130fd4ce8..000000000000 | ||
| --- a/gcc/testsuite/gcc.target/arm/mve/pr114801.c | ||
| +++ /dev/null | ||
| @@ -1,39 +0,0 @@ | ||
| -/* { dg-do compile } */ | ||
| -/* { dg-require-effective-target arm_v8_1m_mve_ok } */ | ||
| -/* { dg-options "-O2" } */ | ||
| -/* { dg-add-options arm_v8_1m_mve } */ | ||
| -/* { dg-final { check-function-bodies "**" "" "" } } */ | ||
| - | ||
| -#include <arm_mve.h> | ||
| - | ||
| -/* | ||
| -** test_32: | ||
| -**... | ||
| -** mov r[0-9]+, #65295 @ movhi | ||
| -**... | ||
| -*/ | ||
| -uint32x4_t test_32() { | ||
| - /* V4BI predicate converted to 0xff0f. */ | ||
| - return vdupq_m_n_u32(vdupq_n_u32(0xffffffff), 0, 0x4f02); /* { dg-warning {constant predicate argument 3 \(0x4f02\) does not map to 4 lane numbers, converted to 0xff0f} } */ | ||
| -} | ||
| - | ||
| -/* | ||
| -** test_16: | ||
| -**... | ||
| -** mov r[0-9]+, #12339 @ movhi | ||
| -**... | ||
| -*/ | ||
| -uint16x8_t test_16() { | ||
| - /* V8BI predicate converted to 0x3033. */ | ||
| - return vdupq_m_n_u16(vdupq_n_u16(0xffff), 0, 0x3021); /* { dg-warning {constant predicate argument 3 \(0x3021\) does not map to 8 lane numbers, converted to 0x3033} } */ | ||
| -} | ||
| - | ||
| -/* | ||
| -** test_8: | ||
| -**... | ||
| -** mov r[0-9]+, #23055 @ movhi | ||
| -**... | ||
| -*/ | ||
| -uint8x16_t test_8() { | ||
| - return vdupq_m_n_u8(vdupq_n_u8(0xff), 0, 0x5a0f); | ||
| -} | ||
|
|
||
| base-commit: e883a7082fecfd85694b275bec4a2e428ac9a081 | ||
| prerequisite-patch-id: 4000f228fd3953eb9877fab7b9493cd86f6bc771 | ||
| prerequisite-patch-id: d61e09af01bb7358c1df6abf5d2c4b7849ab4676 | ||
| prerequisite-patch-id: 54a4cfb376547141937d7e321d7b4554c1e3afe7 | ||
| prerequisite-patch-id: 3117f4e58bd5c0a1aca48af82106bb7f779842fa | ||
| prerequisite-patch-id: a470cf090a6867789c0722d012786c6066d3e706 | ||
| -- | ||
| 2.47.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| # Copyright 1999-2024 Gentoo Authors | ||
| # Distributed under the terms of the GNU General Public License v2 | ||
|
|
||
| EAPI=8 | ||
|
|
||
| TOOLCHAIN_PATCH_DEV="sam" | ||
| TOOLCHAIN_HAS_TESTS=1 | ||
| PATCH_GCC_VER="14.2.0" | ||
| PATCH_VER="7" | ||
| MUSL_VER="1" | ||
| MUSL_GCC_VER="14.1.0" | ||
| PYTHON_COMPAT=( python3_{10..12} ) | ||
|
|
||
| if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then | ||
| # Cheesy hack for RCs | ||
| MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) | ||
| MY_P=${PN}-${MY_PV} | ||
| GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" | ||
| TOOLCHAIN_SET_S=no | ||
| S="${WORKDIR}"/${MY_P} | ||
| fi | ||
|
|
||
| inherit toolchain | ||
|
|
||
| if tc_is_live ; then | ||
| # Needs to be after inherit (for now?), bug #830908 | ||
| EGIT_BRANCH=releases/gcc-$(ver_cut 1) | ||
| elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then | ||
| # m68k doesnt build (ICE, bug 932733) | ||
| KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" | ||
| :; | ||
| fi | ||
|
|
||
| # use alternate source for Apple M1 (also works for x86_64) | ||
| SRC_URI+=" elibc_Darwin? ( https://dev.gentoo.org/~grobian/distfiles/gcc-14.2.1-arm64-darwin.patch )" | ||
| IUSE+=" system-bootstrap" | ||
|
|
||
| if [[ ${CATEGORY} != cross-* ]] ; then | ||
| # Technically only if USE=hardened *too* right now, but no point in complicating it further. | ||
| # If GCC is enabling CET by default, we need glibc to be built with support for it. | ||
| # bug #830454 | ||
| RDEPEND="!prefix-guest? ( elibc_glibc? ( sys-libs/glibc[cet(-)?] ) )" | ||
| DEPEND="${RDEPEND}" | ||
| fi | ||
|
|
||
| src_prepare() { | ||
| # apply big arm64-darwin patch first thing | ||
| use elibc_Darwin && eapply "${DISTDIR}"/${PN}-14.2.1-arm64-darwin.patch | ||
|
|
||
| # run as with - on pipe (for Clang 16) | ||
| eapply "${FILESDIR}"/${PN}-14.2.0-darwin-as-dash-pipe.patch | ||
|
|
||
| # make sure 64-bits native targets don't screw up the linker paths | ||
| eapply "${FILESDIR}"/gcc-12-no-libs-for-startfile.patch | ||
|
|
||
| local p upstreamed_patches=( | ||
| # add them here | ||
| ) | ||
| for p in "${upstreamed_patches[@]}"; do | ||
| rm -v "${WORKDIR}/patch/${p}" || die | ||
| done | ||
|
|
||
| toolchain_src_prepare | ||
|
|
||
| # make it have correct install_names on Darwin | ||
| eapply -p1 "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch | ||
|
|
||
| if [[ ${CHOST} == powerpc*-darwin* ]] ; then | ||
| # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=44107 | ||
| sed -i -e 's|^ifeq (/usr/lib,|ifneq (/usr/lib,|' \ | ||
| libgcc/config/t-slibgcc-darwin || die | ||
| fi | ||
|
|
||
| if [[ ${CHOST} == *-solaris* ]] ; then | ||
| # madvise is not available in the compatibility mode GCC uses, | ||
| # posix_madvise however, is | ||
| sed -i -e 's/madvise/posix_madvise/' gcc/cp/module.cc || die | ||
| fi | ||
|
|
||
| if [[ ${CHOST} == *-darwin* ]] ; then | ||
| use system-bootstrap && eapply "${FILESDIR}"/${PN}-13-darwin14-bootstrap.patch | ||
|
|
||
| # our ld64 is a slight bit different, so tweak expression to not | ||
| # get confused and break the build | ||
| sed -i -e "s/EGREP 'ld64|dyld'/& | head -n1/" \ | ||
| gcc/configure{.ac,} || die | ||
|
|
||
| # rip out specific macos version min | ||
| sed -i -e 's/-mmacosx-version-min=11.0//' \ | ||
| libgcc/config/aarch64/t-darwin \ | ||
| libgcc/config/aarch64/t-heap-trampoline \ | ||
| || die | ||
| fi | ||
|
|
||
| eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch | ||
| eapply "${FILESDIR}"/gcc-14.2.1_p20241221-arm-Revert-arm-MVE-intrinsics-Fix-support-for-predicate-.patch | ||
| eapply_user | ||
| } | ||
|
|
||
| src_configure() { | ||
| local myconf=() | ||
| case ${CTARGET}:" ${USE} " in | ||
| powerpc*-darwin*) | ||
| # bug #381179 | ||
| filter-flags "-mcpu=*" "-mtune=*" | ||
| # bug #657522 | ||
| # A bug in configure checks whether -no-pie works, but the | ||
| # compiler doesn't pass -no-pie onto the linker if -fno-PIE | ||
| # isn't passed, so the configure check always finds -no-pie | ||
| # is accepted. (Likewise, when -fno-PIE is passed, the | ||
| # compiler passes -no_pie onto the linker.) | ||
| # Since our linker doesn't grok this, avoid above checks to | ||
| # be run | ||
| # NOTE: later ld64 does grok -no_pie, not -no-pie (as checked) | ||
| export gcc_cv_c_no_fpie=no | ||
| export gcc_cv_no_pie=no | ||
| ;; | ||
| *-darwin20) | ||
| # use sysroot with the linker, #756160 | ||
| export gcc_cv_ld_sysroot=yes | ||
| ;; | ||
| *-solaris*) | ||
| # todo: some magic for native vs. GNU linking? | ||
| myconf+=( --with-gnu-ld --with-gnu-as --enable-largefile ) | ||
| ;; | ||
| i[34567]86-*-linux*:*" prefix "*) | ||
| # to allow the linux-x86-on-amd64.patch become useful, we need | ||
| # to enable multilib, even if there is just one multilib option. | ||
| myconf+=( --enable-multilib ) | ||
| if [[ ${CBUILD:-${CHOST}} == "${CHOST}" ]]; then | ||
| # we might be on x86_64-linux, but don't do cross-compile, so | ||
| # tell the host-compiler to really create 32bits (for stage1) | ||
| # (real x86-linux-gcc also accept -m32). | ||
| append-flags -m32 | ||
| fi | ||
| ;; | ||
| esac | ||
|
|
||
| # Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at | ||
| # least on Solaris, and AIX /bin/sh is way too slow, | ||
| # so force it to use $BASH (that portage uses) - it can't be EPREFIX | ||
| # in case that doesn't exist yet | ||
| export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}" | ||
| toolchain_src_configure "${myconf[@]}" | ||
| } |