This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Fix missing err declaration in __pthread_initialize_minimal_internal
- From: Steve Ellcey <sellcey at imgtec dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Cc: Roland McGrath <roland at hack dot frob dot com>
- Date: Fri, 22 May 2015 09:42:22 -0700
- Subject: [PATCH] Fix missing err declaration in __pthread_initialize_minimal_internal
- Authentication-results: sourceware.org; auth=none
- Reply-to: <sellcey at imgtec dot com>
Roland's patch (https://sourceware.org/ml/libc-alpha/2015-05/msg00464.html)
to set tid field to a unique value removed the declaration of err
[INTERNAL_SYSCALL_DECL (err);] from __pthread_initialize_minimal_internal,
but there are other uses of err in other INTERNAL_SYSCALL's in
__pthread_initialize_minimal_internal so this broke the build glibc build
for MIPS (and presumably other platforms).
Here is a patch to put the declaration back. I think the only question
is exactly where this declaration should go. I initially put it right
in front of the first INTERNAL_SYSCALL call but I noticed that that is inside
of an ifdef and there are other INTERNAL_SYSCALL uses (with err) that
are in different ifdef's so I moved the declaration outside of any ifdef's.
This fixed my build problem. OK to checkin?
Steve Ellcey
sellcey@imgtec.com
2015-05-22 Steve Ellcey <sellcey@imgtec.com>
* nptl/nptl-init.c (__pthread_initialize_minimal_internal):
Add declaration of err that was removed in earlier patch.
diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
index 5b8d931..3bfb478 100644
--- a/nptl/nptl-init.c
+++ b/nptl/nptl-init.c
@@ -326,6 +326,7 @@ __pthread_initialize_minimal_internal (void)
pd->robust_prev = &pd->robust_head;
#endif
pd->robust_head.list = &pd->robust_head;
+ INTERNAL_SYSCALL_DECL (err);
#ifdef __NR_set_robust_list
pd->robust_head.futex_offset = (offsetof (pthread_mutex_t, __data.__lock)
- offsetof (pthread_mutex_t,