Changeset 7fb3f1c in mainline for uspace

Timestamp:

2011-04-30T20:22:35Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5b72635

Parents:

2ca5f632

Message:

Make all architectures buildable. Only allow enabling dynamic linking on ia32.

Location:

uspace

Files:

• Makefile (modified) (2 diffs)
• Makefile.common (modified) (1 diff)
• lib/c/Makefile (modified) (2 diffs)
• lib/c/generic/libc.c (modified) (1 diff)
• srv/loader/main.c (modified) (5 diffs)

uspace/Makefile

@@ -35 +35 @@
 DIRS = \
         app/bdsh \
-        app/dltest2 \
         app/edit \
         app/getterm \
@@ -96 +95 @@
 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
         DIRS += \
-                app/dltest
+                app/dltest \
+                app/dltest2
 endif
 

uspace/Makefile.common

@@ -73 +73 @@
 endif
 
-ifneq ($(SLIBRARY),)
-        LARCHIVE = $(LIBRARY).la
-        LOUTPUT = $(SLIBRARY)
-        EXTRA_OUTPUT += $(LOUTPUT).disasm
-        EXTRA_CLEAN += $(LOUTPUT).map $(LOUTPUT).ldisasm \
-            $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld
+ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
+        ifneq ($(SLIBRARY),)
+                LARCHIVE = $(LIBRARY).la
+                LOUTPUT = $(SLIBRARY)
+                EXTRA_OUTPUT += $(LOUTPUT).disasm
+                EXTRA_CLEAN += $(LOUTPUT).map $(LOUTPUT).ldisasm \
+                    $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld
+        endif
 endif
 

uspace/lib/c/Makefile

@@ -71 +71 @@
         generic/device/hw_res.c \
         generic/device/char_dev.c \
-        generic/dlfcn.c \
         generic/event.c \
         generic/errno.c \
@@ -126 +125 @@
         generic/sort.c \
         generic/stats.c \
-        generic/assert.c \
-        rtld/rtld.c \
-        rtld/elf_load.c \
-        rtld/dynamic.c \
-        rtld/module.c \
-        rtld/symbol.c
+        generic/assert.c
+
+ifeq ($(CONFIG_RTLD), y)
+        GENERIC_SOURCES += \
+                generic/dlfcn.c \
+                rtld/rtld.c \
+                rtld/elf_load.c \
+                rtld/dynamic.c \
+                rtld/module.c \
+                rtld/symbol.c
+endif
 
 SOURCES = \

uspace/lib/c/generic/libc.c

@@ -53 +53 @@
 #include "private/io.h"
 
+#ifdef CONFIG_RTLD
 /* From librtld. */
 #include <rtld.h>
+#endif
 //#include <string.h>
 

uspace/srv/loader/main.c

@@ -65 +65 @@
 
 /* From librtld */
+#ifdef CONFIG_RTLD
 #include <rtld.h>
 #include <dynamic.h>
@@ -70 +71 @@
 #include <module.h>
 
+static int ldr_load_dyn_linked(elf_info_t *p_info);
+#endif
+
 #define DPRINTF(...)
-
-static int ldr_load_dyn_linked(elf_info_t *p_info);
 
 /** Pathname of the file that will be loaded */
@@ -102 +104 @@
 static bool connected = false;
 
+#ifdef CONFIG_RTLD
 /** State structure of the dynamic linker. */
 runtime_env_t dload_re;
 static module_t prog_mod;
+#endif
 
 static void ldr_get_taskid(ipc_callid_t rid, ipc_call_t *request)
@@ -317 +321 @@
         
         DPRINTF("Binary is dynamically linked.\n");
+#ifdef CONFIG_RTLD
         DPRINTF(" - pcb address: %p\n", &pcb);
         DPRINTF( "- prog dynamic: %p\n", prog_info.dynamic);
 
         rc = ldr_load_dyn_linked(&prog_info);
-
+#else
+        rc = ENOTSUP;
+#endif
         async_answer_0(rid, rc);
         return 0;
 }
+
+#ifdef CONFIG_RTLD
 
 static int ldr_load_dyn_linked(elf_info_t *p_info)
@@ -372 +381 @@
         return 0;
 }
+#endif
 
 /** Run the previously loaded program.