search for: klibcsrc

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

...ir) diff -purN a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc --- a/scripts/Kbuild.klibc 2006-05-11 08:09:08.000000000 +0200 +++ b/scripts/Kbuild.klibc 2006-05-11 08:10:07.000000000 +0200 @@ -57,7 +57,7 @@ KLIBCBITSIZE := KLIBCLDFLAGS := # Arch specific definitions for klibc -include $(KLIBCSRC)/arch/$(KLIBCARCH)/MCONFIG +include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG # klibc version KLIBCMAJOR := $(shell cut -d. -f1 $(srctree)/usr/klibc/version) @@ -74,7 +74,7 @@ KLIBCOBJCOPY := $(OBJCOPY) KLIBCOBJDUMP := $(OBJDUMP) # klibc include paths -KLIBCCPPFLAGS := -I$(KLIBCI...

...2006-05-24 15:19:11.000000000 +0200 +++ b/scripts/Kbuild.klibc 2006-05-24 15:31:04.000000000 +0200 @@ -55,9 +55,10 @@ KLIBCWARNFLAGS := -W -Wall -Wno-sign- KLIBCSHAREDFLAGS := KLIBCBITSIZE := KLIBCLDFLAGS := +KLIBCCFLAGS := # Arch specific definitions for klibc -include $(KLIBCSRC)/arch/$(KLIBCARCH)/MCONFIG +include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG # include/asm-* architecture KLIBCASMARCH ?= $(KLIBCARCH) @@ -77,7 +78,7 @@ KLIBCOBJCOPY := $(OBJCOPY) KLIBCOBJDUMP := $(OBJDUMP) # klibc include paths -KLIBCCPPFLAGS := -I$(KLIBCINC)/arch/$(KLIBCARCH) \ +KL...

...567f6f..a60161c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SRCROOT = . # To see a list of typical targets execute "make help" # kbuild compatibility -export srctree := $(shell pwd) +export srctree := $(or $(KBUILD_SRC),$(shell pwd)) export objtree := $(shell pwd) export KLIBCSRC := usr/klibc export VERSION := $(shell cat $(srctree)/$(KLIBCSRC)/version)

.../Kbuild | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/usr/klibc/socketcalls/Kbuild b/usr/klibc/socketcalls/Kbuild index 648c928..d70b15f 100644 --- a/usr/klibc/socketcalls/Kbuild +++ b/usr/klibc/socketcalls/Kbuild @@ -48,3 +48,6 @@ $(obj)/socketcalls.mk: $(srctree)/$(KLIBCSRC)/socketcalls.pl \ $(obj)/SOCKETCALLS.i \ $(src)/socketcommon.h $(call cmd,socketcalls) + +# Used by if_changed and friends +PHONY += FORCE diff --git a/usr/klibc/syscalls/Kbuild b/usr/klibc/syscalls/Kbuild index...

Remove FORCE from the list used by if_changed and friends. Otherwise the target will always be considered out of date when built with make 3.82.

We currently use KLIBCKERNELSRC and KLIBCKERNELOBJ variables which used to be required to point to a kernel source and object directories. However the kernel headers were reorganised starting in Linux 3.7 such that that doesn't work properly. This series removes KLIBCKERNELOBJ and changes the use and documentation of KLIBCKERNELSRC to be consistent. Ben. Ben Hutchings (4): [klibc]

...NFIG | 3 --- usr/klibc/arch/riscv64/MCONFIG | 2 -- usr/klibc/arch/x86_64/MCONFIG | 3 --- 7 files changed, 3 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 4386135..a11d1e6 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ export VERSION := $(shell cat $(srctree)/$(KLIBCSRC)/version) export KLIBCINC := usr/include export KLIBCOBJ := usr/klibc export KLIBCKERNELSRC ?= linux -export KLIBCKERNELOBJ ?= $(KLIBCKERNELSRC) export VPATH := $(srctree) @@ -135,7 +134,6 @@ help: @echo @echo 'Build options:' @echo 'KLIBCKERNELSRC - Path to a configured l...

...! Sam diff --git a/Makefile b/Makefile index e469623..a3c4cb1 100644 --- a/Makefile +++ b/Makefile @@ -181,6 +181,11 @@ UTS_MACHINE := $(ARCH) # Architecture used to compile user-space code KLIBCARCH ?= $(subst powerpc,ppc,$(ARCH)) +# klibc definitions +export KLIBCINC := usr/include +export KLIBCSRC := $(srctree)/usr/klibc +export KLIBCOBJ := $(objtree)/usr/klibc + # SHELL used by kbuild CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ @@ -1283,39 +1288,42 @@ # Single targets are compatible with: # - build whith m...

...19-January/004030.html Signed-off-by: Ben Hutchings <ben at decadent.org.uk> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cd15149..4386135 100644 --- a/Makefile +++ b/Makefile @@ -112,10 +112,10 @@ klibc.spec: klibc.spec.in $(KLIBCSRC)/version sed -e 's/@@VERSION@@/$(VERSION)/g' < $< > $@ # Build klcc - it is the first target -klcc: $(objtree)/.config +klcc: $(objtree)/.config $(KLIBCKERNELSRC) $(Q)$(MAKE) $(klibc)=klcc -klibc: $(objtree)/.config +klibc: $(objtree)/.config $(KLIBCKERNELSRC) $(Q)$(MAKE...

...(KLIBCKERNELSRC)/include: @echo "Cannot find kernel UAPI headers." @echo "Either make a 'linux' symlink point to the usr subdirectory " @echo "of a kernel tree with headers installed for the $(KLIBCARCH) " @@ -111,10 +111,10 @@ klibc.spec: klibc.spec.in $(KLIBCSRC)/version sed -e 's/@@VERSION@@/$(VERSION)/g' < $< > $@ # Build klcc - it is the first target -klcc: $(objtree)/.config $(KLIBCKERNELSRC) +klcc: $(objtree)/.config $(KLIBCKERNELSRC)/include $(Q)$(MAKE) $(klibc)=klcc -klibc: $(objtree)/.config $(KLIBCKERNELSRC) +klibc: $(obj...

...re these too. I recall I tested make clean and I cannot see how I have missed all the *.o files. Maybe cogito played me a trick? Anyway I learned to use git ls-files --others Sam diff --git a/Makefile b/Makefile index 8c500e3..db9b8ac 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ export KLIBCSRC := klibc export KLIBCINC := include export KLIBCOBJ := klibc export KLIBCKERNELSRC := linux/ +include scripts/Kbuild.include export CC := gcc NOSTDINC_FLAGS := -nostdlib -nostdinc -isystem $(shell $(CC) -print-file-name=include) @@ -89,8 +90,29 @@ klibc: test: klibc $(Q)$(MAKE) $(kli...

...) $(NOSTDINC_FLAGS) $(_klibccflags) klibcaflags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(_klibcaflags) diff --git a/usr/Kbuild b/usr/Kbuild index bc50c48..6ac1959 100644 --- a/usr/Kbuild +++ b/usr/Kbuild @@ -4,7 +4,7 @@ # # klibc definitions - to be moved to top-level Makefile later export KLIBCSRC := $(srctree)/$(src)/klibc -export KLIBCINC := $(srctree)/$(src)/include +export KLIBCINC := $(src)/include export KLIBCOBJ := $(objtree)/$(obj)/klibc CONFIG_KLIBC := 1

...Kbuild.klibc index bfe6edb3..28b5e856 100644 --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -82,6 +82,7 @@ KLIBCCFLAGS := # Defaults for arch to override KLIBCARCHINCFLAGS = +KLIBCCRTSHARED := $(KLIBCOBJ)/interp.o # Arch specific definitions for klibc include $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG @@ -141,7 +142,6 @@ KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) $(if $(filter gcc,$(cc-nam KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o KLIBCLIBC := $(KLIBCOBJ)/libc.a -KLIBCCRTSHARED := $(KLIB...

...:= # Defaults for arch to override -KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include +KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include \ + -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/uapi # Arch specific definitions for klibc include $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG @@ -114,6 +115,7 @@ KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ KLIBCKERNELSRC ?= $(srctree) KLIBCKERNELOBJ ?= $(objtree) KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ + -I$(KLIBCKERNELSRC)/include/uapi \ $(if $...

...ions(-) diff --git a/Makefile b/Makefile index 897e647..ea1bae0 100644 --- a/Makefile +++ b/Makefile @@ -181,6 +181,11 @@ UTS_MACHINE := $(ARCH) # Architecture used to compile user-space code KLIBCARCH ?= $(subst powerpc,ppc,$(ARCH)) +# klibc definitions +export KLIBCINC := usr/include +export KLIBCSRC := $(srctree)/usr/klibc +export KLIBCOBJ := $(objtree)/usr/klibc + # SHELL used by kbuild CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else if [ -x /bin/bash ]; then echo /bin/bash; \ @@ -1281,39 +1286,42 @@ # Single targets are compatible with: # - build whith m...

...uapi \ + -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated/uapi \ + -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated \ + -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include # Arch specific definitions for klibc include $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG @@ -113,7 +116,10 @@ KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ # kernel include paths KLIBCKERNELSRC ?= $(srctree) KLIBCKERNELOBJ ?= $(objtree) -KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ +KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include/ua...

...ifeq ($(KLIBC_INSTALL),1) # Reset variables (to get right type of assingment) subdir- := +# Read .config if it exist, otherwise ignore +-include $(objtree)/.config + # Include Kbuild file include $(srctree)/scripts/Kbuild.include + +# Arch specific definitions for klibc +include $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG + include $(srctree)/$(obj)/Kbuild # Directories to visit diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc index de1cd27..7a8ad2a 100644 --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -304,7 +304,10 @@ ifdef kprogs # Compile klibc-programs for th...

...nts on my less-skilled shell script programming. The files are just pasted in below for comments. Gimme a day more to finish it up. Sam Restructured usr/Kbuild: # # kbuild file for usr/ - including initramfs image and klibc # # klibc definitions - to be moved to top-level Makefile later export KLIBCSRC := $(srctree)/$(src)/klibc export KLIBCINC := $(srctree)/$(src)/include export KLIBCOBJ := $(objtree)/$(obj)/klibc CONFIG_KLIBC := 1 # Klibc binaries ifdef CONFIG_KLIBC klibc := -f $(srctree)/scripts/Kbuild.klibc obj .PHONY: klibcdirs $(obj)/initramfs_list: klibcdirs klibcdirs: FORCE $(Q)$(MAKE...

...-------------------- + +KLIBCREQFLAGS := +KLIBCARCHREQFLAGS := +KLIBCOPTFLAGS := +KLIBCWARNFLAGS := -W -Wall -Wno-sign-compare -Wno-unused-parameter +KLIBCSHAREDFLAGS := +KLIBCBITSIZE := +KLIBCLDFLAGS := +KLIBCCFLAGS := + +# Arch specific definitions for klibc +include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG + +# include/asm-* architecture +KLIBCASMARCH ?= $(KLIBCARCH) + +# klibc version +KLIBCMAJOR := $(shell cut -d. -f1 $(srctree)/usr/klibc/version) +KLIBCMINOR := $(shell cut -d. -f2 $(srctree)/usr/klibc/version) + +# binutils +KLIBCLD := $(LD) +...