search for: klibcinc

...ld.klibc b/scripts/Kbuild.klibc index afc9a546feca..411d7ea9bea6 100644 --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -107,8 +107,15 @@ KLIBCOBJCOPY := $(OBJCOPY) KLIBCOBJDUMP := $(OBJDUMP) # klibc include paths -KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ - -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ +ifeq ($(cc-name),clang) +# clang can't find the compiler-specific header <stdarg.h> if -nostdinc +# is specified so we have to omit it along with the -iwithprefix option. +# See b/35394554. +KLIBCCPPFLAGS := +else +KLIBCCPPFLAGS := -nostdinc -iwithprefix inc...

...c/scripts/Kbuild.include. [...] > --- a/scripts/Kbuild.klibc > +++ b/scripts/Kbuild.klibc > @@ -107,8 +107,15 @@ KLIBCOBJCOPY := $(OBJCOPY) > KLIBCOBJDUMP := $(OBJDUMP) > > # klibc include paths > -KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ > - -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ > +ifeq ($(cc-name),clang) > +# clang can't find the compiler-specific header <stdarg.h> if -nostdinc > +# is specified so we have to omit it along with the -iwithprefix option. > +# See b/35394554. This seems to be an internal bug number. It doesn...

...option, -fno-PIE, ) \ + $(call cc-option, -fno-builtin-bcmp, ) \ -ggdb KLIBCARCHREQFLAGS := KLIBCOPTFLAGS := @@ -108,10 +109,14 @@ KLIBCOBJDUMP := $(OBJDUMP) # klibc include paths KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ - -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ + -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ - -I$(KLIBCOBJ)/../include \ + -I$(KLIBCOBJ)/../include \ -I$(KLIBCINC) +ifeq ($(cc-name),clang) +KLIBCCPPFLAGS...

...option, -fno-PIE, ) \ + $(call cc-option, -fno-builtin-bcmp, ) \ -ggdb KLIBCARCHREQFLAGS := KLIBCOPTFLAGS := @@ -108,10 +109,14 @@ KLIBCOBJDUMP := $(OBJDUMP) # klibc include paths KLIBCCPPFLAGS := -nostdinc -iwithprefix include \ - -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ + -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ - -I$(KLIBCOBJ)/../include \ + -I$(KLIBCOBJ)/../include \ -I$(KLIBCINC) +ifeq ($(cc-name),clang) +KLIBCCPPFLAGS...

Avoiding full path to KLIBCINC will result in havesyscall.h being generated in the $(objtree). We do not want generated files in the source tree with make O=.. -I parmeters to gcc now prefixed with $(srctree) allowing to pick up the generated .h file in $(objtree) Signed-off-by: Sam Ravnborg <sam@ravnborg.org> --- diff -...

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

- Renamed IMAGE_BASE to LD_IMAGE_BASE_OPT. - Moved "-fcommon" to KLIBCREQFLAGS in scripts/Kbuild.klibc. - Remove "dash" warning fixes which have been upstreamed. - Conditionalize the inclusion of compiler flags by using the proper compiler name or "cc-option". - Added "-Werror" to "cc-option" to catch flags that cause warnings. - Retain

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

...purN a/Makefile b/Makefile --- a/Makefile 2006-05-24 15:19:05.000000000 +0200 +++ b/Makefile 2006-05-24 15:43:44.000000000 +0200 @@ -180,6 +180,7 @@ UTS_MACHINE := $(ARCH) # Architecture used to compile user-space code KLIBCARCH ?= $(ARCH) +KLIBCARCHDIR ?= $(ARCH) # klibc definitions export KLIBCINC := usr/include @@ -326,7 +327,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE export KLIBCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD export CC CPP AR RANLIB NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS export PERL UTS_MACHINE HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK -export CHECKFLAGS...

...IBCSRC)/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$(KLIBCINC)/arch/$(KLIBCARCH) \ +KLIBCCPPFLAGS := -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ -I$(KLIBCINC) # kernel include paths @@ -93,7 +93,7 @@ KLIBCAFLAGS := -D__ASSEMBLY__ $(KLI KLIBCSTRIPFLAGS := --strip...

This is a series of patches for clang compatibility: - Using flags needed flags and removing unsupported flags. - Adding support for clang's LLD linker. - Removing a variety of warnings. Bill Wendling (3): [klibc] Kbuild: use "libc.a" with clang [klibc] Kbuild: Add "-fcommon" for clang builds [klibc] Clean up clang warnings Michael Davidson (1): [klibc] Kbuild:

...rch/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 linux tree' - @echo '...

...So I hope to see it in next -mm ! 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 com...

...d jobs.... KLIBCCC usr/klibc/brk.o ... KLIBCAS usr/klibc/syscalls/getsockopt.o LIST usr/klibc/syscalls/klib.list make[1]: *** [all] Error 2 make: *** [klibc] Error 2 The problem stems from within usr/klibc: sigsuspend.c includes <klibc/havesyscall.h> which is effectively $(objtree)/$(KLIBCINC)/klibc/havesyscall.h, which comes about as a side effect of building $(objtree)/$(obj)/syscalls/syscalls.mk, this happens relatively early while recursively building the 'syscalls' subdirectory (of usr/klibc). However, we have no dependency on this. With "make -j 1" klib-y order...

...version) + +# binutils +KLIBCLD := $(LD) +KLIBCCC := $(CC) +KLIBCAR := $(AR) +KLIBCRANLIB := $(RANLIB) +KLIBCSTRIP := $(STRIP) +KLIBCNM := $(NM) +KLIBCOBJCOPY := $(OBJCOPY) +KLIBCOBJDUMP := $(OBJDUMP) + +# klibc include paths +KLIBCCPPFLAGS := -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ + -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ + -I$(KLIBCOBJ)/../include \ + -I$(KLIBCINC) +# kernel include paths +KLIBCKERNELSRC ?= $(srctree)/ +KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)include \ + $(if $(KBUILD_SRC),...

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]

...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) $(klibc)=klibc/tests +### +#...

...anged, 21 insertions(+), 8 deletions(-) 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 com...

...;" + echo "" +fi + # If output_file is set we will generate cpio archive and gzip it # we are carefull to delete tmp files if [ ! -z ${output_file} ]; then diff --git a/usr/Kbuild b/usr/Kbuild index c4f5be2..e338cf9 100644 --- a/usr/Kbuild +++ b/usr/Kbuild @@ -8,21 +8,38 @@ export KLIBCINC := $(srctree)/$(src)/inc export KLIBCOBJ := $(objtree)/$(obj)/klibc CONFIG_KLIBC := 1 +klibc-subdir := klibc +usr-subdirs := kinit utils dash gzip +subdir- := $(klibc-subdir) $(usr-subdirs) + +usr-subdirs := $(addprefix _usr_,$(usr-subdirs)) +klibc-subdir := $(addprefix _usr_,$(klibc-sub...

...ming. 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) $(klibc)=$(src)/klibc $(Q)$(MAKE) $(klib...