From 237277e9a8133c64026b736b1427141e71655330 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Thu, 27 Oct 2005 22:58:52 +0000
Subject: Moved guard_setup to dl-osinfo.h (used commonly by ldso and libc).
 Renamed to _dl_setup_stack_chk_guard, as in glibc. SSP requires now
 binutils-2.16.1 and newer. Add NOT_IN_libc/IS_IN_libc. Began using -DSHARED
 in uClibc_main.c, there are more candidates in there. Move back
 dl_protect_relro to it's earlier place.

---
 ldso/ldso/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ldso/ldso/Makefile.in')

diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
index 30a6c4ec2..47ab64bca 100644
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@@ -19,6 +19,8 @@ ifeq ($(SUPPORT_LD_DEBUG_EARLY),y)
 CFLAGS+=-D__SUPPORT_LD_DEBUG_EARLY__
 endif
 
+CFLAGS+=-DNOT_IN_libc
+
 ifeq ($(DODEBUG),y)
 # Not really much point in including debugging info, since gdb
 # can't really debug ldso, since gdb requires help from ldso to
@@ -60,8 +62,6 @@ EXTRA_LINK_LIBS:=$(LIBGCC) # $(LDADD_LIBFLOAT)
 
 ld-uClibc-so-$(HAVE_SHARED):=$(ld-uClibc_OBJS:.o=.os)
 
-ld-uClibc-multi-$(HAVE_SHARED):=$(ld-uClibc_SRC) $(ld-uClibc_SSRC)
-
 objclean-y+=ld-uClibc_clean ld-uClibc_arch_clean
 
 ld-uClibc_arch_clean:
-- 
cgit v1.2.3