Browse Source

Turn off USE_CACHE by default (so ldconfig, by default, isn't
needed).
Fix a stupid typo in dlib.c where I had several weak symbols
set up backwards, breaking libdl (dlopen and friends),
-Erik

Eric Andersen 23 years ago
parent
commit
523e75677a
4 changed files with 12 additions and 12 deletions
  1. 1 1
      ldso/ldso/Makefile
  2. 1 1
      ldso/libdl/Makefile
  3. 5 5
      ldso/libdl/dlib.c
  4. 5 5
      ldso/libdl/libdl.c

+ 1 - 1
ldso/ldso/Makefile

@@ -24,7 +24,7 @@
 TOPDIR=../../
 include $(TOPDIR)Rules.mak
 
-TARGET_CFLAGS += -DUSE_CACHE #-DDL_DEBUG #-funroll-loops
+TARGET_CFLAGS += #-DUSE_CACHE #-DDL_DEBUG #-funroll-loops
 
 
 

+ 1 - 1
ldso/libdl/Makefile

@@ -31,7 +31,7 @@ LIBDL_SHARED_FULLNAME=libdl-$(MAJOR_VERSION).$(MINOR_VERSION).so
 CSRC= dlib.c
 OBJS=$(patsubst %.c,%.o, $(CSRC))
 
-TARGET_CFLAGS += -DUSE_CACHE #-fPIC -D__PIC__ #-funroll-loops
+TARGET_CFLAGS += #-DUSE_CACHE #-fPIC -D__PIC__ #-funroll-loops
 
 all: $(OBJS) $(LIBDL) shared
 

+ 5 - 5
ldso/libdl/dlib.c

@@ -454,11 +454,11 @@ const char *_dlerror()
 }
 
 /* Generate the correct symbols that we need. */
-weak_alias(dlopen, _dlopen);
-weak_alias(dlerror, _dlerror);
-weak_alias(dlclose, _dlclose);
-weak_alias(dlsym, _dlsym);
-weak_alias(dladdr, _dladdr);
+weak_alias(_dlopen, dlopen);
+weak_alias(_dlerror, dlerror);
+weak_alias(_dlclose, dlclose);
+weak_alias(_dlsym, dlsym);
+weak_alias(_dladdr, dladdr);
 
 /* This is a real hack.  We need access to the dynamic linker, but we
 also need to make it possible to link against this library without any

+ 5 - 5
ldso/libdl/libdl.c

@@ -454,11 +454,11 @@ const char *_dlerror()
 }
 
 /* Generate the correct symbols that we need. */
-weak_alias(dlopen, _dlopen);
-weak_alias(dlerror, _dlerror);
-weak_alias(dlclose, _dlclose);
-weak_alias(dlsym, _dlsym);
-weak_alias(dladdr, _dladdr);
+weak_alias(_dlopen, dlopen);
+weak_alias(_dlerror, dlerror);
+weak_alias(_dlclose, dlclose);
+weak_alias(_dlsym, dlsym);
+weak_alias(_dladdr, dladdr);
 
 /* This is a real hack.  We need access to the dynamic linker, but we
 also need to make it possible to link against this library without any