1 files changed, 25 insertions, 9 deletions
diff --git a/testsuites/libtests/dl05/dl-load.c b/testsuites/libtests/dl05/dl-load.c
index f94317db1a..c7d5698995 100644
--- a/testsuites/libtests/dl05/dl-load.c
+++ b/testsuites/libtests/dl05/dl-load.c
@@ -24,22 +24,38 @@ int dl_load_test(void)
 {
   void*       handle;
   const char* err;
-  void        (*func)(void);
+  void        (*func)(bool );
+#if __i386__
+  /*
+   * std::runtime_error destructor locks up in atomics.
+   */
+  bool        throw_runtime = false;
+#else
+  bool        throw_runtime = true;
+#endif
 
   rtems_rtl_trace_set_mask(RTEMS_RTL_TRACE_ALL);
+
   handle = dlopen("/dl-o5.o", RTLD_GLOBAL | RTLD_NOW);
-  err = dlerror();
-  if (err != NULL)
-    printf("dlopen: %s\n", err);
+  if (handle == NULL)
+  {
+    err = dlerror();
+    if (err != NULL)
+      printf("dlopen: %s\n", err);
+  }
   rtems_test_assert(handle != NULL);
+
   func = dlsym(handle, "exception_dl");
-  err = dlerror ();
-  if (err)
-    printf ("dlsym: %s\n", err);
+  if (func == NULL) {
+    err = dlerror ();
+    if (err)
+      printf ("dlsym: %s\n", err);
+  }
   rtems_test_assert(func != NULL);
 
-  exception_base(false);
-  func();
+  exception_base(throw_runtime);
+
+  func(throw_runtime);
 
   rtems_test_assert(dlclose(handle) == 0);