Merge branch 'master' into dev

2 files changed, 68 insertions, 2 deletions

diff --git a/components/libc/compilers/armlibc/stdio.c b/components/libc/compilers/armlibc/stdio.c
index d1ac976568..9d90823c78 100644
--- a/components/libc/compilers/armlibc/stdio.c
+++ b/components/libc/compilers/armlibc/stdio.c
@@ -65,11 +65,27 @@ int libc_stdio_get_console(void)
 
 int libc_stdio_read(void *buffer, size_t size)
 {
-    return read(std_fd, buffer, size);
+    if (std_fd >= 0)
+    {
+        return read(std_fd, buffer, size);
+    }
+    else
+    {
+        rt_kprintf("Illegal stdio input!\n");
+        return 0;
+    }
 }
 
 int libc_stdio_write(const void *buffer, size_t size)
 {
-    return write(std_fd, buffer, size);
+    if (std_fd >= 0)
+    {
+        return write(std_fd, buffer, size);
+    }
+    else
+    {
+        rt_kprintf("Illegal stdio output!\n");
+        return size;
+    }
 }
 #endif
diff --git a/components/libc/libdl/arch/x86.c b/components/libc/libdl/arch/x86.c
new file mode 100644
index 0000000000..4f70b1d22e
--- /dev/null
+++ b/components/libc/libdl/arch/x86.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * 
+ * Change Logs:
+ * Date           Author      Notes
+ * 2018/09/15     parai     first version
+ */
+
+#include "../dlmodule.h"
+#include "../dlelf.h"
+
+#ifdef __x86__
+
+#define R_X86_64_GLOB_DAT	6	/* Create GOT entry */
+#define R_X86_64_JUMP_SLOT	7	/* Create PLT entry */
+#define R_X86_64_RELATIVE	8	/* Adjust by program base */
+int dlmodule_relocate(struct rt_dlmodule *module, Elf32_Rel *rel, Elf32_Addr sym_val)
+{
+    Elf32_Addr *where, tmp;
+    Elf32_Sword addend, offset;
+    rt_uint32_t upper, lower, sign, j1, j2;
+
+    where = (Elf32_Addr *)((rt_uint8_t *)module->mem_space
+                           + rel->r_offset
+                           - module->vstart_addr);
+
+    switch (ELF32_R_TYPE(rel->r_info))
+    {
+        case R_X86_64_GLOB_DAT:
+        case R_X86_64_JUMP_SLOT:
+            *where = (Elf32_Addr)sym_val;
+
+            RT_DEBUG_LOG(RT_DEBUG_MODULE, ("R_X86_64_JUMP_SLOT: 0x%x -> 0x%x 0x%x\n",
+                  (uint32_t)where, *where, sym_val));
+            break;
+        case R_X86_64_RELATIVE:
+            *where = (Elf32_Addr)sym_val + *where;
+            RT_DEBUG_LOG(RT_DEBUG_MODULE, ("R_X86_64_RELATIVE: 0x%x -> 0x%x 0x%x\n",
+                  (uint32_t)where, *where, sym_val));
+            break;
+        default:
+            RT_DEBUG_LOG(RT_DEBUG_MODULE, ("X86ELF: invalid relocate TYPE %d\n", ELF32_R_TYPE(rel->r_info)));
+            return -1;
+    }
+
+    return 0;
+}
+#endif