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

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

Location:

uspace/lib/c/arch/arm32/include/libarch

Files:

• config.h (modified) (1 diff)
• ddi.h (modified) (1 diff)
• elf_linux.h (modified) (1 diff)
• faddr.h (modified) (1 diff)
• fibril.h (modified) (1 diff)
• fibril_context.h (modified) (3 diffs)
• rtld/dynamic.h (moved) (moved from uspace/lib/cpp/include/__bits/common.hpp ) (2 diffs)
• rtld/elf_dyn.h (added)
• rtld/module.h (added)
• stackarg.h (modified) (1 diff)
• syscall.h (modified) (1 diff)
• thread.h (modified) (1 diff)
• tls.h (modified) (2 diffs)

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

@@ -34 +34 @@
  */
 
-#ifndef LIBC_arm32_CONFIG_H_
-#define LIBC_arm32_CONFIG_H_
+#ifndef _LIBC_arm32_CONFIG_H_
+#define _LIBC_arm32_CONFIG_H_
 
 #define PAGE_WIDTH      12

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

@@ -31 +31 @@
  */
 
-#ifndef LIBC_arm32_DDI_H_
-#define LIBC_arm32_DDI_H_
+#ifndef _LIBC_arm32_DDI_H_
+#define _LIBC_arm32_DDI_H_
 
 #include <ddi.h>

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

@@ -33 +33 @@
  */
 
-#ifndef LIBC_arm32_ELF_LINUX_H_
-#define LIBC_arm32_ELF_LINUX_H_
+#ifndef _LIBC_arm32_ELF_LINUX_H_
+#define _LIBC_arm32_ELF_LINUX_H_
 
 #include <libarch/istate.h>

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

@@ -34 +34 @@
  */
 
-#ifndef LIBC_arm32_FADDR_H_
-#define LIBC_arm32_FADDR_H_
+#ifndef _LIBC_arm32_FADDR_H_
+#define _LIBC_arm32_FADDR_H_
 
 #include <types/common.h>

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

@@ -34 +34 @@
  */
 
-#ifndef LIBC_arm32_FIBRIL_H_
-#define LIBC_arm32_FIBRIL_H_
+#ifndef _LIBC_arm32_FIBRIL_H_
+#define _LIBC_arm32_FIBRIL_H_
 
 #include <types/common.h>

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

@@ -27 +27 @@
  */
 
-#ifndef LIBC_ARCH_FIBRIL_CONTEXT_H_
-#define LIBC_ARCH_FIBRIL_CONTEXT_H_
+#ifndef _LIBC_ARCH_FIBRIL_CONTEXT_H_
+#define _LIBC_ARCH_FIBRIL_CONTEXT_H_
 
 #include <stdint.h>
@@ -41 +41 @@
 // XXX: This struct must match the assembly code in src/fibril.S
 
-typedef struct context {
+typedef struct __context {
         uintptr_t sp;
         uintptr_t pc;
@@ -54 +54 @@
         /* r11 */
         uint32_t fp;
-} context_t;
+} __context_t;
 
 #endif

uspace/lib/c/arch/arm32/include/libarch/rtld/dynamic.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2018 Jaroslav Jindrak
+ * Copyright (c) 2019 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef LIBCPP_BITS_COMMON
-#define LIBCPP_BITS_COMMON
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
 
-/**
- * According to section 17.2 of the standard,
- * the restrict qualifier shall be omitted.
- */
-#define restrict
+#ifndef _LIBC_arm32_RTLD_DYNAMIC_H_
+#define _LIBC_arm32_RTLD_DYNAMIC_H_
 
-#undef NULL
-#define NULL nullptr
+typedef struct {
+        /* Empty. */
+} dyn_info_arch_t;
 
 #endif
+
+/** @}
+ */

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

@@ -34 +34 @@
  */
 
-#ifndef LIBC_arm32_STACKARG_H_
-#define LIBC_arm32_STACKARG_H_
+#ifndef _LIBC_arm32_STACKARG_H_
+#define _LIBC_arm32_STACKARG_H_
 
 #endif

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

@@ -34 +34 @@
  */
 
-#ifndef LIBC_arm32_SYSCALL_H_
-#define LIBC_arm32_SYSCALL_H_
+#ifndef _LIBC_arm32_SYSCALL_H_
+#define _LIBC_arm32_SYSCALL_H_
 
 #define LIBARCH_SYSCALL_GENERIC

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

@@ -34 +34 @@
  */
 
-#ifndef LIBC_arm32_THREAD_H_
-#define LIBC_arm32_THREAD_H_
+#ifndef _LIBC_arm32_THREAD_H_
+#define _LIBC_arm32_THREAD_H_
 
 #endif

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;