[PATCH 11/16] lib/tests: Take RISC-V into account in size conditionals.

[W. J. van der Laan]

* lib/tests/scaffold/76-pointer-arithmetic.c (main): Use the right sizes
in the test for RISC-V architectures.
* lib/tests/scaffold/7k-for-each-elem.c (main): Same.
* lib/tests/scaffold/85-sizeof.c: Same.
---
 lib/tests/scaffold/76-pointer-arithmetic.c | 4 ++--
 lib/tests/scaffold/7k-for-each-elem.c      | 6 +++---
 lib/tests/scaffold/85-sizeof.c             | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/tests/scaffold/76-pointer-arithmetic.c 
b/lib/tests/scaffold/76-pointer-arithmetic.c
index 
21b8a2f00e07407297b4ef815df49035ff799ab0..2829e1325f9dbba25bf61996fdc9ab0f48e9f2e7
 100644
--- a/lib/tests/scaffold/76-pointer-arithmetic.c
+++ b/lib/tests/scaffold/76-pointer-arithmetic.c
@@ -56,10 +56,10 @@ main ()
   oputs (itoa (foo_size));
   oputs ("\n");
   // FIXME: add *14, *18
-#if __i386__ || __arm__
+#if __i386__ || __arm__ || (__riscv && __riscv_xlen == 32)
   int foo_size_14 = 224;
   int foo_size_18 = 288;
-#elif __x86_64__
+#elif __x86_64__ || (__riscv && __riscv_xlen == 64)
   int foo_size_14 = 336;
   int foo_size_18 = 432;
 #endif
diff --git a/lib/tests/scaffold/7k-for-each-elem.c 
b/lib/tests/scaffold/7k-for-each-elem.c
index 
df789986659110b258cf2f2e1b5113783dec847d..9d3a035f78bdfc4bea164f47d737e85e0435870c
 100644
--- a/lib/tests/scaffold/7k-for-each-elem.c
+++ b/lib/tests/scaffold/7k-for-each-elem.c
@@ -47,11 +47,11 @@ struct section section;
 int
 main ()
 {
-#if __i386__ || __arm__
+#if __i386__ || __arm__ || (__riscv && __riscv_xlen == 32)
   int sym_size = 8;
-#elif __GNUC__ && __x86_64__
+#elif __GNUC__ && (__x86_64__ || (__riscv && __riscv_xlen == 64))
   int sym_size = 16;
-#elif  __MESC__ && __x86_64__
+#elif  __MESC__ && (__x86_64__ || (__riscv && __riscv_xlen == 64))
   int sym_size = 12;
 #endif

diff --git a/lib/tests/scaffold/85-sizeof.c b/lib/tests/scaffold/85-sizeof.c
index 
f95b69ede3c94817438629ec92efad93f5507db5..152c3df8a5a44a0cdf93f5c796ea7fc2ce918bf5
 100644
--- a/lib/tests/scaffold/85-sizeof.c
+++ b/lib/tests/scaffold/85-sizeof.c
@@ -34,11 +34,11 @@ struct bar
   };
 };

-#if __i386__ || __arm__
+#if __i386__ || __arm__ || (__riscv && __riscv_xlen == 32)
 #define ptr_size 4
 #define foo_size 20
 #define bar_size 12
-#elif __x86_64__
+#elif __x86_64__ || (__riscv && __riscv_xlen == 64)
 #define ptr_size 8
 #define foo_size 24
 #define bar_size 12
--
2.27.0