From: greg@kroah.com <greg@kroah.com>
Date: Sat, 25 Oct 2003 07:21:18 +0000 (-0700)
Subject: [PATCH] pull some klibc stuff into the make Makefile to try to stay in sync.
X-Git-Tag: 006~53
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2d5b68864f8beeaa89b3d026c6de9a97d70eeb04

[PATCH] pull some klibc stuff into the make Makefile to try to stay in sync.
---

diff --git a/Makefile b/Makefile
index 82ea0bc30..8d7122858 100644
--- a/Makefile
+++ b/Makefile
@@ -106,19 +106,22 @@ endif
 # If we are using our version of klibc, then we need to build and link it.
 # Otherwise, use glibc and link statically.
 ifeq ($(strip $(KLIBC)),true)
-	KLIBC_DIR	= klibc
+	KLIBC_DIR	= klibc/klibc
 	INCLUDE_DIR	:= $(KLIBC_DIR)/include
 	# arch specific objects
+	LIBGCC		= $(shell $(CC) --print-libgcc)
 	ARCH_LIB_OBJS =	\
-			$(KLIBC_DIR)/bin-$(ARCH)/start.o	\
-			$(KLIBC_DIR)/bin-$(ARCH)/klibc.a
+			$(KLIBC_DIR)/libc.a	\
+			$(LIBGCC)
 
-	LIB_OBJS =	$(GCC_LIB)
 
+	CRT0 = $(KLIBC_DIR)/crt0.o
 	LIBC =	$(ARCH_LIB_OBJS) $(LIB_OBJS)
-	CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(GCCINCDIR)
+	CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I$(GCCINCDIR) -Iklibc/linux/include -D__KLIBC__
+	LIB_OBJS =
 	LDFLAGS = --static --nostdlib -nostartfiles
 else
+	CRT0 =
 	LIBC = 
 	CFLAGS += -I$(GCCINCDIR)
 	LIB_OBJS = -lc