Index: uspace/lib/dltest/dltest.c
===================================================================
--- uspace/lib/dltest/dltest.c	(revision e2f260026920f1d43bed8d2b775564b1f64a6f6a)
+++ uspace/lib/dltest/dltest.c	(revision 153c7a29e3a8082bd7b08d69177e32d48d1873a7)
@@ -69,8 +69,20 @@
 }
 
+/** Return address of private initialized variable */
+int *dl_get_private_var_addr(void)
+{
+	return &private_var;
+}
+
 /** Return value of private uninitialized variable */
 int dl_get_private_uvar(void)
 {
 	return private_uvar;
+}
+
+/** Return vaddress of private uninitialized variable */
+int *dl_get_private_uvar_addr(void)
+{
+	return &private_uvar;
 }
 
@@ -81,8 +93,20 @@
 }
 
+/** Return address of public initialized variable */
+int *dl_get_public_var_addr(void)
+{
+	return &dl_public_var;
+}
+
 /** Return value of public uninitialized variable */
 int dl_get_public_uvar(void)
 {
 	return dl_public_uvar;
+}
+
+/** Return address of public uninitialized variable */
+int *dl_get_public_uvar_addr(void)
+{
+	return &dl_public_uvar;
 }
 
@@ -93,8 +117,20 @@
 }
 
+/** Return address of private initialized fibril-local variable */
+int *dl_get_private_fib_var_addr(void)
+{
+	return &dl_private_fib_var;
+}
+
 /** Return value of private uninitialized fibril-local variable */
 int dl_get_private_fib_uvar(void)
 {
 	return dl_private_fib_uvar;
+}
+
+/** Return address of private uninitialized fibril-local variable */
+int *dl_get_private_fib_uvar_addr(void)
+{
+	return &dl_private_fib_uvar;
 }
 
@@ -105,4 +141,10 @@
 }
 
+/** Return value of public initialized fibril-local variable */
+int *dl_get_public_fib_var_addr(void)
+{
+	return &dl_public_fib_var;
+}
+
 /** Return value of public uninitialized fibril-local variable */
 int dl_get_public_fib_uvar(void)
@@ -111,4 +153,10 @@
 }
 
+/** Return value of public uninitialized fibril-local variable */
+int *dl_get_public_fib_uvar_addr(void)
+{
+	return &dl_public_fib_uvar;
+}
+
 /**
  * @}
Index: uspace/lib/dltest/libdltest.h
===================================================================
--- uspace/lib/dltest/libdltest.h	(revision e2f260026920f1d43bed8d2b775564b1f64a6f6a)
+++ uspace/lib/dltest/libdltest.h	(revision 153c7a29e3a8082bd7b08d69177e32d48d1873a7)
@@ -49,11 +49,19 @@
 extern int dl_get_constant(void);
 extern int dl_get_private_var(void);
+extern int *dl_get_private_var_addr(void);
 extern int dl_get_private_uvar(void);
+extern int *dl_get_private_uvar_addr(void);
 extern int dl_get_public_var(void);
+extern int *dl_get_public_var_addr(void);
 extern int dl_get_public_uvar(void);
+extern int *dl_get_public_uvar_addr(void);
 extern int dl_get_private_fib_var(void);
+extern int *dl_get_private_fib_var_addr(void);
 extern int dl_get_private_fib_uvar(void);
+extern int *dl_get_private_fib_uvar_addr(void);
 extern int dl_get_public_fib_var(void);
+extern int *dl_get_public_fib_var_addr(void);
 extern int dl_get_public_fib_uvar(void);
+extern int *dl_get_public_fib_uvar_addr(void);
 
 extern int dl_public_var;