Changeset d5a89a3 in mainline for uspace/lib/c/arch/arm32/include/libarch/tls.h

Timestamp:

2019-02-11T22:31:04Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merging with upstream/master

File:

• uspace/lib/c/arch/arm32/include/libarch/tls.h (modified) (2 diffs)

uspace/lib/c/arch/arm32/include/libarch/tls.h

@@ -34 +34 @@
  */
 
-#ifndef LIBC_arm32_TLS_H_
-#define LIBC_arm32_TLS_H_
+#ifndef _LIBC_arm32_TLS_H_
+#define _LIBC_arm32_TLS_H_
 
 #include <stdint.h>
@@ -49 +49 @@
  */
 typedef struct {
+        void **dtv;
+        void *pad;
         /** Fibril data. */
         void *fibril_data;