Merge updates from master

This commit is contained in:
Repository mirror & CI
2024-09-24 01:48:49 +00:00
9 changed files with 15 additions and 28 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kholtman/${PN}/archive/refs/tags/v${PV}.tar.gz
LICENSE="Artistic LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~hppa ppc ~sparc ~x86"
PATCHES=(
"${FILESDIR}"/${PN}-2.5.2-fix-build-system.patch
+1 -1
View File
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ani6al/${PN}/archive/refs/tags/${PV}.tar.gz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
PATCHES=(
"${FILESDIR}"/${PN}-5.21m-darwin.patch
+2 -2
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jca02266/lha/archive/${MY_COMMIT}.tar.gz -> ${P}.tar
LICENSE="lha"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
S="${WORKDIR}/${PN}-${MY_COMMIT}"
@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
systemd? ( sys-apps/systemd )
!systemd? ( sys-apps/systemd-utils )
virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
systemd? ( sys-apps/systemd )
!systemd? ( sys-apps/systemd-utils )
virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
systemd? ( sys-apps/systemd )
!systemd? ( sys-apps/systemd-utils )
virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
+2 -4
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
systemd? ( sys-apps/systemd )
!systemd? ( sys-apps/systemd-utils )
virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
@@ -66,7 +66,7 @@ index 00000000000..7e28982fb13
+ }
+}
diff --git a/gcc/tree-vect-patterns.cc b/gcc/tree-vect-patterns.cc
index e7e877dd2ad..b913d6de003 100644
index e7e877dd2adb55262822f1660f8d92b42d44e6d0..f0298b2ab97a1e7dd0d943340e1389c3c0fa796e 100644
--- a/gcc/tree-vect-patterns.cc
+++ b/gcc/tree-vect-patterns.cc
@@ -6062,12 +6062,15 @@ vect_recog_bool_pattern (vec_info *vinfo,
@@ -80,14 +80,9 @@ index e7e877dd2ad..b913d6de003 100644
return NULL;
else if (TREE_CODE (TREE_TYPE (var)) == BOOLEAN_TYPE
- && !vect_get_internal_def (vinfo, var))
+ && var_def_info
+ && (STMT_VINFO_DEF_TYPE (var_def_info) == vect_external_def
+ && (!var_def_info
+ || STMT_VINFO_DEF_TYPE (var_def_info) == vect_external_def
+ || STMT_VINFO_DEF_TYPE (var_def_info) == vect_constant_def))
{
/* If the condition is already a boolean then manually convert it to a
mask of the given integer type but don't set a vectype. */
base-commit: 358db2e3ed4acf44282d1d9ebbc4a1a3b6e38d21
--
2.46.1