search for: extra_klibccflags

...Kbuild.klibc @@ -157,9 +157,19 @@ lib-y := $(addprefix $(obj)/,$ always := $(addprefix $(obj)/,$(always)) targets := $(addprefix $(obj)/,$(targets)) +##### +# Handle options to gcc. Support building with separate output directory + +__klibccflags = $(KLIBCCFLAGS) $(EXTRA_KLIBCCFLAGS) $(KLIBCCFLAGS_$(*F).o) +__klibcaflags = $(KLIBCAFLAGS) $(EXTRA_KLIBCAFLAGS) $(KLIBCAFLAGS_$(*F).o) -_klibccflags = $(KLIBCCFLAGS) $(EXTRA_KLIBCCFLAGS) $(KLIBCCFLAGS_$(*F).o) -_klibcaflags = $(KLIBCAFLAGS) $(EXTRA_KLIBCAFLAGS) $(KLIBCAFLAGS_$(*F).o) +ifeq ($(KBUILD_SRC),) +_klibccflags...

...ild | 1 + usr/klibc/Kbuild | 1 + 2 files changed, 2 insertions(+) diff --git a/usr/kinit/nfsmount/Kbuild b/usr/kinit/nfsmount/Kbuild index 5f349500bf2d..83af8a253510 100644 --- a/usr/kinit/nfsmount/Kbuild +++ b/usr/kinit/nfsmount/Kbuild @@ -1,6 +1,7 @@ # # kbuild file for nfsmount # +EXTRA_KLIBCCFLAGS = -fcommon static-y := static/nfsmount #FIXME - build is broken static-y := dummypmap diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild index 24bad07da14e..71b7582811a5 100644 --- a/usr/klibc/Kbuild +++ b/usr/klibc/Kbuild @@ -1,6 +1,7 @@ # # Kbuild file for klibc # +EXTRA_KLIBCCFLAGS = -fcomm...

...ss it on the command line it seems dash breaks the klibc build with global debug on, thus this is easiest: # you may skip first step if you have already current klibc sources cd ~/src && git clone git://git.kernel.org/pub/scm/libs/klibc/klibc.git && cd klibc ~/src/klibc$ echo "EXTRA_KLIBCCFLAGS := -DDEBUG=1" >> usr/kinit/ipconfig/Kbuild ~/src/klibc$ make KLIBCKERNELSRC=`pwd`/../linux-2.6 third step assumes built ~/src/linux-2.6 aka make defconfig, make there. now you need to put that debug ipconfig in the initramfs of where you are seeing that loop. it be interested in the l...

...:= gzip.o util.o unzip.o inflate.o always := gunzip zcat # Optional ZIP support -gzip-$(CONFIG_KLIB_ZIP) += zip.o deflate.o trees.o bits.o -cflags-$(CONFIG_KLIB_ZIP) += -DSUPPORT_ZIP +gzip-$(CONFIG_KLIBC_ZIP) += zip.o deflate.o trees.o bits.o +cflags-$(CONFIG_KLIBC_ZIP) += -DSUPPORT_ZIP EXTRA_KLIBCCFLAGS := $(cflags-y) # Additionally linked targets -- 1.8.3.2

...:= gzip.o util.o unzip.o inflate.o always := gunzip zcat # Optional ZIP support -gzip-$(CONFIG_KLIB_ZIP) += zip.o deflate.o trees.o bits.o -cflags-$(CONFIG_KLIB_ZIP) += -DSUPPORT_ZIP +gzip-$(CONFIG_KLIBC_ZIP) += zip.o deflate.o trees.o bits.o +cflags-$(CONFIG_KLIBC_ZIP) += -DSUPPORT_ZIP EXTRA_KLIBCCFLAGS := $(cflags-y) # Additionally linked targets

...l be linked shared +# +# If the userspace program consist of more files do the following: +# Kbuild: +# +# static-y := ipconfig +# ipconfig-y := main.o netdev.c +# So ipconfig will be linked statically using the two .o files +# specified with ipconfig-y. +# +# To set directory wide CFLAGS use: +# EXTRA_KLIBCCFLAGS := -DDEBUG +# To set directory wide AFLAGS use: +# EXTRA_KLIBCAFLAGS := -DDEBUG +# +# To set target specific CFLAGS (for .c files) use +# KLIBCCFLAGS-main.o := -DDEBUG=3 +# To set target specific AFLAGS (for .s files) use +# KLIBCAFLAGS-main.o := -DDEBUG=3 + +src := $(obj) +# Preset target and make...

...rst use in this function) make[2]: *** [usr/dash/histedit.o] Error 1 make[1]: *** [all] Error 2 make: *** [klibc] Error 2 this happens on top of the 2 patches sent earlier and is easy to reproduce: git clone git://git.kernel.org/pub/scm/libs/klibc/klibc.git make KLIBCKERNELSRC=`pwd`/../linux-2.6 EXTRA_KLIBCCFLAGS="-DDEBUG=1"

Building dash in parallel still fails: GEN dash/builtins.def HOSTCC dash/mkinit HOSTCC dash/mknodes HOSTCC dash/mksignames HOSTCC dash/mksyntax dash/mksignames.c:59: warning: function declaration isn?t a prototype dash/mksignames.c:365: warning: function declaration isn?t a prototype dash/mksignames.c:386: warning: function declaration isn?t a prototype KLIBCCC

Hi hpa & others. Following is a list of issues that I hope to be addressed soon so we are in even better shape for -mm inclusion. 1) rebuild initramfs when content changes. > It is a simple matter of copying in usr/Makefile from the latest > -linus kernel and replace the 10 first lines with the content from > klibc Kbuild file. 2) havesyscalls.h is not deleted after make

...# kinit-y += ipconfig/ +# +# And in the subdirectory: +# ipconfig/Kbuild: +# lib-y := packet.o dhcp_proto.o +# +##### +# For a klibc libary file do like this +# klibc/Kbuild +# klib-y := error.o pipe.o zlib/ +# +##### +# Handling of compiler/linker options +# # To set directory wide CFLAGS use: # EXTRA_KLIBCCFLAGS := -DDEBUG # To set directory wide AFLAGS use: @@ -146,10 +161,22 @@ kprog-objs := $(patsubst %/, %/lib.a, $( targets += $(static-y) $(shared-y) +##### +# klib-y handling +# .o files to build in this dir +klib-real-objs := $(patsubst %/,,$(klib-y)) +# Directories we need to visit before libs...

The following patchset implements 3 seperate series of changes. External Building ================= Patches 1 through 8 enable to use of klibc's build system while leaving the src tree pristine (and potentially read only). Specifically: - srctree=<Sources for klibc> - objtree=<Ouput directory for klibc> - KLIBCKERNELSRC=<Kernel sources> - KLIBCKERNELOBJ=<Kernel

I have updated the klibc patchset based on feedback received. In particular, the patchset has been reorganized so as not to break git-bisect. Additionally, this updates the patch base to 2.6.17-git12 (d38b69689c349f35502b92e20dafb30c62d49d63) and klibc 1.4.8; the main difference on the klibc side is removal of obsolete code. This is also available as a git tree at: