From b5c015fbdfc7a5c255c7e4911148348e2e431407 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 20 Dec 2022 13:49:52 +0100 Subject: [PATCH] rebase of the patches --- debian/patches/930008-arm.diff | 8 ++--- .../clang-arm-default-vfp3-on-armv7a.patch | 34 +++++++++---------- debian/patches/disable-sse2-old-x86.diff | 8 ++--- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/debian/patches/930008-arm.diff b/debian/patches/930008-arm.diff index c9443a56..41bd01b1 100644 --- a/debian/patches/930008-arm.diff +++ b/debian/patches/930008-arm.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20221109021920+0f4f246783fa/llvm/lib/Support/ARMTargetParser.cpp +Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/TargetParser/ARMTargetParser.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20221109021920+0f4f246783fa.orig/llvm/lib/Support/ARMTargetParser.cpp -+++ llvm-toolchain-snapshot_16~++20221109021920+0f4f246783fa/llvm/lib/Support/ARMTargetParser.cpp -@@ -704,7 +704,7 @@ StringRef ARM::getARMCPUForArch(const ll +--- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/lib/TargetParser/ARMTargetParser.cpp ++++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/TargetParser/ARMTargetParser.cpp +@@ -589,7 +589,7 @@ StringRef ARM::getARMCPUForArch(const ll case llvm::Triple::EABIHF: case llvm::Triple::GNUEABIHF: case llvm::Triple::MuslEABIHF: diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch index 500276e0..21a0a955 100644 --- a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch +++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch @@ -1,21 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20221117090012+7b6fe711b210/llvm/include/llvm/Support/ARMTargetParser.def +Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/Target/ARM/ARM.td =================================================================== ---- llvm-toolchain-snapshot_16~++20221117090012+7b6fe711b210.orig/llvm/include/llvm/Support/ARMTargetParser.def -+++ llvm-toolchain-snapshot_16~++20221117090012+7b6fe711b210/llvm/include/llvm/Support/ARMTargetParser.def -@@ -68,7 +68,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "+v6 - ARM_ARCH("armv6-m", ARMV6M, "6-M", "+v6m", ARMBuildAttrs::CPUArch::v6_M, - FK_NONE, ARM::AEK_NONE) - ARM_ARCH("armv7-a", ARMV7A, "7-A", "+v7", ARMBuildAttrs::CPUArch::v7, -- FK_NEON, ARM::AEK_DSP) -+ FK_VFPV3_D16 /* Hard float */, ARM::AEK_DSP) - ARM_ARCH("armv7ve", ARMV7VE, "7VE", "+v7ve", ARMBuildAttrs::CPUArch::v7, - FK_NEON, (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | - ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP)) -Index: llvm-toolchain-snapshot_16~++20221117090012+7b6fe711b210/llvm/lib/Target/ARM/ARM.td -=================================================================== ---- llvm-toolchain-snapshot_16~++20221117090012+7b6fe711b210.orig/llvm/lib/Target/ARM/ARM.td -+++ llvm-toolchain-snapshot_16~++20221117090012+7b6fe711b210/llvm/lib/Target/ARM/ARM.td -@@ -900,7 +900,8 @@ def ARMv6sm : Architecture<"armv6s-m", +--- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/lib/Target/ARM/ARM.td ++++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/Target/ARM/ARM.td +@@ -905,7 +905,8 @@ def ARMv6sm : Architecture<"armv6s-m", FeatureStrictAlign]>; def ARMv7a : Architecture<"armv7-a", "ARMv7a", [HasV7Ops, @@ -25,3 +12,16 @@ Index: llvm-toolchain-snapshot_16~++20221117090012+7b6fe711b210/llvm/lib/Target/ FeatureDB, FeatureDSP, FeatureAClass, +Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/ARMTargetParser.def +=================================================================== +--- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/include/llvm/TargetParser/ARMTargetParser.def ++++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/ARMTargetParser.def +@@ -68,7 +68,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "+v6 + ARM_ARCH("armv6-m", ARMV6M, "6-M", "+v6m", ARMBuildAttrs::CPUArch::v6_M, + FK_NONE, ARM::AEK_NONE) + ARM_ARCH("armv7-a", ARMV7A, "7-A", "+v7", ARMBuildAttrs::CPUArch::v7, +- FK_NEON, ARM::AEK_DSP) ++ FK_VFPV3_D16 /* Hard float */, ARM::AEK_DSP) + ARM_ARCH("armv7ve", ARMV7VE, "7VE", "+v7ve", ARMBuildAttrs::CPUArch::v7, + FK_NEON, (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | + ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP)) diff --git a/debian/patches/disable-sse2-old-x86.diff b/debian/patches/disable-sse2-old-x86.diff index b02eb070..10de84be 100644 --- a/debian/patches/disable-sse2-old-x86.diff +++ b/debian/patches/disable-sse2-old-x86.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/include/llvm/Support/X86TargetParser.def +Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/X86TargetParser.def =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/include/llvm/Support/X86TargetParser.def -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/include/llvm/Support/X86TargetParser.def -@@ -226,7 +226,7 @@ CPU_SPECIFIC("pentium_mmx", "pentium-mmx +--- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/include/llvm/TargetParser/X86TargetParser.def ++++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/X86TargetParser.def +@@ -249,7 +249,7 @@ CPU_SPECIFIC("pentium_mmx", "pentium-mmx CPU_SPECIFIC("pentium_ii", "pentium2", 'E', "+cmov,+mmx") CPU_SPECIFIC("pentium_iii", "pentium3", 'H', "+cmov,+mmx,+sse") CPU_SPECIFIC_ALIAS("pentium_iii_no_xmm_regs", "pentium3", "pentium_iii")