diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-07-04 04:07:19 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-07-04 04:07:19 +0100 |
commit | 2475ac51234b6ca2597db80dd05deb29667888b0 (patch) | |
tree | c3b38e5475d765253892cebd14aa2eb4822ef00f /sys-fs/zfs/files | |
parent | 2764a2c09ef0bc530bda7afb20e505ca24d310c6 (diff) |
gentoo auto-resync : 04:07:2023 - 04:07:19
Diffstat (limited to 'sys-fs/zfs/files')
-rw-r--r-- | sys-fs/zfs/files/2.1.5-dracut-mount.patch | 29 | ||||
-rw-r--r-- | sys-fs/zfs/files/2.1.7-ppc64-ieee128-compat.patch | 217 |
2 files changed, 0 insertions, 246 deletions
diff --git a/sys-fs/zfs/files/2.1.5-dracut-mount.patch b/sys-fs/zfs/files/2.1.5-dracut-mount.patch deleted file mode 100644 index 758f4b3a3e99..000000000000 --- a/sys-fs/zfs/files/2.1.5-dracut-mount.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/openzfs/zfs/commit/07f2793e869196fcbcd5057d9ada377674262fe3 -https://bugs.gentoo.org/857228 - -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Wed, 29 Jun 2022 15:33:38 -0700 -Subject: [PATCH] dracut: fix typo in mount-zfs.sh.in -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Format the `zpool get` command correctly. The -o option must -be followed by "all" or the requested field name. - -Reviewed-by: Ahelenia ZiemiaĆska <nabijaczleweli@nabijaczleweli.xyz> -Reviewed-by: George Melikov <mail@gmelikov.ru> -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #13602 ---- a/contrib/dracut/90zfs/mount-zfs.sh.in -+++ b/contrib/dracut/90zfs/mount-zfs.sh.in -@@ -82,7 +82,7 @@ ZFS_DATASET="${ZFS_DATASET:-${root}}" - ZFS_POOL="${ZFS_DATASET%%/*}" - - --if ! zpool get -Ho name "${ZFS_POOL}" > /dev/null 2>&1; then -+if ! zpool get -Ho value name "${ZFS_POOL}" > /dev/null 2>&1; then - info "ZFS: Importing pool ${ZFS_POOL}..." - # shellcheck disable=SC2086 - if ! zpool import -N ${ZPOOL_IMPORT_OPTS} "${ZFS_POOL}"; then - diff --git a/sys-fs/zfs/files/2.1.7-ppc64-ieee128-compat.patch b/sys-fs/zfs/files/2.1.7-ppc64-ieee128-compat.patch deleted file mode 100644 index 5613cb8ca9d1..000000000000 --- a/sys-fs/zfs/files/2.1.7-ppc64-ieee128-compat.patch +++ /dev/null @@ -1,217 +0,0 @@ -From 8324d738fdb3096bd97336476bb399e6c312289a Mon Sep 17 00:00:00 2001 -From: Richard Yao <richard.yao@alumni.stonybrook.edu> -Date: Thu, 12 Jan 2023 11:06:57 -0500 -Subject: [PATCH] Linux ppc64le ieee128 compat: Do not redefine __asm on - external headers - -There is an external assembly declaration extension in GNU C that glibc -uses when building with ieee128 floating point support on ppc64le. -Marking that as volatile makes no sense, so the build breaks. - -It does not make sense to only mark this as volatile on Linux, since if -do not want the compiler reordering things on Linux, we do not want the -compiler reordering things on any other platform, so we stop treating -Linux specially and just manually inline the CPP macro so that we can -eliminate it. This should fix the build on ppc64le. - -Closes openzfs/zfs#14308 -Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu> ---- - .../vdev_raidz_math_powerpc_altivec_common.h | 44 +++++++++---------- - 1 file changed, 20 insertions(+), 24 deletions(-) - -diff --git a/module/zfs/vdev_raidz_math_powerpc_altivec_common.h b/module/zfs/vdev_raidz_math_powerpc_altivec_common.h -index 46d42c5e241..f76eb47a9c6 100644 ---- a/module/zfs/vdev_raidz_math_powerpc_altivec_common.h -+++ b/module/zfs/vdev_raidz_math_powerpc_altivec_common.h -@@ -26,10 +26,6 @@ - #include <sys/types.h> - #include <sys/simd.h> - --#ifdef __linux__ --#define __asm __asm__ __volatile__ --#endif -- - #define _REG_CNT(_0, _1, _2, _3, _4, _5, _6, _7, N, ...) N - #define REG_CNT(r...) _REG_CNT(r, 8, 7, 6, 5, 4, 3, 2, 1) - -@@ -142,7 +138,7 @@ typedef struct v { - { \ - switch (REG_CNT(r)) { \ - case 8: \ -- __asm( \ -+ __asm__ __volatile__( \ - "lvx 21,0,%[SRC0]\n" \ - "lvx 20,0,%[SRC1]\n" \ - "lvx 19,0,%[SRC2]\n" \ -@@ -172,7 +168,7 @@ typedef struct v { - : "v18", "v19", "v20", "v21"); \ - break; \ - case 4: \ -- __asm( \ -+ __asm__ __volatile__( \ - "lvx 21,0,%[SRC0]\n" \ - "lvx 20,0,%[SRC1]\n" \ - "lvx 19,0,%[SRC2]\n" \ -@@ -189,7 +185,7 @@ typedef struct v { - : "v18", "v19", "v20", "v21"); \ - break; \ - case 2: \ -- __asm( \ -+ __asm__ __volatile__( \ - "lvx 21,0,%[SRC0]\n" \ - "lvx 20,0,%[SRC1]\n" \ - "vxor " VR0(r) "," VR0(r) ",21\n" \ -@@ -208,7 +204,7 @@ typedef struct v { - { \ - switch (REG_CNT(r)) { \ - case 8: \ -- __asm( \ -+ __asm__ __volatile__( \ - "vxor " VR4(r) "," VR4(r) "," VR0(r) "\n" \ - "vxor " VR5(r) "," VR5(r) "," VR1(r) "\n" \ - "vxor " VR6(r) "," VR6(r) "," VR2(r) "\n" \ -@@ -217,7 +213,7 @@ typedef struct v { - : RVR0(r), RVR1(r), RVR2(r), RVR3(r)); \ - break; \ - case 4: \ -- __asm( \ -+ __asm__ __volatile__( \ - "vxor " VR2(r) "," VR2(r) "," VR0(r) "\n" \ - "vxor " VR3(r) "," VR3(r) "," VR1(r) "\n" \ - : UVR2(r), UVR3(r) \ -@@ -232,7 +228,7 @@ typedef struct v { - { \ - switch (REG_CNT(r)) { \ - case 8: \ -- __asm( \ -+ __asm__ __volatile__( \ - "vxor " VR0(r) "," VR0(r) "," VR0(r) "\n" \ - "vxor " VR1(r) "," VR1(r) "," VR1(r) "\n" \ - "vxor " VR2(r) "," VR2(r) "," VR2(r) "\n" \ -@@ -245,7 +241,7 @@ typedef struct v { - WVR4(r), WVR5(r), WVR6(r), WVR7(r)); \ - break; \ - case 4: \ -- __asm( \ -+ __asm__ __volatile__( \ - "vxor " VR0(r) "," VR0(r) "," VR0(r) "\n" \ - "vxor " VR1(r) "," VR1(r) "," VR1(r) "\n" \ - "vxor " VR2(r) "," VR2(r) "," VR2(r) "\n" \ -@@ -253,7 +249,7 @@ typedef struct v { - : WVR0(r), WVR1(r), WVR2(r), WVR3(r)); \ - break; \ - case 2: \ -- __asm( \ -+ __asm__ __volatile__( \ - "vxor " VR0(r) "," VR0(r) "," VR0(r) "\n" \ - "vxor " VR1(r) "," VR1(r) "," VR1(r) "\n" \ - : WVR0(r), WVR1(r)); \ -@@ -267,7 +263,7 @@ typedef struct v { - { \ - switch (REG_CNT(r)) { \ - case 8: \ -- __asm( \ -+ __asm__ __volatile__( \ - "vor " VR4(r) "," VR0(r) "," VR0(r) "\n" \ - "vor " VR5(r) "," VR1(r) "," VR1(r) "\n" \ - "vor " VR6(r) "," VR2(r) "," VR2(r) "\n" \ -@@ -276,7 +272,7 @@ typedef struct v { - : RVR0(r), RVR1(r), RVR2(r), RVR3(r)); \ - break; \ - case 4: \ -- __asm( \ -+ __asm__ __volatile__( \ - "vor " VR2(r) "," VR0(r) "," VR0(r) "\n" \ - "vor " VR3(r) "," VR1(r) "," VR1(r) "\n" \ - : WVR2(r), WVR3(r) \ -@@ -291,7 +287,7 @@ typedef struct v { - { \ - switch (REG_CNT(r)) { \ - case 8: \ -- __asm( \ -+ __asm__ __volatile__( \ - "lvx " VR0(r) " ,0,%[SRC0]\n" \ - "lvx " VR1(r) " ,0,%[SRC1]\n" \ - "lvx " VR2(r) " ,0,%[SRC2]\n" \ -@@ -312,7 +308,7 @@ typedef struct v { - [SRC7] "r" ((OFFSET(src, 112)))); \ - break; \ - case 4: \ -- __asm( \ -+ __asm__ __volatile__( \ - "lvx " VR0(r) " ,0,%[SRC0]\n" \ - "lvx " VR1(r) " ,0,%[SRC1]\n" \ - "lvx " VR2(r) " ,0,%[SRC2]\n" \ -@@ -324,7 +320,7 @@ typedef struct v { - [SRC3] "r" ((OFFSET(src, 48)))); \ - break; \ - case 2: \ -- __asm( \ -+ __asm__ __volatile__( \ - "lvx " VR0(r) " ,0,%[SRC0]\n" \ - "lvx " VR1(r) " ,0,%[SRC1]\n" \ - : WVR0(r), WVR1(r) \ -@@ -340,7 +336,7 @@ typedef struct v { - { \ - switch (REG_CNT(r)) { \ - case 8: \ -- __asm( \ -+ __asm__ __volatile__( \ - "stvx " VR0(r) " ,0,%[DST0]\n" \ - "stvx " VR1(r) " ,0,%[DST1]\n" \ - "stvx " VR2(r) " ,0,%[DST2]\n" \ -@@ -362,7 +358,7 @@ typedef struct v { - : "memory"); \ - break; \ - case 4: \ -- __asm( \ -+ __asm__ __volatile__( \ - "stvx " VR0(r) " ,0,%[DST0]\n" \ - "stvx " VR1(r) " ,0,%[DST1]\n" \ - "stvx " VR2(r) " ,0,%[DST2]\n" \ -@@ -375,7 +371,7 @@ typedef struct v { - : "memory"); \ - break; \ - case 2: \ -- __asm( \ -+ __asm__ __volatile__( \ - "stvx " VR0(r) " ,0,%[DST0]\n" \ - "stvx " VR1(r) " ,0,%[DST1]\n" \ - : : [DST0] "r" ((OFFSET(dst, 0))), \ -@@ -400,7 +396,7 @@ typedef struct v { - - #define MUL2_SETUP() \ - { \ -- __asm( \ -+ __asm__ __volatile__( \ - "vspltisb " VR(16) ",14\n" \ - "vspltisb " VR(17) ",15\n" \ - "vaddubm " VR(16) "," VR(17) "," VR(16) "\n" \ -@@ -412,7 +408,7 @@ typedef struct v { - { \ - switch (REG_CNT(r)) { \ - case 4: \ -- __asm( \ -+ __asm__ __volatile__( \ - "vcmpgtsb 19," VR(17) "," VR0(r) "\n" \ - "vcmpgtsb 18," VR(17) "," VR1(r) "\n" \ - "vcmpgtsb 21," VR(17) "," VR2(r) "\n" \ -@@ -434,7 +430,7 @@ typedef struct v { - : "v18", "v19", "v20", "v21"); \ - break; \ - case 2: \ -- __asm( \ -+ __asm__ __volatile__( \ - "vcmpgtsb 19," VR(17) "," VR0(r) "\n" \ - "vcmpgtsb 18," VR(17) "," VR1(r) "\n" \ - "vand 19,19," VR(16) "\n" \ -@@ -478,7 +474,7 @@ typedef struct v { - { \ - switch (REG_CNT(r)) { \ - case 2: \ -- __asm( \ -+ __asm__ __volatile__( \ - /* lts for upper part */ \ - "vspltisb 15,15\n" \ - "lvx 10,0,%[lt0]\n" \ |