From 523e75677a8d2aff97136429a1171fc1236cff1e Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Tue, 17 Jul 2001 04:00:27 +0000
Subject: 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

---
 ldso/ldso/Makefile  |  2 +-
 ldso/libdl/Makefile |  2 +-
 ldso/libdl/dlib.c   | 10 +++++-----
 ldso/libdl/libdl.c  | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'ldso')

diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile
index ab5d09ebc..95ed01caf 100644
--- a/ldso/ldso/Makefile
+++ b/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
 
 
 
diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile
index 67047d7c6..58b1dab53 100644
--- a/ldso/libdl/Makefile
+++ b/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
 
diff --git a/ldso/libdl/dlib.c b/ldso/libdl/dlib.c
index 50b9ff601..2b6000472 100644
--- a/ldso/libdl/dlib.c
+++ b/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
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index 50b9ff601..2b6000472 100644
--- a/ldso/libdl/libdl.c
+++ b/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
-- 
cgit v1.2.3