[aadk-commits] qwell: uClinux/trunk r72 - /uClinux/trunk/uClinux-dist/uClibc/ldso/libdl/

[aadk-commits at lists.digium.com]

Author: qwell
Date: Tue Dec 12 11:03:54 2006
New Revision: 72

URL: http://svn.digium.com/view/aadk?view=rev&rev=72
Log:
Backport a bug fix from the latest upstream CVS repository.
A huge thanks has to go to Jie Zhang from Analog Devices - very fast response time - had a patch written and committed in just about an hour.

Modified:
    uClinux/trunk/uClinux-dist/uClibc/ldso/libdl/Makefile
    uClinux/trunk/uClinux-dist/uClibc/ldso/libdl/libdl.c

Modified: uClinux/trunk/uClinux-dist/uClibc/ldso/libdl/Makefile
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/uClibc/ldso/libdl/Makefile?view=diff&rev=72&r1=71&r2=72
==============================================================================
--- uClinux/trunk/uClinux-dist/uClibc/ldso/libdl/Makefile (original)
+++ uClinux/trunk/uClinux-dist/uClibc/ldso/libdl/Makefile Tue Dec 12 11:03:54 2006
@@ -38,7 +38,7 @@
 XXFLAGS+=-isystem $(shell $(CC) -print-file-name=include)
 XXFLAGS_NOPIC:=$(XXFLAGS)
 ifeq ($(DOPIC),y)
-    XXFLAGS += $(PICFLAG) -D__LIBDL_SHARED__
+    XXFLAGS += $(PICFLAG) -DSHARED
 endif
 ifeq ($(strip $(SUPPORT_LD_DEBUG)),y)
 XXFLAGS+=-D__SUPPORT_LD_DEBUG__

Modified: uClinux/trunk/uClinux-dist/uClibc/ldso/libdl/libdl.c
URL: http://svn.digium.com/view/aadk/uClinux/trunk/uClinux-dist/uClibc/ldso/libdl/libdl.c?view=diff&rev=72&r1=71&r2=72
==============================================================================
--- uClinux/trunk/uClinux-dist/uClibc/ldso/libdl/libdl.c (original)
+++ uClinux/trunk/uClinux-dist/uClibc/ldso/libdl/libdl.c Tue Dec 12 11:03:54 2006
@@ -32,7 +32,7 @@
 
 #define _GNU_SOURCE
 
-#ifndef __LIBDL_SHARED__
+#ifndef SHARED
 #define _dl_malloc malloc
 #define _dl_free free
 #endif
@@ -43,7 +43,7 @@
 #include <string.h>
 
 
-#if defined (__LIBDL_SHARED__)
+#if defined (SHARED)
 
 #define WEAK __attribute__((weak))
 /* When libdl is loaded as a shared library, we need to load in
@@ -78,7 +78,7 @@
 #endif
 
 
-#else /* __LIBDL_SHARED__ */
+#else /* SHARED */
 
 /* When libdl is linked as a static library, we need to replace all
  * the symbols that otherwise would have been loaded in from ldso... */