Changeset ba3841e2 in mainline

Timestamp:

2018-04-15T18:28:04Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

363fe7e

Parents:

c1f44ca

Message:

libposix: get rid of dlopen() override

The trick we used to override libc's dlopen() doesn't work with
shared libraries. Since it's just an extra warning message, remove
it to avoid future headaches.

Location:

uspace/lib/posix

Files:

• Makefile (modified) (4 diffs)
• src/dlfcn.c (modified) (1 diff)

uspace/lib/posix/Makefile

@@ -35 +35 @@
 INCLUDE_LIBC = ./include/libc
 
-LIBC_FILE = $(LIBC_PREFIX)/libc.a
-
-FIXED_C_LIBRARY = libc4posix.a
-MERGED_C_LIBRARY = libc.a
-MERGE_LIBRARIES = \
-        $(FIXED_C_LIBRARY) \
-        $(LIBRARY).a \
-        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
-        $(LIBSOFTINT_PREFIX)/libsoftint.a
-
 SPECS = gcc.specs
 LIBC_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
@@ -54 +44 @@
         ../math/libmath.a \
         ../clui/libclui.a \
-        $(MERGED_C_LIBRARY) \
+        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
+        $(LIBSOFTINT_PREFIX)/libsoftint.a \
+        $(LIBC_PREFIX)/libc.a \
+        $(LIBRARY).a \
         $(EXPORT_STARTUP_FILE) \
         $(EXPORT_LINKER_SCRIPT) \
         $(SPECS)
 
-REDEFS_HIDE_LIBC = redefs-hide-libc-symbols.list
+PRE_DEPEND = $(INCLUDE_LIBC)
+EXTRA_CLEAN = $(INCLUDE_LIBC)
 
-PRE_DEPEND = $(INCLUDE_LIBC)
-EXTRA_CLEAN = \
-        $(INCLUDE_LIBC) \
-        $(REDEFS_HIDE_LIBC) \
-        libc.o
-
-EXTRA_OUTPUT = $(FIXED_C_LIBRARY) $(FIXED_POSIX_LIBRARY) $(MERGED_C_LIBRARY) $(SPECS) $(EXPORT_LINKER_SCRIPT) $(EXPORT_STARTUP_FILE)
+EXTRA_OUTPUT = $(SPECS) $(EXPORT_LINKER_SCRIPT) $(EXPORT_STARTUP_FILE)
 
 SOURCES = \
@@ -106 +94 @@
 
 EXPORT_LDLIBS = \
-        -lmath -lc
+        --start-group -lposix -lmath -lc -lsoftfloat -lsoftint --end-group
 
 EXPORT_CFLAGS = \
@@ -179 +167 @@
         rm -rf $(EXPORT_DIR)/include
         mv $(EXPORT_DIR)/include.new $(EXPORT_DIR)/include
-
-$(FIXED_C_LIBRARY): $(LIBC_FILE) $(REDEFS_HIDE_LIBC)
-        $(OBJCOPY) --redefine-syms=$(REDEFS_HIDE_LIBC) $(LIBC_FILE) $@
-
-$(MERGED_C_LIBRARY): $(MERGE_LIBRARIES)
-        $(LD) --fatal-warnings -r -o libc.o --whole-archive $(MERGE_LIBRARIES) --no-whole-archive
-        $(AR) rc $@ libc.o
-
-$(REDEFS_HIDE_LIBC): $(SOURCES)
-        sed -n -e 's/_HIDE_LIBC_SYMBOL(\(.*\));/\1 __helenos_libc_\1/p' $(SOURCES) >$@

uspace/lib/posix/src/dlfcn.c

@@ -34 +34 @@
 #include "posix/dlfcn.h"
 
-_HIDE_LIBC_SYMBOL(dlopen);
-extern void *__helenos_libc_dlopen(const char *filename, int flags);
-
-void *dlopen(const char *filename, int flags)
-{
-        if (flags != 0) {
-                fprintf(stderr, "dlopen() not implemented with non-zero flags (%s:%d), something will NOT work.\n", __FILE__, __LINE__);
-        }
-
-        return __helenos_libc_dlopen(filename, 0);
-}
-
 int dlclose(void *handle)
 {