[PATCH 2/5] testsuites/libtests: Remove floats from libdl tests
Alex White
alex.white at oarcorp.com
Mon Aug 28 01:30:10 UTC 2023
This patch addresses an issue seen with MicroBlaze in the dl07, dl08,
and dl09 tests by removing the use of floats. The issue relates to the
fact that the MicroBlaze BSPs use software floating point routines. Any
float passed to `printf` is converted to a double automatically because
of default argument promotion with variadic functions. This conversion
is handled by the `__extendsfdf2` libgcc function. The problem is that
the main test executable does not use floating point code, so the
`__extendsfdf2` function is not linked in. This causes a problem when
loading the test objects.
This patch removes the use of floats so that BSPs that use software
floating point routines can still run the tests.
---
testsuites/libtests/dl07/dl-o1.h | 11 ++++-------
testsuites/libtests/dl07/dl-o2.h | 8 +++-----
testsuites/libtests/dl07/dl-o4.h | 1 -
testsuites/libtests/dl07/dl07-o1.c | 16 +++++-----------
testsuites/libtests/dl07/dl07-o2.c | 13 +++----------
testsuites/libtests/dl07/dl07-o3.c | 6 ------
testsuites/libtests/dl07/dl07-o4.c | 5 -----
testsuites/libtests/dl07/dl07-o5.c | 3 ---
testsuites/libtests/dl08/dl-o1.h | 11 ++++-------
testsuites/libtests/dl08/dl-o2.h | 8 +++-----
testsuites/libtests/dl08/dl-o4.h | 1 -
testsuites/libtests/dl08/dl08-o1.c | 16 +++++-----------
testsuites/libtests/dl08/dl08-o2.c | 10 +++-------
testsuites/libtests/dl08/dl08-o3.c | 1 -
testsuites/libtests/dl08/dl08-o4.c | 2 --
testsuites/libtests/dl09/dl-o1.h | 11 ++++-------
testsuites/libtests/dl09/dl-o2.h | 8 +++-----
testsuites/libtests/dl09/dl-o4.h | 1 -
testsuites/libtests/dl09/dl09-o1.c | 16 +++++-----------
testsuites/libtests/dl09/dl09-o2.c | 10 +++-------
testsuites/libtests/dl09/dl09-o3.c | 1 -
testsuites/libtests/dl09/dl09-o4.c | 2 --
22 files changed, 45 insertions(+), 116 deletions(-)
diff --git a/testsuites/libtests/dl07/dl-o1.h b/testsuites/libtests/dl07/dl-o1.h
index 745e548778..74a9e4c935 100644
--- a/testsuites/libtests/dl07/dl-o1.h
+++ b/testsuites/libtests/dl07/dl-o1.h
@@ -29,13 +29,10 @@
#if !defined(DL01_H)
#define DL01_H
-extern int dl01_bss1;
-extern float dl01_bss2[30];
-extern char dl01_bss3[10];
-extern int dl01_data1;
-extern float dl01_data2;
-extern const int dl01_const1;
-extern const float dl01_const2;
+extern int dl01_bss1;
+extern char dl01_bss3[10];
+extern int dl01_data1;
+extern const int dl01_const1;
int dl01_func1(void);
#endif
diff --git a/testsuites/libtests/dl07/dl-o2.h b/testsuites/libtests/dl07/dl-o2.h
index d7812c4475..ac56921804 100644
--- a/testsuites/libtests/dl07/dl-o2.h
+++ b/testsuites/libtests/dl07/dl-o2.h
@@ -33,10 +33,8 @@
* A set of variables in dl-o2 reference by dl-03.
*/
-extern int dl02_bss1;
-extern float dl02_bss2[7];
-extern char dl02_bss3[21];
-extern int dl02_data1;
-extern float dl02_data2;
+extern int dl02_bss1;
+extern char dl02_bss3[21];
+extern int dl02_data1;
#endif
diff --git a/testsuites/libtests/dl07/dl-o4.h b/testsuites/libtests/dl07/dl-o4.h
index 7ea5139fe9..c49223c23b 100644
--- a/testsuites/libtests/dl07/dl-o4.h
+++ b/testsuites/libtests/dl07/dl-o4.h
@@ -37,7 +37,6 @@
*/
extern int dl04_unresolv_1;
-extern float dl04_unresolv_2;
extern char dl04_unresolv_3;
extern char* dl04_unresolv_4;
extern const int dl04_unresolv_5;
diff --git a/testsuites/libtests/dl07/dl07-o1.c b/testsuites/libtests/dl07/dl07-o1.c
index 24a8086c49..229bd582e7 100644
--- a/testsuites/libtests/dl07/dl07-o1.c
+++ b/testsuites/libtests/dl07/dl07-o1.c
@@ -38,14 +38,11 @@
* separated text and data and this means there is no actual section in the ELF
* file, the details for this are in the symbols.
*/
-int dl01_bss1; /* unitialised, .bss */
-float dl01_bss2[30]; /* unitialised, .bss */
-char dl01_bss3[10]; /* unitialised, .bss */
-int dl01_data1 = 1; /* initialised, .data */
-float dl01_data2 = 0.3333; /* initialised, .data */
-const int dl01_const1 = 3; /* read-only, .const */
-const float dl01_const2 = 0.666; /* read-only, .const */
-int dl01_func1(void) /* code, .text */
+int dl01_bss1; /* unitialised, .bss */
+char dl01_bss3[10]; /* unitialised, .bss */
+int dl01_data1 = 1; /* initialised, .data */
+const int dl01_const1 = 3; /* read-only, .const */
+int dl01_func1(void) /* code, .text */
{
return 4;
}
@@ -63,13 +60,10 @@ int rtems_main_o1 (void)
{
printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__));
printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1));
- printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0]));
printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0]));
printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1));
/* no %f in the rtems test printer */
- printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2));
printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1));
- printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2));
printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1);
return 0;
}
diff --git a/testsuites/libtests/dl07/dl07-o2.c b/testsuites/libtests/dl07/dl07-o2.c
index 12cc917ae0..47dde07d7e 100644
--- a/testsuites/libtests/dl07/dl07-o2.c
+++ b/testsuites/libtests/dl07/dl07-o2.c
@@ -33,11 +33,9 @@
#define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
-int dl02_bss1;
-float dl02_bss2[7];
-char dl02_bss3[21];
-int dl02_data1;
-float dl02_data2;
+int dl02_bss1;
+char dl02_bss3[21];
+int dl02_data1;
/*
* Yes a decl in the source. This is a modules main and I could not find which
@@ -52,19 +50,14 @@ int rtems_main_o2 (int argc, const char* argv[])
{
printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__));
printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1));
- printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0]));
printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0]));
printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1));
/* no %f in the rtems test printer */
- printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2));
printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1));
- printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2));
printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1);
printf (DL_NAME ": dl02_bss1: %4zu: %p: %d\n", PAINT_VAR (dl02_bss1));
- printf (DL_NAME ": dl02_bss2: %4zu: %p: %f\n", PAINT_VAR (dl02_bss2[0]));
printf (DL_NAME ": dl02_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl02_bss3[0]));
printf (DL_NAME ": dl02_data1: %4zu: %p: %d\n", PAINT_VAR (dl02_data1));
/* no %f in the rtems test printer */
- printf (DL_NAME ": dl02_data2: %4zu: %p: %f\n", PAINT_VAR (dl02_data2));
return 0;
}
diff --git a/testsuites/libtests/dl07/dl07-o3.c b/testsuites/libtests/dl07/dl07-o3.c
index 12a5fe6829..ab9e0ff6ac 100644
--- a/testsuites/libtests/dl07/dl07-o3.c
+++ b/testsuites/libtests/dl07/dl07-o3.c
@@ -49,22 +49,16 @@ int rtems_main_o3 (int argc, const char* argv[])
{
printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__));
printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1));
- printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0]));
printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0]));
printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1));
/* no %f in the rtems test printer */
- printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2));
printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1));
- printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2));
printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1);
printf (DL_NAME ": dl02_bss1: %4zu: %p: %d\n", PAINT_VAR (dl02_bss1));
- printf (DL_NAME ": dl02_bss2: %4zu: %p: %f\n", PAINT_VAR (dl02_bss2[0]));
printf (DL_NAME ": dl02_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl02_bss3[0]));
printf (DL_NAME ": dl02_data1: %4zu: %p: %d\n", PAINT_VAR (dl02_data1));
/* no %f in the rtems test printer */
- printf (DL_NAME ": dl02_data2: %4zu: %p: %f\n", PAINT_VAR (dl02_data2));
printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1));
- printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2));
printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3));
printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %p\n", PAINT_VAR (dl04_unresolv_4));
printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5));
diff --git a/testsuites/libtests/dl07/dl07-o4.c b/testsuites/libtests/dl07/dl07-o4.c
index aeeb404561..d52c96747f 100644
--- a/testsuites/libtests/dl07/dl07-o4.c
+++ b/testsuites/libtests/dl07/dl07-o4.c
@@ -35,7 +35,6 @@
int dl04_unresolv_1;
-float dl04_unresolv_2;
char dl04_unresolv_3;
char* dl04_unresolv_4;
const int dl04_unresolv_5 = 4;
@@ -54,16 +53,12 @@ int rtems_main_o4 (int argc, const char* argv[])
{
printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__));
printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1));
- printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0]));
printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0]));
printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1));
/* no %f in the rtems test printer */
- printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2));
printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1));
- printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2));
printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1);
printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1));
- printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2));
printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3));
printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %p\n", PAINT_VAR (dl04_unresolv_4));
printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5));
diff --git a/testsuites/libtests/dl07/dl07-o5.c b/testsuites/libtests/dl07/dl07-o5.c
index e487d072ae..ab38cbca74 100644
--- a/testsuites/libtests/dl07/dl07-o5.c
+++ b/testsuites/libtests/dl07/dl07-o5.c
@@ -54,13 +54,10 @@ int rtems_main_o5 (int argc, const char* argv[])
{
printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__));
printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1));
- printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0]));
printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0]));
printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1));
/* no %f in the rtems test printer */
- printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2));
printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1));
- printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2));
printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1);
printf (DL_NAME ": dl05_unresolv_1: %4zu: %p: %" PRIu64 "\n", PAINT_VAR (dl05_unresolv_1));
printf (DL_NAME ": dl05_unresolv_2: %4zu: %p: %" PRIu16 "\n", PAINT_VAR (dl05_unresolv_2));
diff --git a/testsuites/libtests/dl08/dl-o1.h b/testsuites/libtests/dl08/dl-o1.h
index 598ef785ad..0a3b0d239f 100644
--- a/testsuites/libtests/dl08/dl-o1.h
+++ b/testsuites/libtests/dl08/dl-o1.h
@@ -29,13 +29,10 @@
#if !defined(DL01_H)
#define DL01_H
-extern int dl01_bss1;
-extern float dl01_bss2[30];
-extern char dl01_bss3[10];
-extern int dl01_data1;
-extern float dl01_data2;
-extern const int dl01_const1;
-extern const float dl01_const2;
+extern int dl01_bss1;
+extern char dl01_bss3[10];
+extern int dl01_data1;
+extern const int dl01_const1;
int dl01_func1(void);
diff --git a/testsuites/libtests/dl08/dl-o2.h b/testsuites/libtests/dl08/dl-o2.h
index f0805945cc..c95aefb3ff 100644
--- a/testsuites/libtests/dl08/dl-o2.h
+++ b/testsuites/libtests/dl08/dl-o2.h
@@ -33,11 +33,9 @@
* A set of variables in dl-o2 reference by dl-03.
*/
-extern int dl02_bss1;
-extern float dl02_bss2[7];
-extern char dl02_bss3[21];
-extern int dl02_data1;
-extern float dl02_data2;
+extern int dl02_bss1;
+extern char dl02_bss3[21];
+extern int dl02_data1;
int rtems_main_o2 (void);
diff --git a/testsuites/libtests/dl08/dl-o4.h b/testsuites/libtests/dl08/dl-o4.h
index a4b129f338..b9ec1172c2 100644
--- a/testsuites/libtests/dl08/dl-o4.h
+++ b/testsuites/libtests/dl08/dl-o4.h
@@ -37,7 +37,6 @@
*/
extern int dl04_unresolv_1;
-extern float dl04_unresolv_2;
extern char dl04_unresolv_3;
extern char* dl04_unresolv_4;
extern const int dl04_unresolv_5;
diff --git a/testsuites/libtests/dl08/dl08-o1.c b/testsuites/libtests/dl08/dl08-o1.c
index ccd8bc3587..4cdc97f16b 100644
--- a/testsuites/libtests/dl08/dl08-o1.c
+++ b/testsuites/libtests/dl08/dl08-o1.c
@@ -40,14 +40,11 @@
* separated text and data and this means there is no actual section in the ELF
* file, the details for this are in the symbols.
*/
-int dl01_bss1; /* unitialised, .bss */
-float dl01_bss2[30]; /* unitialised, .bss */
-char dl01_bss3[10]; /* unitialised, .bss */
-int dl01_data1 = 1; /* initialised, .data */
-float dl01_data2 = 0.3333; /* initialised, .data */
-const int dl01_const1 = 3; /* read-only, .const */
-const float dl01_const2 = 0.666; /* read-only, .const */
-int dl01_func1(void) /* code, .text */
+int dl01_bss1; /* unitialised, .bss */
+char dl01_bss3[10]; /* unitialised, .bss */
+int dl01_data1 = 1; /* initialised, .data */
+const int dl01_const1 = 3; /* read-only, .const */
+int dl01_func1(void) /* code, .text */
{
return 4;
}
@@ -65,13 +62,10 @@ int rtems_main_o1 (void)
{
printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__));
printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1));
- printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0]));
printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0]));
printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1));
/* no %f in the rtems test printer */
- printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2));
printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1));
- printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2));
printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1);
rtems_main_o2 ();
diff --git a/testsuites/libtests/dl08/dl08-o2.c b/testsuites/libtests/dl08/dl08-o2.c
index 8d72cb8703..c047037b47 100644
--- a/testsuites/libtests/dl08/dl08-o2.c
+++ b/testsuites/libtests/dl08/dl08-o2.c
@@ -33,11 +33,9 @@
#define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
-int dl02_bss1;
-float dl02_bss2[7];
-char dl02_bss3[21];
-int dl02_data1;
-float dl02_data2;
+int dl02_bss1;
+char dl02_bss3[21];
+int dl02_data1;
#define DL_NAME "dlo2"
#define PAINT_VAR(_v) sizeof(_v), &_v, _v
@@ -46,11 +44,9 @@ int rtems_main_o2 (void)
{
printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__));
printf (DL_NAME ": dl02_bss1: %4zu: %p: %d\n", PAINT_VAR (dl02_bss1));
- printf (DL_NAME ": dl02_bss2: %4zu: %p: %f\n", PAINT_VAR (dl02_bss2[0]));
printf (DL_NAME ": dl02_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl02_bss3[0]));
printf (DL_NAME ": dl02_data1: %4zu: %p: %d\n", PAINT_VAR (dl02_data1));
/* no %f in the rtems test printer */
- printf (DL_NAME ": dl02_data2: %4zu: %p: %f\n", PAINT_VAR (dl02_data2));
rtems_main_o3 ();
diff --git a/testsuites/libtests/dl08/dl08-o3.c b/testsuites/libtests/dl08/dl08-o3.c
index 267895476c..f5aa769772 100644
--- a/testsuites/libtests/dl08/dl08-o3.c
+++ b/testsuites/libtests/dl08/dl08-o3.c
@@ -42,7 +42,6 @@ int rtems_main_o3 ()
{
printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__));
printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1));
- printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2));
printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3));
printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %p\n", PAINT_VAR (dl04_unresolv_4));
printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5));
diff --git a/testsuites/libtests/dl08/dl08-o4.c b/testsuites/libtests/dl08/dl08-o4.c
index b77bf60465..d9d748643f 100644
--- a/testsuites/libtests/dl08/dl08-o4.c
+++ b/testsuites/libtests/dl08/dl08-o4.c
@@ -34,7 +34,6 @@
#define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
int dl04_unresolv_1;
-float dl04_unresolv_2;
char dl04_unresolv_3;
char* dl04_unresolv_4;
const int dl04_unresolv_5 = 4;
@@ -47,7 +46,6 @@ int rtems_main_o4 (void)
{
printf (DL_NAME ": module: %s\n", dl_localise_file (__FILE__));
printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1));
- printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2));
printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3));
printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %p\n", PAINT_VAR (dl04_unresolv_4));
printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5));
diff --git a/testsuites/libtests/dl09/dl-o1.h b/testsuites/libtests/dl09/dl-o1.h
index 598ef785ad..0a3b0d239f 100644
--- a/testsuites/libtests/dl09/dl-o1.h
+++ b/testsuites/libtests/dl09/dl-o1.h
@@ -29,13 +29,10 @@
#if !defined(DL01_H)
#define DL01_H
-extern int dl01_bss1;
-extern float dl01_bss2[30];
-extern char dl01_bss3[10];
-extern int dl01_data1;
-extern float dl01_data2;
-extern const int dl01_const1;
-extern const float dl01_const2;
+extern int dl01_bss1;
+extern char dl01_bss3[10];
+extern int dl01_data1;
+extern const int dl01_const1;
int dl01_func1(void);
diff --git a/testsuites/libtests/dl09/dl-o2.h b/testsuites/libtests/dl09/dl-o2.h
index f0805945cc..c95aefb3ff 100644
--- a/testsuites/libtests/dl09/dl-o2.h
+++ b/testsuites/libtests/dl09/dl-o2.h
@@ -33,11 +33,9 @@
* A set of variables in dl-o2 reference by dl-03.
*/
-extern int dl02_bss1;
-extern float dl02_bss2[7];
-extern char dl02_bss3[21];
-extern int dl02_data1;
-extern float dl02_data2;
+extern int dl02_bss1;
+extern char dl02_bss3[21];
+extern int dl02_data1;
int rtems_main_o2 (void);
diff --git a/testsuites/libtests/dl09/dl-o4.h b/testsuites/libtests/dl09/dl-o4.h
index a4b129f338..b9ec1172c2 100644
--- a/testsuites/libtests/dl09/dl-o4.h
+++ b/testsuites/libtests/dl09/dl-o4.h
@@ -37,7 +37,6 @@
*/
extern int dl04_unresolv_1;
-extern float dl04_unresolv_2;
extern char dl04_unresolv_3;
extern char* dl04_unresolv_4;
extern const int dl04_unresolv_5;
diff --git a/testsuites/libtests/dl09/dl09-o1.c b/testsuites/libtests/dl09/dl09-o1.c
index 4659fda17c..34fe3c9acc 100644
--- a/testsuites/libtests/dl09/dl09-o1.c
+++ b/testsuites/libtests/dl09/dl09-o1.c
@@ -40,14 +40,11 @@
* separated text and data and this means there is no actual section in the ELF
* file, the details for this are in the symbols.
*/
-int dl01_bss1; /* unitialised, .bss */
-float dl01_bss2[30]; /* unitialised, .bss */
-char dl01_bss3[10]; /* unitialised, .bss */
-int dl01_data1 = 1; /* initialised, .data */
-float dl01_data2 = 0.3333; /* initialised, .data */
-const int dl01_const1 = 3; /* read-only, .const */
-const float dl01_const2 = 0.666; /* read-only, .const */
-int dl01_func1(void) /* code, .text */
+int dl01_bss1; /* unitialised, .bss */
+char dl01_bss3[10]; /* unitialised, .bss */
+int dl01_data1 = 1; /* initialised, .data */
+const int dl01_const1 = 3; /* read-only, .const */
+int dl01_func1(void) /* code, .text */
{
return 4;
}
@@ -66,13 +63,10 @@ int rtems_main_o1 (void)
printf (DL_NAME ": module: %s @ %p\n",
dl_localise_file (__FILE__), rtems_main_o1);
printf (DL_NAME ": dl01_bss1: %4zu: %p: %d\n", PAINT_VAR (dl01_bss1));
- printf (DL_NAME ": dl01_bss2: %4zu: %p: %f\n", PAINT_VAR (dl01_bss2[0]));
printf (DL_NAME ": dl01_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl01_bss3[0]));
printf (DL_NAME ": dl01_data1: %4zu: %p: %d\n", PAINT_VAR (dl01_data1));
/* no %f in the rtems test printer */
- printf (DL_NAME ": dl01_data2: %4zu: %p: %f\n", PAINT_VAR (dl01_data2));
printf (DL_NAME ": dl01_const1: %4zu: %p: %d\n", PAINT_VAR (dl01_const1));
- printf (DL_NAME ": dl01_const2: %4zu: %p: %f\n", PAINT_VAR (dl01_const2));
printf (DL_NAME ": dl01_func1: %4zu: %p\n", sizeof(dl01_func1), &dl01_func1);
printf (DL_NAME ": rtems_main_o2: %p\n", &rtems_main_o2);
diff --git a/testsuites/libtests/dl09/dl09-o2.c b/testsuites/libtests/dl09/dl09-o2.c
index a6906b4ad9..93bafaf91a 100644
--- a/testsuites/libtests/dl09/dl09-o2.c
+++ b/testsuites/libtests/dl09/dl09-o2.c
@@ -33,11 +33,9 @@
#define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
-int dl02_bss1;
-float dl02_bss2[7];
-char dl02_bss3[21];
-int dl02_data1 = 0x12345678;
-float dl02_data2;
+int dl02_bss1;
+char dl02_bss3[21];
+int dl02_data1 = 0x12345678;
#define DL_NAME "dlo2"
#define PAINT_VAR(_v) sizeof(_v), &_v, _v
@@ -47,11 +45,9 @@ int rtems_main_o2 (void)
printf (DL_NAME ": module: %s @ %p\n",
dl_localise_file (__FILE__), rtems_main_o2);
printf (DL_NAME ": dl02_bss1: %4zu: %p: %d\n", PAINT_VAR (dl02_bss1));
- printf (DL_NAME ": dl02_bss2: %4zu: %p: %f\n", PAINT_VAR (dl02_bss2[0]));
printf (DL_NAME ": dl02_bss3: %4zu: %p: %02x\n", PAINT_VAR (dl02_bss3[0]));
printf (DL_NAME ": dl02_data1: %4zu: %p: %08x\n", PAINT_VAR (dl02_data1));
/* no %f in the rtems test printer */
- printf (DL_NAME ": dl02_data2: %4zu: %p: %f\n", PAINT_VAR (dl02_data2));
rtems_main_o3 ();
diff --git a/testsuites/libtests/dl09/dl09-o3.c b/testsuites/libtests/dl09/dl09-o3.c
index fab70c02c7..8aed2f964b 100644
--- a/testsuites/libtests/dl09/dl09-o3.c
+++ b/testsuites/libtests/dl09/dl09-o3.c
@@ -43,7 +43,6 @@ int rtems_main_o3 ()
printf (DL_NAME ": module: %s : %p\n",
dl_localise_file (__FILE__), rtems_main_o3);
printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1));
- printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2));
printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3));
printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %p\n", PAINT_VAR (dl04_unresolv_4));
printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5));
diff --git a/testsuites/libtests/dl09/dl09-o4.c b/testsuites/libtests/dl09/dl09-o4.c
index 5cf4eb0f4b..f0b50d4d82 100644
--- a/testsuites/libtests/dl09/dl09-o4.c
+++ b/testsuites/libtests/dl09/dl09-o4.c
@@ -34,7 +34,6 @@
#define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
int dl04_unresolv_1 = 12345;
-float dl04_unresolv_2;
char dl04_unresolv_3 = 'z';
char* dl04_unresolv_4 = "aBcDeF";
const int dl04_unresolv_5 = 4;
@@ -48,7 +47,6 @@ int rtems_main_o4 (void)
printf (DL_NAME ": module: %s @ %p\n",
dl_localise_file (__FILE__), rtems_main_o4);
printf (DL_NAME ": dl04_unresolv_1: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_1));
- printf (DL_NAME ": dl04_unresolv_2: %4zu: %p: %f\n", PAINT_VAR (dl04_unresolv_2));
printf (DL_NAME ": dl04_unresolv_3: %4zu: %p: %02x\n", PAINT_VAR (dl04_unresolv_3));
printf (DL_NAME ": dl04_unresolv_4: %4zu: %p: %s\n", PAINT_VAR (dl04_unresolv_4));
printf (DL_NAME ": dl04_unresolv_5: %4zu: %p: %d\n", PAINT_VAR (dl04_unresolv_5));
--
2.34.1
More information about the devel
mailing list