Changeset 694ca93f in mainline for uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h

Timestamp:

2011-05-01T19:34:26Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

0e26444

Parents:

1ff896e (diff), 042fbe0 (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:

Merge mainline changes

File:

• uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h (moved) (moved from kernel/arch/arm32/include/memstr.h ) (2 diffs)

uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Sergey Bondari
+ * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup arm32
+/** @addtogroup generic 
  * @{
  */
 /** @file
- *  @brief Memory manipulating functions declarations.
  */
 
-#ifndef KERN_arm32_MEMSTR_H_
-#define KERN_arm32_MEMSTR_H_
+#ifndef LIBC_ia32_RTLD_ELF_DYN_H_
+#define LIBC_ia32_RTLD_ELF_DYN_H_
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+/* 
+ * ia32 dynamic relocation types
+ */
 
-extern void memsetw(void *, size_t, uint16_t);
-extern void memsetb(void *, size_t, uint8_t);
+#define R_386_32        1
+#define R_386_PC32      2
+#define R_386_COPY      5
+#define R_386_GLOB_DAT  6
+#define R_386_JUMP_SLOT 7
+#define R_386_RELATIVE  8
+
+#define R_386_TLS_DTPMOD32 35
 
 #endif