[FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root

Alexander Kanavin alex.kanavin at gmail.com
Wed Jan 26 13:42:05 EET 2022


Ping :-)

Alex

On Tue, 18 Jan 2022 at 23:06, Alexander Kanavin <alex.kanavin at gmail.com>
wrote:

> From: Alexander Kanavin <alex.kanavin at gmail.com>
>
> Otherwise nasm writes the full host-specific paths into .o
> output, which breaks binary reproducibility.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
> ---
>  libavutil/x86/cpuid.asm      | 2 +-
>  libavutil/x86/emms.asm       | 2 +-
>  libavutil/x86/fixed_dsp.asm  | 2 +-
>  libavutil/x86/float_dsp.asm  | 2 +-
>  libavutil/x86/lls.asm        | 2 +-
>  libavutil/x86/pixelutils.asm | 2 +-
>  libavutil/x86/tx_float.asm   | 2 +-
>  7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm
> index c3f7866ec7..766f77fcdf 100644
> --- a/libavutil/x86/cpuid.asm
> +++ b/libavutil/x86/cpuid.asm
> @@ -21,7 +21,7 @@
>  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
>  ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
>  SECTION .text
>
> diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm
> index 8611762d73..df84f2221b 100644
> --- a/libavutil/x86/emms.asm
> +++ b/libavutil/x86/emms.asm
> @@ -18,7 +18,7 @@
>  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
>  ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
>  SECTION .text
>
> diff --git a/libavutil/x86/fixed_dsp.asm b/libavutil/x86/fixed_dsp.asm
> index 979dd5c334..2f411850f4 100644
> --- a/libavutil/x86/fixed_dsp.asm
> +++ b/libavutil/x86/fixed_dsp.asm
> @@ -20,7 +20,7 @@
>  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
>  ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
>  SECTION .text
>
> diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm
> index 517fd63638..b773e61a64 100644
> --- a/libavutil/x86/float_dsp.asm
> +++ b/libavutil/x86/float_dsp.asm
> @@ -20,7 +20,7 @@
>  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
>  ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
>  SECTION_RODATA 32
>  pd_reverse: dd 7, 6, 5, 4, 3, 2, 1, 0
> diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm
> index 317fba6fca..d2526d1ff4 100644
> --- a/libavutil/x86/lls.asm
> +++ b/libavutil/x86/lls.asm
> @@ -20,7 +20,7 @@
>  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
>  ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
>  SECTION .text
>
> diff --git a/libavutil/x86/pixelutils.asm b/libavutil/x86/pixelutils.asm
> index 36c57c5f7f..8b45ead78b 100644
> --- a/libavutil/x86/pixelutils.asm
> +++ b/libavutil/x86/pixelutils.asm
> @@ -21,7 +21,7 @@
>  ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
>  ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
>  SECTION .text
>
> diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm
> index 4d2283fae1..ea39f2172a 100644
> --- a/libavutil/x86/tx_float.asm
> +++ b/libavutil/x86/tx_float.asm
> @@ -29,7 +29,7 @@
>  ;       replace some shuffles with vblends?
>  ;       avx512 split-radix
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
>  %if ARCH_X86_64
>  %define ptr resq
> --
> 2.20.1
>
>


More information about the ffmpeg-devel mailing list