Move a bit of data that sneaked into .text into .rodata. Makes the tests

run (and pass) on amd64 with PKU (x-only) enabled.

ok robert@
This commit is contained in:
kettenis 2023-01-24 16:17:29 +00:00
parent afb8481a50
commit 11bc4ef733
2 changed files with 24 additions and 1 deletions

View File

@ -3,7 +3,7 @@ COMMENT= free H.265/HEVC encoder
VER= 3.5
DISTNAME= x265_${VER}
PKGNAME= x265-${VER}
REVISION= 0
REVISION= 1
CATEGORIES= multimedia
MASTER_SITES= https://bitbucket.org/multicoreware/x265_git/downloads/

View File

@ -0,0 +1,23 @@
Index: source/common/x86/h-ipfilter8.asm
--- source/common/x86/h-ipfilter8.asm.orig
+++ source/common/x86/h-ipfilter8.asm
@@ -125,6 +125,9 @@ const pb_8tap_hps_0, times 2 db 0, 1, 1, 2, 2, 3, 3, 4
ALIGN 32
interp4_hps_shuf: times 2 db 0, 1, 2, 3, 1, 2, 3, 4, 8, 9, 10, 11, 9, 10, 11, 12
+ALIGN 32
+const interp_4tap_8x8_horiz_shuf, dd 0, 4, 1, 5, 2, 6, 3, 7
+
SECTION .text
cextern pw_1
@@ -1458,9 +1461,6 @@ cglobal interp_4tap_horiz_pp_4x32, 4, 6, 5, src, srcst
jnz .loop
RET
-
-ALIGN 32
-const interp_4tap_8x8_horiz_shuf, dd 0, 4, 1, 5, 2, 6, 3, 7
%macro FILTER_H4_w6 3
movu %1, [srcq - 1]