[Pkg-openssl-devel] Bug#882007: openssl: add mips r6 support

[YunQiang Su]

Package: src:openssl
Version: 1.1.0g-2
X-Debbugs-Cc: helmut at subdivi.de

Please add mips r6 support of openssl.
mips r6 is quite similar with current mips architectures,
while mips r6 drops and replace some insn,
so they are not compatible with previous version.

Here for openssl, we disable ASM, and -DBN_DIV3W.

-- 
YunQiang Su
-------------- next part --------------
diff --git a/debian/patches/debian-targets.patch b/debian/patches/debian-targets.patch
index dbac728..3085112 100644
--- a/debian/patches/debian-targets.patch
+++ b/debian/patches/debian-targets.patch
@@ -4,7 +4,7 @@
 
 --- /dev/null
 +++ b/Configurations/20-debian.conf
-@@ -0,0 +1,140 @@
+@@ -0,0 +1,165 @@
 +my $debian_cflags = `dpkg-buildflags --get CFLAGS` . `dpkg-buildflags --get CPPFLAGS` . "-Wa,--noexecstack -Wall";
 +$debian_cflags =~ s/\n/ /g;
 +my $debian_ldflags = `dpkg-buildflags --get LDFLAGS`;
@@ -90,6 +90,31 @@
 +		inherit_from => [ "linux64-mips64", "debian" ],
 +		cflags => add("-DL_ENDIAN"),
 +	},
++	"debian-mipsr6" => {
++		inherit_from => [ "linux-mips32r6", "debian" ],
++		cflags => add("-DB_ENDIAN"),
++	},
++	"debian-mipsr6el" => {
++		inherit_from => [ "linux-mips32r6", "debian" ],
++		cflags => add("-DL_ENDIAN"),
++	},
++	"debian-mipsn32r6" => {
++		inherit_from => [ "linux-mips64r6", "debian" ],
++		cflags => add("-DB_ENDIAN"),
++	},
++	"debian-mipsn32r6el" => {
++		inherit_from => [ "linux-mips64r6", "debian" ],
++		cflags => add("-DL_ENDIAN"),
++	},
++	"debian-mips64r6" => {
++		inherit_from => [ "linux64-mips64r6", "debian" ],
++		cflags => add("-DB_ENDIAN"),
++	},
++	"debian-mips64r6el" => {
++		inherit_from => [ "linux64-mips64r6", "debian" ],
++		cflags => add("-DL_ENDIAN"),
++	},
++
 +	"debian-nios2" => {
 +		inherit_from => [ "linux-generic32", "debian" ],
 +	},
@@ -145,3 +170,37 @@
 +	},
 +);
 +
+--- a/Configurations/10-main.conf
++++ b/Configurations/10-main.conf
+@@ -736,6 +736,31 @@ sub vms_info {
+         shared_ldflag    => add("-mabi=64"),
+         multilib         => "64",
+     },
++    "linux-mips32r6" => {
++        # Configure script adds minimally required -march for assembly
++        # support, if no -march was specified at command line.
++        inherit_from     => [ "linux-generic32"],
++        cflags           => add("-mabi=32"),
++        perlasm_scheme   => "o32",
++        shared_ldflag    => add("-mabi=32"),
++    },
++    # mips32 and mips64 below refer to contemporary MIPS Architecture
++    # specifications, MIPS32 and MIPS64, rather than to kernel bitness.
++    "linux-mips64r6" => {
++        inherit_from     => [ "linux-generic32"],
++        cflags           => add("-mabi=n32"),
++        bn_ops           => "SIXTY_FOUR_BIT RC4_CHAR",
++        perlasm_scheme   => "n32",
++        shared_ldflag    => add("-mabi=n32"),
++        multilib         => "32",
++    },
++    "linux64-mips64r6" => {
++        inherit_from     => [ "linux-generic64"],
++        cflags           => add("-mabi=64"),
++        perlasm_scheme   => "64",
++        shared_ldflag    => add("-mabi=64"),
++        multilib         => "64",
++    },
+
+     #### IA-32 targets...
+     #### These two targets are a bit aged and are to be used on older Linux