search for: klibsrc

Factor out all kernel specific path's (those containing usr/) into two variables: KLIBSRC + KLIBINC. Set the variables in a kernel spcific Kbuild file. Sam commit e6f989c1597a837f4aecbd11083697184c089611 tree 93f88d7564bb9e4d4bc95fd455b842d0bd0fdc54 parent 8151f4a98f82fba4fe3b949f49da4ab8bba71501 author Sam Ravnborg <sam@mars.(none)> Thu, 28 Jul 2005 23:36:07 +0200 committer S...

Hi Peter & others. Here are three patches that does the following: #1 - Update kbuild part of klibc so make clean works Adds gzip including a sample kbuild file #2 - Factor out definition of usr/ to two variables #3 - Move kbuild files to reflect location in the kernel As requested in earlier mail I need a bit of guidiance of what you expect from the kernel integrated parts of klibc.

...equire -shared on powerpc, and -R leads to linker errors. This patch makes the -R an arch define. ia64 at least requires -R. --- ash/Makefile +++ ash/Makefile 2003/11/27 15:04:02 @@ -36,7 +36,7 @@ $(STRIP) $(PROG) $(PROG).shared: $(OBJS) $(LIBS) - $(LD) $(LDFLAGS) -o $(PROG).shared -e main $(KLIBSRC)/interp.o $(OBJS) -R $(KLIBSRC)/libc.so $(LIBGCC) + $(LD) $(LDFLAGS) -o $(PROG).shared -e main $(KLIBSRC)/interp.o $(OBJS) $(LD_SOLIB_FLAGS) $(KLIBSRC)/libc.so $(LIBGCC) $(STRIP) $(PROG).shared $(CRT0) $(LIBS): --- klibc/Makefile +++ klibc/Makefile 2003/11/27 15:03:50 @@ -62,7 +62,7 @@ $(STR...

some files depend on nodes.h, but there is no dependency for that fact. olaf@mandarine:~/klibc-0.87> grep -Er 'include.*nodes.h' ash/ | sed 's-^[^/]\+/\([^.]*\).*-\1.o-' | xargs echo OBJ_NODES = OBJ_NODES = cd.o eval.o exec.o expand.o jobs.o main.o nodes.o options.o parser.o redir.o show.o trap.o var.o make spotless doesnt work reliable, the patch adds a few more targets. Is

...alls/Kbuild $kernel/usr/klibc/socketcalls diff --git a/kernel/Kbuild b/kernel/Kbuild deleted file mode 100644 --- a/kernel/Kbuild +++ /dev/null @@ -1,87 +0,0 @@ -# -# kbuild file for usr/ - including initramfs image and klibc -# - -klibc definitions - to be moved to top-level Makefile later -export KLIBSRC := $(srctree)/$(src)/klibc -export KLIBINC := $(srctree)/$(src)/include - -obj-y := initramfs_data.o -always := klibc/libc.a -hostprogs-y := gen_init_cpio -clean-files := initramfs_data.cpio.gz initramfs_list - -# Descend down into klibc when cleaning -subdir- := klibc - -# Buil...

...2 < $(SRCROOT)/version) -ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) +ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/parisc*/parisc/) CC = $(CROSS)gcc LD = $(CROSS)ld KLIBSRC = $(SRCROOT)/klibc

...$(quotefixed_initramfs_source) -$(obj)/initramfs_list: FORCE +$(obj)/initramfs_list: $(src)/Kbuild FORCE $(call filechk,initramfs_list) quiet_cmd_cpio = CPIO $@ diff --git a/kernel/Kbuild.klibc b/kernel/Kbuild.klibc --- a/kernel/Kbuild.klibc +++ b/kernel/Kbuild.klibc @@ -31,8 +31,7 @@ KLIBSRC := usr/klibc # Arch specific definitions for klibc include $(KLIBSRC)/arch/$(ARCH)/MCONFIG -USERWARNFLAGS := -Wall -Wpointer-arith -Wwrite-strings \ - -Wstrict-prototypes -Winline +USERWARNFLAGS := -W -Wall -Wsign-compare USERCROSS := $(CRO...

After getting annoyed with it a few too many times, the "linux" symlink is now expected in the root of the source tree (where you'd type "make" in the normal case). Also, all paths are relative to SRCROOT; KLIBSRC = $(SRCROOT)/klibc. -hpa

...nows about DEBUG=true and builds a debug binary. Maybe klibc should do the same? Was there a reason for -g in the i386 MCONFIG? Index: MCONFIG =================================================================== --- MCONFIG (revision 1003) +++ MCONFIG (working copy) @@ -62,5 +62,11 @@ # include $(KLIBSRC)/arch/$(ARCH)/MCONFIG +ifeq ($(DEBUG),true) +STRIP = /bin/true -Since_we_are_debugging +OPTFLAGS += -O1 -g +endif + + # How to tell the linker main() is the entrypoint EMAIN ?= -e main Index: klibc/arch/i386/MCONFIG =================================================================== --- klibc/a...

...d problems out if needed. PS. Not subscribed to klibc@zytor.com - how do I do that? Already tried majordome@zytor.com - no luck. Sam ===== Makefile 1.415 vs edited ===== --- 1.415/Makefile Thu Jul 31 22:15:44 2003 +++ edited/Makefile Sat Oct 4 06:51:19 2003 @@ -255,7 +255,7 @@ include $(KLIBSRC)/arch/$(ARCH)/MCONFIG -export USERLD USERCC USERAR USERSTRIP USERNM \ +export KLIBSRC USERLD USERCC USERAR USERSTRIP USERNM \ USERCFLAGS USERAFLAGS USERLIBGCC USERSHAREDFLAGS USERSTRIPFLAGS \ USERCRT0 USERLIBC ===== scripts/Makefile.user 1.3 vs edited ===== --- 1.3/scripts/Makefile.use...

I'm still pondering with kbuild and klibc. Next in line was to get ipconfig support in the kernel (build wise). A little challenge that is bigger than anticipated was to create a shared executable. This required a far bigger rewrite of Kbuild.klibc than originally planned. The good part is that I now managed to treat linking of objects with single and multiple .o files almost the same.

...t/plain; charset=us-ascii Content-Disposition: attachment; filename="initramfs.diff" diff -ur -x CVS -x *.[oa] klibc/Makefile klibc-0.51/Makefile --- klibc/Makefile Sun Aug 18 02:00:41 2002 +++ klibc-0.51/Makefile Sun Aug 18 22:27:28 2002 @@ -1,6 +1,47 @@ SUBDIRS = klibc ash utils gzip +KLIBSRC = klibc +include MCONFIG + +PROGS = ash/sh \ + gzip/gzip \ + utils/chroot utils/mkdir utils/mkfifo utils/mount \ + utils/pivot_root utils/umount + +SCRIPTS = scripts/init scripts/load_ramdisk + +.PHONY: all clean spotless size initramfs all: + @set -e; for d in $(SUB...