Changeset bc73be3 in mainline for uspace/lib/c/arch/ppc32/include/libarch/tls.h

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

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

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

@@ -33 +33 @@
  */
 
-#ifndef LIBC_ppc32_TLS_H_
-#define LIBC_ppc32_TLS_H_
+#ifndef _LIBC_ppc32_TLS_H_
+#define _LIBC_ppc32_TLS_H_
 
 #define CONFIG_TLS_VARIANT_1
@@ -43 +43 @@
 
 typedef struct {
+        void **dtv;
+        void *pad;
         void *fibril_data;
 } tcb_t;