diff -pruN 2:6.2.0+dfsg-6/debian/changelog 2:6.2.0+dfsg-6ubuntu1/debian/changelog --- 2:6.2.0+dfsg-6/debian/changelog 2020-06-15 00:03:25.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/changelog 2020-08-06 20:47:35.000000000 +0000 @@ -1,3 +1,10 @@ +gmp (2:6.2.0+dfsg-6ubuntu1) groovy; urgency=medium + + * Import CET patches from + https://gitlab.com/cet-software/gmp-6.2/-/tree/hjl/cet/master + + -- Dimitri John Ledkov Thu, 06 Aug 2020 21:47:35 +0100 + gmp (2:6.2.0+dfsg-6) unstable; urgency=medium * Revert (2:6.2.0+dfsg-5) changes as multi-arch libs should be used instead. diff -pruN 2:6.2.0+dfsg-6/debian/control 2:6.2.0+dfsg-6ubuntu1/debian/control --- 2:6.2.0+dfsg-6/debian/control 2020-06-15 00:03:25.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/control 2020-08-06 20:47:35.000000000 +0000 @@ -1,5 +1,6 @@ Source: gmp -Maintainer: Debian Science Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Science Team Uploaders: Steve M. Robbins Section: libs Priority: optional diff -pruN 2:6.2.0+dfsg-6/debian/patches/0001-Add-.gitignore.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0001-Add-.gitignore.patch --- 2:6.2.0+dfsg-6/debian/patches/0001-Add-.gitignore.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0001-Add-.gitignore.patch 2020-08-06 20:44:07.000000000 +0000 @@ -0,0 +1,36 @@ +From 87d13fc7c00c2b74674be56b5bc4e204a65caeb9 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 29 Jan 2020 07:57:53 -0800 +Subject: [PATCH 01/13] Add .gitignore + +--- + .gitignore | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + create mode 100644 .gitignore + +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 000000000..d2b12799a +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,17 @@ ++/COPYING ++Makefile.in ++/aclocal.m4 ++/autom4te.cache ++/compile ++/config.in ++/configure ++doc/gmp.info* ++doc/mdate-sh ++doc/stamp-vti ++doc/texinfo.tex ++doc/version.texi ++/install-sh ++/ltmain.sh ++/missing ++/test-driver ++/ylwrap +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0002-x86-Add-GMP_ASM_X86_CET_MACROS-to-acinclude.m4.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0002-x86-Add-GMP_ASM_X86_CET_MACROS-to-acinclude.m4.patch --- 2:6.2.0+dfsg-6/debian/patches/0002-x86-Add-GMP_ASM_X86_CET_MACROS-to-acinclude.m4.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0002-x86-Add-GMP_ASM_X86_CET_MACROS-to-acinclude.m4.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,148 @@ +From a35cacb4edfea2fb6217256591d8024110aa140b Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Tue, 28 Jan 2020 14:55:55 -0800 +Subject: [PATCH 02/13] x86: Add GMP_ASM_X86_CET_MACROS to acinclude.m4 + +Add GMP_ASM_X86_CET_MACROS to acinclude.m4 to define + +1. X86_ENDBR. Defined as endbr32/endbr64 if CET is enabled. +2. X86_NOTRACK. Defined as notrack prefix if CET is enabled. +3. X86_GNU_PROPERTY. Add a .note.gnu.property section to mark Intel +CET support if needed. + +and use it in configure.ac. + + * acinclude.m4 (GMP_ASM_X86_CET_MACROS): New. + * configure.ac: Use GMP_ASM_X86_CET_MACROS for x86 targets. +--- + acinclude.m4 | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 1 + + 2 files changed, 102 insertions(+) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 86175ce42..1048311df 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -3136,6 +3136,107 @@ GMP_DEFINE_RAW(["define(,<$gmp_cv_asm_sparc_shared_thunks>)" + ]) + + ++dnl GMP_ASM_X86_CET_MACROS(ABI) ++dnl ------------ ++dnl Define ++dnl 1. X86_ENDBR for endbr32/endbr64. ++dnl 2. X86_NOTRACK for notrack prefix. ++dnl 3. X86_GNU_PROPERTY to add a .note.gnu.property section to mark ++dnl Intel CET support if needed. ++dnl .section ".note.gnu.property", "a" ++dnl .p2align POINTER-ALIGN ++dnl .long 1f - 0f ++dnl .long 4f - 1f ++dnl .long 5 ++dnl 0: ++dnl .asciz "GNU" ++dnl 1: ++dnl .p2align POINTER-ALIGN ++dnl .long 0xc0000002 ++dnl .long 3f - 2f ++dnl 2: ++dnl .long 3 ++dnl 3: ++dnl .p2align POINTER-ALIGN ++dnl 4: ++AC_DEFUN([GMP_ASM_X86_CET_MACROS],[ ++dnl AC_REQUIRE([AC_PROG_CC]) GMP uses something else ++AC_CACHE_CHECK([if Intel CET is enabled], ++ gmp_cv_asm_x86_intel_cet, [dnl ++ cat > conftest.c </dev/null]) ++ then ++ gmp_cv_asm_x86_intel_cet=yes ++ else ++ gmp_cv_asm_x86_intel_cet=no ++ fi ++ rm -f conftest*]) ++ if test "$gmp_cv_asm_x86_intel_cet" = yes; then ++ case $1 in ++ 32) ++ endbr=endbr32 ++ p2align=2 ++ ;; ++ 64) ++ endbr=endbr64 ++ p2align=3 ++ ;; ++ x32) ++ endbr=endbr64 ++ p2align=2 ++ ;; ++ esac ++ AC_CACHE_CHECK([if .note.gnu.property section is needed], ++ gmp_cv_asm_x86_gnu_property, [dnl ++ cat > conftest.c </dev/null]) ++ then ++ gmp_cv_asm_x86_gnu_property=yes ++ else ++ gmp_cv_asm_x86_gnu_property=no ++ fi ++ rm -f conftest*]) ++ echo ["define(,<$endbr>)"] >> $gmp_tmpconfigm4 ++ echo ["define(,)"] >> $gmp_tmpconfigm4 ++ else ++ gmp_cv_asm_x86_gnu_property=no ++ echo ["define(,<>)"] >> $gmp_tmpconfigm4 ++ echo ["define(,<>)"] >> $gmp_tmpconfigm4 ++ fi ++ if test "$gmp_cv_asm_x86_gnu_property" = yes; then ++ echo ["define(, < ++ .section \".note.gnu.property\", \"a\" ++ .p2align $p2align ++ .long 1f - 0f ++ .long 4f - 1f ++ .long 5 ++0: ++ .asciz \"GNU\" ++1: ++ .p2align $p2align ++ .long 0xc0000002 ++ .long 3f - 2f ++2: ++ .long 3 ++3: ++ .p2align $p2align ++4:>)"] >> $gmp_tmpconfigm4 ++ else ++ echo ["define(,<>)"] >> $gmp_tmpconfigm4 ++ fi ++]) ++ ++ + dnl GMP_C_ATTRIBUTE_CONST + dnl --------------------- + +diff --git a/configure.ac b/configure.ac +index e1ffc8a04..9ff5fe0b6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3812,6 +3812,7 @@ yes + esac + ;; + esac ++ GMP_ASM_X86_CET_MACROS($ABI) + ;; + esac + fi +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0003-x86-defs.m4-Use-X86_GNU_PROPERTY-and-X86_ENDBR.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0003-x86-defs.m4-Use-X86_GNU_PROPERTY-and-X86_ENDBR.patch --- 2:6.2.0+dfsg-6/debian/patches/0003-x86-defs.m4-Use-X86_GNU_PROPERTY-and-X86_ENDBR.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0003-x86-defs.m4-Use-X86_GNU_PROPERTY-and-X86_ENDBR.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,41 @@ +From ed81f04089c82a66f5b32c87424934c1b6f6437c Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Tue, 28 Jan 2020 15:03:59 -0800 +Subject: [PATCH 03/13] x86-defs.m4: Use X86_GNU_PROPERTY and X86_ENDBR + +1. Add X86_ENDBR to PROLOGUE_cpu to place "endbr32" at function entry. +2. Add X86_GNU_PROPERTY to ASM_END for .note.gnu.property section. + + * mpn/x86/x86-defs.m4 (PROLOGUE_cpu): Add X86_ENDBR. + (ASM_END): Add X86_GNU_PROPERTY. +--- + mpn/x86/x86-defs.m4 | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/mpn/x86/x86-defs.m4 b/mpn/x86/x86-defs.m4 +index 81309b224..4aaac3bf5 100644 +--- a/mpn/x86/x86-defs.m4 ++++ b/mpn/x86/x86-defs.m4 +@@ -123,6 +123,7 @@ m4_assert_defined(`WANT_PROFILING') + TYPE($1,`function') + COFF_TYPE($1) + $1: ++ X86_ENDBR + ifelse(WANT_PROFILING,`prof', ` call_mcount') + ifelse(WANT_PROFILING,`gprof', ` call_mcount') + ifelse(WANT_PROFILING,`instrument',` call_instrument(enter)') +@@ -992,7 +993,10 @@ L(movl_eip_`'substr($2,1)): + + dnl ASM_END + +-define(`ASM_END',`load_eip') ++define(`ASM_END', ++`load_eip ++X86_GNU_PROPERTY ++') + + define(`load_eip', `') dnl updated in LEA/LEAL + +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0004-x86-Append-missing-ASM_END-to-asm-files.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0004-x86-Append-missing-ASM_END-to-asm-files.patch --- 2:6.2.0+dfsg-6/debian/patches/0004-x86-Append-missing-ASM_END-to-asm-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0004-x86-Append-missing-ASM_END-to-asm-files.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,1026 @@ +From d817bf859fe944f8828efaf0a41313850a6253ac Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Tue, 28 Jan 2020 15:17:27 -0800 +Subject: [PATCH 04/13] x86: Append missing ASM_END to asm files + +Append missing ASM_END to x86 asm files to generate .note.gnu.property +section. + + * mpn/x86/aors_n.asm: Append ASM_END. + * mpn/x86/aorsmul_1.asm: Likewise. + * mpn/x86/atom/sse2/aorsmul_1.asm: Likewise. + * mpn/x86/atom/sse2/mul_basecase.asm: Likewise. + * mpn/x86/atom/sse2/sqr_basecase.asm: Likewise. + * mpn/x86/bdiv_dbm1c.asm: Likewise. + * mpn/x86/copyd.asm: Likewise. + * mpn/x86/copyi.asm: Likewise. + * mpn/x86/divrem_1.asm: Likewise. + * mpn/x86/divrem_2.asm: Likewise. + * mpn/x86/k6/aors_n.asm: Likewise. + * mpn/x86/k6/aorsmul_1.asm: Likewise. + * mpn/x86/k6/divrem_1.asm: Likewise. + * mpn/x86/k6/k62mmx/copyd.asm: Likewise. + * mpn/x86/k6/k62mmx/lshift.asm: Likewise. + * mpn/x86/k6/k62mmx/rshift.asm: Likewise. + * mpn/x86/k6/mmx/com.asm: Likewise. + * mpn/x86/k6/mmx/logops_n.asm: Likewise. + * mpn/x86/k6/mmx/lshift.asm: Likewise. + * mpn/x86/k6/mmx/popham.asm: Likewise. + * mpn/x86/k6/mmx/rshift.asm: Likewise. + * mpn/x86/k6/mod_34lsub1.asm: Likewise. + * mpn/x86/k6/mul_1.asm: Likewise. + * mpn/x86/k6/mul_basecase.asm: Likewise. + * mpn/x86/k6/pre_mod_1.asm: Likewise. + * mpn/x86/k6/sqr_basecase.asm: Likewise. + * mpn/x86/k7/aors_n.asm: Likewise. + * mpn/x86/k7/mmx/com.asm: Likewise. + * mpn/x86/k7/mmx/copyd.asm: Likewise. + * mpn/x86/k7/mmx/copyi.asm: Likewise. + * mpn/x86/k7/mmx/divrem_1.asm: Likewise. + * mpn/x86/k7/mmx/lshift.asm: Likewise. + * mpn/x86/k7/mmx/popham.asm: Likewise. + * mpn/x86/k7/mmx/rshift.asm: Likewise. + * mpn/x86/k7/mod_1_1.asm: Likewise. + * mpn/x86/k7/mod_1_4.asm: Likewise. + * mpn/x86/k7/mod_34lsub1.asm: Likewise. + * mpn/x86/k7/mul_basecase.asm: Likewise. + * mpn/x86/k7/sqr_basecase.asm: Likewise. + * mpn/x86/lshift.asm: Likewise. + * mpn/x86/mmx/sec_tabselect.asm: Likewise. + * mpn/x86/mod_34lsub1.asm: Likewise. + * mpn/x86/mul_1.asm: Likewise. + * mpn/x86/mul_basecase.asm: Likewise. + * mpn/x86/p6/aors_n.asm: Likewise. + * mpn/x86/p6/aorsmul_1.asm: Likewise. + * mpn/x86/p6/copyd.asm: Likewise. + * mpn/x86/p6/gcd_11.asm: Likewise. + * mpn/x86/p6/lshsub_n.asm: Likewise. + * mpn/x86/p6/mmx/divrem_1.asm: Likewise. + * mpn/x86/p6/mod_34lsub1.asm: Likewise. + * mpn/x86/p6/mul_basecase.asm: Likewise. + * mpn/x86/p6/sqr_basecase.asm: Likewise. + * mpn/x86/pentium/aors_n.asm: Likewise. + * mpn/x86/pentium/aorsmul_1.asm: Likewise. + * mpn/x86/pentium/com.asm: Likewise. + * mpn/x86/pentium/copyd.asm: Likewise. + * mpn/x86/pentium/copyi.asm: Likewise. + * mpn/x86/pentium/logops_n.asm: Likewise. + * mpn/x86/pentium/lshift.asm: Likewise. + * mpn/x86/pentium/mmx/lshift.asm: Likewise. + * mpn/x86/pentium/mmx/mul_1.asm: Likewise. + * mpn/x86/pentium/mmx/rshift.asm: Likewise. + * mpn/x86/pentium/mod_34lsub1.asm: Likewise. + * mpn/x86/pentium/mul_1.asm: Likewise. + * mpn/x86/pentium/mul_2.asm: Likewise. + * mpn/x86/pentium/mul_basecase.asm: Likewise. + * mpn/x86/pentium/rshift.asm: Likewise. + * mpn/x86/pentium/sqr_basecase.asm: Likewise. + * mpn/x86/pentium4/copyd.asm: Likewise. + * mpn/x86/pentium4/copyi.asm: Likewise. + * mpn/x86/pentium4/mmx/popham.asm: Likewise. + * mpn/x86/pentium4/sse2/add_n.asm: Likewise. + * mpn/x86/pentium4/sse2/addlsh1_n.asm: Likewise. + * mpn/x86/pentium4/sse2/addmul_1.asm: Likewise. + * mpn/x86/pentium4/sse2/cnd_add_n.asm: Likewise. + * mpn/x86/pentium4/sse2/cnd_sub_n.asm: Likewise. + * mpn/x86/pentium4/sse2/divrem_1.asm: Likewise. + * mpn/x86/pentium4/sse2/mod_1_1.asm: Likewise. + * mpn/x86/pentium4/sse2/mod_1_4.asm: Likewise. + * mpn/x86/pentium4/sse2/mod_34lsub1.asm: Likewise. + * mpn/x86/pentium4/sse2/mul_1.asm: Likewise. + * mpn/x86/pentium4/sse2/mul_basecase.asm: Likewise. + * mpn/x86/pentium4/sse2/rsh1add_n.asm: Likewise. + * mpn/x86/pentium4/sse2/sqr_basecase.asm: Likewise. + * mpn/x86/pentium4/sse2/sub_n.asm: Likewise. + * mpn/x86/pentium4/sse2/submul_1.asm: Likewise. + * mpn/x86/rshift.asm: Likewise. + * mpn/x86/sec_tabselect.asm: Likewise. + * mpn/x86/sqr_basecase.asm: Likewise. + * mpn/x86/udiv.asm: Likewise. + * mpn/x86/umul.asm: Likewise. +--- + mpn/x86/aors_n.asm | 1 + + mpn/x86/aorsmul_1.asm | 1 + + mpn/x86/atom/sse2/aorsmul_1.asm | 1 + + mpn/x86/atom/sse2/mul_basecase.asm | 1 + + mpn/x86/atom/sse2/sqr_basecase.asm | 1 + + mpn/x86/bdiv_dbm1c.asm | 1 + + mpn/x86/copyd.asm | 1 + + mpn/x86/copyi.asm | 1 + + mpn/x86/divrem_1.asm | 1 + + mpn/x86/divrem_2.asm | 1 + + mpn/x86/k6/aors_n.asm | 1 + + mpn/x86/k6/aorsmul_1.asm | 1 + + mpn/x86/k6/divrem_1.asm | 1 + + mpn/x86/k6/k62mmx/copyd.asm | 1 + + mpn/x86/k6/k62mmx/lshift.asm | 1 + + mpn/x86/k6/k62mmx/rshift.asm | 1 + + mpn/x86/k6/mmx/com.asm | 1 + + mpn/x86/k6/mmx/logops_n.asm | 1 + + mpn/x86/k6/mmx/lshift.asm | 1 + + mpn/x86/k6/mmx/popham.asm | 1 + + mpn/x86/k6/mmx/rshift.asm | 1 + + mpn/x86/k6/mod_34lsub1.asm | 1 + + mpn/x86/k6/mul_1.asm | 1 + + mpn/x86/k6/mul_basecase.asm | 1 + + mpn/x86/k6/pre_mod_1.asm | 1 + + mpn/x86/k6/sqr_basecase.asm | 1 + + mpn/x86/k7/aors_n.asm | 1 + + mpn/x86/k7/mmx/com.asm | 1 + + mpn/x86/k7/mmx/copyd.asm | 1 + + mpn/x86/k7/mmx/copyi.asm | 1 + + mpn/x86/k7/mmx/divrem_1.asm | 1 + + mpn/x86/k7/mmx/lshift.asm | 1 + + mpn/x86/k7/mmx/popham.asm | 1 + + mpn/x86/k7/mmx/rshift.asm | 1 + + mpn/x86/k7/mod_1_1.asm | 1 + + mpn/x86/k7/mod_1_4.asm | 1 + + mpn/x86/k7/mod_34lsub1.asm | 1 + + mpn/x86/k7/mul_basecase.asm | 1 + + mpn/x86/k7/sqr_basecase.asm | 1 + + mpn/x86/lshift.asm | 1 + + mpn/x86/mmx/sec_tabselect.asm | 1 + + mpn/x86/mod_34lsub1.asm | 1 + + mpn/x86/mul_1.asm | 1 + + mpn/x86/mul_basecase.asm | 1 + + mpn/x86/p6/aors_n.asm | 1 + + mpn/x86/p6/aorsmul_1.asm | 1 + + mpn/x86/p6/copyd.asm | 1 + + mpn/x86/p6/gcd_11.asm | 1 + + mpn/x86/p6/lshsub_n.asm | 1 + + mpn/x86/p6/mmx/divrem_1.asm | 1 + + mpn/x86/p6/mod_34lsub1.asm | 1 + + mpn/x86/p6/mul_basecase.asm | 1 + + mpn/x86/p6/sqr_basecase.asm | 1 + + mpn/x86/pentium/aors_n.asm | 1 + + mpn/x86/pentium/aorsmul_1.asm | 1 + + mpn/x86/pentium/com.asm | 1 + + mpn/x86/pentium/copyd.asm | 1 + + mpn/x86/pentium/copyi.asm | 1 + + mpn/x86/pentium/logops_n.asm | 1 + + mpn/x86/pentium/lshift.asm | 1 + + mpn/x86/pentium/mmx/lshift.asm | 1 + + mpn/x86/pentium/mmx/mul_1.asm | 1 + + mpn/x86/pentium/mmx/rshift.asm | 1 + + mpn/x86/pentium/mod_34lsub1.asm | 1 + + mpn/x86/pentium/mul_1.asm | 1 + + mpn/x86/pentium/mul_2.asm | 1 + + mpn/x86/pentium/mul_basecase.asm | 1 + + mpn/x86/pentium/rshift.asm | 1 + + mpn/x86/pentium/sqr_basecase.asm | 1 + + mpn/x86/pentium4/copyd.asm | 1 + + mpn/x86/pentium4/copyi.asm | 1 + + mpn/x86/pentium4/mmx/popham.asm | 1 + + mpn/x86/pentium4/sse2/add_n.asm | 1 + + mpn/x86/pentium4/sse2/addlsh1_n.asm | 1 + + mpn/x86/pentium4/sse2/addmul_1.asm | 1 + + mpn/x86/pentium4/sse2/cnd_add_n.asm | 1 + + mpn/x86/pentium4/sse2/cnd_sub_n.asm | 1 + + mpn/x86/pentium4/sse2/divrem_1.asm | 1 + + mpn/x86/pentium4/sse2/mod_1_1.asm | 1 + + mpn/x86/pentium4/sse2/mod_1_4.asm | 1 + + mpn/x86/pentium4/sse2/mod_34lsub1.asm | 1 + + mpn/x86/pentium4/sse2/mul_1.asm | 1 + + mpn/x86/pentium4/sse2/mul_basecase.asm | 1 + + mpn/x86/pentium4/sse2/rsh1add_n.asm | 1 + + mpn/x86/pentium4/sse2/sqr_basecase.asm | 1 + + mpn/x86/pentium4/sse2/sub_n.asm | 1 + + mpn/x86/pentium4/sse2/submul_1.asm | 1 + + mpn/x86/rshift.asm | 1 + + mpn/x86/sec_tabselect.asm | 1 + + mpn/x86/sqr_basecase.asm | 1 + + mpn/x86/udiv.asm | 1 + + mpn/x86/umul.asm | 1 + + 92 files changed, 92 insertions(+) + +diff --git a/mpn/x86/aors_n.asm b/mpn/x86/aors_n.asm +index 5d359f59b..95d006a5a 100644 +--- a/mpn/x86/aors_n.asm ++++ b/mpn/x86/aors_n.asm +@@ -200,3 +200,4 @@ L(oop): movl (%esi),%eax + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/aorsmul_1.asm b/mpn/x86/aorsmul_1.asm +index 54a890544..0ab1e01f5 100644 +--- a/mpn/x86/aorsmul_1.asm ++++ b/mpn/x86/aorsmul_1.asm +@@ -154,3 +154,4 @@ L(end): movl %ebx,%eax + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/atom/sse2/aorsmul_1.asm b/mpn/x86/atom/sse2/aorsmul_1.asm +index 969a14a91..20658e170 100644 +--- a/mpn/x86/atom/sse2/aorsmul_1.asm ++++ b/mpn/x86/atom/sse2/aorsmul_1.asm +@@ -172,3 +172,4 @@ PROLOGUE(func_1c) + mov 20(%esp), %edx C carry + jmp L(ent) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/atom/sse2/mul_basecase.asm b/mpn/x86/atom/sse2/mul_basecase.asm +index 97d3aeb5a..74171aa5a 100644 +--- a/mpn/x86/atom/sse2/mul_basecase.asm ++++ b/mpn/x86/atom/sse2/mul_basecase.asm +@@ -499,3 +499,4 @@ L(done): + pop %edi + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/atom/sse2/sqr_basecase.asm b/mpn/x86/atom/sse2/sqr_basecase.asm +index af19ed854..0031812f6 100644 +--- a/mpn/x86/atom/sse2/sqr_basecase.asm ++++ b/mpn/x86/atom/sse2/sqr_basecase.asm +@@ -632,3 +632,4 @@ L(one): pmuludq %mm7, %mm7 + pop %edi + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/bdiv_dbm1c.asm b/mpn/x86/bdiv_dbm1c.asm +index 0288c475c..7a3b1a62c 100644 +--- a/mpn/x86/bdiv_dbm1c.asm ++++ b/mpn/x86/bdiv_dbm1c.asm +@@ -127,3 +127,4 @@ L(b1): add $-4, %ebp + pop %esi + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/copyd.asm b/mpn/x86/copyd.asm +index 51fa19568..0e588d997 100644 +--- a/mpn/x86/copyd.asm ++++ b/mpn/x86/copyd.asm +@@ -89,3 +89,4 @@ PROLOGUE(mpn_copyd) + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/copyi.asm b/mpn/x86/copyi.asm +index f6b0354b4..6efbb903e 100644 +--- a/mpn/x86/copyi.asm ++++ b/mpn/x86/copyi.asm +@@ -97,3 +97,4 @@ PROLOGUE(mpn_copyi) + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/divrem_1.asm b/mpn/x86/divrem_1.asm +index 255d4935c..b1af92042 100644 +--- a/mpn/x86/divrem_1.asm ++++ b/mpn/x86/divrem_1.asm +@@ -231,3 +231,4 @@ deflit(`FRAME',8) + popl %edi + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/divrem_2.asm b/mpn/x86/divrem_2.asm +index 4c38ad0ac..c2920c2d7 100644 +--- a/mpn/x86/divrem_2.asm ++++ b/mpn/x86/divrem_2.asm +@@ -197,3 +197,4 @@ L(35): sub 20(%esp), %ebp + movl $1, 32(%esp) + jmp L(8) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/aors_n.asm b/mpn/x86/k6/aors_n.asm +index 168f9b4ae..257ba5987 100644 +--- a/mpn/x86/k6/aors_n.asm ++++ b/mpn/x86/k6/aors_n.asm +@@ -335,3 +335,4 @@ L(inplace_done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/aorsmul_1.asm b/mpn/x86/k6/aorsmul_1.asm +index eaa92ebb2..78be9d250 100644 +--- a/mpn/x86/k6/aorsmul_1.asm ++++ b/mpn/x86/k6/aorsmul_1.asm +@@ -389,3 +389,4 @@ Zdisp( M4_inst,%ecx, disp0,(%edi)) + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/divrem_1.asm b/mpn/x86/k6/divrem_1.asm +index b4cea4fa2..ca41a3f4d 100644 +--- a/mpn/x86/k6/divrem_1.asm ++++ b/mpn/x86/k6/divrem_1.asm +@@ -201,3 +201,4 @@ deflit(`FRAME',8) + popl %edi + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/k62mmx/copyd.asm b/mpn/x86/k6/k62mmx/copyd.asm +index f80a5a1cd..fc329f5b9 100644 +--- a/mpn/x86/k6/k62mmx/copyd.asm ++++ b/mpn/x86/k6/k62mmx/copyd.asm +@@ -116,3 +116,4 @@ L(zero): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/k62mmx/lshift.asm b/mpn/x86/k6/k62mmx/lshift.asm +index c86575fee..728fb5b15 100644 +--- a/mpn/x86/k6/k62mmx/lshift.asm ++++ b/mpn/x86/k6/k62mmx/lshift.asm +@@ -292,3 +292,4 @@ deflit(`FRAME',4) + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/k62mmx/rshift.asm b/mpn/x86/k6/k62mmx/rshift.asm +index f604a7bd5..bd673f303 100644 +--- a/mpn/x86/k6/k62mmx/rshift.asm ++++ b/mpn/x86/k6/k62mmx/rshift.asm +@@ -291,3 +291,4 @@ L(finish_even): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/mmx/com.asm b/mpn/x86/k6/mmx/com.asm +index b74745462..646d16b02 100644 +--- a/mpn/x86/k6/mmx/com.asm ++++ b/mpn/x86/k6/mmx/com.asm +@@ -101,3 +101,4 @@ L(no_extra): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/mmx/logops_n.asm b/mpn/x86/k6/mmx/logops_n.asm +index e17930bb2..acfd7df08 100644 +--- a/mpn/x86/k6/mmx/logops_n.asm ++++ b/mpn/x86/k6/mmx/logops_n.asm +@@ -224,3 +224,4 @@ L(no_extra): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/mmx/lshift.asm b/mpn/x86/k6/mmx/lshift.asm +index 45be58263..eee1eb869 100644 +--- a/mpn/x86/k6/mmx/lshift.asm ++++ b/mpn/x86/k6/mmx/lshift.asm +@@ -128,3 +128,4 @@ L(top): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/mmx/popham.asm b/mpn/x86/k6/mmx/popham.asm +index 2b19d0b5e..efeb1b4cb 100644 +--- a/mpn/x86/k6/mmx/popham.asm ++++ b/mpn/x86/k6/mmx/popham.asm +@@ -234,3 +234,4 @@ HAM(` nop C code alignment') + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/mmx/rshift.asm b/mpn/x86/k6/mmx/rshift.asm +index cd0382f32..ae53711cb 100644 +--- a/mpn/x86/k6/mmx/rshift.asm ++++ b/mpn/x86/k6/mmx/rshift.asm +@@ -128,3 +128,4 @@ Zdisp( movd, %mm0, 0,(%ecx,%eax,4)) + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/mod_34lsub1.asm b/mpn/x86/k6/mod_34lsub1.asm +index 7e30503e5..05f89795c 100644 +--- a/mpn/x86/k6/mod_34lsub1.asm ++++ b/mpn/x86/k6/mod_34lsub1.asm +@@ -188,3 +188,4 @@ L(combine): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/mul_1.asm b/mpn/x86/k6/mul_1.asm +index 3ef7ec24f..2139f3673 100644 +--- a/mpn/x86/k6/mul_1.asm ++++ b/mpn/x86/k6/mul_1.asm +@@ -290,3 +290,4 @@ L(finish_not_one): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/mul_basecase.asm b/mpn/x86/k6/mul_basecase.asm +index 7030001c3..ab202a2ce 100644 +--- a/mpn/x86/k6/mul_basecase.asm ++++ b/mpn/x86/k6/mul_basecase.asm +@@ -610,3 +610,4 @@ Zdisp( addl, %ecx, disp0,(%edi)) + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/pre_mod_1.asm b/mpn/x86/k6/pre_mod_1.asm +index 34db20d38..1e4cb17e9 100644 +--- a/mpn/x86/k6/pre_mod_1.asm ++++ b/mpn/x86/k6/pre_mod_1.asm +@@ -144,3 +144,4 @@ L(q1_ff): + + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k6/sqr_basecase.asm b/mpn/x86/k6/sqr_basecase.asm +index b7ecb5cc8..f3a101a0f 100644 +--- a/mpn/x86/k6/sqr_basecase.asm ++++ b/mpn/x86/k6/sqr_basecase.asm +@@ -678,3 +678,4 @@ L(pic_calc): + + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/aors_n.asm b/mpn/x86/k7/aors_n.asm +index 1a0807202..bfdf3d40a 100644 +--- a/mpn/x86/k7/aors_n.asm ++++ b/mpn/x86/k7/aors_n.asm +@@ -256,3 +256,4 @@ L(even): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/mmx/com.asm b/mpn/x86/k7/mmx/com.asm +index a258c224f..cf48facfd 100644 +--- a/mpn/x86/k7/mmx/com.asm ++++ b/mpn/x86/k7/mmx/com.asm +@@ -123,3 +123,4 @@ L(done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/mmx/copyd.asm b/mpn/x86/k7/mmx/copyd.asm +index 59ece4092..3bc9ff8b8 100644 +--- a/mpn/x86/k7/mmx/copyd.asm ++++ b/mpn/x86/k7/mmx/copyd.asm +@@ -142,3 +142,4 @@ L(done): + + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/mmx/copyi.asm b/mpn/x86/k7/mmx/copyi.asm +index 9a28f927e..f0648fa09 100644 +--- a/mpn/x86/k7/mmx/copyi.asm ++++ b/mpn/x86/k7/mmx/copyi.asm +@@ -155,3 +155,4 @@ L(done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/mmx/divrem_1.asm b/mpn/x86/k7/mmx/divrem_1.asm +index cf343280b..370bfbb88 100644 +--- a/mpn/x86/k7/mmx/divrem_1.asm ++++ b/mpn/x86/k7/mmx/divrem_1.asm +@@ -830,3 +830,4 @@ L(fraction_entry): + jmp L(fraction_done) + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/mmx/lshift.asm b/mpn/x86/k7/mmx/lshift.asm +index b3383cf2c..4140e82bb 100644 +--- a/mpn/x86/k7/mmx/lshift.asm ++++ b/mpn/x86/k7/mmx/lshift.asm +@@ -479,3 +479,4 @@ L(end_even_unaligned): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/mmx/popham.asm b/mpn/x86/k7/mmx/popham.asm +index 95965b74d..f29540a0a 100644 +--- a/mpn/x86/k7/mmx/popham.asm ++++ b/mpn/x86/k7/mmx/popham.asm +@@ -211,3 +211,4 @@ L(loaded): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/mmx/rshift.asm b/mpn/x86/k7/mmx/rshift.asm +index 345d23a25..0da1f9341 100644 +--- a/mpn/x86/k7/mmx/rshift.asm ++++ b/mpn/x86/k7/mmx/rshift.asm +@@ -478,3 +478,4 @@ L(end_even_unaligned): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/mod_1_1.asm b/mpn/x86/k7/mod_1_1.asm +index 1bbe6f92d..8da9519b0 100644 +--- a/mpn/x86/k7/mod_1_1.asm ++++ b/mpn/x86/k7/mod_1_1.asm +@@ -219,3 +219,4 @@ PROLOGUE(mpn_mod_1_1p_cps) + pop %ebp + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/mod_1_4.asm b/mpn/x86/k7/mod_1_4.asm +index bb7597edd..fe1da5bba 100644 +--- a/mpn/x86/k7/mod_1_4.asm ++++ b/mpn/x86/k7/mod_1_4.asm +@@ -258,3 +258,4 @@ C CAUTION: This is the same code as in pentium4/sse2/mod_1_4.asm + pop %ebp + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/mod_34lsub1.asm b/mpn/x86/k7/mod_34lsub1.asm +index ee3ad0409..0c1b8c84e 100644 +--- a/mpn/x86/k7/mod_34lsub1.asm ++++ b/mpn/x86/k7/mod_34lsub1.asm +@@ -186,3 +186,4 @@ L(combine): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/mul_basecase.asm b/mpn/x86/k7/mul_basecase.asm +index 4dfb50088..b96fda7e0 100644 +--- a/mpn/x86/k7/mul_basecase.asm ++++ b/mpn/x86/k7/mul_basecase.asm +@@ -600,3 +600,4 @@ deflit(`disp1', eval(disp0-0 + 4)) + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/k7/sqr_basecase.asm b/mpn/x86/k7/sqr_basecase.asm +index 7b6a97e0d..df47ee421 100644 +--- a/mpn/x86/k7/sqr_basecase.asm ++++ b/mpn/x86/k7/sqr_basecase.asm +@@ -633,3 +633,4 @@ L(diag): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/lshift.asm b/mpn/x86/lshift.asm +index 6ee6153cc..95f5321e0 100644 +--- a/mpn/x86/lshift.asm ++++ b/mpn/x86/lshift.asm +@@ -104,3 +104,4 @@ L(end): shll %cl,%ebx C compute least significant limb + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/mmx/sec_tabselect.asm b/mpn/x86/mmx/sec_tabselect.asm +index aae158abf..543dec164 100644 +--- a/mpn/x86/mmx/sec_tabselect.asm ++++ b/mpn/x86/mmx/sec_tabselect.asm +@@ -161,3 +161,4 @@ L(b00): pop %ebp + emms + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/mod_34lsub1.asm b/mpn/x86/mod_34lsub1.asm +index e09e702c6..df52d371c 100644 +--- a/mpn/x86/mod_34lsub1.asm ++++ b/mpn/x86/mod_34lsub1.asm +@@ -181,3 +181,4 @@ L(combine): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/mul_1.asm b/mpn/x86/mul_1.asm +index 421de6222..dbbc0e339 100644 +--- a/mpn/x86/mul_1.asm ++++ b/mpn/x86/mul_1.asm +@@ -138,3 +138,4 @@ L(end): movl %ebx,%eax + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/mul_basecase.asm b/mpn/x86/mul_basecase.asm +index 8339732a8..c32fd7e0e 100644 +--- a/mpn/x86/mul_basecase.asm ++++ b/mpn/x86/mul_basecase.asm +@@ -221,3 +221,4 @@ L(done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/p6/aors_n.asm b/mpn/x86/p6/aors_n.asm +index df51c2e6f..b4a32150f 100644 +--- a/mpn/x86/p6/aors_n.asm ++++ b/mpn/x86/p6/aors_n.asm +@@ -154,3 +154,4 @@ PROLOGUE(func_nc) + movl 20(%esp), %edx + jmp L(start) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/p6/aorsmul_1.asm b/mpn/x86/p6/aorsmul_1.asm +index bc8c49c62..d6bc549e3 100644 +--- a/mpn/x86/p6/aorsmul_1.asm ++++ b/mpn/x86/p6/aorsmul_1.asm +@@ -318,3 +318,4 @@ deflit(`disp0', eval(UNROLL_BYTES ifelse(UNROLL_BYTES,256,-128))) + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/p6/copyd.asm b/mpn/x86/p6/copyd.asm +index 1be763683..bd42da18b 100644 +--- a/mpn/x86/p6/copyd.asm ++++ b/mpn/x86/p6/copyd.asm +@@ -176,3 +176,4 @@ L(zero): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/p6/gcd_11.asm b/mpn/x86/p6/gcd_11.asm +index 80e055e2e..a7fc6a8d6 100644 +--- a/mpn/x86/p6/gcd_11.asm ++++ b/mpn/x86/p6/gcd_11.asm +@@ -81,3 +81,4 @@ L(end): mov %edx, %eax + pop %edi + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/p6/lshsub_n.asm b/mpn/x86/p6/lshsub_n.asm +index 7ada21364..2ceb98bd8 100644 +--- a/mpn/x86/p6/lshsub_n.asm ++++ b/mpn/x86/p6/lshsub_n.asm +@@ -167,3 +167,4 @@ L(ent): mov 0(up,n,4), %eax + jmp L(top) + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/p6/mmx/divrem_1.asm b/mpn/x86/p6/mmx/divrem_1.asm +index 5300616c1..b6057ddcc 100644 +--- a/mpn/x86/p6/mmx/divrem_1.asm ++++ b/mpn/x86/p6/mmx/divrem_1.asm +@@ -765,3 +765,4 @@ L(fraction_top): + jmp L(fraction_done) + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/p6/mod_34lsub1.asm b/mpn/x86/p6/mod_34lsub1.asm +index b88ab5d17..46b38060d 100644 +--- a/mpn/x86/p6/mod_34lsub1.asm ++++ b/mpn/x86/p6/mod_34lsub1.asm +@@ -188,3 +188,4 @@ L(done_0): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/p6/mul_basecase.asm b/mpn/x86/p6/mul_basecase.asm +index d87bc12b6..03ae0d6b2 100644 +--- a/mpn/x86/p6/mul_basecase.asm ++++ b/mpn/x86/p6/mul_basecase.asm +@@ -605,3 +605,4 @@ deflit(`disp1', eval(disp0 + 4)) + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/p6/sqr_basecase.asm b/mpn/x86/p6/sqr_basecase.asm +index 8fc7fdf37..ca29e8084 100644 +--- a/mpn/x86/p6/sqr_basecase.asm ++++ b/mpn/x86/p6/sqr_basecase.asm +@@ -647,3 +647,4 @@ L(pic_calc): + + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/aors_n.asm b/mpn/x86/pentium/aors_n.asm +index 01ebfb96a..ca124a54f 100644 +--- a/mpn/x86/pentium/aors_n.asm ++++ b/mpn/x86/pentium/aors_n.asm +@@ -201,3 +201,4 @@ L(end2): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/aorsmul_1.asm b/mpn/x86/pentium/aorsmul_1.asm +index d83cc4513..5cec8b3ad 100644 +--- a/mpn/x86/pentium/aorsmul_1.asm ++++ b/mpn/x86/pentium/aorsmul_1.asm +@@ -142,3 +142,4 @@ L(top): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/com.asm b/mpn/x86/pentium/com.asm +index b0805452a..00064fffe 100644 +--- a/mpn/x86/pentium/com.asm ++++ b/mpn/x86/pentium/com.asm +@@ -179,3 +179,4 @@ L(done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/copyd.asm b/mpn/x86/pentium/copyd.asm +index 72a543b2a..c7f74b5fc 100644 +--- a/mpn/x86/pentium/copyd.asm ++++ b/mpn/x86/pentium/copyd.asm +@@ -144,3 +144,4 @@ L(done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/copyi.asm b/mpn/x86/pentium/copyi.asm +index d983d6b46..bc7744eb8 100644 +--- a/mpn/x86/pentium/copyi.asm ++++ b/mpn/x86/pentium/copyi.asm +@@ -162,3 +162,4 @@ L(done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/logops_n.asm b/mpn/x86/pentium/logops_n.asm +index 18773172e..41a9477ba 100644 +--- a/mpn/x86/pentium/logops_n.asm ++++ b/mpn/x86/pentium/logops_n.asm +@@ -174,3 +174,4 @@ L(done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/lshift.asm b/mpn/x86/pentium/lshift.asm +index 2a31f36c6..68cba52e9 100644 +--- a/mpn/x86/pentium/lshift.asm ++++ b/mpn/x86/pentium/lshift.asm +@@ -241,3 +241,4 @@ L(L1): movl %edx,(%edi) C store last limb + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/mmx/lshift.asm b/mpn/x86/pentium/mmx/lshift.asm +index 04b0ddcc8..9e18c861e 100644 +--- a/mpn/x86/pentium/mmx/lshift.asm ++++ b/mpn/x86/pentium/mmx/lshift.asm +@@ -461,3 +461,4 @@ L(finish_zero_unaligned): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/mmx/mul_1.asm b/mpn/x86/pentium/mmx/mul_1.asm +index 4ced577b1..b04a718f8 100644 +--- a/mpn/x86/pentium/mmx/mul_1.asm ++++ b/mpn/x86/pentium/mmx/mul_1.asm +@@ -369,3 +369,4 @@ L(small_done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/mmx/rshift.asm b/mpn/x86/pentium/mmx/rshift.asm +index e3b274bb6..5493d2054 100644 +--- a/mpn/x86/pentium/mmx/rshift.asm ++++ b/mpn/x86/pentium/mmx/rshift.asm +@@ -466,3 +466,4 @@ L(finish_zero_unaligned): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/mod_34lsub1.asm b/mpn/x86/pentium/mod_34lsub1.asm +index 2d88223b8..0945de825 100644 +--- a/mpn/x86/pentium/mod_34lsub1.asm ++++ b/mpn/x86/pentium/mod_34lsub1.asm +@@ -190,3 +190,4 @@ L(combine): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/mul_1.asm b/mpn/x86/pentium/mul_1.asm +index a0858af2b..2c4913071 100644 +--- a/mpn/x86/pentium/mul_1.asm ++++ b/mpn/x86/pentium/mul_1.asm +@@ -175,3 +175,4 @@ L(top): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/mul_2.asm b/mpn/x86/pentium/mul_2.asm +index 4c7beb5df..e94e07120 100644 +--- a/mpn/x86/pentium/mul_2.asm ++++ b/mpn/x86/pentium/mul_2.asm +@@ -148,3 +148,4 @@ L(done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/mul_basecase.asm b/mpn/x86/pentium/mul_basecase.asm +index e1d0f0526..ff269bb9d 100644 +--- a/mpn/x86/pentium/mul_basecase.asm ++++ b/mpn/x86/pentium/mul_basecase.asm +@@ -140,3 +140,4 @@ L(done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/rshift.asm b/mpn/x86/pentium/rshift.asm +index 2105c4c93..d98080de6 100644 +--- a/mpn/x86/pentium/rshift.asm ++++ b/mpn/x86/pentium/rshift.asm +@@ -241,3 +241,4 @@ L(L1): movl %edx,(%edi) C store last limb + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium/sqr_basecase.asm b/mpn/x86/pentium/sqr_basecase.asm +index b11d767da..ee64eb371 100644 +--- a/mpn/x86/pentium/sqr_basecase.asm ++++ b/mpn/x86/pentium/sqr_basecase.asm +@@ -526,3 +526,4 @@ L(diag): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/copyd.asm b/mpn/x86/pentium4/copyd.asm +index 82af81c52..bf06a0534 100644 +--- a/mpn/x86/pentium4/copyd.asm ++++ b/mpn/x86/pentium4/copyd.asm +@@ -69,3 +69,4 @@ L(end): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/copyi.asm b/mpn/x86/pentium4/copyi.asm +index b6148879f..acbb3f462 100644 +--- a/mpn/x86/pentium4/copyi.asm ++++ b/mpn/x86/pentium4/copyi.asm +@@ -91,3 +91,4 @@ L(replmovs): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/mmx/popham.asm b/mpn/x86/pentium4/mmx/popham.asm +index 9563cb57e..f7a612487 100644 +--- a/mpn/x86/pentium4/mmx/popham.asm ++++ b/mpn/x86/pentium4/mmx/popham.asm +@@ -201,3 +201,4 @@ L(loaded): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/add_n.asm b/mpn/x86/pentium4/sse2/add_n.asm +index 8e2380e49..e32963560 100644 +--- a/mpn/x86/pentium4/sse2/add_n.asm ++++ b/mpn/x86/pentium4/sse2/add_n.asm +@@ -99,3 +99,4 @@ L(top): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/addlsh1_n.asm b/mpn/x86/pentium4/sse2/addlsh1_n.asm +index 93b63b201..e801f7b4f 100644 +--- a/mpn/x86/pentium4/sse2/addlsh1_n.asm ++++ b/mpn/x86/pentium4/sse2/addlsh1_n.asm +@@ -106,3 +106,4 @@ L(top): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/addmul_1.asm b/mpn/x86/pentium4/sse2/addmul_1.asm +index 78102072b..62a76753a 100644 +--- a/mpn/x86/pentium4/sse2/addmul_1.asm ++++ b/mpn/x86/pentium4/sse2/addmul_1.asm +@@ -187,3 +187,4 @@ PROLOGUE(mpn_addmul_1c) + movd 20(%esp), %mm6 + jmp L(ent) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/cnd_add_n.asm b/mpn/x86/pentium4/sse2/cnd_add_n.asm +index b3f3474e6..7183b9422 100644 +--- a/mpn/x86/pentium4/sse2/cnd_add_n.asm ++++ b/mpn/x86/pentium4/sse2/cnd_add_n.asm +@@ -93,3 +93,4 @@ L(top): movd (%ebx,%ecx,4), %mm2 + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/cnd_sub_n.asm b/mpn/x86/pentium4/sse2/cnd_sub_n.asm +index 339a23e0b..ba0fc47ad 100644 +--- a/mpn/x86/pentium4/sse2/cnd_sub_n.asm ++++ b/mpn/x86/pentium4/sse2/cnd_sub_n.asm +@@ -112,3 +112,4 @@ L(done_mm1): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/divrem_1.asm b/mpn/x86/pentium4/sse2/divrem_1.asm +index 0146fab11..d8619e047 100644 +--- a/mpn/x86/pentium4/sse2/divrem_1.asm ++++ b/mpn/x86/pentium4/sse2/divrem_1.asm +@@ -643,3 +643,4 @@ L(fraction_top): + jmp L(fraction_done) + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/mod_1_1.asm b/mpn/x86/pentium4/sse2/mod_1_1.asm +index ee88babee..2e5a5146b 100644 +--- a/mpn/x86/pentium4/sse2/mod_1_1.asm ++++ b/mpn/x86/pentium4/sse2/mod_1_1.asm +@@ -164,3 +164,4 @@ C CAUTION: This is the same code as in k7/mod_1_1.asm + pop %ebp + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/mod_1_4.asm b/mpn/x86/pentium4/sse2/mod_1_4.asm +index eb2edb629..5ef3c4aef 100644 +--- a/mpn/x86/pentium4/sse2/mod_1_4.asm ++++ b/mpn/x86/pentium4/sse2/mod_1_4.asm +@@ -267,3 +267,4 @@ C CAUTION: This is the same code as in k7/mod_1_4.asm + pop %ebp + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/mod_34lsub1.asm b/mpn/x86/pentium4/sse2/mod_34lsub1.asm +index 31e25b79b..5b6b9a765 100644 +--- a/mpn/x86/pentium4/sse2/mod_34lsub1.asm ++++ b/mpn/x86/pentium4/sse2/mod_34lsub1.asm +@@ -173,3 +173,4 @@ L(combine): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/mul_1.asm b/mpn/x86/pentium4/sse2/mul_1.asm +index 6347b8bf6..9e4f3fc88 100644 +--- a/mpn/x86/pentium4/sse2/mul_1.asm ++++ b/mpn/x86/pentium4/sse2/mul_1.asm +@@ -162,3 +162,4 @@ PROLOGUE(mpn_mul_1c) + movd 20(%esp), %mm6 + jmp L(ent) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/mul_basecase.asm b/mpn/x86/pentium4/sse2/mul_basecase.asm +index 6e3775ae0..0bad75610 100644 +--- a/mpn/x86/pentium4/sse2/mul_basecase.asm ++++ b/mpn/x86/pentium4/sse2/mul_basecase.asm +@@ -660,3 +660,4 @@ L(oel3): + pop %esi C 3 + ret C 3 + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/rsh1add_n.asm b/mpn/x86/pentium4/sse2/rsh1add_n.asm +index f421d1323..543a637de 100644 +--- a/mpn/x86/pentium4/sse2/rsh1add_n.asm ++++ b/mpn/x86/pentium4/sse2/rsh1add_n.asm +@@ -124,3 +124,4 @@ L(done): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/sqr_basecase.asm b/mpn/x86/pentium4/sse2/sqr_basecase.asm +index 2dd57d25d..9695d42c5 100644 +--- a/mpn/x86/pentium4/sse2/sqr_basecase.asm ++++ b/mpn/x86/pentium4/sse2/sqr_basecase.asm +@@ -703,3 +703,4 @@ L(diag): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/sub_n.asm b/mpn/x86/pentium4/sse2/sub_n.asm +index 5ba1c018e..2cd5b2297 100644 +--- a/mpn/x86/pentium4/sse2/sub_n.asm ++++ b/mpn/x86/pentium4/sse2/sub_n.asm +@@ -117,3 +117,4 @@ L(done_mm1): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/pentium4/sse2/submul_1.asm b/mpn/x86/pentium4/sse2/submul_1.asm +index 020675bd7..1172f0a5a 100644 +--- a/mpn/x86/pentium4/sse2/submul_1.asm ++++ b/mpn/x86/pentium4/sse2/submul_1.asm +@@ -180,3 +180,4 @@ L(eod): paddq %mm6, %mm4 C add 0xFFFFFFFE00000001 + movd %mm0, 8(%edx) C result + jmp L(rt) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/rshift.asm b/mpn/x86/rshift.asm +index a60dcaa4b..1cedc0ddc 100644 +--- a/mpn/x86/rshift.asm ++++ b/mpn/x86/rshift.asm +@@ -106,3 +106,4 @@ L(end): shrl %cl,%ebx C compute most significant limb + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/sec_tabselect.asm b/mpn/x86/sec_tabselect.asm +index c7c2e059f..3a8fa1729 100644 +--- a/mpn/x86/sec_tabselect.asm ++++ b/mpn/x86/sec_tabselect.asm +@@ -113,3 +113,4 @@ L(outer_end): + pop %edi + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/sqr_basecase.asm b/mpn/x86/sqr_basecase.asm +index 39f8a8980..3414b057c 100644 +--- a/mpn/x86/sqr_basecase.asm ++++ b/mpn/x86/sqr_basecase.asm +@@ -357,3 +357,4 @@ L(diag): + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/udiv.asm b/mpn/x86/udiv.asm +index a3ee08860..2531ef72c 100644 +--- a/mpn/x86/udiv.asm ++++ b/mpn/x86/udiv.asm +@@ -50,3 +50,4 @@ deflit(`FRAME',0) + movl %edx, (%ecx) + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86/umul.asm b/mpn/x86/umul.asm +index 34fe43440..5c1da35c9 100644 +--- a/mpn/x86/umul.asm ++++ b/mpn/x86/umul.asm +@@ -49,3 +49,4 @@ deflit(`FRAME',0) + movl %edx, %eax + ret + EPILOGUE() ++ASM_END() +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0005-x86_64-defs.m4-Use-X86_GNU_PROPERTY-and-X86_ENDBR.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0005-x86_64-defs.m4-Use-X86_GNU_PROPERTY-and-X86_ENDBR.patch --- 2:6.2.0+dfsg-6/debian/patches/0005-x86_64-defs.m4-Use-X86_GNU_PROPERTY-and-X86_ENDBR.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0005-x86_64-defs.m4-Use-X86_GNU_PROPERTY-and-X86_ENDBR.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,39 @@ +From 5ffe7ae722fc0f1d25acbf0257c44d988c1090ce Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Tue, 28 Jan 2020 15:40:34 -0800 +Subject: [PATCH 05/13] x86_64-defs.m4: Use X86_GNU_PROPERTY and X86_ENDBR + +1. Add X86_ENDBR to PROLOGUE_cpu to place "endbr64" at function entry. +2. Define ASM_END to use X86_GNU_PROPERTY for .note.gnu.property section. + + * mpn/x86_64/x86_64-defs.m4 (PROLOGUE_cpu): Add X86_ENDBR. + (ASM_END): New. +--- + mpn/x86_64/x86_64-defs.m4 | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/mpn/x86_64/x86_64-defs.m4 b/mpn/x86_64/x86_64-defs.m4 +index 64e372980..83b4c27a6 100644 +--- a/mpn/x86_64/x86_64-defs.m4 ++++ b/mpn/x86_64/x86_64-defs.m4 +@@ -94,6 +94,7 @@ m4_assert_numargs(1) + ` GLOBL $1 + TYPE($1,`function') + $1: ++ X86_ENDBR + ') + + +@@ -149,6 +150,9 @@ ifdef(`PIC', + `lea $1(%rip), $2') + ') + ++dnl ASM_END ++ ++define(`ASM_END', `X86_GNU_PROPERTY') + + define(`DEF_OBJECT', + m4_assert_numargs_range(2,3) +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0006-x86_64-Append-ASM_END-to-assembly-codes.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0006-x86_64-Append-ASM_END-to-assembly-codes.patch --- 2:6.2.0+dfsg-6/debian/patches/0006-x86_64-Append-ASM_END-to-assembly-codes.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0006-x86_64-Append-ASM_END-to-assembly-codes.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,1620 @@ +From 3de10ba667f6cbdd6e184925f58b96c4ca6ddb18 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Tue, 28 Jan 2020 15:41:00 -0800 +Subject: [PATCH 06/13] x86_64: Append ASM_END to assembly codes + +Append ASM_END to x86_64 assembly codes to generate .note.gnu.property +section when Intel CET is enabled. + + * mpn/x86_64/addaddmul_1msb0.asm: Append ASM_END. + * mpn/x86_64/aorrlsh1_n.asm: Likewise. + * mpn/x86_64/aorrlshC_n.asm: Likewise. + * mpn/x86_64/aorrlsh_n.asm: Likewise. + * mpn/x86_64/aors_err1_n.asm: Likewise. + * mpn/x86_64/aors_err2_n.asm: Likewise. + * mpn/x86_64/aors_err3_n.asm: Likewise. + * mpn/x86_64/aors_n.asm: Likewise. + * mpn/x86_64/aorsmul_1.asm: Likewise. + * mpn/x86_64/atom/addmul_2.asm: Likewise. + * mpn/x86_64/atom/aorrlsh1_n.asm: Likewise. + * mpn/x86_64/atom/aorrlsh2_n.asm: Likewise. + * mpn/x86_64/atom/lshift.asm: Likewise. + * mpn/x86_64/atom/lshiftc.asm: Likewise. + * mpn/x86_64/atom/mul_2.asm: Likewise. + * mpn/x86_64/atom/rsh1aors_n.asm: Likewise. + * mpn/x86_64/atom/rshift.asm: Likewise. + * mpn/x86_64/atom/sublsh1_n.asm: Likewise. + * mpn/x86_64/bd1/addmul_2.asm: Likewise. + * mpn/x86_64/bd1/hamdist.asm: Likewise. + * mpn/x86_64/bd1/mul_2.asm: Likewise. + * mpn/x86_64/bd1/mul_basecase.asm: Likewise. + * mpn/x86_64/bd1/popcount.asm: Likewise. + * mpn/x86_64/bd2/gcd_11.asm: Likewise. + * mpn/x86_64/bd2/gcd_22.asm: Likewise. + * mpn/x86_64/bd4/gcd_11.asm: Likewise. + * mpn/x86_64/bdiv_dbm1c.asm: Likewise. + * mpn/x86_64/bdiv_q_1.asm: Likewise. + * mpn/x86_64/bt1/aors_n.asm: Likewise. + * mpn/x86_64/bt1/aorsmul_1.asm: Likewise. + * mpn/x86_64/bt1/copyd.asm: Likewise. + * mpn/x86_64/bt1/copyi.asm: Likewise. + * mpn/x86_64/bt1/gcd_11.asm: Likewise. + * mpn/x86_64/bt1/mul_1.asm: Likewise. + * mpn/x86_64/bt1/mul_basecase.asm: Likewise. + * mpn/x86_64/bt1/sqr_basecase.asm: Likewise. + * mpn/x86_64/cnd_aors_n.asm: Likewise. + * mpn/x86_64/com.asm: Likewise. + * mpn/x86_64/copyd.asm: Likewise. + * mpn/x86_64/copyi.asm: Likewise. + * mpn/x86_64/core2/aors_err1_n.asm: Likewise. + * mpn/x86_64/core2/aors_n.asm: Likewise. + * mpn/x86_64/core2/aorsmul_1.asm: Likewise. + * mpn/x86_64/core2/divrem_1.asm: Likewise. + * mpn/x86_64/core2/gcd_11.asm: Likewise. + * mpn/x86_64/core2/gcd_22.asm: Likewise. + * mpn/x86_64/core2/hamdist.asm: Likewise. + * mpn/x86_64/core2/logops_n.asm: Likewise. + * mpn/x86_64/core2/lshift.asm: Likewise. + * mpn/x86_64/core2/lshiftc.asm: Likewise. + * mpn/x86_64/core2/mul_basecase.asm: Likewise. + * mpn/x86_64/core2/mullo_basecase.asm: Likewise. + * mpn/x86_64/core2/popcount.asm: Likewise. + * mpn/x86_64/core2/rsh1aors_n.asm: Likewise. + * mpn/x86_64/core2/rshift.asm: Likewise. + * mpn/x86_64/core2/sqr_basecase.asm: Likewise. + * mpn/x86_64/core2/sublshC_n.asm: Likewise. + * mpn/x86_64/coreibwl/mul_basecase.asm: Likewise. + * mpn/x86_64/coreibwl/mullo_basecase.asm: Likewise. + * mpn/x86_64/coreibwl/sqr_basecase.asm: Likewise. + * mpn/x86_64/coreihwl/addmul_2.asm: Likewise. + * mpn/x86_64/coreihwl/aors_n.asm: Likewise. + * mpn/x86_64/coreihwl/aorsmul_1.asm: Likewise. + * mpn/x86_64/coreihwl/gcd_22.asm: Likewise. + * mpn/x86_64/coreihwl/mul_2.asm: Likewise. + * mpn/x86_64/coreihwl/mul_basecase.asm: Likewise. + * mpn/x86_64/coreihwl/mullo_basecase.asm: Likewise. + * mpn/x86_64/coreihwl/redc_1.asm: Likewise. + * mpn/x86_64/coreihwl/sqr_basecase.asm: Likewise. + * mpn/x86_64/coreinhm/aorrlsh_n.asm: Likewise. + * mpn/x86_64/coreinhm/hamdist.asm: Likewise. + * mpn/x86_64/coreinhm/popcount.asm: Likewise. + * mpn/x86_64/coreisbr/addmul_2.asm: Likewise. + * mpn/x86_64/coreisbr/aorrlshC_n.asm: Likewise. + * mpn/x86_64/coreisbr/aorrlsh_n.asm: Likewise. + * mpn/x86_64/coreisbr/aors_n.asm: Likewise. + * mpn/x86_64/coreisbr/cnd_add_n.asm: Likewise. + * mpn/x86_64/coreisbr/cnd_sub_n.asm: Likewise. + * mpn/x86_64/coreisbr/mul_1.asm: Likewise. + * mpn/x86_64/coreisbr/mul_2.asm: Likewise. + * mpn/x86_64/coreisbr/mul_basecase.asm: Likewise. + * mpn/x86_64/coreisbr/mullo_basecase.asm: Likewise. + * mpn/x86_64/coreisbr/rsh1aors_n.asm: Likewise. + * mpn/x86_64/coreisbr/sqr_basecase.asm: Likewise. + * mpn/x86_64/div_qr_1n_pi1.asm: Likewise. + * mpn/x86_64/div_qr_2n_pi1.asm: Likewise. + * mpn/x86_64/div_qr_2u_pi1.asm: Likewise. + * mpn/x86_64/dive_1.asm: Likewise. + * mpn/x86_64/divrem_1.asm: Likewise. + * mpn/x86_64/divrem_2.asm: Likewise. + * mpn/x86_64/fastavx/copyd.asm: Likewise. + * mpn/x86_64/fastavx/copyi.asm: Likewise. + * mpn/x86_64/fastsse/com-palignr.asm: Likewise. + * mpn/x86_64/fastsse/com.asm: Likewise. + * mpn/x86_64/fastsse/copyd-palignr.asm: Likewise. + * mpn/x86_64/fastsse/copyd.asm: Likewise. + * mpn/x86_64/fastsse/copyi-palignr.asm: Likewise. + * mpn/x86_64/fastsse/copyi.asm: Likewise. + * mpn/x86_64/fastsse/lshift-movdqu2.asm: Likewise. + * mpn/x86_64/fastsse/lshift.asm: Likewise. + * mpn/x86_64/fastsse/lshiftc-movdqu2.asm: Likewise. + * mpn/x86_64/fastsse/lshiftc.asm: Likewise. + * mpn/x86_64/fastsse/rshift-movdqu2.asm: Likewise. + * mpn/x86_64/fastsse/sec_tabselect.asm: Likewise. + * mpn/x86_64/fat/fat_entry.asm: Likewise. + * mpn/x86_64/gcd_11.asm: Likewise. + * mpn/x86_64/gcd_22.asm: Likewise. + * mpn/x86_64/k10/gcd_22.asm: Likewise. + * mpn/x86_64/k10/hamdist.asm: Likewise. + * mpn/x86_64/k10/popcount.asm: Likewise. + * mpn/x86_64/k8/addmul_2.asm: Likewise. + * mpn/x86_64/k8/aorrlsh_n.asm: Likewise. + * mpn/x86_64/k8/bdiv_q_1.asm: Likewise. + * mpn/x86_64/k8/div_qr_1n_pi1.asm: Likewise. + * mpn/x86_64/k8/mul_basecase.asm: Likewise. + * mpn/x86_64/k8/mullo_basecase.asm: Likewise. + * mpn/x86_64/k8/mulmid_basecase.asm: Likewise. + * mpn/x86_64/k8/redc_1.asm: Likewise. + * mpn/x86_64/k8/sqr_basecase.asm: Likewise. + * mpn/x86_64/logops_n.asm: Likewise. + * mpn/x86_64/lshift.asm: Likewise. + * mpn/x86_64/lshiftc.asm: Likewise. + * mpn/x86_64/lshsub_n.asm: Likewise. + * mpn/x86_64/missing.asm: Likewise. + * mpn/x86_64/mod_1_2.asm: Likewise. + * mpn/x86_64/mod_1_4.asm: Likewise. + * mpn/x86_64/mod_34lsub1.asm: Likewise. + * mpn/x86_64/mode1o.asm: Likewise. + * mpn/x86_64/mul_1.asm: Likewise. + * mpn/x86_64/mul_2.asm: Likewise. + * mpn/x86_64/nano/dive_1.asm: Likewise. + * mpn/x86_64/pentium4/aors_n.asm: Likewise. + * mpn/x86_64/pentium4/mod_34lsub1.asm: Likewise. + * mpn/x86_64/pentium4/rsh1aors_n.asm: Likewise. + * mpn/x86_64/pentium4/rshift.asm: Likewise. + * mpn/x86_64/popham.asm: Likewise. + * mpn/x86_64/rsh1aors_n.asm: Likewise. + * mpn/x86_64/rshift.asm: Likewise. + * mpn/x86_64/sec_tabselect.asm: Likewise. + * mpn/x86_64/sqr_diag_addlsh1.asm: Likewise. + * mpn/x86_64/sublsh1_n.asm: Likewise. + * mpn/x86_64/zen/aorrlsh_n.asm: Likewise. + * mpn/x86_64/zen/mul_basecase.asm: Likewise. + * mpn/x86_64/zen/mullo_basecase.asm: Likewise. + * mpn/x86_64/zen/sbpi1_bdiv_r.asm: Likewise. + * mpn/x86_64/zen/sqr_basecase.asm: Likewise. +--- + mpn/x86_64/addaddmul_1msb0.asm | 1 + + mpn/x86_64/aorrlsh1_n.asm | 1 + + mpn/x86_64/aorrlshC_n.asm | 1 + + mpn/x86_64/aorrlsh_n.asm | 1 + + mpn/x86_64/aors_err1_n.asm | 1 + + mpn/x86_64/aors_err2_n.asm | 1 + + mpn/x86_64/aors_err3_n.asm | 1 + + mpn/x86_64/aors_n.asm | 1 + + mpn/x86_64/aorsmul_1.asm | 1 + + mpn/x86_64/atom/addmul_2.asm | 1 + + mpn/x86_64/atom/aorrlsh1_n.asm | 1 + + mpn/x86_64/atom/aorrlsh2_n.asm | 1 + + mpn/x86_64/atom/lshift.asm | 1 + + mpn/x86_64/atom/lshiftc.asm | 1 + + mpn/x86_64/atom/mul_2.asm | 1 + + mpn/x86_64/atom/rsh1aors_n.asm | 1 + + mpn/x86_64/atom/rshift.asm | 1 + + mpn/x86_64/atom/sublsh1_n.asm | 1 + + mpn/x86_64/bd1/addmul_2.asm | 1 + + mpn/x86_64/bd1/hamdist.asm | 1 + + mpn/x86_64/bd1/mul_2.asm | 1 + + mpn/x86_64/bd1/mul_basecase.asm | 1 + + mpn/x86_64/bd1/popcount.asm | 1 + + mpn/x86_64/bd2/gcd_11.asm | 1 + + mpn/x86_64/bd2/gcd_22.asm | 1 + + mpn/x86_64/bd4/gcd_11.asm | 1 + + mpn/x86_64/bdiv_dbm1c.asm | 1 + + mpn/x86_64/bdiv_q_1.asm | 1 + + mpn/x86_64/bt1/aors_n.asm | 1 + + mpn/x86_64/bt1/aorsmul_1.asm | 1 + + mpn/x86_64/bt1/copyd.asm | 1 + + mpn/x86_64/bt1/copyi.asm | 1 + + mpn/x86_64/bt1/gcd_11.asm | 1 + + mpn/x86_64/bt1/mul_1.asm | 1 + + mpn/x86_64/bt1/mul_basecase.asm | 1 + + mpn/x86_64/bt1/sqr_basecase.asm | 1 + + mpn/x86_64/cnd_aors_n.asm | 1 + + mpn/x86_64/com.asm | 1 + + mpn/x86_64/copyd.asm | 1 + + mpn/x86_64/copyi.asm | 1 + + mpn/x86_64/core2/aors_err1_n.asm | 1 + + mpn/x86_64/core2/aors_n.asm | 1 + + mpn/x86_64/core2/aorsmul_1.asm | 1 + + mpn/x86_64/core2/divrem_1.asm | 1 + + mpn/x86_64/core2/gcd_11.asm | 1 + + mpn/x86_64/core2/gcd_22.asm | 1 + + mpn/x86_64/core2/hamdist.asm | 1 + + mpn/x86_64/core2/logops_n.asm | 1 + + mpn/x86_64/core2/lshift.asm | 1 + + mpn/x86_64/core2/lshiftc.asm | 1 + + mpn/x86_64/core2/mul_basecase.asm | 1 + + mpn/x86_64/core2/mullo_basecase.asm | 1 + + mpn/x86_64/core2/popcount.asm | 1 + + mpn/x86_64/core2/rsh1aors_n.asm | 1 + + mpn/x86_64/core2/rshift.asm | 1 + + mpn/x86_64/core2/sqr_basecase.asm | 1 + + mpn/x86_64/core2/sublshC_n.asm | 1 + + mpn/x86_64/coreibwl/mul_basecase.asm | 1 + + mpn/x86_64/coreibwl/mullo_basecase.asm | 1 + + mpn/x86_64/coreibwl/sqr_basecase.asm | 1 + + mpn/x86_64/coreihwl/addmul_2.asm | 1 + + mpn/x86_64/coreihwl/aors_n.asm | 1 + + mpn/x86_64/coreihwl/aorsmul_1.asm | 1 + + mpn/x86_64/coreihwl/gcd_22.asm | 1 + + mpn/x86_64/coreihwl/mul_2.asm | 1 + + mpn/x86_64/coreihwl/mul_basecase.asm | 1 + + mpn/x86_64/coreihwl/mullo_basecase.asm | 1 + + mpn/x86_64/coreihwl/redc_1.asm | 1 + + mpn/x86_64/coreihwl/sqr_basecase.asm | 1 + + mpn/x86_64/coreinhm/aorrlsh_n.asm | 1 + + mpn/x86_64/coreinhm/hamdist.asm | 1 + + mpn/x86_64/coreinhm/popcount.asm | 1 + + mpn/x86_64/coreisbr/addmul_2.asm | 1 + + mpn/x86_64/coreisbr/aorrlshC_n.asm | 1 + + mpn/x86_64/coreisbr/aorrlsh_n.asm | 1 + + mpn/x86_64/coreisbr/aors_n.asm | 1 + + mpn/x86_64/coreisbr/cnd_add_n.asm | 1 + + mpn/x86_64/coreisbr/cnd_sub_n.asm | 1 + + mpn/x86_64/coreisbr/mul_1.asm | 1 + + mpn/x86_64/coreisbr/mul_2.asm | 1 + + mpn/x86_64/coreisbr/mul_basecase.asm | 1 + + mpn/x86_64/coreisbr/mullo_basecase.asm | 1 + + mpn/x86_64/coreisbr/rsh1aors_n.asm | 1 + + mpn/x86_64/coreisbr/sqr_basecase.asm | 1 + + mpn/x86_64/div_qr_1n_pi1.asm | 1 + + mpn/x86_64/div_qr_2n_pi1.asm | 1 + + mpn/x86_64/div_qr_2u_pi1.asm | 1 + + mpn/x86_64/dive_1.asm | 1 + + mpn/x86_64/divrem_1.asm | 1 + + mpn/x86_64/divrem_2.asm | 1 + + mpn/x86_64/fastavx/copyd.asm | 1 + + mpn/x86_64/fastavx/copyi.asm | 1 + + mpn/x86_64/fastsse/com-palignr.asm | 1 + + mpn/x86_64/fastsse/com.asm | 1 + + mpn/x86_64/fastsse/copyd-palignr.asm | 1 + + mpn/x86_64/fastsse/copyd.asm | 1 + + mpn/x86_64/fastsse/copyi-palignr.asm | 1 + + mpn/x86_64/fastsse/copyi.asm | 1 + + mpn/x86_64/fastsse/lshift-movdqu2.asm | 1 + + mpn/x86_64/fastsse/lshift.asm | 1 + + mpn/x86_64/fastsse/lshiftc-movdqu2.asm | 1 + + mpn/x86_64/fastsse/lshiftc.asm | 1 + + mpn/x86_64/fastsse/rshift-movdqu2.asm | 1 + + mpn/x86_64/fastsse/sec_tabselect.asm | 1 + + mpn/x86_64/fat/fat_entry.asm | 1 + + mpn/x86_64/gcd_11.asm | 1 + + mpn/x86_64/gcd_22.asm | 1 + + mpn/x86_64/k10/gcd_22.asm | 1 + + mpn/x86_64/k10/hamdist.asm | 1 + + mpn/x86_64/k10/popcount.asm | 1 + + mpn/x86_64/k8/addmul_2.asm | 1 + + mpn/x86_64/k8/aorrlsh_n.asm | 1 + + mpn/x86_64/k8/bdiv_q_1.asm | 1 + + mpn/x86_64/k8/div_qr_1n_pi1.asm | 1 + + mpn/x86_64/k8/mul_basecase.asm | 1 + + mpn/x86_64/k8/mullo_basecase.asm | 1 + + mpn/x86_64/k8/mulmid_basecase.asm | 1 + + mpn/x86_64/k8/redc_1.asm | 1 + + mpn/x86_64/k8/sqr_basecase.asm | 1 + + mpn/x86_64/logops_n.asm | 1 + + mpn/x86_64/lshift.asm | 1 + + mpn/x86_64/lshiftc.asm | 1 + + mpn/x86_64/lshsub_n.asm | 1 + + mpn/x86_64/missing.asm | 1 + + mpn/x86_64/mod_1_2.asm | 1 + + mpn/x86_64/mod_1_4.asm | 1 + + mpn/x86_64/mod_34lsub1.asm | 1 + + mpn/x86_64/mode1o.asm | 1 + + mpn/x86_64/mul_1.asm | 1 + + mpn/x86_64/mul_2.asm | 1 + + mpn/x86_64/nano/dive_1.asm | 1 + + mpn/x86_64/pentium4/aors_n.asm | 1 + + mpn/x86_64/pentium4/mod_34lsub1.asm | 1 + + mpn/x86_64/pentium4/rsh1aors_n.asm | 1 + + mpn/x86_64/pentium4/rshift.asm | 1 + + mpn/x86_64/popham.asm | 1 + + mpn/x86_64/rsh1aors_n.asm | 1 + + mpn/x86_64/rshift.asm | 1 + + mpn/x86_64/sec_tabselect.asm | 1 + + mpn/x86_64/sqr_diag_addlsh1.asm | 1 + + mpn/x86_64/sublsh1_n.asm | 1 + + mpn/x86_64/zen/aorrlsh_n.asm | 1 + + mpn/x86_64/zen/mul_basecase.asm | 1 + + mpn/x86_64/zen/mullo_basecase.asm | 1 + + mpn/x86_64/zen/sbpi1_bdiv_r.asm | 1 + + mpn/x86_64/zen/sqr_basecase.asm | 1 + + 146 files changed, 146 insertions(+) + +diff --git a/mpn/x86_64/addaddmul_1msb0.asm b/mpn/x86_64/addaddmul_1msb0.asm +index 87c21b4ac..2d03ddb9b 100644 +--- a/mpn/x86_64/addaddmul_1msb0.asm ++++ b/mpn/x86_64/addaddmul_1msb0.asm +@@ -168,3 +168,4 @@ L(end): cmp $1, R32(n) + pop %r12 + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/aorrlsh1_n.asm b/mpn/x86_64/aorrlsh1_n.asm +index 6ee087282..1441a6caf 100644 +--- a/mpn/x86_64/aorrlsh1_n.asm ++++ b/mpn/x86_64/aorrlsh1_n.asm +@@ -168,3 +168,4 @@ ifdef(`OPERATION_rsblsh1_n',` + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/aorrlshC_n.asm b/mpn/x86_64/aorrlshC_n.asm +index de00154a1..691abde88 100644 +--- a/mpn/x86_64/aorrlshC_n.asm ++++ b/mpn/x86_64/aorrlshC_n.asm +@@ -170,3 +170,4 @@ ifelse(ADDSUB,add,` + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/aorrlsh_n.asm b/mpn/x86_64/aorrlsh_n.asm +index 5ca128fbf..57f0e77d3 100644 +--- a/mpn/x86_64/aorrlsh_n.asm ++++ b/mpn/x86_64/aorrlsh_n.asm +@@ -174,3 +174,4 @@ L(end): add R32(%rbx), R32(%rbx) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/aors_err1_n.asm b/mpn/x86_64/aors_err1_n.asm +index 54d0b3f9b..8c42ea197 100644 +--- a/mpn/x86_64/aors_err1_n.asm ++++ b/mpn/x86_64/aors_err1_n.asm +@@ -223,3 +223,4 @@ L(end): + pop %rbx + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/aors_err2_n.asm b/mpn/x86_64/aors_err2_n.asm +index ce5c2a49b..0227e5db5 100644 +--- a/mpn/x86_64/aors_err2_n.asm ++++ b/mpn/x86_64/aors_err2_n.asm +@@ -170,3 +170,4 @@ L(end): + pop %rbx + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/aors_err3_n.asm b/mpn/x86_64/aors_err3_n.asm +index bb6d0c536..37047db1f 100644 +--- a/mpn/x86_64/aors_err3_n.asm ++++ b/mpn/x86_64/aors_err3_n.asm +@@ -154,3 +154,4 @@ L(end): + pop %rbx + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/aors_n.asm b/mpn/x86_64/aors_n.asm +index d5a314ac5..b516c4d92 100644 +--- a/mpn/x86_64/aors_n.asm ++++ b/mpn/x86_64/aors_n.asm +@@ -176,3 +176,4 @@ L(end): lea 32(up), up + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/aorsmul_1.asm b/mpn/x86_64/aorsmul_1.asm +index dfe4dc43d..e3bb2f947 100644 +--- a/mpn/x86_64/aorsmul_1.asm ++++ b/mpn/x86_64/aorsmul_1.asm +@@ -188,3 +188,4 @@ IFDOS(``pop %rdi '') + IFDOS(``pop %rsi '') + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/atom/addmul_2.asm b/mpn/x86_64/atom/addmul_2.asm +index c1dcdc44a..c1d945189 100644 +--- a/mpn/x86_64/atom/addmul_2.asm ++++ b/mpn/x86_64/atom/addmul_2.asm +@@ -184,3 +184,4 @@ L(end): mul v1 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/atom/aorrlsh1_n.asm b/mpn/x86_64/atom/aorrlsh1_n.asm +index f44de19fe..693a302b8 100644 +--- a/mpn/x86_64/atom/aorrlsh1_n.asm ++++ b/mpn/x86_64/atom/aorrlsh1_n.asm +@@ -236,3 +236,4 @@ IFDOS(` mov 56(%rsp), %r8 ') + sbb R32(%rbp), R32(%rbp) C save acy + jmp L(ent) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/atom/aorrlsh2_n.asm b/mpn/x86_64/atom/aorrlsh2_n.asm +index 02fb29dd7..c6ded740a 100644 +--- a/mpn/x86_64/atom/aorrlsh2_n.asm ++++ b/mpn/x86_64/atom/aorrlsh2_n.asm +@@ -189,3 +189,4 @@ ifdef(`OPERATION_rsblsh2_n',` + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/atom/lshift.asm b/mpn/x86_64/atom/lshift.asm +index 1b37d5dcc..894b912cf 100644 +--- a/mpn/x86_64/atom/lshift.asm ++++ b/mpn/x86_64/atom/lshift.asm +@@ -121,3 +121,4 @@ L(end): shl R8(%rcx), %r10 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/atom/lshiftc.asm b/mpn/x86_64/atom/lshiftc.asm +index 7385f8fd4..40d8fff05 100644 +--- a/mpn/x86_64/atom/lshiftc.asm ++++ b/mpn/x86_64/atom/lshiftc.asm +@@ -125,3 +125,4 @@ L(end): shl R8(%rcx), %r10 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/atom/mul_2.asm b/mpn/x86_64/atom/mul_2.asm +index 4bc22cd39..87414d93f 100644 +--- a/mpn/x86_64/atom/mul_2.asm ++++ b/mpn/x86_64/atom/mul_2.asm +@@ -188,3 +188,4 @@ L(end): mul v1 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/atom/rsh1aors_n.asm b/mpn/x86_64/atom/rsh1aors_n.asm +index 6f5f6384a..f3952c073 100644 +--- a/mpn/x86_64/atom/rsh1aors_n.asm ++++ b/mpn/x86_64/atom/rsh1aors_n.asm +@@ -285,3 +285,4 @@ L(cj1): pop %r15 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/atom/rshift.asm b/mpn/x86_64/atom/rshift.asm +index 29c027de4..f4c59e113 100644 +--- a/mpn/x86_64/atom/rshift.asm ++++ b/mpn/x86_64/atom/rshift.asm +@@ -119,3 +119,4 @@ L(end): shr R8(cnt), %r10 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/atom/sublsh1_n.asm b/mpn/x86_64/atom/sublsh1_n.asm +index 1306acde2..762e1ee85 100644 +--- a/mpn/x86_64/atom/sublsh1_n.asm ++++ b/mpn/x86_64/atom/sublsh1_n.asm +@@ -240,3 +240,4 @@ IFDOS(` mov 56(%rsp), %r8 ') + sbb R32(%rbp), R32(%rbp) C save acy + jmp L(ent) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bd1/addmul_2.asm b/mpn/x86_64/bd1/addmul_2.asm +index b54e91af1..b1c149b5a 100644 +--- a/mpn/x86_64/bd1/addmul_2.asm ++++ b/mpn/x86_64/bd1/addmul_2.asm +@@ -233,3 +233,4 @@ L(end): mul v0 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bd1/hamdist.asm b/mpn/x86_64/bd1/hamdist.asm +index 29e78a324..f93ce4d61 100644 +--- a/mpn/x86_64/bd1/hamdist.asm ++++ b/mpn/x86_64/bd1/hamdist.asm +@@ -204,3 +204,4 @@ DEF_OBJECT(L(cnsts),16,`JUMPTABSECT') + .byte 0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f + END_OBJECT(L(cnsts)) + ') ++ASM_END() +diff --git a/mpn/x86_64/bd1/mul_2.asm b/mpn/x86_64/bd1/mul_2.asm +index 85fa7aa33..e910ceeaa 100644 +--- a/mpn/x86_64/bd1/mul_2.asm ++++ b/mpn/x86_64/bd1/mul_2.asm +@@ -193,3 +193,4 @@ L(end): mov -8(up), %rax + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bd1/mul_basecase.asm b/mpn/x86_64/bd1/mul_basecase.asm +index e47ba587c..ebae74dc6 100644 +--- a/mpn/x86_64/bd1/mul_basecase.asm ++++ b/mpn/x86_64/bd1/mul_basecase.asm +@@ -414,3 +414,4 @@ L(ret2):pop %rbp + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bd1/popcount.asm b/mpn/x86_64/bd1/popcount.asm +index 28ce4616c..063c2cc61 100644 +--- a/mpn/x86_64/bd1/popcount.asm ++++ b/mpn/x86_64/bd1/popcount.asm +@@ -189,3 +189,4 @@ DEF_OBJECT(L(cnsts),16,`JUMPTABSECT') + .byte 0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f + END_OBJECT(L(cnsts)) + ') ++ASM_END() +diff --git a/mpn/x86_64/bd2/gcd_11.asm b/mpn/x86_64/bd2/gcd_11.asm +index b1670770d..3d1c7880f 100644 +--- a/mpn/x86_64/bd2/gcd_11.asm ++++ b/mpn/x86_64/bd2/gcd_11.asm +@@ -94,3 +94,4 @@ L(end): mov v0, %rax + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bd2/gcd_22.asm b/mpn/x86_64/bd2/gcd_22.asm +index a4f30eadd..b88667823 100644 +--- a/mpn/x86_64/bd2/gcd_22.asm ++++ b/mpn/x86_64/bd2/gcd_22.asm +@@ -140,3 +140,4 @@ L(end): C mov v0, %rax + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bd4/gcd_11.asm b/mpn/x86_64/bd4/gcd_11.asm +index 4176b85c8..d172e3221 100644 +--- a/mpn/x86_64/bd4/gcd_11.asm ++++ b/mpn/x86_64/bd4/gcd_11.asm +@@ -94,3 +94,4 @@ L(end): C rax = result + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bdiv_dbm1c.asm b/mpn/x86_64/bdiv_dbm1c.asm +index a53bd52be..c383ee3d2 100644 +--- a/mpn/x86_64/bdiv_dbm1c.asm ++++ b/mpn/x86_64/bdiv_dbm1c.asm +@@ -104,3 +104,4 @@ L(lo1): sub %rax, %r8 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bdiv_q_1.asm b/mpn/x86_64/bdiv_q_1.asm +index 85538c9bb..c983c7f27 100644 +--- a/mpn/x86_64/bdiv_q_1.asm ++++ b/mpn/x86_64/bdiv_q_1.asm +@@ -193,3 +193,4 @@ L(one): shr R8(%rcx), %rax + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bt1/aors_n.asm b/mpn/x86_64/bt1/aors_n.asm +index 9b6b5c77b..04d81ddfe 100644 +--- a/mpn/x86_64/bt1/aors_n.asm ++++ b/mpn/x86_64/bt1/aors_n.asm +@@ -157,3 +157,4 @@ PROLOGUE(func_nc) + IFDOS(` mov 56(%rsp), %r8 ') + jmp L(ent) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bt1/aorsmul_1.asm b/mpn/x86_64/bt1/aorsmul_1.asm +index 41e1d8aba..d309321cf 100644 +--- a/mpn/x86_64/bt1/aorsmul_1.asm ++++ b/mpn/x86_64/bt1/aorsmul_1.asm +@@ -189,3 +189,4 @@ IFDOS(` pop %rdi ') + IFDOS(` pop %rsi ') + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bt1/copyd.asm b/mpn/x86_64/bt1/copyd.asm +index 877714e90..23fb80b3a 100644 +--- a/mpn/x86_64/bt1/copyd.asm ++++ b/mpn/x86_64/bt1/copyd.asm +@@ -89,3 +89,4 @@ L(end): cmp $-4, R32(n) + L(ret): FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bt1/copyi.asm b/mpn/x86_64/bt1/copyi.asm +index ee0f57865..25718e642 100644 +--- a/mpn/x86_64/bt1/copyi.asm ++++ b/mpn/x86_64/bt1/copyi.asm +@@ -92,3 +92,4 @@ L(end): cmp $4, R32(n) + L(ret): FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bt1/gcd_11.asm b/mpn/x86_64/bt1/gcd_11.asm +index ef5339250..03bc06d4f 100644 +--- a/mpn/x86_64/bt1/gcd_11.asm ++++ b/mpn/x86_64/bt1/gcd_11.asm +@@ -117,3 +117,4 @@ L(count_better): + bsf u0, cnt + jmp L(shr) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bt1/mul_1.asm b/mpn/x86_64/bt1/mul_1.asm +index 4394d6e1f..634cb35a6 100644 +--- a/mpn/x86_64/bt1/mul_1.asm ++++ b/mpn/x86_64/bt1/mul_1.asm +@@ -239,3 +239,4 @@ IFDOS(` pop %rdi ') + IFDOS(` pop %rsi ') + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bt1/mul_basecase.asm b/mpn/x86_64/bt1/mul_basecase.asm +index e7d46bfcf..17261909c 100644 +--- a/mpn/x86_64/bt1/mul_basecase.asm ++++ b/mpn/x86_64/bt1/mul_basecase.asm +@@ -484,3 +484,4 @@ L(ret): pop %r13 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/bt1/sqr_basecase.asm b/mpn/x86_64/bt1/sqr_basecase.asm +index 0e417a1eb..8f665d1db 100644 +--- a/mpn/x86_64/bt1/sqr_basecase.asm ++++ b/mpn/x86_64/bt1/sqr_basecase.asm +@@ -563,3 +563,4 @@ L(esd): add %rbx, w0 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/cnd_aors_n.asm b/mpn/x86_64/cnd_aors_n.asm +index 13a2ab3be..b720ecbab 100644 +--- a/mpn/x86_64/cnd_aors_n.asm ++++ b/mpn/x86_64/cnd_aors_n.asm +@@ -181,3 +181,4 @@ L(end): neg R32(%rax) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/com.asm b/mpn/x86_64/com.asm +index 006acaf64..ec72e1912 100644 +--- a/mpn/x86_64/com.asm ++++ b/mpn/x86_64/com.asm +@@ -93,3 +93,4 @@ L(e10): movq 24(up,n,8), %r9 + L(ret): FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/copyd.asm b/mpn/x86_64/copyd.asm +index a5e6e595e..02ab53f1b 100644 +--- a/mpn/x86_64/copyd.asm ++++ b/mpn/x86_64/copyd.asm +@@ -91,3 +91,4 @@ L(end): shr R32(n) + mov %r9, -16(rp) + 1: ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/copyi.asm b/mpn/x86_64/copyi.asm +index bafce7a09..8c6dbdcf7 100644 +--- a/mpn/x86_64/copyi.asm ++++ b/mpn/x86_64/copyi.asm +@@ -90,3 +90,4 @@ L(end): shr R32(n) + mov %r9, 16(rp) + 1: ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/aors_err1_n.asm b/mpn/x86_64/core2/aors_err1_n.asm +index 3f875aefa..c9c6c366f 100644 +--- a/mpn/x86_64/core2/aors_err1_n.asm ++++ b/mpn/x86_64/core2/aors_err1_n.asm +@@ -223,3 +223,4 @@ L(end): + pop %rbx + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/aors_n.asm b/mpn/x86_64/core2/aors_n.asm +index f9e003987..7981b7f48 100644 +--- a/mpn/x86_64/core2/aors_n.asm ++++ b/mpn/x86_64/core2/aors_n.asm +@@ -148,3 +148,4 @@ PROLOGUE(func_nc) + IFDOS(` mov 56(%rsp), %r8 ') + jmp L(start) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/aorsmul_1.asm b/mpn/x86_64/core2/aorsmul_1.asm +index a7a5d6e59..b2b067ad3 100644 +--- a/mpn/x86_64/core2/aorsmul_1.asm ++++ b/mpn/x86_64/core2/aorsmul_1.asm +@@ -186,3 +186,4 @@ L(n1): mov 8(rp), %r10 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/divrem_1.asm b/mpn/x86_64/core2/divrem_1.asm +index 1b3f1394e..d41c49441 100644 +--- a/mpn/x86_64/core2/divrem_1.asm ++++ b/mpn/x86_64/core2/divrem_1.asm +@@ -241,3 +241,4 @@ L(ret): pop %rbx + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/gcd_11.asm b/mpn/x86_64/core2/gcd_11.asm +index b00451f90..b730a5567 100644 +--- a/mpn/x86_64/core2/gcd_11.asm ++++ b/mpn/x86_64/core2/gcd_11.asm +@@ -91,3 +91,4 @@ L(end): C rax = result + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/gcd_22.asm b/mpn/x86_64/core2/gcd_22.asm +index b5aa73ba9..0ccde8a64 100644 +--- a/mpn/x86_64/core2/gcd_22.asm ++++ b/mpn/x86_64/core2/gcd_22.asm +@@ -135,3 +135,4 @@ L(end): C mov v0, %rax + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/hamdist.asm b/mpn/x86_64/core2/hamdist.asm +index a78753dcf..be451d78c 100644 +--- a/mpn/x86_64/core2/hamdist.asm ++++ b/mpn/x86_64/core2/hamdist.asm +@@ -208,3 +208,4 @@ DEF_OBJECT(L(cnsts),16,`JUMPTABSECT') + .byte 0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f + .byte 0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f + END_OBJECT(L(cnsts)) ++ASM_END() +diff --git a/mpn/x86_64/core2/logops_n.asm b/mpn/x86_64/core2/logops_n.asm +index 5ff174c78..451d556c2 100644 +--- a/mpn/x86_64/core2/logops_n.asm ++++ b/mpn/x86_64/core2/logops_n.asm +@@ -283,3 +283,4 @@ L(ret): FUNC_EXIT() + ret + EPILOGUE() + ') ++ASM_END() +diff --git a/mpn/x86_64/core2/lshift.asm b/mpn/x86_64/core2/lshift.asm +index 9016a71ff..62053c297 100644 +--- a/mpn/x86_64/core2/lshift.asm ++++ b/mpn/x86_64/core2/lshift.asm +@@ -143,3 +143,4 @@ L(1): shl R8(cnt), %r9 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/lshiftc.asm b/mpn/x86_64/core2/lshiftc.asm +index c428f13ca..cdd4e11a2 100644 +--- a/mpn/x86_64/core2/lshiftc.asm ++++ b/mpn/x86_64/core2/lshiftc.asm +@@ -157,3 +157,4 @@ L(1): shl R8(cnt), %r9 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/mul_basecase.asm b/mpn/x86_64/core2/mul_basecase.asm +index d16be852f..8a184330b 100644 +--- a/mpn/x86_64/core2/mul_basecase.asm ++++ b/mpn/x86_64/core2/mul_basecase.asm +@@ -973,3 +973,4 @@ L(lo3): mul v0 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/mullo_basecase.asm b/mpn/x86_64/core2/mullo_basecase.asm +index 0f03d867f..11814d520 100644 +--- a/mpn/x86_64/core2/mullo_basecase.asm ++++ b/mpn/x86_64/core2/mullo_basecase.asm +@@ -425,3 +425,4 @@ L(n3): mov (vp_param), %r9 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/popcount.asm b/mpn/x86_64/core2/popcount.asm +index 39d8c5ded..5e03ef3cc 100644 +--- a/mpn/x86_64/core2/popcount.asm ++++ b/mpn/x86_64/core2/popcount.asm +@@ -183,3 +183,4 @@ DEF_OBJECT(L(cnsts),16,`JUMPTABSECT') + .byte 0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f + .byte 0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f,0x0f + END_OBJECT(L(cnsts)) ++ASM_END() +diff --git a/mpn/x86_64/core2/rsh1aors_n.asm b/mpn/x86_64/core2/rsh1aors_n.asm +index 27eed3712..5b4fe7ea4 100644 +--- a/mpn/x86_64/core2/rsh1aors_n.asm ++++ b/mpn/x86_64/core2/rsh1aors_n.asm +@@ -167,3 +167,4 @@ L(end): shrd $1, %rbx, %rbp + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/rshift.asm b/mpn/x86_64/core2/rshift.asm +index 7578a5349..86cc804e6 100644 +--- a/mpn/x86_64/core2/rshift.asm ++++ b/mpn/x86_64/core2/rshift.asm +@@ -141,3 +141,4 @@ L(1): shr R8(cnt), %r9 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/sqr_basecase.asm b/mpn/x86_64/core2/sqr_basecase.asm +index a112c1b52..65286b0fc 100644 +--- a/mpn/x86_64/core2/sqr_basecase.asm ++++ b/mpn/x86_64/core2/sqr_basecase.asm +@@ -982,3 +982,4 @@ L(n3): mov %rax, %r10 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/core2/sublshC_n.asm b/mpn/x86_64/core2/sublshC_n.asm +index 272700db5..e30562ba8 100644 +--- a/mpn/x86_64/core2/sublshC_n.asm ++++ b/mpn/x86_64/core2/sublshC_n.asm +@@ -156,3 +156,4 @@ L(end): shr $RSH, %r11 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreibwl/mul_basecase.asm b/mpn/x86_64/coreibwl/mul_basecase.asm +index 42ca976a2..6dd34495b 100644 +--- a/mpn/x86_64/coreibwl/mul_basecase.asm ++++ b/mpn/x86_64/coreibwl/mul_basecase.asm +@@ -367,3 +367,4 @@ L(atab):JMPENT( L(f0), L(atab)) + JMPENT( L(f7), L(atab)) + TEXT + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreibwl/mullo_basecase.asm b/mpn/x86_64/coreibwl/mullo_basecase.asm +index 5cdb20918..b3e435b35 100644 +--- a/mpn/x86_64/coreibwl/mullo_basecase.asm ++++ b/mpn/x86_64/coreibwl/mullo_basecase.asm +@@ -393,3 +393,4 @@ L(mtab):JMPENT( L(mf7), L(mtab)) + JMPENT( L(mf4), L(mtab)) + JMPENT( L(mf5), L(mtab)) + JMPENT( L(mf6), L(mtab)) ++ASM_END() +diff --git a/mpn/x86_64/coreibwl/sqr_basecase.asm b/mpn/x86_64/coreibwl/sqr_basecase.asm +index e81b01b34..e4f77597c 100644 +--- a/mpn/x86_64/coreibwl/sqr_basecase.asm ++++ b/mpn/x86_64/coreibwl/sqr_basecase.asm +@@ -837,3 +837,4 @@ L(atab):JMPENT( L(f6), L(atab)) + JMPENT( L(f5), L(atab)) + TEXT + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreihwl/addmul_2.asm b/mpn/x86_64/coreihwl/addmul_2.asm +index 9d1c40534..322037ee9 100644 +--- a/mpn/x86_64/coreihwl/addmul_2.asm ++++ b/mpn/x86_64/coreihwl/addmul_2.asm +@@ -239,3 +239,4 @@ L(end): mulx( v0, %rax, w3) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreihwl/aors_n.asm b/mpn/x86_64/coreihwl/aors_n.asm +index fc996277f..f9d89f768 100644 +--- a/mpn/x86_64/coreihwl/aors_n.asm ++++ b/mpn/x86_64/coreihwl/aors_n.asm +@@ -259,3 +259,4 @@ L(tab): JMPENT( L(0), L(tab)) + JMPENT( L(5), L(tab)) + JMPENT( L(6), L(tab)) + JMPENT( L(7), L(tab)) ++ASM_END() +diff --git a/mpn/x86_64/coreihwl/aorsmul_1.asm b/mpn/x86_64/coreihwl/aorsmul_1.asm +index 3f43afa78..d01c94103 100644 +--- a/mpn/x86_64/coreihwl/aorsmul_1.asm ++++ b/mpn/x86_64/coreihwl/aorsmul_1.asm +@@ -199,3 +199,4 @@ L(ret): pop %r13 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreihwl/gcd_22.asm b/mpn/x86_64/coreihwl/gcd_22.asm +index b5863b60e..e41731ead 100644 +--- a/mpn/x86_64/coreihwl/gcd_22.asm ++++ b/mpn/x86_64/coreihwl/gcd_22.asm +@@ -136,3 +136,4 @@ L(end): mov v0, %rax + L(ret): FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreihwl/mul_2.asm b/mpn/x86_64/coreihwl/mul_2.asm +index f1f044f18..f48e5d848 100644 +--- a/mpn/x86_64/coreihwl/mul_2.asm ++++ b/mpn/x86_64/coreihwl/mul_2.asm +@@ -174,3 +174,4 @@ L(end): mulx( v1, %rdx, %rax) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreihwl/mul_basecase.asm b/mpn/x86_64/coreihwl/mul_basecase.asm +index b2656c8e9..14826e823 100644 +--- a/mpn/x86_64/coreihwl/mul_basecase.asm ++++ b/mpn/x86_64/coreihwl/mul_basecase.asm +@@ -439,3 +439,4 @@ L(ret2):pop %rbp + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreihwl/mullo_basecase.asm b/mpn/x86_64/coreihwl/mullo_basecase.asm +index e65559ba2..b29352cc1 100644 +--- a/mpn/x86_64/coreihwl/mullo_basecase.asm ++++ b/mpn/x86_64/coreihwl/mullo_basecase.asm +@@ -420,3 +420,4 @@ L(n3): mov (vp), %r9 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreihwl/redc_1.asm b/mpn/x86_64/coreihwl/redc_1.asm +index b1d6c0a7d..3b09a73d1 100644 +--- a/mpn/x86_64/coreihwl/redc_1.asm ++++ b/mpn/x86_64/coreihwl/redc_1.asm +@@ -435,3 +435,4 @@ L(ret): pop %r15 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreihwl/sqr_basecase.asm b/mpn/x86_64/coreihwl/sqr_basecase.asm +index 641cdf349..b6ea890c1 100644 +--- a/mpn/x86_64/coreihwl/sqr_basecase.asm ++++ b/mpn/x86_64/coreihwl/sqr_basecase.asm +@@ -504,3 +504,4 @@ L(dend):adc %rbx, %rdx + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreinhm/aorrlsh_n.asm b/mpn/x86_64/coreinhm/aorrlsh_n.asm +index eed64e701..3f25eea2b 100644 +--- a/mpn/x86_64/coreinhm/aorrlsh_n.asm ++++ b/mpn/x86_64/coreinhm/aorrlsh_n.asm +@@ -198,3 +198,4 @@ IFDOS(` mov 64(%rsp), %r9 ') C cy + sbb R32(%rbx), R32(%rbx) C initialise CF save register + jmp L(ent) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreinhm/hamdist.asm b/mpn/x86_64/coreinhm/hamdist.asm +index a5a63e4b3..a84bcbc78 100644 +--- a/mpn/x86_64/coreinhm/hamdist.asm ++++ b/mpn/x86_64/coreinhm/hamdist.asm +@@ -194,3 +194,4 @@ L(tab): JMPENT( L(0), L(tab)) + JMPENT( L(1), L(tab)) + JMPENT( L(2), L(tab)) + JMPENT( L(3), L(tab)) ++ASM_END() +diff --git a/mpn/x86_64/coreinhm/popcount.asm b/mpn/x86_64/coreinhm/popcount.asm +index 0a3c867bb..24c4ebc84 100644 +--- a/mpn/x86_64/coreinhm/popcount.asm ++++ b/mpn/x86_64/coreinhm/popcount.asm +@@ -180,3 +180,4 @@ L(tab): JMPENT( L(0), L(tab)) + JMPENT( L(5), L(tab)) + JMPENT( L(6), L(tab)) + JMPENT( L(7), L(tab)) ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/addmul_2.asm b/mpn/x86_64/coreisbr/addmul_2.asm +index 21f0bf465..45c7b15cb 100644 +--- a/mpn/x86_64/coreisbr/addmul_2.asm ++++ b/mpn/x86_64/coreisbr/addmul_2.asm +@@ -222,3 +222,4 @@ L(end): mul v1 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/aorrlshC_n.asm b/mpn/x86_64/coreisbr/aorrlshC_n.asm +index 23ace4188..6af7da8ad 100644 +--- a/mpn/x86_64/coreisbr/aorrlshC_n.asm ++++ b/mpn/x86_64/coreisbr/aorrlshC_n.asm +@@ -171,3 +171,4 @@ L(end): shr $RSH, %rbp + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/aorrlsh_n.asm b/mpn/x86_64/coreisbr/aorrlsh_n.asm +index db8ee6884..56ca4979f 100644 +--- a/mpn/x86_64/coreisbr/aorrlsh_n.asm ++++ b/mpn/x86_64/coreisbr/aorrlsh_n.asm +@@ -213,3 +213,4 @@ IFDOS(` mov 64(%rsp), %r9 ') C cy + sbb R32(%rbx), R32(%rbx) C initialise CF save register + jmp L(ent) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/aors_n.asm b/mpn/x86_64/coreisbr/aors_n.asm +index 61fee3e36..d4662486b 100644 +--- a/mpn/x86_64/coreisbr/aors_n.asm ++++ b/mpn/x86_64/coreisbr/aors_n.asm +@@ -201,3 +201,4 @@ PROLOGUE(func_nc) + IFDOS(` mov 56(%rsp), %r8 ') + jmp L(ent) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/cnd_add_n.asm b/mpn/x86_64/coreisbr/cnd_add_n.asm +index 43abcc861..3d72bf8da 100644 +--- a/mpn/x86_64/coreisbr/cnd_add_n.asm ++++ b/mpn/x86_64/coreisbr/cnd_add_n.asm +@@ -172,3 +172,4 @@ L(end): neg R32(%rax) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/cnd_sub_n.asm b/mpn/x86_64/coreisbr/cnd_sub_n.asm +index f55492b67..3371269f3 100644 +--- a/mpn/x86_64/coreisbr/cnd_sub_n.asm ++++ b/mpn/x86_64/coreisbr/cnd_sub_n.asm +@@ -198,3 +198,4 @@ L(end): neg R32(%rax) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/mul_1.asm b/mpn/x86_64/coreisbr/mul_1.asm +index a43a1174b..1f172935e 100644 +--- a/mpn/x86_64/coreisbr/mul_1.asm ++++ b/mpn/x86_64/coreisbr/mul_1.asm +@@ -197,3 +197,4 @@ L(00c): add cin, %r10 + mov 8(up,n,8), %rax + jmp L(L0c) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/mul_2.asm b/mpn/x86_64/coreisbr/mul_2.asm +index 781534dba..10f1769a0 100644 +--- a/mpn/x86_64/coreisbr/mul_2.asm ++++ b/mpn/x86_64/coreisbr/mul_2.asm +@@ -165,3 +165,4 @@ L(end): mul v0 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/mul_basecase.asm b/mpn/x86_64/coreisbr/mul_basecase.asm +index 35fd1cc00..d5c7e5b43 100644 +--- a/mpn/x86_64/coreisbr/mul_basecase.asm ++++ b/mpn/x86_64/coreisbr/mul_basecase.asm +@@ -405,3 +405,4 @@ L(ret2):pop %rbp + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/mullo_basecase.asm b/mpn/x86_64/coreisbr/mullo_basecase.asm +index a41a8acee..acf7776ac 100644 +--- a/mpn/x86_64/coreisbr/mullo_basecase.asm ++++ b/mpn/x86_64/coreisbr/mullo_basecase.asm +@@ -382,3 +382,4 @@ L(n3): mov (vp_param), %r9 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/rsh1aors_n.asm b/mpn/x86_64/coreisbr/rsh1aors_n.asm +index fd2eaea7b..eefad99ae 100644 +--- a/mpn/x86_64/coreisbr/rsh1aors_n.asm ++++ b/mpn/x86_64/coreisbr/rsh1aors_n.asm +@@ -191,3 +191,4 @@ L(end): shrd $1, %rbx, %rbp + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/coreisbr/sqr_basecase.asm b/mpn/x86_64/coreisbr/sqr_basecase.asm +index 46a36121f..1600e2552 100644 +--- a/mpn/x86_64/coreisbr/sqr_basecase.asm ++++ b/mpn/x86_64/coreisbr/sqr_basecase.asm +@@ -482,3 +482,4 @@ L(dend):add %r8, %r10 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/div_qr_1n_pi1.asm b/mpn/x86_64/div_qr_1n_pi1.asm +index b3d45e2c7..9fd26339c 100644 +--- a/mpn/x86_64/div_qr_1n_pi1.asm ++++ b/mpn/x86_64/div_qr_1n_pi1.asm +@@ -245,3 +245,4 @@ L(q_incr_loop): + lea 8(U1), U1 + jmp L(q_incr_loop) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/div_qr_2n_pi1.asm b/mpn/x86_64/div_qr_2n_pi1.asm +index 5e59a0ac5..c189c33bb 100644 +--- a/mpn/x86_64/div_qr_2n_pi1.asm ++++ b/mpn/x86_64/div_qr_2n_pi1.asm +@@ -156,3 +156,4 @@ L(fix): C Unlikely update. u2 >= d1 + sbb d1, u2 + jmp L(bck) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/div_qr_2u_pi1.asm b/mpn/x86_64/div_qr_2u_pi1.asm +index 85af96fbf..f2ac526a5 100644 +--- a/mpn/x86_64/div_qr_2u_pi1.asm ++++ b/mpn/x86_64/div_qr_2u_pi1.asm +@@ -198,3 +198,4 @@ L(fix_qh): C Unlikely update. u2 >= d1 + sbb d1, u2 + jmp L(bck_qh) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/dive_1.asm b/mpn/x86_64/dive_1.asm +index 988bdab63..1929091b8 100644 +--- a/mpn/x86_64/dive_1.asm ++++ b/mpn/x86_64/dive_1.asm +@@ -156,3 +156,4 @@ L(one): shr R8(%rcx), %rax + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/divrem_1.asm b/mpn/x86_64/divrem_1.asm +index d4d61ad9d..edfd89351 100644 +--- a/mpn/x86_64/divrem_1.asm ++++ b/mpn/x86_64/divrem_1.asm +@@ -312,3 +312,4 @@ L(ret): pop %rbx + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/divrem_2.asm b/mpn/x86_64/divrem_2.asm +index 20811ccbc..e10f3282f 100644 +--- a/mpn/x86_64/divrem_2.asm ++++ b/mpn/x86_64/divrem_2.asm +@@ -190,3 +190,4 @@ L(fix): seta %dl + sbb %r11, %rbx + jmp L(bck) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastavx/copyd.asm b/mpn/x86_64/fastavx/copyd.asm +index 56d472f83..a69a62430 100644 +--- a/mpn/x86_64/fastavx/copyd.asm ++++ b/mpn/x86_64/fastavx/copyd.asm +@@ -170,3 +170,4 @@ L(bc): test $4, R8(n) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastavx/copyi.asm b/mpn/x86_64/fastavx/copyi.asm +index 760774797..f50aa4717 100644 +--- a/mpn/x86_64/fastavx/copyi.asm ++++ b/mpn/x86_64/fastavx/copyi.asm +@@ -167,3 +167,4 @@ L(bc): test $4, R8(n) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/com-palignr.asm b/mpn/x86_64/fastsse/com-palignr.asm +index 69027bc28..50cd40fc6 100644 +--- a/mpn/x86_64/fastsse/com-palignr.asm ++++ b/mpn/x86_64/fastsse/com-palignr.asm +@@ -309,3 +309,4 @@ L(end): test $1, R8(n) + 1: FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/com.asm b/mpn/x86_64/fastsse/com.asm +index c86722289..aec7d2544 100644 +--- a/mpn/x86_64/fastsse/com.asm ++++ b/mpn/x86_64/fastsse/com.asm +@@ -173,3 +173,4 @@ IFDOS(` add $56, %rsp ') + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/copyd-palignr.asm b/mpn/x86_64/fastsse/copyd-palignr.asm +index fac6f8a83..fa1e4a4cf 100644 +--- a/mpn/x86_64/fastsse/copyd-palignr.asm ++++ b/mpn/x86_64/fastsse/copyd-palignr.asm +@@ -252,3 +252,4 @@ L(end): test $1, R8(n) + 1: FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/copyd.asm b/mpn/x86_64/fastsse/copyd.asm +index b3c47064d..ce820c5d1 100644 +--- a/mpn/x86_64/fastsse/copyd.asm ++++ b/mpn/x86_64/fastsse/copyd.asm +@@ -164,3 +164,4 @@ L(sma): test $8, R8(n) + L(don): FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/copyi-palignr.asm b/mpn/x86_64/fastsse/copyi-palignr.asm +index 9876a4733..fb4655f1f 100644 +--- a/mpn/x86_64/fastsse/copyi-palignr.asm ++++ b/mpn/x86_64/fastsse/copyi-palignr.asm +@@ -298,3 +298,4 @@ L(end): test $1, R8(n) + 1: FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/copyi.asm b/mpn/x86_64/fastsse/copyi.asm +index 97f7865e6..826caadba 100644 +--- a/mpn/x86_64/fastsse/copyi.asm ++++ b/mpn/x86_64/fastsse/copyi.asm +@@ -183,3 +183,4 @@ dnl jnc 1b + L(ret): FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/lshift-movdqu2.asm b/mpn/x86_64/fastsse/lshift-movdqu2.asm +index a05e850a1..217f2cdef 100644 +--- a/mpn/x86_64/fastsse/lshift-movdqu2.asm ++++ b/mpn/x86_64/fastsse/lshift-movdqu2.asm +@@ -180,3 +180,4 @@ L(end8):movq (ap), %xmm0 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/lshift.asm b/mpn/x86_64/fastsse/lshift.asm +index 6a17b9351..79a555424 100644 +--- a/mpn/x86_64/fastsse/lshift.asm ++++ b/mpn/x86_64/fastsse/lshift.asm +@@ -171,3 +171,4 @@ L(end8):movq (ap), %xmm0 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/lshiftc-movdqu2.asm b/mpn/x86_64/fastsse/lshiftc-movdqu2.asm +index 8250910c5..9f144358b 100644 +--- a/mpn/x86_64/fastsse/lshiftc-movdqu2.asm ++++ b/mpn/x86_64/fastsse/lshiftc-movdqu2.asm +@@ -191,3 +191,4 @@ L(end8):movq (ap), %xmm0 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/lshiftc.asm b/mpn/x86_64/fastsse/lshiftc.asm +index a616075f1..a6630cb49 100644 +--- a/mpn/x86_64/fastsse/lshiftc.asm ++++ b/mpn/x86_64/fastsse/lshiftc.asm +@@ -181,3 +181,4 @@ L(end8):movq (ap), %xmm0 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/rshift-movdqu2.asm b/mpn/x86_64/fastsse/rshift-movdqu2.asm +index 1e270b13c..15bcc0271 100644 +--- a/mpn/x86_64/fastsse/rshift-movdqu2.asm ++++ b/mpn/x86_64/fastsse/rshift-movdqu2.asm +@@ -199,3 +199,4 @@ L(bc): dec R32(n) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fastsse/sec_tabselect.asm b/mpn/x86_64/fastsse/sec_tabselect.asm +index e7b7febbe..f3b76ebb8 100644 +--- a/mpn/x86_64/fastsse/sec_tabselect.asm ++++ b/mpn/x86_64/fastsse/sec_tabselect.asm +@@ -202,3 +202,4 @@ IFDOS(` add $88, %rsp ') + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/fat/fat_entry.asm b/mpn/x86_64/fat/fat_entry.asm +index 5f244ac2b..2322be825 100644 +--- a/mpn/x86_64/fat/fat_entry.asm ++++ b/mpn/x86_64/fat/fat_entry.asm +@@ -207,3 +207,4 @@ PROLOGUE(__gmpn_cpuid) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/gcd_11.asm b/mpn/x86_64/gcd_11.asm +index f9b3bcc96..1e5ac6833 100644 +--- a/mpn/x86_64/gcd_11.asm ++++ b/mpn/x86_64/gcd_11.asm +@@ -112,3 +112,4 @@ L(shift_alot): + mov u0, %rdx + jmp L(mid) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/gcd_22.asm b/mpn/x86_64/gcd_22.asm +index 78f985f89..c3b0b8910 100644 +--- a/mpn/x86_64/gcd_22.asm ++++ b/mpn/x86_64/gcd_22.asm +@@ -161,3 +161,4 @@ L(end): C mov v0, %rax + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k10/gcd_22.asm b/mpn/x86_64/k10/gcd_22.asm +index f58b4cccf..c7fe66895 100644 +--- a/mpn/x86_64/k10/gcd_22.asm ++++ b/mpn/x86_64/k10/gcd_22.asm +@@ -140,3 +140,4 @@ L(end): C mov v0, %rax + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k10/hamdist.asm b/mpn/x86_64/k10/hamdist.asm +index f70494a33..d885e2d60 100644 +--- a/mpn/x86_64/k10/hamdist.asm ++++ b/mpn/x86_64/k10/hamdist.asm +@@ -107,3 +107,4 @@ L(top): mov (ap,n,8), %r8 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k10/popcount.asm b/mpn/x86_64/k10/popcount.asm +index 3814aeabf..735d25a30 100644 +--- a/mpn/x86_64/k10/popcount.asm ++++ b/mpn/x86_64/k10/popcount.asm +@@ -136,3 +136,4 @@ C 1 = n mod 8 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k8/addmul_2.asm b/mpn/x86_64/k8/addmul_2.asm +index 78bcba16a..38caa4d30 100644 +--- a/mpn/x86_64/k8/addmul_2.asm ++++ b/mpn/x86_64/k8/addmul_2.asm +@@ -193,3 +193,4 @@ L(end): xor R32(w1), R32(w1) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k8/aorrlsh_n.asm b/mpn/x86_64/k8/aorrlsh_n.asm +index ff3a1842f..3ab7050b0 100644 +--- a/mpn/x86_64/k8/aorrlsh_n.asm ++++ b/mpn/x86_64/k8/aorrlsh_n.asm +@@ -215,3 +215,4 @@ L(cj1): mov %r9, 8(rp,n,8) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k8/bdiv_q_1.asm b/mpn/x86_64/k8/bdiv_q_1.asm +index 1172b0d11..606d54f27 100644 +--- a/mpn/x86_64/k8/bdiv_q_1.asm ++++ b/mpn/x86_64/k8/bdiv_q_1.asm +@@ -177,3 +177,4 @@ L(one): shr R8(%rcx), %rax + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k8/div_qr_1n_pi1.asm b/mpn/x86_64/k8/div_qr_1n_pi1.asm +index 86de08cc8..e91b80923 100644 +--- a/mpn/x86_64/k8/div_qr_1n_pi1.asm ++++ b/mpn/x86_64/k8/div_qr_1n_pi1.asm +@@ -247,3 +247,4 @@ L(q_incr_loop): + lea 8(U1), U1 + jmp L(q_incr_loop) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k8/mul_basecase.asm b/mpn/x86_64/k8/mul_basecase.asm +index ca2efb9b2..8b114ce8b 100644 +--- a/mpn/x86_64/k8/mul_basecase.asm ++++ b/mpn/x86_64/k8/mul_basecase.asm +@@ -467,3 +467,4 @@ L(ret): pop %r15 + ret + + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k8/mullo_basecase.asm b/mpn/x86_64/k8/mullo_basecase.asm +index fa00f4234..fc6a4396d 100644 +--- a/mpn/x86_64/k8/mullo_basecase.asm ++++ b/mpn/x86_64/k8/mullo_basecase.asm +@@ -434,3 +434,4 @@ L(ret): pop %r15 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k8/mulmid_basecase.asm b/mpn/x86_64/k8/mulmid_basecase.asm +index 86f1414ed..d7d1f27c6 100644 +--- a/mpn/x86_64/k8/mulmid_basecase.asm ++++ b/mpn/x86_64/k8/mulmid_basecase.asm +@@ -557,3 +557,4 @@ L(ret): pop %r15 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k8/redc_1.asm b/mpn/x86_64/k8/redc_1.asm +index 9327b21b1..4cb65af49 100644 +--- a/mpn/x86_64/k8/redc_1.asm ++++ b/mpn/x86_64/k8/redc_1.asm +@@ -589,3 +589,4 @@ L(ret): pop %r15 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/k8/sqr_basecase.asm b/mpn/x86_64/k8/sqr_basecase.asm +index 60cf945a4..f2c70b06b 100644 +--- a/mpn/x86_64/k8/sqr_basecase.asm ++++ b/mpn/x86_64/k8/sqr_basecase.asm +@@ -805,3 +805,4 @@ L(d1): mov %r11, 24(rp,j,8) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/logops_n.asm b/mpn/x86_64/logops_n.asm +index e25854d26..b3969ba97 100644 +--- a/mpn/x86_64/logops_n.asm ++++ b/mpn/x86_64/logops_n.asm +@@ -258,3 +258,4 @@ L(ret): FUNC_EXIT() + ret + EPILOGUE() + ') ++ASM_END() +diff --git a/mpn/x86_64/lshift.asm b/mpn/x86_64/lshift.asm +index fff31520d..4187bdcce 100644 +--- a/mpn/x86_64/lshift.asm ++++ b/mpn/x86_64/lshift.asm +@@ -170,3 +170,4 @@ L(ast): mov (up), %r10 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/lshiftc.asm b/mpn/x86_64/lshiftc.asm +index c4ba04a17..f6fe4c9b6 100644 +--- a/mpn/x86_64/lshiftc.asm ++++ b/mpn/x86_64/lshiftc.asm +@@ -180,3 +180,4 @@ L(ast): mov (up), %r10 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/lshsub_n.asm b/mpn/x86_64/lshsub_n.asm +index 4d428c0bd..62877d781 100644 +--- a/mpn/x86_64/lshsub_n.asm ++++ b/mpn/x86_64/lshsub_n.asm +@@ -170,3 +170,4 @@ L(end): + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/missing.asm b/mpn/x86_64/missing.asm +index 9b65c89dd..22dac17f0 100644 +--- a/mpn/x86_64/missing.asm ++++ b/mpn/x86_64/missing.asm +@@ -128,3 +128,4 @@ PROLOGUE(__gmp_adcx) + ret + EPILOGUE() + PROTECT(__gmp_adcx) ++ASM_END() +diff --git a/mpn/x86_64/mod_1_2.asm b/mpn/x86_64/mod_1_2.asm +index 40fcaebf4..fbaae3b3c 100644 +--- a/mpn/x86_64/mod_1_2.asm ++++ b/mpn/x86_64/mod_1_2.asm +@@ -239,3 +239,4 @@ ifdef(`SHLD_SLOW',` + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/mod_1_4.asm b/mpn/x86_64/mod_1_4.asm +index 6cf304cf2..8969e42c6 100644 +--- a/mpn/x86_64/mod_1_4.asm ++++ b/mpn/x86_64/mod_1_4.asm +@@ -270,3 +270,4 @@ ifdef(`SHLD_SLOW',` + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/mod_34lsub1.asm b/mpn/x86_64/mod_34lsub1.asm +index 75421a6ec..74f576a07 100644 +--- a/mpn/x86_64/mod_34lsub1.asm ++++ b/mpn/x86_64/mod_34lsub1.asm +@@ -213,3 +213,4 @@ L(0): add %r9, %rax + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/mode1o.asm b/mpn/x86_64/mode1o.asm +index 2cd2b0884..3377435fc 100644 +--- a/mpn/x86_64/mode1o.asm ++++ b/mpn/x86_64/mode1o.asm +@@ -169,3 +169,4 @@ L(one): + + EPILOGUE(mpn_modexact_1c_odd) + EPILOGUE(mpn_modexact_1_odd) ++ASM_END() +diff --git a/mpn/x86_64/mul_1.asm b/mpn/x86_64/mul_1.asm +index e1ba89b04..44764dd51 100644 +--- a/mpn/x86_64/mul_1.asm ++++ b/mpn/x86_64/mul_1.asm +@@ -190,3 +190,4 @@ IFDOS(``pop %rdi '') + IFDOS(``pop %rsi '') + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/mul_2.asm b/mpn/x86_64/mul_2.asm +index d64313b32..b6c6bf191 100644 +--- a/mpn/x86_64/mul_2.asm ++++ b/mpn/x86_64/mul_2.asm +@@ -202,3 +202,4 @@ L(m22): mul v1 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/nano/dive_1.asm b/mpn/x86_64/nano/dive_1.asm +index e9a07631c..aead4d551 100644 +--- a/mpn/x86_64/nano/dive_1.asm ++++ b/mpn/x86_64/nano/dive_1.asm +@@ -164,3 +164,4 @@ L(one): shr R8(%rcx), %rax + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/pentium4/aors_n.asm b/mpn/x86_64/pentium4/aors_n.asm +index 8e6ee1bae..3751e381d 100644 +--- a/mpn/x86_64/pentium4/aors_n.asm ++++ b/mpn/x86_64/pentium4/aors_n.asm +@@ -194,3 +194,4 @@ L(ret): mov R32(%rbx), R32(%rax) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/pentium4/mod_34lsub1.asm b/mpn/x86_64/pentium4/mod_34lsub1.asm +index f34b3f079..bf83f6278 100644 +--- a/mpn/x86_64/pentium4/mod_34lsub1.asm ++++ b/mpn/x86_64/pentium4/mod_34lsub1.asm +@@ -165,3 +165,4 @@ L(combine): + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/pentium4/rsh1aors_n.asm b/mpn/x86_64/pentium4/rsh1aors_n.asm +index 5528ce47d..219a809cf 100644 +--- a/mpn/x86_64/pentium4/rsh1aors_n.asm ++++ b/mpn/x86_64/pentium4/rsh1aors_n.asm +@@ -332,3 +332,4 @@ L(cj1): or %r14, %rbx + L(c3): mov $1, R8(%rax) + jmp L(rc3) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/pentium4/rshift.asm b/mpn/x86_64/pentium4/rshift.asm +index b7c1ee2cd..848045f46 100644 +--- a/mpn/x86_64/pentium4/rshift.asm ++++ b/mpn/x86_64/pentium4/rshift.asm +@@ -167,3 +167,4 @@ L(ast): movq (up), %mm2 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/popham.asm b/mpn/x86_64/popham.asm +index 3a29b2e66..b7ceb177f 100644 +--- a/mpn/x86_64/popham.asm ++++ b/mpn/x86_64/popham.asm +@@ -161,3 +161,4 @@ L(end): + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/rsh1aors_n.asm b/mpn/x86_64/rsh1aors_n.asm +index a3e9cc5d2..797e2507a 100644 +--- a/mpn/x86_64/rsh1aors_n.asm ++++ b/mpn/x86_64/rsh1aors_n.asm +@@ -187,3 +187,4 @@ L(end): mov %rbx, (rp) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/rshift.asm b/mpn/x86_64/rshift.asm +index 3f344f1df..0fc58775b 100644 +--- a/mpn/x86_64/rshift.asm ++++ b/mpn/x86_64/rshift.asm +@@ -174,3 +174,4 @@ L(ast): mov (up), %r10 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/sec_tabselect.asm b/mpn/x86_64/sec_tabselect.asm +index e8aed261e..5dce3c1c0 100644 +--- a/mpn/x86_64/sec_tabselect.asm ++++ b/mpn/x86_64/sec_tabselect.asm +@@ -174,3 +174,4 @@ L(b00): pop %r15 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/sqr_diag_addlsh1.asm b/mpn/x86_64/sqr_diag_addlsh1.asm +index f48612507..a1d876782 100644 +--- a/mpn/x86_64/sqr_diag_addlsh1.asm ++++ b/mpn/x86_64/sqr_diag_addlsh1.asm +@@ -114,3 +114,4 @@ L(end): add %r10, %r8 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/sublsh1_n.asm b/mpn/x86_64/sublsh1_n.asm +index c6d829fcb..c18f32a9d 100644 +--- a/mpn/x86_64/sublsh1_n.asm ++++ b/mpn/x86_64/sublsh1_n.asm +@@ -158,3 +158,4 @@ L(end): add R32(%rbp), R32(%rax) + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/zen/aorrlsh_n.asm b/mpn/x86_64/zen/aorrlsh_n.asm +index e049b2f53..e27b564fe 100644 +--- a/mpn/x86_64/zen/aorrlsh_n.asm ++++ b/mpn/x86_64/zen/aorrlsh_n.asm +@@ -224,3 +224,4 @@ L(tab): JMPENT( L(0), L(tab)) + JMPENT( L(5), L(tab)) + JMPENT( L(6), L(tab)) + JMPENT( L(7), L(tab)) ++ASM_END() +diff --git a/mpn/x86_64/zen/mul_basecase.asm b/mpn/x86_64/zen/mul_basecase.asm +index affa3b69c..c70d548ea 100644 +--- a/mpn/x86_64/zen/mul_basecase.asm ++++ b/mpn/x86_64/zen/mul_basecase.asm +@@ -453,3 +453,4 @@ L(wd3): adc %r11, 8(rp) + jne L(3) + jmp L(end) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/zen/mullo_basecase.asm b/mpn/x86_64/zen/mullo_basecase.asm +index 2ae729a4b..c0816981a 100644 +--- a/mpn/x86_64/zen/mullo_basecase.asm ++++ b/mpn/x86_64/zen/mullo_basecase.asm +@@ -297,3 +297,4 @@ L(lo0): .byte 0xc4,0xe2,0xe3,0xf6,0x44,0xce,0x18 C mulx 24(up,n,8), %rbx, %rax + inc %r14 + jmp L(outer) + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/zen/sbpi1_bdiv_r.asm b/mpn/x86_64/zen/sbpi1_bdiv_r.asm +index f6e8f9ce1..277b3c3f1 100644 +--- a/mpn/x86_64/zen/sbpi1_bdiv_r.asm ++++ b/mpn/x86_64/zen/sbpi1_bdiv_r.asm +@@ -505,3 +505,4 @@ L(ret): mov %rbp, %rax + pop %r15 + ret + EPILOGUE() ++ASM_END() +diff --git a/mpn/x86_64/zen/sqr_basecase.asm b/mpn/x86_64/zen/sqr_basecase.asm +index a7c612763..d185debcd 100644 +--- a/mpn/x86_64/zen/sqr_basecase.asm ++++ b/mpn/x86_64/zen/sqr_basecase.asm +@@ -480,3 +480,4 @@ C pop %r14 + FUNC_EXIT() + ret + EPILOGUE() ++ASM_END() +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0007-x86_64-coreibwl-mullo_basecase.asm-Add-X86_ENDBR.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0007-x86_64-coreibwl-mullo_basecase.asm-Add-X86_ENDBR.patch --- 2:6.2.0+dfsg-6/debian/patches/0007-x86_64-coreibwl-mullo_basecase.asm-Add-X86_ENDBR.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0007-x86_64-coreibwl-mullo_basecase.asm-Add-X86_ENDBR.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,170 @@ +From 1b0c215a8b9149d1df81f1ae0f5762f77bb0d2b3 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 29 Jan 2020 10:28:17 -0800 +Subject: [PATCH 07/13] x86_64/coreibwl/mullo_basecase.asm: Add X86_ENDBR + +Add X86_ENDBR to indirect branch targets. Since adding X86_ENDBR makes +one byte displacement of "jrcxz L(end)" out of range, move L(end) closer +to "jrcxz L(end)". + + * mpn/x86_64/coreibwl/mullo_basecase.asm: Add X86_ENDBR to + indirect branch targets. Move L(end) closer to "jrcxz L(end)". +--- + mpn/x86_64/coreibwl/mullo_basecase.asm | 58 ++++++++++++++++---------- + 1 file changed, 37 insertions(+), 21 deletions(-) + +diff --git a/mpn/x86_64/coreibwl/mullo_basecase.asm b/mpn/x86_64/coreibwl/mullo_basecase.asm +index b3e435b35..d7f3bd55e 100644 +--- a/mpn/x86_64/coreibwl/mullo_basecase.asm ++++ b/mpn/x86_64/coreibwl/mullo_basecase.asm +@@ -134,13 +134,15 @@ ifdef(`PIC', + jmp *(%r10,%rax,8) + ') + +-L(mf0): mulx( (up), %r10, %r8) ++L(mf0): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 56(up), up + lea -8(rp), rp + lea L(f7)(%rip), jmpreg + jmp L(mb0) + +-L(mf3): mulx( (up), %r9, %rax) ++L(mf3): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea 16(up), up + lea 16(rp), rp + jrcxz L(mc) +@@ -157,38 +159,44 @@ L(mc): mulx( -8,(up), %r10, %r8) + mov %r9, (rp) + jmp L(c2) + +-L(mf4): mulx( (up), %r10, %r8) ++L(mf4): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 24(up), up + lea 24(rp), rp + inc R32(n) + lea L(f3)(%rip), jmpreg + jmp L(mb4) + +-L(mf5): mulx( (up), %r9, %rax) ++L(mf5): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea 32(up), up + lea 32(rp), rp + inc R32(n) + lea L(f4)(%rip), jmpreg + jmp L(mb5) + +-L(mf6): mulx( (up), %r10, %r8) ++L(mf6): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 40(up), up + lea 40(rp), rp + inc R32(n) + lea L(f5)(%rip), jmpreg + jmp L(mb6) + +-L(mf7): mulx( (up), %r9, %rax) ++L(mf7): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea 48(up), up + lea 48(rp), rp + lea L(f6)(%rip), jmpreg + jmp L(mb7) + +-L(mf1): mulx( (up), %r9, %rax) ++L(mf1): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea L(f0)(%rip), jmpreg + jmp L(mb1) + +-L(mf2): mulx( (up), %r10, %r8) ++L(mf2): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 8(up), up + lea 8(rp), rp + lea L(f1)(%rip), jmpreg +@@ -235,17 +243,26 @@ L(mend):mov %r10, -8(rp) + shr $3, R32(nn) + jmp L(ent) + +-L(f0): mulx( (up), %r10, %r8) ++L(f0): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea -8(up), up + lea -8(rp), rp + lea L(f7)(%rip), jmpreg + jmp L(b0) + +-L(f1): mulx( (up), %r9, %rax) ++L(f1): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea -1(nn), R32(nn) + lea L(f0)(%rip), jmpreg + jmp L(b1) + ++L(f7): X86_ENDBR ++ mulx( (up), %r9, %rax) ++ lea -16(up), up ++ lea -16(rp), rp ++ lea L(f6)(%rip), jmpreg ++ jmp L(b7) ++ + L(end): adox( (rp), %r9) + mov %r9, (rp) + adox( %rcx, %rax) C relies on rcx = 0 +@@ -261,13 +278,8 @@ L(ent): mulx( 8,(up), %r10, %r8) C r8 unused (use imul?) + or R32(nn), R32(n) C copy count, clear CF,OF (n = 0 prior) + jmp *jmpreg + +-L(f7): mulx( (up), %r9, %rax) +- lea -16(up), up +- lea -16(rp), rp +- lea L(f6)(%rip), jmpreg +- jmp L(b7) +- +-L(f2): mulx( (up), %r10, %r8) ++L(f2): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 8(up), up + lea 8(rp), rp + mulx( (up), %r9, %rax) +@@ -313,25 +325,29 @@ L(b3): adox( 48,(rp), %r9) + mulx( (up), %r9, %rax) + jmp L(top) + +-L(f6): mulx( (up), %r10, %r8) ++L(f6): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 40(up), up + lea -24(rp), rp + lea L(f5)(%rip), jmpreg + jmp L(b6) + +-L(f5): mulx( (up), %r9, %rax) ++L(f5): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea 32(up), up + lea -32(rp), rp + lea L(f4)(%rip), jmpreg + jmp L(b5) + +-L(f4): mulx( (up), %r10, %r8) ++L(f4): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 24(up), up + lea -40(rp), rp + lea L(f3)(%rip), jmpreg + jmp L(b4) + +-L(f3): mulx( (up), %r9, %rax) ++L(f3): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea 16(up), up + lea -48(rp), rp + jrcxz L(cor) +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0008-x86_64-k10-popcount.asm-Prepend-X86_NOTRACK-to-jmp-r.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0008-x86_64-k10-popcount.asm-Prepend-X86_NOTRACK-to-jmp-r.patch --- 2:6.2.0+dfsg-6/debian/patches/0008-x86_64-k10-popcount.asm-Prepend-X86_NOTRACK-to-jmp-r.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0008-x86_64-k10-popcount.asm-Prepend-X86_NOTRACK-to-jmp-r.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,41 @@ +From 20ae1bdac80679b43326321cfa892e548a3e85de Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 29 Jan 2020 10:58:30 -0800 +Subject: [PATCH 08/13] x86_64/k10/popcount.asm: Prepend X86_NOTRACK to "jmp + *%rdx" + +Since K10 popcount.asm uses a trick to implment jump tables with LEA, +prepend X86_NOTRACK to "jmp *%rdx" to disable indirect branch tracking +when Intel CET is enabled. + + * mpn/x86_64/k10/popcount.asm: Prepend X86_NOTRACK to + "jmp *%rdx". +--- + mpn/x86_64/k10/popcount.asm | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mpn/x86_64/k10/popcount.asm b/mpn/x86_64/k10/popcount.asm +index 735d25a30..45bcba5b0 100644 +--- a/mpn/x86_64/k10/popcount.asm ++++ b/mpn/x86_64/k10/popcount.asm +@@ -79,7 +79,7 @@ C neg R32(%rcx) + + lea L(top)(%rip), %rdx + lea (%rdx,%rcx,2), %rdx +- jmp *%rdx ++ X86_NOTRACK jmp *%rdx + ',` + lea (up,n,8), up + +@@ -101,7 +101,7 @@ C lea (%rcx,%rcx,4), %rcx C 10x + + lea L(top)(%rip), %rdx + add %rcx, %rdx +- jmp *%rdx ++ X86_NOTRACK jmp *%rdx + ') + + ALIGN(32) +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0009-mpn-x86_64-Add-X86_ENDBR-to-indirect-branch-targets.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0009-mpn-x86_64-Add-X86_ENDBR-to-indirect-branch-targets.patch --- 2:6.2.0+dfsg-6/debian/patches/0009-mpn-x86_64-Add-X86_ENDBR-to-indirect-branch-targets.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0009-mpn-x86_64-Add-X86_ENDBR-to-indirect-branch-targets.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,1382 @@ +From ea20a88eb93312a6f3c4b6580420a8a67e372260 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 29 Jan 2020 11:34:59 -0800 +Subject: [PATCH 09/13] mpn/x86_64: Add X86_ENDBR to indirect branch targets + +Add X86_ENDBR to indirect branch targets to support Intel CET. + + * mpn/x86_64/bd1/hamdist.asm: Add X86_ENDBR to indirect branch + targets. + * mpn/x86_64/bd1/popcount.asm: Likewise. + * mpn/x86_64/core2/hamdist.asm: Likewise. + * mpn/x86_64/core2/mul_basecase.asm: Likewise. + * mpn/x86_64/core2/popcount.asm: Likewise. + * mpn/x86_64/coreibwl/addmul_1.asm: Likewise. + * mpn/x86_64/coreibwl/mul_1.asm: Likewise. + * mpn/x86_64/coreibwl/mul_basecase.asm: Likewise. + * mpn/x86_64/coreibwl/sqr_basecase.asm: Likewise. + * mpn/x86_64/coreihwl/aors_n.asm: Likewise. + * mpn/x86_64/coreinhm/hamdist.asm: Likewise. + * mpn/x86_64/coreinhm/popcount.asm: Likewise. + * mpn/x86_64/k8/mul_basecase.asm: Likewise. + * mpn/x86_64/k8/mullo_basecase.asm: Likewise. + * mpn/x86_64/k8/mulmid_basecase.asm: Likewise. + * mpn/x86_64/k8/redc_1.asm: Likewise. + * mpn/x86_64/k8/sqr_basecase.asm: Likewise. + * mpn/x86_64/mod_34lsub1.asm: Likewise. + * mpn/x86_64/zen/aorrlsh_n.asm: Likewise. +--- + mpn/x86_64/bd1/hamdist.asm | 12 ++++--- + mpn/x86_64/bd1/popcount.asm | 24 +++++++++----- + mpn/x86_64/core2/hamdist.asm | 24 +++++++++----- + mpn/x86_64/core2/mul_basecase.asm | 4 +++ + mpn/x86_64/core2/popcount.asm | 24 +++++++++----- + mpn/x86_64/coreibwl/addmul_1.asm | 24 +++++++++----- + mpn/x86_64/coreibwl/mul_1.asm | 24 +++++++++----- + mpn/x86_64/coreibwl/mul_basecase.asm | 46 +++++++++++++++++--------- + mpn/x86_64/coreibwl/sqr_basecase.asm | 48 ++++++++++++++++++---------- + mpn/x86_64/coreihwl/aors_n.asm | 24 +++++++++----- + mpn/x86_64/coreinhm/hamdist.asm | 12 ++++--- + mpn/x86_64/coreinhm/popcount.asm | 24 +++++++++----- + mpn/x86_64/k8/mul_basecase.asm | 7 ++++ + mpn/x86_64/k8/mullo_basecase.asm | 11 +++++-- + mpn/x86_64/k8/mulmid_basecase.asm | 8 +++++ + mpn/x86_64/k8/redc_1.asm | 17 ++++++---- + mpn/x86_64/k8/sqr_basecase.asm | 17 +++++++--- + mpn/x86_64/mod_34lsub1.asm | 27 ++++++++++------ + mpn/x86_64/zen/aorrlsh_n.asm | 24 +++++++++----- + 19 files changed, 274 insertions(+), 127 deletions(-) + +diff --git a/mpn/x86_64/bd1/hamdist.asm b/mpn/x86_64/bd1/hamdist.asm +index f93ce4d61..efdeb7f74 100644 +--- a/mpn/x86_64/bd1/hamdist.asm ++++ b/mpn/x86_64/bd1/hamdist.asm +@@ -113,7 +113,8 @@ ifdef(`PIC',` + jmp *(%r9,%rax,4) + ') + +-L(0): add $64, up ++L(0): X86_ENDBR ++ add $64, up + add $64, vp + sub $2, n + +@@ -127,7 +128,8 @@ L(top): lddqu (up), %xmm0 + .byte 0x8f,0xe8,0x40,0xa3,0xdf,0x10 C vpperm %xmm1,%xmm7,%xmm7,%xmm3 + paddb %xmm2, %xmm3 + paddb %xmm3, %xmm4 +-L(6): lddqu 16(up), %xmm0 ++L(6): X86_ENDBR ++ lddqu 16(up), %xmm0 + pxor 16(vp), %xmm0 + .byte 0x8f,0xe9,0x48,0x94,0xc8 C vpshlb %xmm6, %xmm0, %xmm1 + pand %xmm5, %xmm0 +@@ -136,7 +138,8 @@ L(6): lddqu 16(up), %xmm0 + .byte 0x8f,0xe8,0x40,0xa3,0xdf,0x10 C vpperm %xmm1,%xmm7,%xmm7,%xmm3 + paddb %xmm2, %xmm3 + paddb %xmm3, %xmm4 +-L(4): lddqu 32(up), %xmm0 ++L(4): X86_ENDBR ++ lddqu 32(up), %xmm0 + pxor 32(vp), %xmm0 + .byte 0x8f,0xe9,0x48,0x94,0xc8 C vpshlb %xmm6, %xmm0, %xmm1 + pand %xmm5, %xmm0 +@@ -147,7 +150,8 @@ L(4): lddqu 32(up), %xmm0 + paddb %xmm2, %xmm3 + paddb %xmm2, %xmm4 + paddq %xmm0, %xmm8 C sum to 2 x 64-bit counts +-L(2): mov 48(up), %r8 ++L(2): X86_ENDBR ++ mov 48(up), %r8 + mov 56(up), %r9 + add $64, up + xor 48(vp), %r8 +diff --git a/mpn/x86_64/bd1/popcount.asm b/mpn/x86_64/bd1/popcount.asm +index 063c2cc61..531f53674 100644 +--- a/mpn/x86_64/bd1/popcount.asm ++++ b/mpn/x86_64/bd1/popcount.asm +@@ -100,7 +100,8 @@ ifdef(`PIC',` + jmp *(%r9,%rax,8) + ') + +-L(1): .byte 0xf3,0x48,0x0f,0xb8,0x17 C popcnt (up),%rdx ++L(1): X86_ENDBR ++ .byte 0xf3,0x48,0x0f,0xb8,0x17 C popcnt (up),%rdx + add $8, up + dec n + jnz L(top) +@@ -108,29 +109,36 @@ L(1): .byte 0xf3,0x48,0x0f,0xb8,0x17 C popcnt (up),%rdx + FUNC_EXIT() + ret + +-L(2): add $-48, up ++L(2): X86_ENDBR ++ add $-48, up + jmp L(e2) + +-L(3): .byte 0xf3,0x48,0x0f,0xb8,0x17 C popcnt (up), %rdx ++L(3): X86_ENDBR ++ .byte 0xf3,0x48,0x0f,0xb8,0x17 C popcnt (up), %rdx + add $-40, up + jmp L(e2) + +-L(4): add $-32, up ++L(4): X86_ENDBR ++ add $-32, up + jmp L(e4) + +-L(5): .byte 0xf3,0x48,0x0f,0xb8,0x17 C popcnt (up), %rdx ++L(5): X86_ENDBR ++ .byte 0xf3,0x48,0x0f,0xb8,0x17 C popcnt (up), %rdx + add $-24, up + jmp L(e4) + +-L(6): add $-16, up ++L(6): X86_ENDBR ++ add $-16, up + jmp L(e6) + +-L(7): .byte 0xf3,0x48,0x0f,0xb8,0x17 C popcnt (up), %rdx ++L(7): X86_ENDBR ++ .byte 0xf3,0x48,0x0f,0xb8,0x17 C popcnt (up), %rdx + add $-8, up + jmp L(e6) + + ALIGN(32) +-L(top): lddqu (up), %xmm0 ++L(top): X86_ENDBR ++ lddqu (up), %xmm0 + .byte 0x8f,0xe9,0x48,0x94,0xc8 C vpshlb %xmm6, %xmm0, %xmm1 + pand %xmm9, %xmm0 + pand %xmm9, %xmm1 +diff --git a/mpn/x86_64/core2/hamdist.asm b/mpn/x86_64/core2/hamdist.asm +index be451d78c..f5d1a38e2 100644 +--- a/mpn/x86_64/core2/hamdist.asm ++++ b/mpn/x86_64/core2/hamdist.asm +@@ -87,40 +87,47 @@ ifdef(`PIC',` + jmp *(%r9,%rax,8) + ') + +-L(1): movq (up), %xmm1 ++L(1): X86_ENDBR ++ movq (up), %xmm1 + add $8, up + movq (vp), %xmm10 + add $8, vp + pxor %xmm10, %xmm1 + jmp L(e1) + +-L(2): add $-48, up ++L(2): X86_ENDBR ++ add $-48, up + add $-48, vp + jmp L(e2) + +-L(3): movq (up), %xmm1 ++L(3): X86_ENDBR ++ movq (up), %xmm1 + add $-40, up + movq (vp), %xmm10 + add $-40, vp + pxor %xmm10, %xmm1 + jmp L(e3) + +-L(4): add $-32, up ++L(4): X86_ENDBR ++ add $-32, up + add $-32, vp + jmp L(e4) + +-L(5): movq (up), %xmm1 ++L(5): X86_ENDBR ++ movq (up), %xmm1 + add $-24, up + movq (vp), %xmm10 + add $-24, vp + pxor %xmm10, %xmm1 + jmp L(e5) + +-L(6): add $-16, up ++L(6): X86_ENDBR ++ add $-16, up + add $-16, vp + jmp L(e6) + +-L(7): movq (up), %xmm1 ++L(7): X86_ENDBR ++ movq (up), %xmm1 + add $-8, up + movq (vp), %xmm10 + add $-8, vp +@@ -128,7 +135,8 @@ L(7): movq (up), %xmm1 + jmp L(e7) + + ALIGN(32) +-L(top): lddqu (up), %xmm1 ++L(top): X86_ENDBR ++ lddqu (up), %xmm1 + lddqu (vp), %xmm10 + pxor %xmm10, %xmm1 + L(e7): movdqa %xmm6, %xmm0 C copy mask register +diff --git a/mpn/x86_64/core2/mul_basecase.asm b/mpn/x86_64/core2/mul_basecase.asm +index 8a184330b..0dcf0f8bf 100644 +--- a/mpn/x86_64/core2/mul_basecase.asm ++++ b/mpn/x86_64/core2/mul_basecase.asm +@@ -347,6 +347,7 @@ L(m2e0):mul v1 + jz L(ret2) + + L(do_am0): ++ X86_ENDBR + push %r15 + push vn_param + +@@ -520,6 +521,7 @@ L(m2e1):mul v1 + jz L(ret2) + + L(do_am1): ++ X86_ENDBR + push %r15 + push vn_param + +@@ -693,6 +695,7 @@ L(m2e2):mul v1 + jz L(ret2) + + L(do_am2): ++ X86_ENDBR + push %r15 + push vn_param + +@@ -866,6 +869,7 @@ L(m2e3):mul v1 + jz L(ret2) + + L(do_am3): ++ X86_ENDBR + push %r15 + push vn_param + +diff --git a/mpn/x86_64/core2/popcount.asm b/mpn/x86_64/core2/popcount.asm +index 5e03ef3cc..8fe510426 100644 +--- a/mpn/x86_64/core2/popcount.asm ++++ b/mpn/x86_64/core2/popcount.asm +@@ -86,33 +86,41 @@ ifdef(`PIC',` + jmp *(%r9,%rax,8) + ') + +-L(1): movq (up), %xmm1 ++L(1): X86_ENDBR ++ movq (up), %xmm1 + add $8, up + jmp L(e1) + +-L(2): add $-48, up ++L(2): X86_ENDBR ++ add $-48, up + jmp L(e2) + +-L(3): movq (up), %xmm1 ++L(3): X86_ENDBR ++ movq (up), %xmm1 + add $-40, up + jmp L(e3) + +-L(4): add $-32, up ++L(4): X86_ENDBR ++ add $-32, up + jmp L(e4) + +-L(5): movq (up), %xmm1 ++L(5): X86_ENDBR ++ movq (up), %xmm1 + add $-24, up + jmp L(e5) + +-L(6): add $-16, up ++L(6): X86_ENDBR ++ add $-16, up + jmp L(e6) + +-L(7): movq (up), %xmm1 ++L(7): X86_ENDBR ++ movq (up), %xmm1 + add $-8, up + jmp L(e7) + + ALIGN(32) +-L(top): lddqu (up), %xmm1 ++L(top): X86_ENDBR ++ lddqu (up), %xmm1 + L(e7): movdqa %xmm6, %xmm0 C copy mask register + movdqa %xmm7, %xmm2 C copy count register + movdqa %xmm7, %xmm3 C copy count register +diff --git a/mpn/x86_64/coreibwl/addmul_1.asm b/mpn/x86_64/coreibwl/addmul_1.asm +index ee7e4eeab..4ea5580cf 100644 +--- a/mpn/x86_64/coreibwl/addmul_1.asm ++++ b/mpn/x86_64/coreibwl/addmul_1.asm +@@ -110,33 +110,39 @@ L(tab): JMPENT( L(f0), L(tab)) + JMPENT( L(f7), L(tab)) + TEXT + +-L(f0): mulx( (up), %r10, %r8) ++L(f0): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea -8(up), up + lea -8(rp), rp + lea -1(n), n + jmp L(b0) + +-L(f3): mulx( (up), %r9, %rax) ++L(f3): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea 16(up), up + lea -48(rp), rp + jmp L(b3) + +-L(f4): mulx( (up), %r10, %r8) ++L(f4): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 24(up), up + lea -40(rp), rp + jmp L(b4) + +-L(f5): mulx( (up), %r9, %rax) ++L(f5): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea 32(up), up + lea -32(rp), rp + jmp L(b5) + +-L(f6): mulx( (up), %r10, %r8) ++L(f6): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 40(up), up + lea -24(rp), rp + jmp L(b6) + +-L(f1): mulx( (up), %r9, %rax) ++L(f1): X86_ENDBR ++ mulx( (up), %r9, %rax) + jrcxz L(1) + jmp L(b1) + L(1): add (rp), %r9 +@@ -156,7 +162,8 @@ ifdef(`PIC', + ` nop;nop;nop;nop', + ` nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;nop') + +-L(f2): mulx( (up), %r10, %r8) ++L(f2): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 8(up), up + lea 8(rp), rp + mulx( (up), %r9, %rax) +@@ -200,7 +207,8 @@ L(b3): adox( 48,(rp), %r9) + mulx( (up), %r9, %rax) + jmp L(top) + +-L(f7): mulx( (up), %r9, %rax) ++L(f7): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea -16(up), up + lea -16(rp), rp + jmp L(b7) +diff --git a/mpn/x86_64/coreibwl/mul_1.asm b/mpn/x86_64/coreibwl/mul_1.asm +index b7fae2f90..77121a5d4 100644 +--- a/mpn/x86_64/coreibwl/mul_1.asm ++++ b/mpn/x86_64/coreibwl/mul_1.asm +@@ -108,48 +108,56 @@ L(tab): JMPENT( L(f0), L(tab)) + JMPENT( L(f7), L(tab)) + TEXT + +-L(f0): mulx( (up), %r10, %r8) ++L(f0): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 56(up), up + lea -8(rp), rp + jmp L(b0) + +-L(f3): mulx( (up), %r9, %rax) ++L(f3): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea 16(up), up + lea 16(rp), rp + inc n + jmp L(b3) + +-L(f4): mulx( (up), %r10, %r8) ++L(f4): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 24(up), up + lea 24(rp), rp + inc n + jmp L(b4) + +-L(f5): mulx( (up), %r9, %rax) ++L(f5): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea 32(up), up + lea 32(rp), rp + inc n + jmp L(b5) + +-L(f6): mulx( (up), %r10, %r8) ++L(f6): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 40(up), up + lea 40(rp), rp + inc n + jmp L(b6) + +-L(f7): mulx( (up), %r9, %rax) ++L(f7): X86_ENDBR ++ mulx( (up), %r9, %rax) + lea 48(up), up + lea 48(rp), rp + inc n + jmp L(b7) + +-L(f1): mulx( (up), %r9, %rax) ++L(f1): X86_ENDBR ++ mulx( (up), %r9, %rax) + test n, n + jnz L(b1) + L(1): mov %r9, (rp) + ret + +-L(f2): mulx( (up), %r10, %r8) ++L(f2): X86_ENDBR ++ mulx( (up), %r10, %r8) + lea 8(up), up + lea 8(rp), rp + mulx( (up), %r9, %rax) +diff --git a/mpn/x86_64/coreibwl/mul_basecase.asm b/mpn/x86_64/coreibwl/mul_basecase.asm +index 6dd34495b..c5e60e79c 100644 +--- a/mpn/x86_64/coreibwl/mul_basecase.asm ++++ b/mpn/x86_64/coreibwl/mul_basecase.asm +@@ -157,45 +157,53 @@ ifdef(`PIC', + jmp *(%r10,%rax,8) + ') + +-L(mf0): mulx( (up), w2, w3) ++L(mf0): X86_ENDBR ++ mulx( (up), w2, w3) + lea 56(up), up + lea -8(rp), rp + jmp L(mb0) + +-L(mf3): mulx( (up), w0, w1) ++L(mf3): X86_ENDBR ++ mulx( (up), w0, w1) + lea 16(up), up + lea 16(rp), rp + inc n + jmp L(mb3) + +-L(mf4): mulx( (up), w2, w3) ++L(mf4): X86_ENDBR ++ mulx( (up), w2, w3) + lea 24(up), up + lea 24(rp), rp + inc n + jmp L(mb4) + +-L(mf5): mulx( (up), w0, w1) ++L(mf5): X86_ENDBR ++ mulx( (up), w0, w1) + lea 32(up), up + lea 32(rp), rp + inc n + jmp L(mb5) + +-L(mf6): mulx( (up), w2, w3) ++L(mf6): X86_ENDBR ++ mulx( (up), w2, w3) + lea 40(up), up + lea 40(rp), rp + inc n + jmp L(mb6) + +-L(mf7): mulx( (up), w0, w1) ++L(mf7): X86_ENDBR ++ mulx( (up), w0, w1) + lea 48(up), up + lea 48(rp), rp + inc n + jmp L(mb7) + +-L(mf1): mulx( (up), w0, w1) ++L(mf1): X86_ENDBR ++ mulx( (up), w0, w1) + jmp L(mb1) + +-L(mf2): mulx( (up), w2, w3) ++L(mf2): X86_ENDBR ++ mulx( (up), w2, w3) + lea 8(up), up + lea 8(rp), rp + mulx( (up), w0, w1) +@@ -256,32 +264,39 @@ L(outer): + lea 8(vp), vp + jmp *jaddr + +-L(f0): mulx( 8,(up), w2, w3) ++L(f0): X86_ENDBR ++ mulx( 8,(up), w2, w3) + lea 8(rp,unneg,8), rp + lea -1(n), n + jmp L(b0) + +-L(f3): mulx( -16,(up), w0, w1) ++L(f3): X86_ENDBR ++ mulx( -16,(up), w0, w1) + lea -56(rp,unneg,8), rp + jmp L(b3) + +-L(f4): mulx( -24,(up), w2, w3) ++L(f4): X86_ENDBR ++ mulx( -24,(up), w2, w3) + lea -56(rp,unneg,8), rp + jmp L(b4) + +-L(f5): mulx( -32,(up), w0, w1) ++L(f5): X86_ENDBR ++ mulx( -32,(up), w0, w1) + lea -56(rp,unneg,8), rp + jmp L(b5) + +-L(f6): mulx( -40,(up), w2, w3) ++L(f6): X86_ENDBR ++ mulx( -40,(up), w2, w3) + lea -56(rp,unneg,8), rp + jmp L(b6) + +-L(f7): mulx( 16,(up), w0, w1) ++L(f7): X86_ENDBR ++ mulx( 16,(up), w0, w1) + lea 8(rp,unneg,8), rp + jmp L(b7) + +-L(f1): mulx( (up), w0, w1) ++L(f1): X86_ENDBR ++ mulx( (up), w0, w1) + lea 8(rp,unneg,8), rp + jmp L(b1) + +@@ -303,6 +318,7 @@ L(done): + ret + + L(f2): ++ X86_ENDBR + mulx( -8,(up), w2, w3) + lea 8(rp,unneg,8), rp + mulx( (up), w0, w1) +diff --git a/mpn/x86_64/coreibwl/sqr_basecase.asm b/mpn/x86_64/coreibwl/sqr_basecase.asm +index e4f77597c..0faf92ba8 100644 +--- a/mpn/x86_64/coreibwl/sqr_basecase.asm ++++ b/mpn/x86_64/coreibwl/sqr_basecase.asm +@@ -181,14 +181,16 @@ ifdef(`PIC', + jmp *(%r10,%rax,8) + ') + +-L(mf0): mulx( u0, w0, w1) C up[0]^2 ++L(mf0): X86_ENDBR ++ mulx( u0, w0, w1) C up[0]^2 + add u0, u0 + mulx( 8,(up), w2, w3) + lea 64(up), up + add w1, w2 + jmp L(mb0) + +-L(mf3): mulx( u0, w2, w3) C up[0]^2 ++L(mf3): X86_ENDBR ++ mulx( u0, w2, w3) C up[0]^2 + add u0, u0 + mov w2, (rp) + mulx( 8,(up), w0, w1) +@@ -197,7 +199,8 @@ L(mf3): mulx( u0, w2, w3) C up[0]^2 + add w3, w0 + jmp L(mb3) + +-L(mf4): mulx( u0, w0, w1) C up[0]^2 ++L(mf4): X86_ENDBR ++ mulx( u0, w0, w1) C up[0]^2 + add u0, u0 + mulx( 8,(up), w2, w3) + mov w0, (rp) +@@ -206,7 +209,8 @@ L(mf4): mulx( u0, w0, w1) C up[0]^2 + add w1, w2 + jmp L(mb4) + +-L(mf5): mulx( u0, w2, w3) C up[0]^2 ++L(mf5): X86_ENDBR ++ mulx( u0, w2, w3) C up[0]^2 + add u0, u0 + mulx( 8,(up), w0, w1) + mov w2, (rp) +@@ -215,7 +219,8 @@ L(mf5): mulx( u0, w2, w3) C up[0]^2 + add w3, w0 + jmp L(mb5) + +-L(mf6): mulx( u0, w0, w1) C up[0]^2 ++L(mf6): X86_ENDBR ++ mulx( u0, w0, w1) C up[0]^2 + add u0, u0 + mulx( 8,(up), w2, w3) + mov w0, (rp) +@@ -224,7 +229,8 @@ L(mf6): mulx( u0, w0, w1) C up[0]^2 + add w1, w2 + jmp L(mb6) + +-L(mf7): mulx( u0, w2, w3) C up[0]^2 ++L(mf7): X86_ENDBR ++ mulx( u0, w2, w3) C up[0]^2 + add u0, u0 + mulx( 8,(up), w0, w1) + mov w2, (rp) +@@ -233,7 +239,8 @@ L(mf7): mulx( u0, w2, w3) C up[0]^2 + add w3, w0 + jmp L(mb7) + +-L(mf1): mulx( u0, w2, w3) C up[0]^2 ++L(mf1): X86_ENDBR ++ mulx( u0, w2, w3) C up[0]^2 + add u0, u0 + mulx( 8,(up), w0, w1) + mov w2, (rp) +@@ -242,7 +249,8 @@ L(mf1): mulx( u0, w2, w3) C up[0]^2 + add w3, w0 + jmp L(mb1) + +-L(mf2): mulx( u0, w0, w1) C up[0]^2 ++L(mf2): X86_ENDBR ++ mulx( u0, w0, w1) C up[0]^2 + add u0, u0 + mulx( 8,(up), w2, w3) + mov w0, (rp) +@@ -300,7 +308,8 @@ ifdef(`PIC', + + L(ed0): adox( (rp), w0) + adox( %rcx, w1) C relies on rcx = 0 +-L(f7): mov w0, (rp) ++L(f7): X86_ENDBR ++ mov w0, (rp) + adc %rcx, w1 C relies on rcx = 0 + mov w1, 8(rp) + lea -64(up,un_save,8), up +@@ -356,7 +365,8 @@ L(b0): mov w0, (rp) + + L(ed1): adox( (rp), w0) + adox( %rcx, w1) C relies on rcx = 0 +-L(f0): mov w0, (rp) ++L(f0): X86_ENDBR ++ mov w0, (rp) + adc %rcx, w1 C relies on rcx = 0 + mov w1, 8(rp) + lea -64(up,un_save,8), up +@@ -415,7 +425,8 @@ L(b1): mulx( 8,(up), w2, w3) + + L(ed2): adox( (rp), w0) + adox( %rcx, w1) C relies on rcx = 0 +-L(f1): mov w0, (rp) ++L(f1): X86_ENDBR ++ mov w0, (rp) + adc %rcx, w1 C relies on rcx = 0 + mov w1, 8(rp) + lea (up,un_save,8), up +@@ -477,7 +488,8 @@ L(b2): adox( 48,(rp), w0) + + L(ed3): adox( (rp), w0) + adox( %rcx, w1) C relies on rcx = 0 +-L(f2): mov w0, (rp) ++L(f2): X86_ENDBR ++ mov w0, (rp) + adc %rcx, w1 C relies on rcx = 0 + mov w1, 8(rp) + lea (up,un_save,8), up +@@ -535,7 +547,8 @@ L(b3): mulx( -16,(up), w0, w1) + + L(ed4): adox( (rp), w0) + adox( %rcx, w1) C relies on rcx = 0 +-L(f3): mov w0, (rp) ++L(f3): X86_ENDBR ++ mov w0, (rp) + adc %rcx, w1 C relies on rcx = 0 + mov w1, 8(rp) + lea (up,un_save,8), up +@@ -592,7 +605,8 @@ L(b4): mulx( -24,(up), w2, w3) + + L(ed5): adox( (rp), w0) + adox( %rcx, w1) C relies on rcx = 0 +-L(f4): mov w0, (rp) ++L(f4): X86_ENDBR ++ mov w0, (rp) + adc %rcx, w1 C relies on rcx = 0 + mov w1, 8(rp) + lea (up,un_save,8), up +@@ -649,7 +663,8 @@ L(b5): mulx( -32,(up), w0, w1) + + L(ed6): adox( (rp), w0) + adox( %rcx, w1) C relies on rcx = 0 +-L(f5): mov w0, (rp) ++L(f5): X86_ENDBR ++ mov w0, (rp) + adc %rcx, w1 C relies on rcx = 0 + mov w1, 8(rp) + lea (up,un_save,8), up +@@ -706,7 +721,8 @@ L(b6): adcx( w1, w2) + + L(ed7): adox( (rp), w0) + adox( %rcx, w1) C relies on rcx = 0 +-L(f6): mov w0, (rp) ++L(f6): X86_ENDBR ++ mov w0, (rp) + adc %rcx, w1 C relies on rcx = 0 + mov w1, 8(rp) + lea (up,un_save,8), up +diff --git a/mpn/x86_64/coreihwl/aors_n.asm b/mpn/x86_64/coreihwl/aors_n.asm +index f9d89f768..db5c59a95 100644 +--- a/mpn/x86_64/coreihwl/aors_n.asm ++++ b/mpn/x86_64/coreihwl/aors_n.asm +@@ -115,12 +115,14 @@ ifdef(`PIC',` + jmp *(%r9,%rax,8) + ') + +-L(0): mov (up), %r8 ++L(0): X86_ENDBR ++ mov (up), %r8 + mov 8(up), %r9 + ADCSBB (vp), %r8 + jmp L(e0) + +-L(4): mov (up), %r8 ++L(4): X86_ENDBR ++ mov (up), %r8 + mov 8(up), %r9 + ADCSBB (vp), %r8 + lea -32(up), up +@@ -129,7 +131,8 @@ L(4): mov (up), %r8 + inc n + jmp L(e4) + +-L(5): mov (up), %r11 ++L(5): X86_ENDBR ++ mov (up), %r11 + mov 8(up), %r8 + mov 16(up), %r9 + ADCSBB (vp), %r11 +@@ -139,7 +142,8 @@ L(5): mov (up), %r11 + inc n + jmp L(e5) + +-L(6): mov (up), %r10 ++L(6): X86_ENDBR ++ mov (up), %r10 + ADCSBB (vp), %r10 + mov 8(up), %r11 + lea -16(up), up +@@ -148,7 +152,8 @@ L(6): mov (up), %r10 + inc n + jmp L(e6) + +-L(7): mov (up), %r9 ++L(7): X86_ENDBR ++ mov (up), %r9 + mov 8(up), %r10 + ADCSBB (vp), %r9 + ADCSBB 8(vp), %r10 +@@ -199,7 +204,8 @@ L(end): mov %r9, 40(rp) + ret + + ALIGN(16) +-L(3): mov (up), %r9 ++L(3): X86_ENDBR ++ mov (up), %r9 + mov 8(up), %r10 + mov 16(up), %r11 + ADCSBB (vp), %r9 +@@ -219,7 +225,8 @@ L(x3): mov %r9, (rp) + ret + + ALIGN(16) +-L(1): mov (up), %r11 ++L(1): X86_ENDBR ++ mov (up), %r11 + ADCSBB (vp), %r11 + jrcxz L(x1) + lea 8(up), up +@@ -233,7 +240,8 @@ L(x1): mov %r11, (rp) + ret + + ALIGN(16) +-L(2): mov (up), %r10 ++L(2): X86_ENDBR ++ mov (up), %r10 + mov 8(up), %r11 + ADCSBB (vp), %r10 + ADCSBB 8(vp), %r11 +diff --git a/mpn/x86_64/coreinhm/hamdist.asm b/mpn/x86_64/coreinhm/hamdist.asm +index a84bcbc78..17f4c2e6f 100644 +--- a/mpn/x86_64/coreinhm/hamdist.asm ++++ b/mpn/x86_64/coreinhm/hamdist.asm +@@ -98,7 +98,8 @@ ifdef(`PIC',` + jmp *(%r9,%r8,8) + ') + +-L(3): mov 8(up), %r10 ++L(3): X86_ENDBR ++ mov 8(up), %r10 + mov 16(up), %r11 + xor 8(vp), %r10 + xor 16(vp), %r11 +@@ -111,7 +112,8 @@ L(3): mov 8(up), %r10 + add $24, vp + jmp L(e3) + +-L(0): mov 8(up), %r9 ++L(0): X86_ENDBR ++ mov 8(up), %r9 + xor 8(vp), %r9 + mov 16(up), %r10 + mov 24(up), %r11 +@@ -159,7 +161,8 @@ L(x1): pop %rbp + FUNC_EXIT() + ret + +-L(2): mov 8(up), %r11 ++L(2): X86_ENDBR ++ mov 8(up), %r11 + xor 8(vp), %r11 + sub $2, n + jle L(n2) +@@ -174,7 +177,8 @@ L(2): mov 8(up), %r11 + L(n2): .byte 0xf3,0x49,0x0f,0xb8,0xcb C popcnt %r11,%rcx + jmp L(x2) + +-L(1): dec n ++L(1): X86_ENDBR ++ dec n + jle L(x1) + mov 8(up), %r8 + mov 16(up), %r9 +diff --git a/mpn/x86_64/coreinhm/popcount.asm b/mpn/x86_64/coreinhm/popcount.asm +index 24c4ebc84..5243595ce 100644 +--- a/mpn/x86_64/coreinhm/popcount.asm ++++ b/mpn/x86_64/coreinhm/popcount.asm +@@ -88,7 +88,8 @@ ifdef(`PIC',` + jmp *(%r9,%r8,8) + ') + +-L(3): .byte 0xf3,0x4c,0x0f,0xb8,0x57,0x08 C popcnt 8(up), %r10 ++L(3): X86_ENDBR ++ .byte 0xf3,0x4c,0x0f,0xb8,0x57,0x08 C popcnt 8(up), %r10 + .byte 0xf3,0x4c,0x0f,0xb8,0x5f,0x10 C popcnt 16(up), %r11 + add $24, up + sub $8, n +@@ -98,24 +99,28 @@ L(3): .byte 0xf3,0x4c,0x0f,0xb8,0x57,0x08 C popcnt 8(up), %r10 + L(s1): FUNC_EXIT() + ret + +-L(1): sub $8, n ++L(1): X86_ENDBR ++ sub $8, n + jle L(s1) + .byte 0xf3,0x4c,0x0f,0xb8,0x47,0x08 C popcnt 8(up), %r8 + .byte 0xf3,0x4c,0x0f,0xb8,0x4f,0x10 C popcnt 16(up), %r9 + add $8, up + jmp L(e12) + +-L(7): .byte 0xf3,0x4c,0x0f,0xb8,0x57,0x08 C popcnt 0x8(%rdi),%r10 ++L(7): X86_ENDBR ++ .byte 0xf3,0x4c,0x0f,0xb8,0x57,0x08 C popcnt 0x8(%rdi),%r10 + .byte 0xf3,0x4c,0x0f,0xb8,0x5f,0x10 C popcnt 0x10(%rdi),%r11 + add $-8, up + jmp L(e07) + +-L(0): .byte 0xf3,0x48,0x0f,0xb8,0x4f,0x08 C popcnt 0x8(%rdi),%rcx ++L(0): X86_ENDBR ++ .byte 0xf3,0x48,0x0f,0xb8,0x4f,0x08 C popcnt 0x8(%rdi),%rcx + .byte 0xf3,0x4c,0x0f,0xb8,0x57,0x10 C popcnt 0x10(%rdi),%r10 + .byte 0xf3,0x4c,0x0f,0xb8,0x5f,0x18 C popcnt 0x18(%rdi),%r11 + jmp L(e07) + +-L(4): .byte 0xf3,0x48,0x0f,0xb8,0x4f,0x08 C popcnt 0x8(%rdi),%rcx ++L(4): X86_ENDBR ++ .byte 0xf3,0x48,0x0f,0xb8,0x4f,0x08 C popcnt 0x8(%rdi),%rcx + .byte 0xf3,0x4c,0x0f,0xb8,0x57,0x10 C popcnt 0x10(%rdi),%r10 + .byte 0xf3,0x4c,0x0f,0xb8,0x5f,0x18 C popcnt 0x18(%rdi),%r11 + add $32, up +@@ -151,7 +156,8 @@ L(x2): add %rcx, %rax + FUNC_EXIT() + ret + +-L(2): .byte 0xf3,0x48,0x0f,0xb8,0x4f,0x08 C popcnt 0x8(%rdi),%rcx ++L(2): X86_ENDBR ++ .byte 0xf3,0x48,0x0f,0xb8,0x4f,0x08 C popcnt 0x8(%rdi),%rcx + sub $8, n + jle L(x2) + .byte 0xf3,0x4c,0x0f,0xb8,0x47,0x10 C popcnt 0x10(%rdi),%r8 +@@ -159,12 +165,14 @@ L(2): .byte 0xf3,0x48,0x0f,0xb8,0x4f,0x08 C popcnt 0x8(%rdi),%rcx + add $16, up + jmp L(e12) + +-L(5): .byte 0xf3,0x4c,0x0f,0xb8,0x47,0x08 C popcnt 0x8(%rdi),%r8 ++L(5): X86_ENDBR ++ .byte 0xf3,0x4c,0x0f,0xb8,0x47,0x08 C popcnt 0x8(%rdi),%r8 + .byte 0xf3,0x4c,0x0f,0xb8,0x4f,0x10 C popcnt 0x10(%rdi),%r9 + add $-24, up + jmp L(e56) + +-L(6): .byte 0xf3,0x48,0x0f,0xb8,0x4f,0x08 C popcnt 0x8(%rdi),%rcx ++L(6): X86_ENDBR ++ .byte 0xf3,0x48,0x0f,0xb8,0x4f,0x08 C popcnt 0x8(%rdi),%rcx + .byte 0xf3,0x4c,0x0f,0xb8,0x47,0x10 C popcnt 0x10(%rdi),%r8 + .byte 0xf3,0x4c,0x0f,0xb8,0x4f,0x18 C popcnt 0x18(%rdi),%r9 + add $-16, up +diff --git a/mpn/x86_64/k8/mul_basecase.asm b/mpn/x86_64/k8/mul_basecase.asm +index 8b114ce8b..9126c2b80 100644 +--- a/mpn/x86_64/k8/mul_basecase.asm ++++ b/mpn/x86_64/k8/mul_basecase.asm +@@ -335,8 +335,10 @@ C addmul_2 for remaining vp's + C adjusted value of n that is reloaded on each iteration + + L(addmul_outer_0): ++ X86_ENDBR + add $3, un + lea 0(%rip), outer_addr ++ X86_ENDBR + + mov un, n + mov -24(up,un,8), %rax +@@ -348,6 +350,7 @@ L(addmul_outer_0): + jmp L(addmul_entry_0) + + L(addmul_outer_1): ++ X86_ENDBR + mov un, n + mov (up,un,8), %rax + mul v0 +@@ -358,8 +361,10 @@ L(addmul_outer_1): + jmp L(addmul_entry_1) + + L(addmul_outer_2): ++ X86_ENDBR + add $1, un + lea 0(%rip), outer_addr ++ X86_ENDBR + + mov un, n + mov -8(up,un,8), %rax +@@ -372,8 +377,10 @@ L(addmul_outer_2): + jmp L(addmul_entry_2) + + L(addmul_outer_3): ++ X86_ENDBR + add $2, un + lea 0(%rip), outer_addr ++ X86_ENDBR + + mov un, n + mov -16(up,un,8), %rax +diff --git a/mpn/x86_64/k8/mullo_basecase.asm b/mpn/x86_64/k8/mullo_basecase.asm +index fc6a4396d..4a931a535 100644 +--- a/mpn/x86_64/k8/mullo_basecase.asm ++++ b/mpn/x86_64/k8/mullo_basecase.asm +@@ -99,12 +99,14 @@ dnl JMPENT( L(2m4), L(tab)) C 10 + dnl JMPENT( L(3m4), L(tab)) C 11 + TEXT + +-L(1): imul %r8, %rax ++L(1): X86_ENDBR ++ imul %r8, %rax + mov %rax, (rp) + FUNC_EXIT() + ret + +-L(2): mov 8(vp_param), %r11 ++L(2): X86_ENDBR ++ mov 8(vp_param), %r11 + imul %rax, %r11 C u0 x v1 + mul %r8 C u0 x v0 + mov %rax, (rp) +@@ -115,7 +117,8 @@ L(2): mov 8(vp_param), %r11 + FUNC_EXIT() + ret + +-L(3): mov 8(vp_param), %r9 C v1 ++L(3): X86_ENDBR ++ mov 8(vp_param), %r9 C v1 + mov 16(vp_param), %r11 + mul %r8 C u0 x v0 -> + mov %rax, (rp) C r0 +@@ -335,6 +338,7 @@ L(mul_2_entry_1): + + + L(addmul_outer_1): ++ X86_ENDBR + lea -2(n), j + mov -16(up,n,8), %rax + mul v0 +@@ -346,6 +350,7 @@ L(addmul_outer_1): + jmp L(addmul_entry_1) + + L(addmul_outer_3): ++ X86_ENDBR + lea 0(n), j + mov -16(up,n,8), %rax + xor R32(w3), R32(w3) +diff --git a/mpn/x86_64/k8/mulmid_basecase.asm b/mpn/x86_64/k8/mulmid_basecase.asm +index d7d1f27c6..7d5f1588f 100644 +--- a/mpn/x86_64/k8/mulmid_basecase.asm ++++ b/mpn/x86_64/k8/mulmid_basecase.asm +@@ -329,6 +329,7 @@ C addmul_2 for remaining vp's + + ALIGN(16) + L(addmul_prologue_0): ++ X86_ENDBR + mov -8(up,n,8), %rax + mul v1 + mov %rax, w1 +@@ -338,6 +339,7 @@ L(addmul_prologue_0): + + ALIGN(16) + L(addmul_prologue_1): ++ X86_ENDBR + mov 16(up,n,8), %rax + mul v1 + mov %rax, w0 +@@ -348,6 +350,7 @@ L(addmul_prologue_1): + + ALIGN(16) + L(addmul_prologue_2): ++ X86_ENDBR + mov 8(up,n,8), %rax + mul v1 + mov %rax, w3 +@@ -357,6 +360,7 @@ L(addmul_prologue_2): + + ALIGN(16) + L(addmul_prologue_3): ++ X86_ENDBR + mov (up,n,8), %rax + mul v1 + mov %rax, w2 +@@ -471,6 +475,7 @@ L(diag_prologue_0): + mov vp, vp_inner + mov vn, n + lea 0(%rip), outer_addr ++ X86_ENDBR + mov -8(up,n,8), %rax + jmp L(diag_entry_0) + +@@ -480,6 +485,7 @@ L(diag_prologue_1): + add $3, vn + mov vn, n + lea 0(%rip), outer_addr ++ X86_ENDBR + mov -8(vp_inner), %rax + jmp L(diag_entry_1) + +@@ -489,6 +495,7 @@ L(diag_prologue_2): + add $2, vn + mov vn, n + lea 0(%rip), outer_addr ++ X86_ENDBR + mov 16(vp_inner), %rax + jmp L(diag_entry_2) + +@@ -507,6 +514,7 @@ L(diag_entry_0): + adc %rdx, w1 + adc $0, w2 + L(diag_entry_3): ++ X86_ENDBR + mov -16(up,n,8), %rax + mulq 8(vp_inner) + add %rax, w0 +diff --git a/mpn/x86_64/k8/redc_1.asm b/mpn/x86_64/k8/redc_1.asm +index 4cb65af49..3e241af27 100644 +--- a/mpn/x86_64/k8/redc_1.asm ++++ b/mpn/x86_64/k8/redc_1.asm +@@ -125,7 +125,8 @@ L(tab): JMPENT( L(0), L(tab)) + TEXT + + ALIGN(16) +-L(1): mov (mp_param), %rax ++L(1): X86_ENDBR ++ mov (mp_param), %rax + mul q0 + add 8(up), %rax + adc 16(up), %rdx +@@ -136,7 +137,8 @@ L(1): mov (mp_param), %rax + + + ALIGN(16) +-L(2): mov (mp_param), %rax ++L(2): X86_ENDBR ++ mov (mp_param), %rax + mul q0 + xor R32(%r14), R32(%r14) + mov %rax, %r10 +@@ -171,7 +173,8 @@ L(2): mov (mp_param), %rax + jmp L(ret) + + +-L(3): mov (mp_param), %rax ++L(3): X86_ENDBR ++ mov (mp_param), %rax + mul q0 + mov %rax, %rbx + mov %rdx, %r10 +@@ -248,7 +251,7 @@ L(3): mov (mp_param), %rax + + + ALIGN(16) +-L(2m4): ++L(2m4): X86_ENDBR + L(lo2): mov (mp,nneg,8), %rax + mul q0 + xor R32(%r14), R32(%r14) +@@ -324,7 +327,7 @@ L(le2): add %r10, (up) + + + ALIGN(16) +-L(1m4): ++L(1m4): X86_ENDBR + L(lo1): mov (mp,nneg,8), %rax + xor %r9, %r9 + xor R32(%rbx), R32(%rbx) +@@ -398,7 +401,7 @@ L(le1): add %r10, (up) + + ALIGN(16) + L(0): +-L(0m4): ++L(0m4): X86_ENDBR + L(lo0): mov (mp,nneg,8), %rax + mov nneg, i + mul q0 +@@ -463,7 +466,7 @@ L(le0): add %r10, (up) + + + ALIGN(16) +-L(3m4): ++L(3m4): X86_ENDBR + L(lo3): mov (mp,nneg,8), %rax + mul q0 + mov %rax, %rbx +diff --git a/mpn/x86_64/k8/sqr_basecase.asm b/mpn/x86_64/k8/sqr_basecase.asm +index f2c70b06b..37858b497 100644 +--- a/mpn/x86_64/k8/sqr_basecase.asm ++++ b/mpn/x86_64/k8/sqr_basecase.asm +@@ -131,7 +131,8 @@ L(tab): JMPENT( L(4), L(tab)) + JMPENT( L(3m4), L(tab)) + TEXT + +-L(1): mov (up), %rax ++L(1): X86_ENDBR ++ mov (up), %rax + mul %rax + add $40, %rsp + mov %rax, (rp) +@@ -139,7 +140,8 @@ L(1): mov (up), %rax + FUNC_EXIT() + ret + +-L(2): mov (up), %rax ++L(2): X86_ENDBR ++ mov (up), %rax + mov %rax, %r8 + mul %rax + mov 8(up), %r11 +@@ -165,7 +167,8 @@ L(2): mov (up), %rax + FUNC_EXIT() + ret + +-L(3): mov (up), %rax ++L(3): X86_ENDBR ++ mov (up), %rax + mov %rax, %r10 + mul %rax + mov 8(up), %r11 +@@ -210,7 +213,8 @@ L(3): mov (up), %rax + FUNC_EXIT() + ret + +-L(4): mov (up), %rax ++L(4): X86_ENDBR ++ mov (up), %rax + mov %rax, %r11 + mul %rax + mov 8(up), %rbx +@@ -282,6 +286,7 @@ L(4): mov (up), %rax + + + L(0m4): ++ X86_ENDBR + lea -16(rp,n,8), tp C point tp in middle of result operand + mov (up), v0 + mov 8(up), %rax +@@ -340,6 +345,7 @@ L(L3): xor R32(w1), R32(w1) + + + L(1m4): ++ X86_ENDBR + lea 8(rp,n,8), tp C point tp in middle of result operand + mov (up), v0 C u0 + mov 8(up), %rax C u1 +@@ -418,6 +424,7 @@ L(m2x): mov (up,j,8), %rax + + + L(2m4): ++ X86_ENDBR + lea -16(rp,n,8), tp C point tp in middle of result operand + mov (up), v0 + mov 8(up), %rax +@@ -474,7 +481,7 @@ L(L1): xor R32(w0), R32(w0) + jmp L(dowhile_mid) + + +-L(3m4): ++L(3m4): X86_ENDBR + lea 8(rp,n,8), tp C point tp in middle of result operand + mov (up), v0 C u0 + mov 8(up), %rax C u1 +diff --git a/mpn/x86_64/mod_34lsub1.asm b/mpn/x86_64/mod_34lsub1.asm +index 74f576a07..70282b6c2 100644 +--- a/mpn/x86_64/mod_34lsub1.asm ++++ b/mpn/x86_64/mod_34lsub1.asm +@@ -145,46 +145,55 @@ L(tab): JMPENT( L(0), L(tab)) + JMPENT( L(8), L(tab)) + TEXT + +-L(6): add (ap), %rax ++L(6): X86_ENDBR ++ add (ap), %rax + adc 8(ap), %rcx + adc 16(ap), %rdx + adc $0, %r9 + add $24, ap +-L(3): add (ap), %rax ++L(3): X86_ENDBR ++ add (ap), %rax + adc 8(ap), %rcx + adc 16(ap), %rdx + jmp L(cj1) + +-L(7): add (ap), %rax ++L(7): X86_ENDBR ++ add (ap), %rax + adc 8(ap), %rcx + adc 16(ap), %rdx + adc $0, %r9 + add $24, ap +-L(4): add (ap), %rax ++L(4): X86_ENDBR ++ add (ap), %rax + adc 8(ap), %rcx + adc 16(ap), %rdx + adc $0, %r9 + add $24, ap +-L(1): add (ap), %rax ++L(1): X86_ENDBR ++ add (ap), %rax + adc $0, %rcx + jmp L(cj2) + +-L(8): add (ap), %rax ++L(8): X86_ENDBR ++ add (ap), %rax + adc 8(ap), %rcx + adc 16(ap), %rdx + adc $0, %r9 + add $24, ap +-L(5): add (ap), %rax ++L(5): X86_ENDBR ++ add (ap), %rax + adc 8(ap), %rcx + adc 16(ap), %rdx + adc $0, %r9 + add $24, ap +-L(2): add (ap), %rax ++L(2): X86_ENDBR ++ add (ap), %rax + adc 8(ap), %rcx + + L(cj2): adc $0, %rdx + L(cj1): adc $0, %r9 +-L(0): add %r9, %rax ++L(0): X86_ENDBR ++ add %r9, %rax + adc $0, %rcx + adc $0, %rdx + adc $0, %rax +diff --git a/mpn/x86_64/zen/aorrlsh_n.asm b/mpn/x86_64/zen/aorrlsh_n.asm +index e27b564fe..627e64870 100644 +--- a/mpn/x86_64/zen/aorrlsh_n.asm ++++ b/mpn/x86_64/zen/aorrlsh_n.asm +@@ -102,26 +102,30 @@ ifdef(`PIC',` + jmp *(%r11,%rax,8) + ') + +-L(0): lea 32(up), up ++L(0): X86_ENDBR ++ lea 32(up), up + lea 32(vp), vp + lea 32(rp), rp + xor R32(%r11), R32(%r11) + jmp L(e0) + +-L(7): mov %r10, %r11 ++L(7): X86_ENDBR ++ mov %r10, %r11 + lea 24(up), up + lea 24(vp), vp + lea 24(rp), rp + xor R32(%r10), R32(%r10) + jmp L(e7) + +-L(6): lea 16(up), up ++L(6): X86_ENDBR ++ lea 16(up), up + lea 16(vp), vp + lea 16(rp), rp + xor R32(%r11), R32(%r11) + jmp L(e6) + +-L(5): mov %r10, %r11 ++L(5): X86_ENDBR ++ mov %r10, %r11 + lea 8(up), up + lea 8(vp), vp + lea 8(rp), rp +@@ -191,23 +195,27 @@ L(e1): shlx( cnt, %r11, %rax) + lea (%r10,%rax), %rax + jmp L(top) + +-L(4): xor R32(%r11), R32(%r11) ++L(4): X86_ENDBR ++ xor R32(%r11), R32(%r11) + jmp L(e4) + +-L(3): mov %r10, %r11 ++L(3): X86_ENDBR ++ mov %r10, %r11 + lea -8(up), up + lea -8(vp), vp + lea -8(rp), rp + xor R32(%r10), R32(%r10) + jmp L(e3) + +-L(2): lea -16(up), up ++L(2): X86_ENDBR ++ lea -16(up), up + lea -16(vp), vp + lea -16(rp), rp + xor R32(%r11), R32(%r11) + jmp L(e2) + +-L(1): mov %r10, %r11 ++L(1): X86_ENDBR ++ mov %r10, %r11 + lea -24(up), up + lea 40(vp), vp + lea 40(rp), rp +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0010-x86-aors_n.asm-Add-X86_ENDBR-to-indirect-jump-target.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0010-x86-aors_n.asm-Add-X86_ENDBR-to-indirect-jump-target.patch --- 2:6.2.0+dfsg-6/debian/patches/0010-x86-aors_n.asm-Add-X86_ENDBR-to-indirect-jump-target.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0010-x86-aors_n.asm-Add-X86_ENDBR-to-indirect-jump-target.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,130 @@ +From af47e22f2e9892bc84985be055bf22725ef44972 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 29 Jan 2020 20:10:12 -0800 +Subject: [PATCH 10/13] x86/aors_n.asm: Add X86_ENDBR to indirect jump targets + +x86/aors_n.asm uses a trick to implment jump tables with LEA. We can't +use conditional branches nor normal jump tables since jump table entries +use EFLAGS set by jump table index. This patch adds X86_ENDBR to indirect +jump targets and adjust destination for X86_ENDBR. + + * mpn/x86/aors_n.asm: Save and restore %ebx if X86_ENDBR is + endbr32. Add X86_ENDBR to indirect jump targets and adjust + jump destination for X86_ENDBR. +--- + mpn/x86/aors_n.asm | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +diff --git a/mpn/x86/aors_n.asm b/mpn/x86/aors_n.asm +index 95d006a5a..94fa16ed8 100644 +--- a/mpn/x86/aors_n.asm ++++ b/mpn/x86/aors_n.asm +@@ -80,6 +80,9 @@ deflit(`FRAME',0) + movl PARAM_SRC2,%edx + movl PARAM_SIZE,%ecx + ++ifelse(X86_ENDBR,`endbr32', ++` pushl %ebx FRAME_pushl()') ++ + movl %ecx,%eax + shrl $3,%ecx C compute count for unrolled loop + negl %eax +@@ -92,6 +95,10 @@ deflit(`FRAME',0) + subl %eax,%edx C ... enter the loop + shrl $2,%eax C restore previous value + ++ C Count for 4-byte endbr32. ++ifelse(X86_ENDBR,`endbr32', ++` leal -4(,%eax,4),%ebx') ++ + ifdef(`PIC',` + C Calculate start address in loop for PIC. Due to limitations in + C old gas, LF(M4_function_n,oop)-L(0a)-3 cannot be put into the leal +@@ -105,6 +112,10 @@ L(0a): leal (%eax,%eax,8),%eax + leal L(oop)-3(%eax,%eax,8),%eax + ') + ++ C Adjust for endbr32 ++ifelse(X86_ENDBR,`endbr32', ++` addl %ebx,%eax') ++ + C These lines initialize carry from the 5th parameter. Should be + C possible to simplify. + pushl %ebp FRAME_pushl() +@@ -129,6 +140,9 @@ deflit(`FRAME',0) + movl PARAM_SRC2,%edx + movl PARAM_SIZE,%ecx + ++ifelse(X86_ENDBR,`endbr32', ++` pushl %ebx FRAME_pushl()') ++ + movl %ecx,%eax + shrl $3,%ecx C compute count for unrolled loop + negl %eax +@@ -141,6 +155,10 @@ deflit(`FRAME',0) + subl %eax,%edx C ... enter the loop + shrl $2,%eax C restore previous value + ++ C Count for 4-byte endbr32. ++ifelse(X86_ENDBR,`endbr32', ++` leal -4(,%eax,4),%ebx') ++ + ifdef(`PIC',` + C Calculate start address in loop for PIC. Due to limitations in + C some assemblers, L(oop)-L(0b)-3 cannot be put into the leal +@@ -153,6 +171,10 @@ L(0b): leal (%eax,%eax,8),%eax + C Calculate start address in loop for non-PIC. + leal L(oop)-3(%eax,%eax,8),%eax + ') ++ C Adjust for endbr32 ++ifelse(X86_ENDBR,`endbr32', ++` addl %ebx,%eax') ++ + jmp *%eax C jump into loop + + L(oopgo): +@@ -165,24 +187,31 @@ L(oopgo): + L(oop): movl (%esi),%eax + M4_inst (%edx),%eax + movl %eax,(%edi) ++ X86_ENDBR + movl 4(%esi),%eax + M4_inst 4(%edx),%eax + movl %eax,4(%edi) ++ X86_ENDBR + movl 8(%esi),%eax + M4_inst 8(%edx),%eax + movl %eax,8(%edi) ++ X86_ENDBR + movl 12(%esi),%eax + M4_inst 12(%edx),%eax + movl %eax,12(%edi) ++ X86_ENDBR + movl 16(%esi),%eax + M4_inst 16(%edx),%eax + movl %eax,16(%edi) ++ X86_ENDBR + movl 20(%esi),%eax + M4_inst 20(%edx),%eax + movl %eax,20(%edi) ++ X86_ENDBR + movl 24(%esi),%eax + M4_inst 24(%edx),%eax + movl %eax,24(%edi) ++ X86_ENDBR + movl 28(%esi),%eax + M4_inst 28(%edx),%eax + movl %eax,28(%edi) +@@ -195,6 +224,9 @@ L(oop): movl (%esi),%eax + sbbl %eax,%eax + negl %eax + ++ifelse(X86_ENDBR,`endbr32', ++` popl %ebx') ++ + popl %esi + popl %edi + ret +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0011-x86-p6-Prepend-X86_NOTRACK-to-jmp-reg.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0011-x86-p6-Prepend-X86_NOTRACK-to-jmp-reg.patch --- 2:6.2.0+dfsg-6/debian/patches/0011-x86-p6-Prepend-X86_NOTRACK-to-jmp-reg.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0011-x86-p6-Prepend-X86_NOTRACK-to-jmp-reg.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,90 @@ +From 0eb9101b3d153dc6de3b1b84ef97008dfb182d58 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Thu, 30 Jan 2020 03:24:52 -0800 +Subject: [PATCH 11/13] x86/p6: Prepend X86_NOTRACK to "jmp *%reg" + +Since some P6 .asm files uses a trick to implment jump tables with LEA, +prepend X86_NOTRACK to "jmp *%reg" to disable indirect branch tracking +when Intel CET is enabled. + + * mpn/x86/p6/aors_n.asm: Prepend X86_NOTRACK to "jmp *%reg". + * mpn/x86/p6/aorsmul_1.asm: Likewise. + * mpn/x86/p6/lshsub_n.asm: Likewise. + * mpn/x86/p6/mul_basecase.asm: Likewise. + * mpn/x86/p6/sqr_basecase.asm: Likewise. +--- + mpn/x86/p6/aors_n.asm | 2 +- + mpn/x86/p6/aorsmul_1.asm | 2 +- + mpn/x86/p6/lshsub_n.asm | 2 +- + mpn/x86/p6/mul_basecase.asm | 2 +- + mpn/x86/p6/sqr_basecase.asm | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/mpn/x86/p6/aors_n.asm b/mpn/x86/p6/aors_n.asm +index b4a32150f..ab172df7e 100644 +--- a/mpn/x86/p6/aors_n.asm ++++ b/mpn/x86/p6/aors_n.asm +@@ -90,7 +90,7 @@ L(here): + ') + + shr %edx C set cy flag +- jmp *%eax ++ X86_NOTRACK jmp *%eax + + ifdef(`PIC',` + L(pic_calc): +diff --git a/mpn/x86/p6/aorsmul_1.asm b/mpn/x86/p6/aorsmul_1.asm +index d6bc549e3..2a3b122ee 100644 +--- a/mpn/x86/p6/aorsmul_1.asm ++++ b/mpn/x86/p6/aorsmul_1.asm +@@ -240,7 +240,7 @@ L(here): + cmovnz( %ebx, %ecx) C high,low carry other way around + cmovnz( %eax, %ebx) + +- jmp *%edx ++ X86_NOTRACK jmp *%edx + + + ifdef(`PIC',` +diff --git a/mpn/x86/p6/lshsub_n.asm b/mpn/x86/p6/lshsub_n.asm +index 2ceb98bd8..17db5d5e0 100644 +--- a/mpn/x86/p6/lshsub_n.asm ++++ b/mpn/x86/p6/lshsub_n.asm +@@ -82,7 +82,7 @@ L(here): + pxor %mm1, %mm1 + pxor %mm0, %mm0 + +- jmp *%eax ++ X86_NOTRACK jmp *%eax + + ifdef(`PIC',` + L(pic_calc): +diff --git a/mpn/x86/p6/mul_basecase.asm b/mpn/x86/p6/mul_basecase.asm +index 03ae0d6b2..521b31e01 100644 +--- a/mpn/x86/p6/mul_basecase.asm ++++ b/mpn/x86/p6/mul_basecase.asm +@@ -524,7 +524,7 @@ L(unroll_outer_entry): + xorl %eax, %ebx C carries other way for odd index + xorl %eax, %ecx + +- jmp *%edx ++ X86_NOTRACK jmp *%edx + + + C ----------------------------------------------------------------------------- +diff --git a/mpn/x86/p6/sqr_basecase.asm b/mpn/x86/p6/sqr_basecase.asm +index ca29e8084..f71304f39 100644 +--- a/mpn/x86/p6/sqr_basecase.asm ++++ b/mpn/x86/p6/sqr_basecase.asm +@@ -447,7 +447,7 @@ define(cmovX,`ifelse(eval(UNROLL_COUNT%2),1,`cmovz($@)',`cmovnz($@)')') + cmovX( %ebx, %ecx) C high carry reverse + cmovX( %eax, %ebx) C low carry reverse + movl %edx, VAR_JMP +- jmp *%edx ++ X86_NOTRACK jmp *%edx + + + C Must be on an even address here so the low bit of the jump address +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0012-x86-k6-Prepend-X86_NOTRACK-to-jmp-reg.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0012-x86-k6-Prepend-X86_NOTRACK-to-jmp-reg.patch --- 2:6.2.0+dfsg-6/debian/patches/0012-x86-k6-Prepend-X86_NOTRACK-to-jmp-reg.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0012-x86-k6-Prepend-X86_NOTRACK-to-jmp-reg.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,60 @@ +From 6bdcdc0932721ee38176fc2b866fd994d60c2286 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Thu, 30 Jan 2020 04:00:13 -0800 +Subject: [PATCH 12/13] x86/k6: Prepend X86_NOTRACK to "jmp *%reg" + +Since some K6 .asm files uses a trick to implment jump tables with LEA, +prepend X86_NOTRACK to "jmp *%reg" to disable indirect branch tracking +when Intel CET is enabled. + + * mpn/x86/k6/aorsmul_1.asm: Prepend X86_NOTRACK to "jmp *%reg". + * mpn/x86/k6/mul_basecase.asm: Likewise. + * mpn/x86/k6/sqr_basecase.asm: Likewise. +--- + mpn/x86/k6/aorsmul_1.asm | 2 +- + mpn/x86/k6/mul_basecase.asm | 2 +- + mpn/x86/k6/sqr_basecase.asm | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mpn/x86/k6/aorsmul_1.asm b/mpn/x86/k6/aorsmul_1.asm +index 78be9d250..018644d15 100644 +--- a/mpn/x86/k6/aorsmul_1.asm ++++ b/mpn/x86/k6/aorsmul_1.asm +@@ -321,7 +321,7 @@ L(here): + movl %eax, %esi + L(noswap): + +- jmp *%edx ++ X86_NOTRACK jmp *%edx + + + ifdef(`PIC',` +diff --git a/mpn/x86/k6/mul_basecase.asm b/mpn/x86/k6/mul_basecase.asm +index ab202a2ce..0022894aa 100644 +--- a/mpn/x86/k6/mul_basecase.asm ++++ b/mpn/x86/k6/mul_basecase.asm +@@ -542,7 +542,7 @@ L(unroll_outer_entry): + movl %edx, %ecx + L(unroll_noswap): + +- jmp *%eax ++ X86_NOTRACK jmp *%eax + + + +diff --git a/mpn/x86/k6/sqr_basecase.asm b/mpn/x86/k6/sqr_basecase.asm +index f3a101a0f..f4b8df414 100644 +--- a/mpn/x86/k6/sqr_basecase.asm ++++ b/mpn/x86/k6/sqr_basecase.asm +@@ -467,7 +467,7 @@ ifelse(eval(UNROLL_COUNT%2),0, + movl %eax, %ecx + L(unroll_noswap): + +- jmp *%edx ++ X86_NOTRACK jmp *%edx + + + C Must be on an even address here so the low bit of the jump address +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/0013-x86-k7-Prepend-X86_NOTRACK-to-indirect-branches.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/0013-x86-k7-Prepend-X86_NOTRACK-to-indirect-branches.patch --- 2:6.2.0+dfsg-6/debian/patches/0013-x86-k7-Prepend-X86_NOTRACK-to-indirect-branches.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/0013-x86-k7-Prepend-X86_NOTRACK-to-indirect-branches.patch 2020-08-06 20:44:08.000000000 +0000 @@ -0,0 +1,90 @@ +From d466e564fa164ab50e8f49cd2f55d8be2c361e04 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Thu, 30 Jan 2020 04:01:45 -0800 +Subject: [PATCH 13/13] x86/k7: Prepend X86_NOTRACK to indirect branches + +Since some K7 .asm files uses a trick to implment jump tables with LEA, +prepend X86_NOTRACK to indirect branches to disable indirect branch +tracking when Intel CET is enabled. + + * mpn/x86/k7/aors_n.asm: Prepend X86_NOTRACK to indirect branches. + * mpn/x86/k7/mmx/lshift.asm: Likewise. + * mpn/x86/k7/mmx/rshift.asm: Likewise. + * mpn/x86/k7/mul_basecase.asm: Likewise. + * mpn/x86/k7/sqr_basecase.asm: Likewise. +--- + mpn/x86/k7/aors_n.asm | 2 +- + mpn/x86/k7/mmx/lshift.asm | 2 +- + mpn/x86/k7/mmx/rshift.asm | 2 +- + mpn/x86/k7/mul_basecase.asm | 2 +- + mpn/x86/k7/sqr_basecase.asm | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/mpn/x86/k7/aors_n.asm b/mpn/x86/k7/aors_n.asm +index bfdf3d40a..b3def5df6 100644 +--- a/mpn/x86/k7/aors_n.asm ++++ b/mpn/x86/k7/aors_n.asm +@@ -188,7 +188,7 @@ L(here): + leal ifelse(UNROLL_BYTES,256,128) (%edx,%edi,4), %edx + leal ifelse(UNROLL_BYTES,256,128) (%ebp,%edi,4), %edi + +- jmp *%esi ++ X86_NOTRACK jmp *%esi + + + ifdef(`PIC',` +diff --git a/mpn/x86/k7/mmx/lshift.asm b/mpn/x86/k7/mmx/lshift.asm +index 4140e82bb..77bc86ed2 100644 +--- a/mpn/x86/k7/mmx/lshift.asm ++++ b/mpn/x86/k7/mmx/lshift.asm +@@ -280,7 +280,7 @@ L(here): + leal ifelse(UNROLL_BYTES,256,128) -8(%edx,%eax,2), %edx + leal ifelse(UNROLL_BYTES,256,128) (%edi,%eax,2), %edi + movl PARAM_SIZE, %eax C for use at end +- jmp *%esi ++ X86_NOTRACK jmp *%esi + + + ifdef(`PIC',` +diff --git a/mpn/x86/k7/mmx/rshift.asm b/mpn/x86/k7/mmx/rshift.asm +index 0da1f9341..8119adc1c 100644 +--- a/mpn/x86/k7/mmx/rshift.asm ++++ b/mpn/x86/k7/mmx/rshift.asm +@@ -280,7 +280,7 @@ L(here): + leal ifelse(UNROLL_BYTES,256,128) (%edi,%eax,2), %edi + movl PARAM_SIZE, %eax C for use at end + +- jmp *%esi ++ X86_NOTRACK jmp *%esi + + + ifdef(`PIC',` +diff --git a/mpn/x86/k7/mul_basecase.asm b/mpn/x86/k7/mul_basecase.asm +index b96fda7e0..1e352cd6d 100644 +--- a/mpn/x86/k7/mul_basecase.asm ++++ b/mpn/x86/k7/mul_basecase.asm +@@ -511,7 +511,7 @@ L(unroll_outer_entry): + cmovnz( %eax, %ebx) + + C Extra fetch of VAR_JMP is bad, but registers are tight +- jmp *VAR_JMP ++ X86_NOTRACK jmp *VAR_JMP + + + C ----------------------------------------------------------------------------- +diff --git a/mpn/x86/k7/sqr_basecase.asm b/mpn/x86/k7/sqr_basecase.asm +index df47ee421..0f79ef015 100644 +--- a/mpn/x86/k7/sqr_basecase.asm ++++ b/mpn/x86/k7/sqr_basecase.asm +@@ -425,7 +425,7 @@ define(cmovX,`ifelse(eval(UNROLL_COUNT%2),0,`cmovz($@)',`cmovnz($@)')') + + movl %eax, VAR_JMP + +- jmp *%eax ++ X86_NOTRACK jmp *%eax + + + ifdef(`PIC',` +-- +2.27.0 + diff -pruN 2:6.2.0+dfsg-6/debian/patches/autoreconf.patch 2:6.2.0+dfsg-6ubuntu1/debian/patches/autoreconf.patch --- 2:6.2.0+dfsg-6/debian/patches/autoreconf.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2:6.2.0+dfsg-6ubuntu1/debian/patches/autoreconf.patch 2020-08-06 20:47:31.000000000 +0000 @@ -0,0 +1,2716 @@ +Description: rerun autoreconf --force --install + +--- gmp-6.2.0+dfsg.orig/Makefile.in ++++ gmp-6.2.0+dfsg/Makefile.in +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.16.1 from Makefile.am. ++# Makefile.in generated by automake 1.16.2 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2018 Free Software Foundation, Inc. ++# Copyright (C) 1994-2020 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -336,8 +336,8 @@ am__recursive_targets = \ + $(am__extra_recursive_targets) + AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir distdir-am dist dist-all distcheck +-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ +- $(LISP)config.in ++am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ ++ config.in + # Read a list of newline-separated strings from the standard input, + # and print each of them once, without duplicates. Input order is + # *not* preserved. +@@ -1178,6 +1178,10 @@ dist-xz: distdir + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) + ++dist-zstd: distdir ++ tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst ++ $(am__post_remove_distdir) ++ + dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 +@@ -1220,6 +1224,8 @@ distcheck: dist + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ ++ *.tar.zst*) \ ++ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ + esac + chmod -R a-w $(distdir) + chmod u+w $(distdir) +@@ -1412,7 +1418,7 @@ uninstall-am: uninstall-includeHEADERS u + clean-libLTLIBRARIES clean-libtool clean-local cscope \ + cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ +- dist-zip distcheck distclean distclean-compile \ ++ dist-zip dist-zstd distcheck distclean distclean-compile \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-local distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ +--- gmp-6.2.0+dfsg.orig/aclocal.m4 ++++ gmp-6.2.0+dfsg/aclocal.m4 +@@ -1,6 +1,6 @@ +-# generated automatically by aclocal 1.16.1 -*- Autoconf -*- ++# generated automatically by aclocal 1.16.2 -*- Autoconf -*- + +-# Copyright (C) 1996-2018 Free Software Foundation, Inc. ++# Copyright (C) 1996-2020 Free Software Foundation, Inc. + + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -1055,8 +1055,8 @@ int forced_loaded() { return 2;} + _LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD +- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD +- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD ++ echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD ++ $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +@@ -1506,7 +1506,7 @@ need_locks=$enable_libtool_lock + m4_defun([_LT_PROG_AR], + [AC_CHECK_TOOLS(AR, [ar], false) + : ${AR=ar} +-: ${AR_FLAGS=cru} ++: ${AR_FLAGS=cr} + _LT_DECL([], [AR], [1], [The archiver]) + _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +@@ -9074,7 +9074,7 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_L + m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) + m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) + +-# Copyright (C) 2002-2018 Free Software Foundation, Inc. ++# Copyright (C) 2002-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9089,7 +9089,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], + [am__api_version='1.16' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.16.1], [], ++m4_if([$1], [1.16.2], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -9105,14 +9105,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.16.1])dnl ++[AM_AUTOMAKE_VERSION([1.16.2])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +-# Copyright (C) 2001-2018 Free Software Foundation, Inc. ++# Copyright (C) 2001-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9164,7 +9164,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997-2018 Free Software Foundation, Inc. ++# Copyright (C) 1997-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9197,7 +9197,7 @@ fi])]) + + # Do all the work for Automake. -*- Autoconf -*- + +-# Copyright (C) 1996-2018 Free Software Foundation, Inc. ++# Copyright (C) 1996-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9394,7 +9394,7 @@ for _am_header in $config_headers :; do + done + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +-# Copyright (C) 2001-2018 Free Software Foundation, Inc. ++# Copyright (C) 2001-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9415,7 +9415,7 @@ if test x"${install_sh+set}" != xset; th + fi + AC_SUBST([install_sh])]) + +-# Copyright (C) 2003-2018 Free Software Foundation, Inc. ++# Copyright (C) 2003-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9434,7 +9434,7 @@ fi + rmdir .tst 2>/dev/null + AC_SUBST([am__leading_dot])]) + +-# Copyright (C) 1998-2018 Free Software Foundation, Inc. ++# Copyright (C) 1998-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9455,7 +9455,7 @@ fi]) + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- + # From Jim Meyering + +-# Copyright (C) 1996-2018 Free Software Foundation, Inc. ++# Copyright (C) 1996-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9490,7 +9490,7 @@ AC_MSG_CHECKING([whether to enable maint + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997-2018 Free Software Foundation, Inc. ++# Copyright (C) 1997-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9529,7 +9529,7 @@ fi + + # Helper functions for option handling. -*- Autoconf -*- + +-# Copyright (C) 2001-2018 Free Software Foundation, Inc. ++# Copyright (C) 2001-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9558,7 +9558,7 @@ AC_DEFUN([_AM_SET_OPTIONS], + AC_DEFUN([_AM_IF_OPTION], + [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +-# Copyright (C) 1999-2018 Free Software Foundation, Inc. ++# Copyright (C) 1999-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9605,7 +9605,7 @@ AC_LANG_POP([C])]) + # For backward compatibility. + AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +-# Copyright (C) 2001-2018 Free Software Foundation, Inc. ++# Copyright (C) 2001-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9624,7 +9624,7 @@ AC_DEFUN([AM_RUN_LOG], + + # Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# Copyright (C) 1996-2018 Free Software Foundation, Inc. ++# Copyright (C) 1996-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9705,7 +9705,7 @@ AC_CONFIG_COMMANDS_PRE( + rm -f conftest.file + ]) + +-# Copyright (C) 2009-2018 Free Software Foundation, Inc. ++# Copyright (C) 2009-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9765,7 +9765,7 @@ AC_SUBST([AM_BACKSLASH])dnl + _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl + ]) + +-# Copyright (C) 2001-2018 Free Software Foundation, Inc. ++# Copyright (C) 2001-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9793,7 +9793,7 @@ fi + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# Copyright (C) 2006-2018 Free Software Foundation, Inc. ++# Copyright (C) 2006-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -9812,7 +9812,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_ + + # Check how to create a tarball. -*- Autoconf -*- + +-# Copyright (C) 2004-2018 Free Software Foundation, Inc. ++# Copyright (C) 2004-2020 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +--- gmp-6.2.0+dfsg.orig/autom4te.cache/output.0 ++++ gmp-6.2.0+dfsg/autom4te.cache/output.0 +@@ -13459,7 +13459,7 @@ esac + fi + + : ${AR=ar} +-: ${AR_FLAGS=cru} ++: ${AR_FLAGS=cr} + + + +@@ -15180,8 +15180,8 @@ int forced_loaded() { return 2;} + _LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 +- echo "$AR cru libconftest.a conftest.o" >&5 +- $AR cru libconftest.a conftest.o 2>&5 ++ echo "$AR cr libconftest.a conftest.o" >&5 ++ $AR cr libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +@@ -27231,6 +27231,103 @@ echo "define(,1)" >> $gmp_tmpconf + esac + ;; + esac ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Intel CET is enabled" >&5 ++$as_echo_n "checking if Intel CET is enabled... " >&6; } ++if ${gmp_cv_asm_x86_intel_cet+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat > conftest.c <&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } ++ then ++ gmp_cv_asm_x86_intel_cet=yes ++ else ++ gmp_cv_asm_x86_intel_cet=no ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_intel_cet" >&5 ++$as_echo "$gmp_cv_asm_x86_intel_cet" >&6; } ++ if test "$gmp_cv_asm_x86_intel_cet" = yes; then ++ case $ABI in ++ 32) ++ endbr=endbr32 ++ p2align=2 ++ ;; ++ 64) ++ endbr=endbr64 ++ p2align=3 ++ ;; ++ x32) ++ endbr=endbr64 ++ p2align=2 ++ ;; ++ esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if .note.gnu.property section is needed" >&5 ++$as_echo_n "checking if .note.gnu.property section is needed... " >&6; } ++if ${gmp_cv_asm_x86_gnu_property+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat > conftest.c <&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } ++ then ++ gmp_cv_asm_x86_gnu_property=yes ++ else ++ gmp_cv_asm_x86_gnu_property=no ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_gnu_property" >&5 ++$as_echo "$gmp_cv_asm_x86_gnu_property" >&6; } ++ echo "define(,<$endbr>)" >> $gmp_tmpconfigm4 ++ echo "define(,)" >> $gmp_tmpconfigm4 ++ else ++ gmp_cv_asm_x86_gnu_property=no ++ echo "define(,<>)" >> $gmp_tmpconfigm4 ++ echo "define(,<>)" >> $gmp_tmpconfigm4 ++ fi ++ if test "$gmp_cv_asm_x86_gnu_property" = yes; then ++ echo "define(, < ++ .section \".note.gnu.property\", \"a\" ++ .p2align $p2align ++ .long 1f - 0f ++ .long 4f - 1f ++ .long 5 ++0: ++ .asciz \"GNU\" ++1: ++ .p2align $p2align ++ .long 0xc0000002 ++ .long 3f - 2f ++2: ++ .long 3 ++3: ++ .p2align $p2align ++4:>)" >> $gmp_tmpconfigm4 ++ else ++ echo "define(,<>)" >> $gmp_tmpconfigm4 ++ fi ++ + ;; + esac + fi +--- gmp-6.2.0+dfsg.orig/autom4te.cache/output.1 ++++ gmp-6.2.0+dfsg/autom4te.cache/output.1 +@@ -13458,7 +13458,7 @@ esac + fi + + : ${AR=ar} +-: ${AR_FLAGS=cru} ++: ${AR_FLAGS=cr} + + + +@@ -15179,8 +15179,8 @@ int forced_loaded() { return 2;} + _LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 +- echo "$AR cru libconftest.a conftest.o" >&5 +- $AR cru libconftest.a conftest.o 2>&5 ++ echo "$AR cr libconftest.a conftest.o" >&5 ++ $AR cr libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +@@ -27226,6 +27226,103 @@ echo "define(,1)" >> $gmp_tmpconf + esac + ;; + esac ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Intel CET is enabled" >&5 ++$as_echo_n "checking if Intel CET is enabled... " >&6; } ++if ${gmp_cv_asm_x86_intel_cet+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat > conftest.c <&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } ++ then ++ gmp_cv_asm_x86_intel_cet=yes ++ else ++ gmp_cv_asm_x86_intel_cet=no ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_intel_cet" >&5 ++$as_echo "$gmp_cv_asm_x86_intel_cet" >&6; } ++ if test "$gmp_cv_asm_x86_intel_cet" = yes; then ++ case $ABI in ++ 32) ++ endbr=endbr32 ++ p2align=2 ++ ;; ++ 64) ++ endbr=endbr64 ++ p2align=3 ++ ;; ++ x32) ++ endbr=endbr64 ++ p2align=2 ++ ;; ++ esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if .note.gnu.property section is needed" >&5 ++$as_echo_n "checking if .note.gnu.property section is needed... " >&6; } ++if ${gmp_cv_asm_x86_gnu_property+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat > conftest.c <&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } ++ then ++ gmp_cv_asm_x86_gnu_property=yes ++ else ++ gmp_cv_asm_x86_gnu_property=no ++ fi ++ rm -f conftest* ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gmp_cv_asm_x86_gnu_property" >&5 ++$as_echo "$gmp_cv_asm_x86_gnu_property" >&6; } ++ echo "define(,<$endbr>)" >> $gmp_tmpconfigm4 ++ echo "define(,)" >> $gmp_tmpconfigm4 ++ else ++ gmp_cv_asm_x86_gnu_property=no ++ echo "define(,<>)" >> $gmp_tmpconfigm4 ++ echo "define(,<>)" >> $gmp_tmpconfigm4 ++ fi ++ if test "$gmp_cv_asm_x86_gnu_property" = yes; then ++ echo "define(, < ++ .section \".note.gnu.property\", \"a\" ++ .p2align $p2align ++ .long 1f - 0f ++ .long 4f - 1f ++ .long 5 ++0: ++ .asciz \"GNU\" ++1: ++ .p2align $p2align ++ .long 0xc0000002 ++ .long 3f - 2f ++2: ++ .long 3 ++3: ++ .p2align $p2align ++4:>)" >> $gmp_tmpconfigm4 ++ else ++ echo "define(,<>)" >> $gmp_tmpconfigm4 ++ fi ++ + ;; + esac + fi +--- gmp-6.2.0+dfsg.orig/autom4te.cache/requests ++++ gmp-6.2.0+dfsg/autom4te.cache/requests +@@ -1,4 +1,4 @@ +-# This file was generated by Autom4te Fri Jan 17 22:04:50 UTC 2020. ++# This file was generated by Autom4te Wed Jan 22 14:03:12 UTC 2020. + # It contains the lists of macros which have been traced. + # It can be safely removed. + +@@ -44,275 +44,276 @@ + 'configure.ac' + ], + { +- 'GMP_ASM_W32' => 1, +- 'GMP_PROG_CXX_WORKS' => 1, +- 'LT_LIB_DLLOAD' => 1, +- 'AM_MISSING_PROG' => 1, +- '_LT_PROG_F77' => 1, +- 'GMP_PROG_AR' => 1, +- 'GMP_OPTION_ALLOCA' => 1, +- '_LT_PROG_LTMAIN' => 1, +- 'AM_SUBST_NOTMAKE' => 1, +- 'GMP_GCC_PENTIUM4_SSE2' => 1, +- 'GMP_C_DOUBLE_FORMAT' => 1, +- 'GMP_CRAY_OPTIONS' => 1, +- 'LT_FUNC_ARGZ' => 1, +- 'AC_LIBLTDL_CONVENIENCE' => 1, +- 'GMP_ASM_X86_GOT_UNDERSCORE' => 1, +- 'LTOBSOLETE_VERSION' => 1, +- 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, +- 'GMP_ASM_SIZE' => 1, ++ 'GMP_ASM_M68K_BRANCHES' => 1, + 'AC_LTDL_PREOPEN' => 1, +- 'GMP_DEFINE_RAW' => 1, +- 'AM_PROG_LD' => 1, +- 'LT_AC_PROG_EGREP' => 1, ++ 'GMP_ASM_X86_MMX' => 1, ++ 'GMP_FINISH' => 1, ++ '_LT_LINKER_BOILERPLATE' => 1, + 'GMP_ASM_UNDERSCORE' => 1, +- 'AC_PATH_TOOL_PREFIX' => 1, +- 'GMP_ASM_ALIGN_FILL_0x90' => 1, +- 'AC_LIBTOOL_GCJ' => 1, +- '_LT_AC_TAGVAR' => 1, +- 'GMP_INIT' => 1, + 'AC_LTDL_SHLIBPATH' => 1, +- '_LT_AC_FILE_LTDLL_C' => 1, +- '_LT_LINKER_OPTION' => 1, ++ 'GMP_PROG_CXX_WORKS' => 1, ++ 'GMP_PROG_CC_FOR_BUILD_WORKS' => 1, ++ 'AM_PROG_LEX' => 1, ++ 'AC_CONFIG_MACRO_DIR_TRACE' => 1, ++ '_LT_AC_LANG_C_CONFIG' => 1, + 'LT_SYS_MODULE_PATH' => 1, +- 'AC_DISABLE_SHARED' => 1, +- 'LT_CONFIG_LTDL_DIR' => 1, +- 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, +- '_LT_AC_TRY_DLOPEN_SELF' => 1, +- '_LT_AC_PROG_ECHO_BACKSLASH' => 1, +- 'AM_SET_LEADING_DOT' => 1, +- 'LT_SYS_DLSEARCH_PATH' => 1, +- '_AM_SUBST_NOTMAKE' => 1, +- 'AC_LIBTOOL_RC' => 1, +- 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, +- 'LT_SUPPORTED_TAG' => 1, +- 'AC_DEPLIBS_CHECK_METHOD' => 1, +- 'LT_SYS_DLOPEN_DEPLIBS' => 1, +- 'LT_FUNC_DLSYM_USCORE' => 1, +- 'AM_MAKE_INCLUDE' => 1, +- 'GMP_PROG_CPP_FOR_BUILD' => 1, +- '_LT_PROG_FC' => 1, +- '_AM_DEPENDENCIES' => 1, +- 'GMP_CHECK_LIBM_FOR_BUILD' => 1, +- 'AM_PROG_CC_C_O' => 1, +- 'GMP_PROG_CC_IS_GNU' => 1, +- '_LT_AC_CHECK_DLFCN' => 1, +- '_AM_PROG_TAR' => 1, +- 'GMP_FUNC_SSCANF_WRITABLE_INPUT' => 1, +- 'GMP_ASM_POWERPC_PIC_ALWAYS' => 1, +- '_GMP_SUBST_CHECK_HEADERS' => 1, +- 'AC_LIBTOOL_CONFIG' => 1, +- '_LT_WITH_SYSROOT' => 1, ++ 'AC_LIBTOOL_FC' => 1, ++ '_LT_DLL_DEF_P' => 1, ++ '_AM_MANGLE_OPTION' => 1, + 'GMP_GCC_ARM_UMODSI' => 1, ++ 'AC_LIBTOOL_WIN32_DLL' => 1, ++ '_AM_SUBST_NOTMAKE' => 1, ++ 'LT_PROG_RC' => 1, ++ 'AM_MISSING_PROG' => 1, ++ 'LT_WITH_LTDL' => 1, ++ '_LT_AC_SHELL_INIT' => 1, + 'AC_PROG_LD_GNU' => 1, +- 'AC_PROG_LD' => 1, +- 'LTDL_INSTALLABLE' => 1, +- '_AM_CONFIG_MACRO_DIRS' => 1, +- '_LT_PATH_TOOL_PREFIX' => 1, +- 'LT_OUTPUT' => 1, +- '_AC_AM_CONFIG_HEADER_HOOK' => 1, +- 'GMP_C_HIDDEN_ALIAS' => 1, +- 'GMP_C_ATTRIBUTE_MODE' => 1, +- 'AC_PROG_EGREP' => 1, +- 'GMP_HPC_HPPA_2_0' => 1, +- 'AU_DEFUN' => 1, +- 'GMP_ASM_LABEL_SUFFIX' => 1, +- 'LTVERSION_VERSION' => 1, +- 'GMP_PROG_CXX_WORKS_PART' => 1, +- 'GMP_GCC_MIPS_O32' => 1, +- 'GMP_ASM_SPARC_GOTDATA' => 1, +- '_LT_AC_LOCK' => 1, +- 'GMP_PROG_CC_WORKS_PART' => 1, +- 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, +- '_LT_CC_BASENAME' => 1, +- 'AC_CHECK_LIBM' => 1, +- 'GMP_C_TEST_SIZEOF' => 1, +- 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, +- '_LT_REQUIRED_DARWIN_CHECKS' => 1, +- 'AC_LIBTOOL_OBJDIR' => 1, +- 'GMP_ASM_GLOBL_ATTR' => 1, +- 'AC_LIBTOOL_LINKER_OPTION' => 1, +- 'AM_MISSING_HAS_RUN' => 1, +- 'AC_LTDL_DLLIB' => 1, +- 'LT_SYS_DLOPEN_SELF' => 1, +- 'GMP_ASM_M68K_ADDRESSING' => 1, +- 'LT_PATH_LD' => 1, +- '_AM_SET_OPTION' => 1, +- 'AC_LIBTOOL_CXX' => 1, +- 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, ++ 'GMP_ASM_X86_SHLDL_CL' => 1, ++ 'AC_ENABLE_STATIC' => 1, ++ 'GMP_GCC_WA_OLDAS' => 1, ++ 'GMP_ASM_ALIGN_FILL_0x90' => 1, ++ 'AM_ENABLE_STATIC' => 1, ++ '_AC_PROG_LIBTOOL' => 1, ++ 'GMP_PROG_M4' => 1, ++ 'm4_pattern_allow' => 1, ++ 'GMP_ASM_RODATA' => 1, ++ 'GMP_PROG_CPP_FOR_BUILD' => 1, ++ 'AM_SUBST_NOTMAKE' => 1, + 'include' => 1, +- '_LT_AC_PROG_CXXCPP' => 1, +- 'LT_LIB_M' => 1, +- 'AC_WITH_LTDL' => 1, ++ '_LT_LINKER_OPTION' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, +- 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, +- 'AM_RUN_LOG' => 1, ++ '_LT_COMPILER_BOILERPLATE' => 1, ++ 'AM_DEP_TRACK' => 1, ++ '_LT_REQUIRED_DARWIN_CHECKS' => 1, ++ 'GMP_ASM_GLOBL' => 1, ++ 'LT_AC_PROG_RC' => 1, ++ 'AC_DEFUN_ONCE' => 1, + 'GMP_ASM_LSYM_PREFIX' => 1, +- 'GMP_INCLUDE_MPN' => 1, +- 'GMP_SUBST_CHECK_HEADERS' => 1, +- 'AM_SILENT_RULES' => 1, ++ 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, ++ '_LT_PROG_LTMAIN' => 1, ++ 'GMP_PROG_CC_X86_GOT_EAX_EMITTED' => 1, ++ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, ++ 'LT_PATH_NM' => 1, ++ 'GMP_PROG_NM' => 1, ++ 'GMP_M4_M4WRAP_SPURIOUS' => 1, ++ 'GMP_ASM_X86_GOT_EAX_OK' => 1, ++ 'AC_LTDL_SHLIBEXT' => 1, ++ 'GMP_PROG_AR' => 1, ++ 'AM_PROG_NM' => 1, ++ 'GMP_ASM_W32' => 1, ++ 'LT_LIB_DLLOAD' => 1, ++ 'AC_PROG_NM' => 1, ++ 'GMP_ASM_ALIGN_LOG' => 1, ++ '_LT_AC_FILE_LTDLL_C' => 1, ++ 'LTVERSION_VERSION' => 1, ++ 'GMP_ASM_SPARC_SHARED_THUNKS' => 1, ++ '_LT_PROG_F77' => 1, + 'LTDL_INIT' => 1, +- '_LT_PROG_CXX' => 1, +- 'GMP_PROG_CC_IS_XLC' => 1, +- 'GMP_GCC_NO_CPP_PRECOMP' => 1, ++ 'GMP_ASM_M68K_INSTRUCTION' => 1, ++ 'LT_FUNC_DLSYM_USCORE' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, ++ 'LTOPTIONS_VERSION' => 1, ++ 'LT_AC_PROG_GCJ' => 1, ++ '_AC_AM_CONFIG_HEADER_HOOK' => 1, ++ 'GMP_H_HAVE_FILE' => 1, ++ 'AM_MISSING_HAS_RUN' => 1, ++ 'm4_pattern_forbid' => 1, ++ '_LT_WITH_SYSROOT' => 1, ++ 'GMP_PROG_CC_WORKS_PART' => 1, ++ 'GMP_PROG_EXEEXT_FOR_BUILD' => 1, ++ 'LT_LANG' => 1, + 'GMP_SUBST_CHECK_FUNCS' => 1, +- '_LT_COMPILER_OPTION' => 1, +- 'AM_DISABLE_SHARED' => 1, +- 'AC_CONFIG_MACRO_DIR_TRACE' => 1, +- 'GMP_ASM_SPARC_REGISTER' => 1, +- '_LT_AC_LANG_GCJ_CONFIG' => 1, +- 'AC_LTDL_SYSSEARCHPATH' => 1, +- '_LT_DLL_DEF_P' => 1, +- 'LT_SYS_SYMBOL_USCORE' => 1, +- '_LTDL_SETUP' => 1, +- 'AM_ENABLE_SHARED' => 1, +- 'GMP_C_ATTRIBUTE_CONST' => 1, +- 'AM_AUTOMAKE_VERSION' => 1, +- 'GMP_ASM_GLOBL' => 1, +- 'AC_DISABLE_STATIC' => 1, +- 'GMP_PROG_CC_WORKS_LONGLONG' => 1, +- 'GMP_PROG_CC_WORKS' => 1, +- 'AC_LTDL_DLSYM_USCORE' => 1, +- 'GMP_ASM_SPARC_SHARED_THUNKS' => 1, ++ 'GMP_H_EXTERN_INLINE' => 1, ++ 'LTSUGAR_VERSION' => 1, ++ 'LT_AC_PROG_SED' => 1, ++ '_AM_AUTOCONF_VERSION' => 1, ++ 'GMP_PROG_CC_WORKS_PART_MAIN' => 1, ++ 'AC_LTDL_SYMBOL_USCORE' => 1, ++ 'GMP_ASM_IA64_ALIGN_OK' => 1, ++ 'AC_WITH_LTDL' => 1, ++ '_LT_AC_LANG_RC_CONFIG' => 1, ++ '_LT_PATH_TOOL_PREFIX' => 1, ++ 'AC_DISABLE_FAST_INSTALL' => 1, ++ '_LT_AC_SYS_LIBPATH_AIX' => 1, ++ 'LT_SYS_DLOPEN_SELF' => 1, ++ 'AC_PROG_EGREP' => 1, ++ '_AM_SET_OPTIONS' => 1, ++ 'GMP_ASM_POWERPC_R_REGISTERS' => 1, ++ 'LTDL_INSTALLABLE' => 1, ++ '_AM_PROG_CC_C_O' => 1, ++ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, ++ 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, ++ 'GMP_PROG_CC_WORKS_PART_TEST' => 1, ++ 'AC_CHECK_LIBM' => 1, ++ 'GMP_ASM_M68K_ADDRESSING' => 1, ++ 'GMP_ASM_SIZE' => 1, ++ 'AC_LIBTOOL_PROG_CC_C_O' => 1, ++ 'GMP_GCC_PENTIUM4_SSE2' => 1, + 'GMP_ASM_TEXT' => 1, +- 'AC_LIB_LTDL' => 1, +- 'AC_LIBTOOL_LANG_C_CONFIG' => 1, +- 'GMP_ASM_RODATA' => 1, +- 'GMP_ASM_X86_GOT_EAX_OK' => 1, ++ 'AC_LTDL_SYSSEARCHPATH' => 1, ++ 'AM_PROG_LIBTOOL' => 1, ++ 'AC_PROG_LIBTOOL' => 1, ++ '_LT_LIBOBJ' => 1, ++ 'GMP_PROG_CC_IS_XLC' => 1, ++ 'AC_DEPLIBS_CHECK_METHOD' => 1, ++ 'LT_OUTPUT' => 1, ++ 'LT_CMD_MAX_LEN' => 1, ++ 'LTDL_CONVENIENCE' => 1, + '_m4_warn' => 1, +- 'GMP_ASM_X86_SSE2' => 1, +- 'AC_LTDL_OBJDIR' => 1, +- '_LT_AC_LANG_F77_CONFIG' => 1, +- '_LT_AC_TAGCONFIG' => 1, +- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, +- 'AM_PROG_LEX' => 1, +- 'AM_DEP_TRACK' => 1, +- 'LTOPTIONS_VERSION' => 1, +- '_AM_IF_OPTION' => 1, ++ 'AM_ENABLE_SHARED' => 1, ++ 'AC_PATH_TOOL_PREFIX' => 1, ++ 'AC_ENABLE_SHARED' => 1, ++ 'AM_INIT_AUTOMAKE' => 1, + 'AM_MAINTAINER_MODE' => 1, +- 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, +- 'GMP_GCC_WA_MCPU' => 1, +- 'AM_PROG_LIBTOOL' => 1, +- '_LT_AC_LANG_CXX_CONFIG' => 1, +- 'AM_PROG_NM' => 1, +- 'GMP_PROG_CC_FOR_BUILD' => 1, +- 'LT_PROG_RC' => 1, +- 'AC_DEFUN' => 1, +- 'GMP_GCC_WA_OLDAS' => 1, +- 'CL_AS_NOEXECSTACK' => 1, +- 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, +- '_LT_AC_LANG_F77' => 1, +- 'AC_DISABLE_FAST_INSTALL' => 1, ++ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, ++ 'AU_DEFUN' => 1, ++ 'GMP_ASM_TYPE' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, +- 'AC_LTDL_SYMBOL_USCORE' => 1, +- 'GMP_ASM_X86_MCOUNT' => 1, +- 'AC_DEFUN_ONCE' => 1, +- 'GMP_PROG_M4' => 1, ++ 'GMP_TRY_ASSEMBLE' => 1, ++ 'AC_LIBLTDL_CONVENIENCE' => 1, ++ 'AM_AUTOMAKE_VERSION' => 1, ++ 'GMP_OPTION_ALLOCA' => 1, ++ 'LT_PROG_GCJ' => 1, ++ 'GMP_C_ATTRIBUTE_MODE' => 1, ++ 'LT_CONFIG_LTDL_DIR' => 1, ++ 'LT_PATH_LD' => 1, ++ 'AC_PROG_LD' => 1, ++ '_LT_PROG_ECHO_BACKSLASH' => 1, + 'GMP_ASM_X86_MULX' => 1, +- '_LT_COMPILER_BOILERPLATE' => 1, +- 'GMP_ASM_TYPE' => 1, +- 'LT_AC_PROG_RC' => 1, +- 'GMP_H_EXTERN_INLINE' => 1, ++ 'AM_PROG_LD' => 1, ++ 'AC_LIB_LTDL' => 1, ++ '_LT_PROG_CXX' => 1, ++ '_LT_AC_LANG_GCJ' => 1, ++ 'GMP_SUBST_CHECK_HEADERS' => 1, ++ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, ++ 'AM_SET_DEPDIR' => 1, ++ '_LTDL_SETUP' => 1, ++ 'GMP_GCC_WA_MCPU' => 1, ++ 'GMP_ASM_GLOBL_ATTR' => 1, + 'GMP_ASM_DATA' => 1, +- 'GMP_ASM_ALIGN_LOG' => 1, +- '_LT_PREPARE_SED_QUOTE_VARS' => 1, +- 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, +- 'AC_LIBTOOL_FC' => 1, +- '_LT_PROG_ECHO_BACKSLASH' => 1, +- '_LT_AC_LANG_CXX' => 1, +- 'AC_LIBTOOL_WIN32_DLL' => 1, +- 'GMP_COMPARE_GE_INTERNAL' => 1, +- 'GMP_FUNC_ALLOCA' => 1, ++ 'GMP_C_DOUBLE_FORMAT' => 1, ++ 'AM_PROG_INSTALL_SH' => 1, ++ 'GMP_INCLUDE_MPN' => 1, ++ '_AM_DEPENDENCIES' => 1, ++ '_LT_AC_LANG_GCJ_CONFIG' => 1, + 'GMP_ASM_BYTE' => 1, +- 'GMP_PROG_CC_WORKS_PART_MAIN' => 1, +- '_LT_AC_LANG_GCJ' => 1, +- 'AC_LIBTOOL_DLOPEN_SELF' => 1, +- 'GMP_ASM_COFF_TYPE' => 1, +- '_AM_AUTOCONF_VERSION' => 1, ++ 'AM_DISABLE_SHARED' => 1, ++ 'AC_DISABLE_SHARED' => 1, ++ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, ++ '_LT_AC_LOCK' => 1, ++ 'GMP_GCC_MIPS_O32' => 1, ++ 'AC_LIBTOOL_GCJ' => 1, ++ 'AM_RUN_LOG' => 1, ++ 'AM_SET_LEADING_DOT' => 1, ++ 'AC_LIBTOOL_F77' => 1, ++ 'LT_LIB_M' => 1, ++ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, ++ 'GMP_ASM_SPARC_GOTDATA' => 1, ++ '_LT_AC_TAGCONFIG' => 1, ++ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, ++ 'GMP_OS_X86_XMM' => 1, ++ 'AM_PROG_CC_C_O' => 1, ++ 'AC_LIBTOOL_CXX' => 1, ++ '_LT_PREPARE_SED_QUOTE_VARS' => 1, ++ 'GMP_CHECK_LIBM_FOR_BUILD' => 1, ++ 'AC_PATH_MAGIC' => 1, + 'LT_INIT' => 1, +- 'GMP_C_ATTRIBUTE_NORETURN' => 1, ++ 'AC_LTDL_DLLIB' => 1, ++ 'GMP_ASM_X86_MCOUNT' => 1, ++ 'AC_CONFIG_MACRO_DIR' => 1, ++ 'GMP_C_TEST_SIZEOF' => 1, ++ 'AC_LIBTOOL_LINKER_OPTION' => 1, ++ 'GMP_ASM_POWERPC_PIC_ALWAYS' => 1, + 'm4_include' => 1, +- 'AM_INIT_AUTOMAKE' => 1, +- 'AC_LIBTOOL_PROG_CC_C_O' => 1, +- 'AC_PROG_LD_RELOAD_FLAG' => 1, +- '_LT_AC_SHELL_INIT' => 1, +- '_AM_PROG_CC_C_O' => 1, +- 'AC_LTDL_ENABLE_INSTALL' => 1, +- '_LT_AC_SYS_LIBPATH_AIX' => 1, +- 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, +- 'GMP_M4_M4WRAP_SPURIOUS' => 1, +- 'AM_ENABLE_STATIC' => 1, +- 'LT_AC_PROG_GCJ' => 1, +- 'GMP_OS_X86_XMM' => 1, +- 'LTDL_CONVENIENCE' => 1, +- 'm4_pattern_allow' => 1, + 'GMP_DEFINE' => 1, +- 'AM_SET_DEPDIR' => 1, +- '_LT_LINKER_BOILERPLATE' => 1, +- 'LT_WITH_LTDL' => 1, +- 'GMP_PROG_CC_WORKS_PART_TEST' => 1, +- 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, +- 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, +- 'GMP_H_HAVE_FILE' => 1, +- 'LTSUGAR_VERSION' => 1, +- 'AC_LIBTOOL_PICMODE' => 1, +- '_LT_AC_LANG_RC_CONFIG' => 1, +- 'GMP_FINISH' => 1, +- 'AC_PROG_NM' => 1, +- 'AC_PROG_LIBTOOL' => 1, +- 'GMP_ASM_IA64_ALIGN_OK' => 1, ++ 'GMP_C_FOR_BUILD_ANSI' => 1, ++ 'GMP_PROG_CC_WORKS_LONGLONG' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, +- 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, +- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, +- 'AM_PROG_INSTALL_SH' => 1, +- 'AC_ENABLE_SHARED' => 1, +- '_GMP_SUBST_CHECK_FUNCS' => 1, +- '_AM_MANGLE_OPTION' => 1, +- 'GMP_PROG_NM' => 1, +- 'LT_LANG' => 1, +- 'AC_CONFIG_MACRO_DIR' => 1, +- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, +- 'AM_AUX_DIR_EXPAND' => 1, +- 'GMP_ASM_M68K_INSTRUCTION' => 1, +- 'AM_DISABLE_STATIC' => 1, +- 'GMP_HEADER_ALLOCA' => 1, +- 'AM_CONDITIONAL' => 1, +- 'GMP_COMPARE_GE' => 1, +- 'AC_LIBTOOL_F77' => 1, +- 'AC_LTDL_SHLIBEXT' => 1, +- 'AC_LIBTOOL_DLOPEN' => 1, +- 'GMP_PROG_CC_X86_GOT_EAX_EMITTED' => 1, ++ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'LT_SYS_MODULE_EXT' => 1, +- 'GMP_ASM_X86_SHLDL_CL' => 1, +- 'LT_PROG_GCJ' => 1, +- '_LT_LIBOBJ' => 1, +- 'AM_SANITY_CHECK' => 1, +- 'AC_LIBTOOL_SETUP' => 1, +- 'GMP_C_FOR_BUILD_ANSI' => 1, +- 'GMP_FUNC_VSNPRINTF' => 1, +- '_AC_PROG_LIBTOOL' => 1, +- 'LT_AC_PROG_SED' => 1, +- 'LT_PATH_NM' => 1, +- 'GMP_ASM_M68K_BRANCHES' => 1, +- 'AC_ENABLE_STATIC' => 1, +- 'GMP_ASM_X86_MMX' => 1, +- 'GMP_PROG_CC_FOR_BUILD_WORKS' => 1, +- 'GMP_PROG_EXEEXT_FOR_BUILD' => 1, ++ 'GMP_C_ATTRIBUTE_NORETURN' => 1, ++ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, ++ 'GMP_FUNC_ALLOCA' => 1, ++ 'GMP_FUNC_SSCANF_WRITABLE_INPUT' => 1, ++ 'GMP_ASM_LABEL_SUFFIX' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, ++ 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, ++ 'LT_SUPPORTED_TAG' => 1, + 'GMP_C_ATTRIBUTE_MALLOC' => 1, +- 'AC_PATH_MAGIC' => 1, +- 'LT_CMD_MAX_LEN' => 1, +- 'GMP_ASM_POWERPC_R_REGISTERS' => 1, +- '_LT_AC_LANG_C_CONFIG' => 1, +- 'LT_PROG_GO' => 1, +- 'GMP_TRY_ASSEMBLE' => 1, ++ '_LT_COMPILER_OPTION' => 1, ++ '_AM_CONFIG_MACRO_DIRS' => 1, ++ 'GMP_C_HIDDEN_ALIAS' => 1, ++ 'AC_LIBTOOL_CONFIG' => 1, ++ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, ++ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, ++ 'LT_FUNC_ARGZ' => 1, ++ '_LT_PROG_FC' => 1, ++ 'LT_SYS_DLOPEN_DEPLIBS' => 1, + '_LT_AC_SYS_COMPILER' => 1, +- 'AC_ENABLE_FAST_INSTALL' => 1, ++ '_AM_PROG_TAR' => 1, ++ 'AC_LIBTOOL_PICMODE' => 1, ++ 'GMP_FUNC_VSNPRINTF' => 1, ++ 'AC_LTDL_ENABLE_INSTALL' => 1, ++ 'AC_PROG_LD_RELOAD_FLAG' => 1, ++ 'LT_SYS_DLSEARCH_PATH' => 1, ++ 'AC_DEFUN' => 1, ++ 'LT_PROG_GO' => 1, ++ '_AM_SET_OPTION' => 1, ++ 'GMP_PROG_CC_WORKS' => 1, ++ 'LT_AC_PROG_EGREP' => 1, ++ 'AM_MAKE_INCLUDE' => 1, ++ '_GMP_SUBST_CHECK_HEADERS' => 1, ++ 'LT_SYS_SYMBOL_USCORE' => 1, ++ 'AC_LIBTOOL_SETUP' => 1, ++ '_LT_AC_PROG_CXXCPP' => 1, ++ 'GMP_PROG_CC_FOR_BUILD' => 1, + 'GMP_HPPA_LEVEL_20' => 1, +- '_AM_SET_OPTIONS' => 1, +- 'm4_pattern_forbid' => 1 ++ 'GMP_ASM_COFF_TYPE' => 1, ++ 'AC_ENABLE_FAST_INSTALL' => 1, ++ 'LTOBSOLETE_VERSION' => 1, ++ 'AC_LTDL_OBJDIR' => 1, ++ 'GMP_GCC_NO_CPP_PRECOMP' => 1, ++ 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, ++ 'GMP_INIT' => 1, ++ '_LT_AC_CHECK_DLFCN' => 1, ++ '_LT_CC_BASENAME' => 1, ++ 'AC_DISABLE_STATIC' => 1, ++ 'AM_DISABLE_STATIC' => 1, ++ 'AC_LIBTOOL_OBJDIR' => 1, ++ 'AM_SANITY_CHECK' => 1, ++ 'AM_AUX_DIR_EXPAND' => 1, ++ 'GMP_ASM_X86_SSE2' => 1, ++ 'CL_AS_NOEXECSTACK' => 1, ++ 'GMP_COMPARE_GE' => 1, ++ 'AM_SILENT_RULES' => 1, ++ '_LT_AC_TRY_DLOPEN_SELF' => 1, ++ '_LT_AC_LANG_F77' => 1, ++ 'GMP_DEFINE_RAW' => 1, ++ 'AC_LIBTOOL_DLOPEN' => 1, ++ 'GMP_CRAY_OPTIONS' => 1, ++ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, ++ 'GMP_ASM_SPARC_REGISTER' => 1, ++ 'GMP_ASM_X86_CET_MACROS' => 1, ++ 'AC_LIBTOOL_DLOPEN_SELF' => 1, ++ '_LT_AC_LANG_CXX_CONFIG' => 1, ++ 'GMP_C_ATTRIBUTE_CONST' => 1, ++ 'GMP_HPC_HPPA_2_0' => 1, ++ '_AM_IF_OPTION' => 1, ++ 'GMP_PROG_CC_IS_GNU' => 1, ++ 'AC_LTDL_DLSYM_USCORE' => 1, ++ '_LT_AC_LANG_CXX' => 1, ++ '_GMP_SUBST_CHECK_FUNCS' => 1, ++ 'AC_LIBTOOL_RC' => 1, ++ 'GMP_PROG_CXX_WORKS_PART' => 1, ++ '_LT_AC_TAGVAR' => 1, ++ 'AC_LIBTOOL_LANG_C_CONFIG' => 1, ++ 'GMP_ASM_X86_GOT_UNDERSCORE' => 1, ++ '_LT_AC_PROG_ECHO_BACKSLASH' => 1, ++ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, ++ '_LT_AC_LANG_F77_CONFIG' => 1, ++ 'AM_CONDITIONAL' => 1, ++ 'GMP_HEADER_ALLOCA' => 1, ++ 'GMP_COMPARE_GE_INTERNAL' => 1 + } + ], 'Autom4te::Request' ), + bless( [ +@@ -327,66 +328,66 @@ + 'configure.ac' + ], + { +- 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, +- 'AM_GNU_GETTEXT' => 1, +- 'AM_MAINTAINER_MODE' => 1, ++ 'AC_PROG_LIBTOOL' => 1, + 'AM_PROG_LIBTOOL' => 1, +- 'AC_CONFIG_LINKS' => 1, +- 'AC_FC_PP_DEFINE' => 1, +- 'AC_CANONICAL_TARGET' => 1, +- 'AM_CONDITIONAL' => 1, +- 'AC_LIBSOURCE' => 1, ++ 'AM_PROG_MOC' => 1, ++ 'AC_INIT' => 1, ++ 'AC_FC_FREEFORM' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, +- '_AM_COND_ELSE' => 1, +- '_LT_AC_TAGCONFIG' => 1, +- 'AC_SUBST' => 1, +- '_m4_warn' => 1, +- 'AM_PATH_GUILE' => 1, +- 'AC_REQUIRE_AUX_FILE' => 1, +- 'AC_PROG_LIBTOOL' => 1, +- 'AC_CONFIG_FILES' => 1, ++ 'AC_DEFINE_TRACE_LITERAL' => 1, ++ 'm4_include' => 1, ++ 'AM_SILENT_RULES' => 1, + 'AC_CONFIG_HEADERS' => 1, +- 'AM_ENABLE_MULTILIB' => 1, +- 'AM_AUTOMAKE_VERSION' => 1, +- 'AC_INIT' => 1, +- '_AM_MAKEFILE_INCLUDE' => 1, +- 'AC_SUBST_TRACE' => 1, +- 'AC_FC_SRCEXT' => 1, ++ 'AC_FC_PP_DEFINE' => 1, + 'AM_PROG_CC_C_O' => 1, +- '_AM_COND_IF' => 1, +- 'AM_XGETTEXT_OPTION' => 1, +- 'm4_pattern_forbid' => 1, +- 'm4_pattern_allow' => 1, ++ 'AC_CONFIG_FILES' => 1, + 'sinclude' => 1, +- 'AM_PROG_FC_C_O' => 1, ++ 'LT_INIT' => 1, ++ '_LT_AC_TAGCONFIG' => 1, ++ 'AM_PROG_F77_C_O' => 1, + 'AM_POT_TOOLS' => 1, ++ 'AM_PROG_AR' => 1, ++ 'AC_CONFIG_SUBDIRS' => 1, ++ '_AM_COND_ENDIF' => 1, ++ 'AM_CONDITIONAL' => 1, + 'AM_INIT_AUTOMAKE' => 1, +- 'm4_include' => 1, ++ 'AM_MAINTAINER_MODE' => 1, ++ 'AC_CANONICAL_SYSTEM' => 1, ++ 'AC_REQUIRE_AUX_FILE' => 1, ++ '_AM_COND_ELSE' => 1, ++ 'AC_FC_PP_SRCEXT' => 1, + 'LT_SUPPORTED_TAG' => 1, +- 'AC_CONFIG_SUBDIRS' => 1, +- 'AC_CANONICAL_BUILD' => 1, +- 'AM_SILENT_RULES' => 1, +- 'LT_INIT' => 1, ++ '_m4_warn' => 1, ++ 'AM_MAKEFILE_INCLUDE' => 1, ++ 'AM_ENABLE_MULTILIB' => 1, ++ '_AM_MAKEFILE_INCLUDE' => 1, ++ 'AM_PATH_GUILE' => 1, ++ 'AM_GNU_GETTEXT' => 1, ++ 'AH_OUTPUT' => 1, ++ 'AM_PROG_MKDIR_P' => 1, ++ 'AC_CANONICAL_TARGET' => 1, + 'AC_CONFIG_AUX_DIR' => 1, ++ 'm4_pattern_forbid' => 1, + '_AM_SUBST_NOTMAKE' => 1, +- 'include' => 1, +- 'AC_CANONICAL_HOST' => 1, +- 'AC_FC_FREEFORM' => 1, ++ 'AC_FC_SRCEXT' => 1, ++ 'AC_CANONICAL_BUILD' => 1, ++ 'AM_AUTOMAKE_VERSION' => 1, ++ 'AM_PROG_CXX_C_O' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, +- 'AM_PROG_MKDIR_P' => 1, +- 'AC_FC_PP_SRCEXT' => 1, ++ 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, ++ 'AC_LIBSOURCE' => 1, ++ 'include' => 1, ++ 'AC_SUBST' => 1, ++ 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'm4_sinclude' => 1, +- 'AH_OUTPUT' => 1, +- 'AM_PROG_AR' => 1, +- 'AM_PROG_F77_C_O' => 1, +- '_AM_COND_ENDIF' => 1, ++ 'AM_PROG_FC_C_O' => 1, ++ 'm4_pattern_allow' => 1, + 'AM_NLS' => 1, +- 'AM_PROG_MOC' => 1, +- 'AC_CANONICAL_SYSTEM' => 1, +- 'AM_PROG_CXX_C_O' => 1, +- 'AM_MAKEFILE_INCLUDE' => 1, +- 'AC_DEFINE_TRACE_LITERAL' => 1, +- 'AM_EXTRA_RECURSIVE_TARGETS' => 1 ++ '_AM_COND_IF' => 1, ++ 'AC_SUBST_TRACE' => 1, ++ 'AC_CONFIG_LINKS' => 1, ++ 'AC_CANONICAL_HOST' => 1, ++ 'AM_XGETTEXT_OPTION' => 1 + } + ], 'Autom4te::Request' ) + ); +--- gmp-6.2.0+dfsg.orig/autom4te.cache/traces.0 ++++ gmp-6.2.0+dfsg/autom4te.cache/traces.0 +@@ -1687,10 +1687,10 @@ m4trace:/usr/share/aclocal/lt~obsolete.m + m4trace:/usr/share/aclocal-1.16/amversion.m4:14: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.16.1], [], ++m4_if([$1], [1.16.2], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) +-m4trace:/usr/share/aclocal-1.16/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.16.1])dnl ++m4trace:/usr/share/aclocal-1.16/amversion.m4:33: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.16.2])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +@@ -1899,7 +1899,9 @@ m4trace:/usr/share/aclocal-1.16/depout.m + done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments +- for automatic dependency tracking. Try re-running configure with the ++ for automatic dependency tracking. If GNU make was not used, consider ++ re-running the configure script with MAKE="gmake" (or whatever is ++ necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi +@@ -1910,7 +1912,7 @@ m4trace:/usr/share/aclocal-1.16/depout.m + rm -f conftest-deps.mk + } + ]) +-m4trace:/usr/share/aclocal-1.16/depout.m4:62: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], ++m4trace:/usr/share/aclocal-1.16/depout.m4:64: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) + m4trace:/usr/share/aclocal-1.16/init.m4:29: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +@@ -4330,7 +4332,83 @@ __sparc_get_pc_thunk.l7: + + GMP_DEFINE_RAW(["define(,<$gmp_cv_asm_sparc_shared_thunks>)"]) + ]) +-m4trace:acinclude.m4:3142: -1- AC_DEFUN([GMP_C_ATTRIBUTE_CONST], [AC_CACHE_CHECK([whether gcc __attribute__ ((const)) works], ++m4trace:acinclude.m4:3162: -1- AC_DEFUN([GMP_ASM_X86_CET_MACROS], [ ++dnl AC_REQUIRE([AC_PROG_CC]) GMP uses something else ++AC_CACHE_CHECK([if Intel CET is enabled], ++ gmp_cv_asm_x86_intel_cet, [dnl ++ cat > conftest.c </dev/null]) ++ then ++ gmp_cv_asm_x86_intel_cet=yes ++ else ++ gmp_cv_asm_x86_intel_cet=no ++ fi ++ rm -f conftest*]) ++ if test "$gmp_cv_asm_x86_intel_cet" = yes; then ++ case $1 in ++ 32) ++ endbr=endbr32 ++ p2align=2 ++ ;; ++ 64) ++ endbr=endbr64 ++ p2align=3 ++ ;; ++ x32) ++ endbr=endbr64 ++ p2align=2 ++ ;; ++ esac ++ AC_CACHE_CHECK([if .note.gnu.property section is needed], ++ gmp_cv_asm_x86_gnu_property, [dnl ++ cat > conftest.c </dev/null]) ++ then ++ gmp_cv_asm_x86_gnu_property=yes ++ else ++ gmp_cv_asm_x86_gnu_property=no ++ fi ++ rm -f conftest*]) ++ echo ["define(,<$endbr>)"] >> $gmp_tmpconfigm4 ++ echo ["define(,)"] >> $gmp_tmpconfigm4 ++ else ++ gmp_cv_asm_x86_gnu_property=no ++ echo ["define(,<>)"] >> $gmp_tmpconfigm4 ++ echo ["define(,<>)"] >> $gmp_tmpconfigm4 ++ fi ++ if test "$gmp_cv_asm_x86_gnu_property" = yes; then ++ echo ["define(, < ++ .section \".note.gnu.property\", \"a\" ++ .p2align $p2align ++ .long 1f - 0f ++ .long 4f - 1f ++ .long 5 ++0: ++ .asciz \"GNU\" ++1: ++ .p2align $p2align ++ .long 0xc0000002 ++ .long 3f - 2f ++2: ++ .long 3 ++3: ++ .p2align $p2align ++4:>)"] >> $gmp_tmpconfigm4 ++ else ++ echo ["define(,<>)"] >> $gmp_tmpconfigm4 ++ fi ++]) ++m4trace:acinclude.m4:3243: -1- AC_DEFUN([GMP_C_ATTRIBUTE_CONST], [AC_CACHE_CHECK([whether gcc __attribute__ ((const)) works], + gmp_cv_c_attribute_const, + [AC_TRY_COMPILE([int foo (int x) __attribute__ ((const));], , + gmp_cv_c_attribute_const=yes, gmp_cv_c_attribute_const=no) +@@ -4340,7 +4418,7 @@ if test $gmp_cv_c_attribute_const = yes; + [Define to 1 if the compiler accepts gcc style __attribute__ ((const))]) + fi + ]) +-m4trace:acinclude.m4:3161: -1- AC_DEFUN([GMP_C_ATTRIBUTE_MALLOC], [AC_CACHE_CHECK([whether gcc __attribute__ ((malloc)) works], ++m4trace:acinclude.m4:3262: -1- AC_DEFUN([GMP_C_ATTRIBUTE_MALLOC], [AC_CACHE_CHECK([whether gcc __attribute__ ((malloc)) works], + gmp_cv_c_attribute_malloc, + [cat >conftest.c <