Merging debian version 22.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 139 insertions, 31 deletions

diff --git a/debian/changelog b/debian/changelog
index 4d2a501..e1d3fd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+isa-support (22) experimental; urgency=medium
+
+  * Add x86-64-v2-support, x86-64-v3-support and
+    amd64-baseline-support packages.
+
+ -- Bastien Roucariès <rouca@debian.org>  Mon, 24 Jun 2024 12:16:24 +0000
+
 isa-support (21-0.0~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index bb2e0d5..9768ea3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
 XSBC-Original-Maintainer: Bastien Roucariès <rouca@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
 Build-Depends: debhelper-compat (= 13), po-debconf
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/isa-support
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/isa-support
@@ -41,8 +41,8 @@ Description: CPU feature checking - require SSE2
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for SSE2 and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for SSE2 and
+ refuses to install on unsupported hardware.
  .
  Streaming SIMD Extensions (SSE) is a single instruction, multiple data
  (SIMD) instruction set extension.
@@ -52,6 +52,67 @@ Description: CPU feature checking - require SSE2
  including all 64-bit capable ones, but not on Pentium 3, Athlon XP, Via C3,
  Quark, or older processors.
 
+Package: amd64-baseline-support
+Multi-Arch: foreign
+Architecture: any-i386
+Pre-Depends: isa-support (= ${binary:Version})
+Description: CPU feature checking - require amd64-baseline
+ The packages in the isa-support family probe for microprocessor Instruction
+ Set Architecture features such as SSE3. By refusing to install on machines
+ lacking a required feature, they allow ISA requirements to be handled in
+ terms of package dependencies.
+ .
+ This is a mostly dummy package which checks for amd64-baseline and
+ refuses to install on unsupported hardware.
+ .
+ This is the Micro-Architecture Levels baseline for Debian under
+ x86-64 architecture, corresponding to x86-65 psABI v1.
+ .
+ This includes:
+ - cmov instruction (CMOV instruction set),
+ - cmpxchg8b ant other 64 bits atomics instruction (CX8 instruction set),
+ - MMX a single instruction, multiple data (SIMD) instruction set,
+ - streaming SIMD Extensions (SSE) set, a single instruction, multiple data
+   (SIMD) instruction set extension,
+ - SSE2 an incremental upgrade to SSE.
+ .
+ On ABIs other than the x86-64 psABI they select the same CPU features
+ as the x86-64 psABI documents for the particular micro-architecture level.
+
+Package: x86-64-v2-support
+Multi-Arch: foreign
+Architecture: any-i386 any-amd64
+Pre-Depends: isa-support (= ${binary:Version})
+Description: CPU feature checking - require x86-64-v2
+ The packages in the isa-support family probe for microprocessor Instruction
+ Set Architecture features such as SSE3. By refusing to install on machines
+ lacking a required feature, they allow ISA requirements to be handled in
+ terms of package dependencies.
+ .
+ This is a mostly dummy package which checks for x86-64-v2 and
+ refuses to install on unsupported hardware.
+ .
+ This is the Micro-Architecture Levels version 2 as defined by the
+ amd64 ABI document.
+ This includes:
+ - cmov instruction (CMOV instruction set),
+ - cmpxchg8b ant other 64 bits atomics instruction (CX8 instruction set),
+ - MMX a single instruction, multiple data (SIMD) instruction set,
+ - streaming SIMD Extensions (SSE) set, a single instruction, multiple data
+   (SIMD) instruction set extension,
+ - SSE2 an incremental upgrade to SSE.
+ - cmpxchg16b ant other 128 bits atomics instruction (CX16 instruction set),
+ - SSE3, also called PNI (Prescott New Instructions), is an incremental upgrade
+   to SSE2
+ - SSE4.1 added a dot product instruction and additional integer instructions.
+ - SSE4.2 added string and text processing instructions that perform character
+   searches and comparison on two operands of 16 bytes at a time.
+ - SSSE3 or Supplemental Streaming SIMD Extension 3.
+ .
+ The corresponding micro-architecture level from the x86-64 psABI.
+ On ABIs other than the x86-64 psABI they select the same CPU features
+ as the x86-64 psABI documents for the particular micro-architecture level.
+
 Package: sse3-support
 Multi-Arch: foreign
 Architecture: any-i386 any-amd64
@@ -62,8 +123,8 @@ Description: CPU feature checking - require SSE3
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for SSE3 and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for SSE3 and
+ refuses to install on unsupported hardware.
  .
  Streaming SIMD Extensions (SSE) is a single instruction, multiple data
  (SIMD) instruction set extension.
@@ -84,8 +145,8 @@ Description: CPU feature checking - require SSE4.1
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for SSE4.1 and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for SSE4.1 and
+ refuses to install on unsupported hardware.
  .
  Streaming SIMD Extensions (SSE) is a single instruction, multiple data
  (SIMD) instruction set extension.
@@ -105,8 +166,8 @@ Description: CPU feature checking - require SSE4.2
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for SSE4.2 and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for SSE4.2 and
+ refuses to install on unsupported hardware.
  .
  SSE4.2 added string and text processing instructions that perform character
  searches and comparison on two operands of 16 bytes at a time. It is
@@ -114,6 +175,46 @@ Description: CPU feature checking - require SSE4.2
  on anything AMD until the Bulldozer (15h, in 2011) and Jaguar (16h, in
  2013) families.
 
+Package: x86-64-v3-support
+Multi-Arch: foreign
+Architecture: any-i386 any-amd64
+Pre-Depends: isa-support (= ${binary:Version})
+Description: CPU feature checking - require x86-64-v3
+ The packages in the isa-support family probe for microprocessor Instruction
+ Set Architecture features such as SSE3. By refusing to install on machines
+ lacking a required feature, they allow ISA requirements to be handled in
+ terms of package dependencies.
+ .
+ This is a mostly dummy package which checks for x86-64-v3 and
+ refuses to install on unsupported hardware.
+ .
+ This is the Micro-Architecture Levels version 3 as defined by
+ the amd64 ABI document.
+ This includes:
+ - cmov instruction (CMOV instruction set),
+ - cmpxchg8b ant other 64 bits atomics instruction (CX8 instruction set),
+ - MMX a single instruction, multiple data (SIMD) instruction set,
+ - streaming SIMD Extensions (SSE) set, a single instruction, multiple data
+   (SIMD) instruction set extension,
+ - SSE2 an incremental upgrade to SSE.
+ - cmpxchg16b ant other 128 bits atomics instruction (CX16 instruction set),
+ - SSE3, also called PNI (Prescott New Instructions), is an incremental upgrade
+   to SSE2,
+ - SSE4.1 added a dot product instruction and additional integer instructions,
+ - SSE4.2 added string and text processing instructions that perform character
+   searches and comparison on two operands of 16 bytes at a time,
+ - SSSE3 or Supplemental Streaming SIMD Extension 3,
+ - Advanced Vector Extensions (AVX and AVX2)
+ - Bit manipulation instructions sets (BMI and BMI2),
+ - F16C instruction set converting between half-precision
+   and standard IEEE single-precision floating-point formats,
+ - LZCNT instruction, Count the Number of Leading Zero Bits,
+ - OSXSAVE, Save Processor Extended States instruction.
+ .
+ The corresponding micro-architecture level from the x86-64 psABI.
+ On ABIs other than the x86-64 psABI they select the same CPU features
+ as the x86-64 psABI documents for the particular micro-architecture level.
+
 Package: altivec-support
 Multi-Arch: foreign
 Architecture: powerpc
@@ -124,8 +225,8 @@ Description: CPU feature checking - require altivec
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for altivec and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for altivec and
+ refuses to install on unsupported hardware.
  .
  AltiVec is a single-precision floating point and integer SIMD instruction
  set. It is a standard part of the Power ISA v.2.03 specification.
@@ -140,8 +241,8 @@ Description: CPU feature checking - require neon
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for neon and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for neon and
+ refuses to install on unsupported hardware.
  .
  This is a mostly dummy package which checks for Neon and refuses to install
  on unsupported hardware.
@@ -162,8 +263,8 @@ Description: CPU feature checking - require ARMv6
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for ARMv6 and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for ARMv6 and
+ refuses to install on unsupported hardware.
  .
  The ARMv6 architecture (not to be confused with product family ARM6) uses
  physically addressed cache, solving many cache aliasing problems and
@@ -187,8 +288,8 @@ Description: CPU feature checking - require ARMv6K
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for ARMv6K and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for ARMv6K and
+ refuses to install on unsupported hardware.
  .
  ARMv6k is a subarchitecture of ARMV6 adding Symmetric MultiProcessing
  and Thread Local Storage instruction sets. It is not guaranteed by the
@@ -206,8 +307,8 @@ Description: CPU feature checking - require ARMv7
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for ARMv7 and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for ARMv7 and
+ refuses to install on unsupported hardware.
  .
  ARMv7 (not to be confused with product family ARM7) includes Thumb-2
  technology, adding 32-bit instructions into compressed Thumb mode. It is
@@ -226,8 +327,8 @@ Description: CPU feature checking - require ARMv8
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for ARMv8 and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for ARMv8 and
+ refuses to install on unsupported hardware.
  .
  ARMv8 (not to be confused with product family ARM8) introduced a large
  number of ISA enhancements. It is not guaranteed by the architecture
@@ -245,8 +346,8 @@ Description: CPU feature checking - require VFP
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for VFP and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for VFP and
+ refuses to install on unsupported hardware.
  .
  VFP (Vector Floating Point) technology is a floating-point unit (FPU)
  coprocessor extension to the ARM architecture. It provides single- and
@@ -263,8 +364,8 @@ Description: CPU feature checking - require VFPv2
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for VFPv2 and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for VFPv2 and
+ refuses to install on unsupported hardware.
  .
  VFP (Vector Floating Point) technology is a floating-point unit (FPU)
  coprocessor extension to the ARM architecture. It provides single- and
@@ -284,8 +385,8 @@ Description: CPU feature checking - require VFPv3
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for VFPv3 and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for VFPv3 and
+ refuses to install on unsupported hardware.
  .
  VFP (Vector Floating Point) technology is a floating-point unit (FPU)
  coprocessor extension to the ARM architecture. It provides single- and
diff --git a/debian/control.d/control-base.in b/debian/control.d/control-base.in
index 6c5b840..3a3597c 100644
--- a/debian/control.d/control-base.in
+++ b/debian/control.d/control-base.in
@@ -6,7 +6,7 @@ XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
 XSBC-Original-Maintainer: Bastien Roucariès <rouca@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
 Build-Depends: debhelper-compat (= 13), po-debconf
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/isa-support
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/isa-support
diff --git a/debian/control.d/control.in b/debian/control.d/control.in
index d4a093e..da8b7a3 100644
--- a/debian/control.d/control.in
+++ b/debian/control.d/control.in
@@ -8,7 +8,7 @@ Description: CPU feature checking - require @NAME@
  lacking a required feature, they allow ISA requirements to be handled in
  terms of package dependencies.
  .
- This is a mostly dummy package which checks for @NAME@ and refuses to install
- on unsupported hardware.
+ This is a mostly dummy package which checks for @NAME@ and
+ refuses to install on unsupported hardware.
  .
  @DESCRIPTION@
diff --git a/debian/tests/control b/debian/tests/control
index 81d8b99..4ac8393 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -8,7 +8,7 @@ Architecture: any-i386
 
 Tests: test-amd64-baseline
 Depends: isa-support, qemu-user-static (>>1:7.2~), build-essential
-Architecture: any-i386 any-amd64
+Architecture: any-i386
 
 Tests: test-x86-64-v1
 Depends: isa-support, qemu-user-static (>>1:7.2~), build-essential