6 files changed, 20 insertions, 8 deletions
diff --git a/testsuites/libtests/dl09/dl-load.c b/testsuites/libtests/dl09/dl-load.c
index 1de7c8fa29..216fb5a201 100644
--- a/testsuites/libtests/dl09/dl-load.c
+++ b/testsuites/libtests/dl09/dl-load.c
@@ -116,8 +116,12 @@ static void dl_check_resolved(void* handle, bool has_unresolved)
       rtems_test_assert (unresolved == 0);
     }
   }
-  printf ("handel: %p: %sunresolved externals\n",
-          handle, unresolved != 0 ? "" : "no ");
+  if (handle == RTLD_SELF)
+    printf ("handle: RTL_SELF: %sunresolved externals\n",
+            unresolved != 0 ? "" : "no ");
+  else
+    printf ("handle: %p: %sunresolved externals\n",
+            handle, unresolved != 0 ? "" : "no ");
 }
 
 static void* dl_load_obj (const char* name, bool has_unresolved)
@@ -152,12 +156,20 @@ static void dl_close (void* handle)
 
 static int dl_call (void* handle, const char* func)
 {
+  static call_sig last_call;
   call_sig call = dlsym (handle, func);
   if (call == NULL)
   {
     printf("dlsym failed: symbol not found: %s\n", func);
     return 1;
   }
+  if (last_call != NULL && last_call != call)
+  {
+    printf("Call location different: moved by: %i (call:%p last:%p)\n",
+           (int) (call - last_call),
+           call, last_call);
+  }
+  last_call = call;
   call ();
   return 0;
 }
@@ -171,7 +183,7 @@ static void dl_object_open (object_def* od, objects* o)
   if (od->space != 0)
   {
     o->space = malloc (od->space);
-    printf("space alloc: %s: %d: %p\n", od->name, od->space, o->space);
+    printf("space alloc: %s: %zd: %p\n", od->name, od->space, o->space);
     rtems_test_assert (o->space != NULL);
   }
   dl_load_dump ();
diff --git a/testsuites/libtests/dl09/dl09-o1.c b/testsuites/libtests/dl09/dl09-o1.c
index 4659fda17c..291d33fcd0 100644
--- a/testsuites/libtests/dl09/dl09-o1.c
+++ b/testsuites/libtests/dl09/dl09-o1.c
@@ -28,7 +28,7 @@
 
 #include "dl-o1.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 #include "dl-load.h"
 #include "dl-o1.h"
 #include "dl-o2.h"
diff --git a/testsuites/libtests/dl09/dl09-o2.c b/testsuites/libtests/dl09/dl09-o2.c
index a6906b4ad9..e8976f3b49 100644
--- a/testsuites/libtests/dl09/dl09-o2.c
+++ b/testsuites/libtests/dl09/dl09-o2.c
@@ -29,7 +29,7 @@
 #include "dl-o2.h"
 #include "dl-o3.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl09/dl09-o3.c b/testsuites/libtests/dl09/dl09-o3.c
index fab70c02c7..d9a056d45d 100644
--- a/testsuites/libtests/dl09/dl09-o3.c
+++ b/testsuites/libtests/dl09/dl09-o3.c
@@ -31,7 +31,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl09/dl09-o4.c b/testsuites/libtests/dl09/dl09-o4.c
index 5cf4eb0f4b..8998059c93 100644
--- a/testsuites/libtests/dl09/dl09-o4.c
+++ b/testsuites/libtests/dl09/dl09-o4.c
@@ -29,7 +29,7 @@
 #include "dl-o4.h"
 #include "dl-o5.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl09/dl09-o5.c b/testsuites/libtests/dl09/dl09-o5.c
index 6b4aedbf68..e5374f3eb8 100644
--- a/testsuites/libtests/dl09/dl09-o5.c
+++ b/testsuites/libtests/dl09/dl09-o5.c
@@ -30,7 +30,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);