aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--nptl/tst-stack4.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 51df3b5..a2c8b76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2014-12-02 Joseph Myers <joseph@codesourcery.com>
+ * nptl/tst-stack4.c (dso_process): Use int not uintptr_t for t.
+
* nptl/tst-mutex1.c: Include <stdbool.h>.
[!ATTR] (ATTR_NULL): New macro.
(do_test): Test !ATTR_NULL instead of ATTR != NULL.
diff --git a/nptl/tst-stack4.c b/nptl/tst-stack4.c
index d9c8df2..3b72693 100644
--- a/nptl/tst-stack4.c
+++ b/nptl/tst-stack4.c
@@ -56,7 +56,7 @@ dso_process (void * p)
function fun_vec[DSO_SHARED_FILES];
char dso_path[DSO_SHARED_FILES][100];
int dso;
- uintptr_t t = (uintptr_t) p;
+ int t = (int) (uintptr_t) p;
/* Open DSOs and get a function. */
for (dso = 0; dso < DSO_SHARED_FILES; dso++)