Description: Fix mipsel define and byte-op-metric test
 Mixed fix, needs cleanup.
 .
 cbmc (5.84.0-3) unstable; urgency=low
 .
   * Fix several lintian warnings
   * Introduce new jbmc binary package
Author: Michael Tautschnig <mt@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2023-06-10

--- cbmc-5.84.0.orig/regression/cbmc/byte-op-metric/test.desc
+++ cbmc-5.84.0/regression/cbmc/byte-op-metric/test.desc
@@ -5,11 +5,11 @@ main.c
 ^SIGNAL=0$
 ^Byte Extracts:$
 ^.*main\.c line 8 function main$
-^.* byte\_extract\_little\_endian\(.*\)$
+^.* byte\_extract\_(big|little)\_endian\(.*\)$
 ^Number of byte extracts: 1$
 ^Byte Updates:$
 ^.*main\.c line 8 function main$
-^.* byte\_update\_little\_endian\(.*\)$
+^.* byte\_update\_(big|little)\_endian\(.*\)$
 ^Number of byte updates: 1$
 --
 --
--- cbmc-5.84.0.orig/regression/cbmc/byte-op-metric/test_json.desc
+++ cbmc-5.84.0/regression/cbmc/byte-op-metric/test_json.desc
@@ -4,7 +4,7 @@ main.c
 activate-multi-line-match
 ^EXIT=0$
 ^SIGNAL=0$
-"byteOpsStats": \{\n\s*"byteExtractStats": \{\n\s*"byteExtractList": \[\n\s*\{\n\s*"sourceLocation": \{(\n.*)*\},\n\s*"ssaExpr": \{(\n.*)*\},\n\s*"ssaExprString": ".* .* byte\_extract\_little\_endian\(.*\)"\n\s*\}\n\s*\],\n\s*"numOfExtracts": 1\n\s*\},\n\s*"byteUpdateStats": \{\n\s*"byteUpdateList": \[\n\s*\{\n\s*"sourceLocation": \{(\n.*)*\},\n\s*"ssaExpr": \{(\n.*)*\},\n\s*"ssaExprString": ".* .* byte\_update\_little\_endian\(.*\)"\n\s*\}\n\s*\],\n\s*"numOfUpdates": 1\n\s*\}
+"byteOpsStats": \{\n\s*"byteExtractStats": \{\n\s*"byteExtractList": \[\n\s*\{\n\s*"sourceLocation": \{(\n.*)*\},\n\s*"ssaExpr": \{(\n.*)*\},\n\s*"ssaExprString": ".* .* byte\_extract\_(big|little)\_endian\(.*\)"\n\s*\}\n\s*\],\n\s*"numOfExtracts": 1\n\s*\},\n\s*"byteUpdateStats": \{\n\s*"byteUpdateList": \[\n\s*\{\n\s*"sourceLocation": \{(\n.*)*\},\n\s*"ssaExpr": \{(\n.*)*\},\n\s*"ssaExprString": ".* .* byte\_update\_(big|little)\_endian\(.*\)"\n\s*\}\n\s*\],\n\s*"numOfUpdates": 1\n\s*\}
 --
 --
 To test json output for --show-byte-ops option that displays byte extract and update metrics.
--- cbmc-5.84.0.orig/src/util/config.cpp
+++ cbmc-5.84.0/src/util/config.cpp
@@ -1364,7 +1364,7 @@ irep_idt configt::this_architecture()
     #else
     this_arch = "arm";
     #endif
-  #elif defined(__mipsel__)
+  #elif defined(_MIPSEL)
     #if _MIPS_SIM==_ABIO32
     this_arch = "mipsel";
     #elif _MIPS_SIM==_ABIN32
