Module Name: src
Committed By: mrg
Date: Tue Apr 13 08:06:11 UTC 2021
Modified Files:
src/external/gpl3/gcc/dist/libgcc: emutls.c
Log Message:
make this match the builtin prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/gpl3/gcc/dist/libgcc/emutls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libgcc/emutls.c
diff -u src/external/gpl3/gcc/dist/libgcc/emutls.c:1.1.1.9 src/external/gpl3/gcc/dist/libgcc/emutls.c:1.2
--- src/external/gpl3/gcc/dist/libgcc/emutls.c:1.1.1.9 Sat Apr 10 22:09:58 2021
+++ src/external/gpl3/gcc/dist/libgcc/emutls.c Tue Apr 13 08:06:11 2021
@@ -50,8 +50,8 @@ struct __emutls_array
void **data[];
};
-void *__emutls_get_address (struct __emutls_object *);
-void __emutls_register_common (struct __emutls_object *, word, word, void *);
+void *__emutls_get_address (void *);
+void __emutls_register_common (void *, word, word, void *);
#ifdef __GTHREADS
#ifdef __GTHREAD_MUTEX_INIT
@@ -124,8 +124,10 @@ emutls_alloc (struct __emutls_object *ob
}
void *
-__emutls_get_address (struct __emutls_object *obj)
+__emutls_get_address (void *vobj)
{
+ struct __emutls_object *obj = vobj;
+
if (! __gthread_active_p ())
{
if (__builtin_expect (obj->loc.ptr == NULL, 0))
@@ -188,9 +190,11 @@ __emutls_get_address (struct __emutls_ob
}
void
-__emutls_register_common (struct __emutls_object *obj,
+__emutls_register_common (void *vobj,
word size, word align, void *templ)
{
+ struct __emutls_object *obj = vobj;
+
if (obj->size < size)
{
obj->size = size;