search for: klibccrtshared

...mit;h=95a3123c94abc28c65f33c9589693dde9f140fe1 Author: Ben Hutchings <ben at decadent.org.uk> AuthorDate: Sat, 29 Aug 2020 22:29:52 +0100 Committer: Ben Hutchings <ben at decadent.org.uk> CommitDate: Sat, 29 Aug 2020 22:53:10 +0100 [klibc] Kbuild, klcc: Support multiple objects in KLIBCCRTSHARED On some architectures (notably riscv64) we need a wrapper for the main function that is statically linked even when using a shared library. * Allow architectures to override KLIBCCRTSHARED (they should always append to it) * Change klcc to use the list of filenames in KLIBCCRTSHARED, rather t...

...ld.klibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc index 82c74ea7..bfe6edb3 100644 --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -361,7 +361,7 @@ quiet_cmd_ld-shared = KLIBCLD $@ $(KLIBCEMAIN) $(KLIBCCRTSHARED) \ --start-group \ $(link-deps) \ - -R $(KLIBCLIBCSHARED) \ + --just-symbols $(KLIBCLIBCSHARED) \ $(KLIBCLIBGCC) \ --end-group ; \ cp -f $@ $@...

...+= -D__ASSEMBLY__ $(KLIBCCFLAGS) +KLIBCSTRIPFLAGS += --strip-all -R .comment -R .note + +KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc) +KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) +KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o +KLIBCLIBC := $(KLIBCOBJ)/libc.a +KLIBCCRTSHARED := $(KLIBCOBJ)/interp.o +KLIBCLIBCSHARED := $(KLIBCOBJ)/libc.so +# How to tell the linker main() is the entrypoint +KLIBCEMAIN ?= -e main + +# +# This indicates the location of the final version of the shared library. +# THIS MUST BE AN ABSOLUTE PATH WITH NO FINAL SLASH. +# Leave this empty to...

...rking in my initial port, so I disabled relaxation. Make it work now: * For statically-linked executables, the _entry routine in crt0.S correctly initialises gp * For executables using the shared-library, add a _main routine in _main.S that initialises gp and tail-calls main * Add _main.o to $(KLIBCCRTSHARED) and change the entry point to _main * Install _main.o so klcc can use it * Drop the --no-relax linker option Signed-off-by: Ben Hutchings <ben at decadent.org.uk> --- usr/klibc/arch/riscv64/Kbuild | 8 ++++++-- usr/klibc/arch/riscv64/MCONFIG | 6 +++--- usr/klibc/arch/riscv64/_main.S |...

...utables. pc-relative relaxation can be enabled in all cases. * When linking the shared library, define __global_pointer$ as 0 to disable gp-relative relaxation * For executables using the shared-library, add a _main routine in _main.S that initialises gp and tail-calls main * Add _main.o to $(KLIBCCRTSHARED) and change the entry point to _main * Install _main.o so klcc can use it * Drop the --no-relax linker option Signed-off-by: Ben Hutchings <ben at decadent.org.uk> --- usr/klibc/arch/riscv64/Kbuild | 8 ++++++-- usr/klibc/arch/riscv64/MCONFIG | 7 ++++--- usr/klibc/arch/riscv64/_main.S...

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

...ld.klibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc index 82c74ea7..bfe6edb3 100644 --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -361,7 +361,7 @@ quiet_cmd_ld-shared = KLIBCLD $@ $(KLIBCEMAIN) $(KLIBCCRTSHARED) \ --start-group \ $(link-deps) \ - -R $(KLIBCLIBCSHARED) \ + --just-symbols $(KLIBCLIBCSHARED) \ $(KLIBCLIBGCC) \ --end-group ; \ cp -f $@ $@...

...CLIBGCC ?= $(KLIBCLIBGCC_DEF) +KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) $(if $(filter gcc,$(cc-name)),--print-libgcc,--print-libgcc-file-name)) +KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o KLIBCLIBC := $(KLIBCOBJ)/libc.a KLIBCCRTSHARED := $(KLIBCOBJ)/interp.o diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild index 24bad07d..c3ebff99 100644 --- a/usr/klibc/Kbuild +++ b/usr/klibc/Kbuild @@ -85,8 +85,8 @@ endif # These pass a huge maximum length to the corresponding length-limiting # functions -KLIBCCFLAGS_sprintf.o += -Wno-for...

...CLIBGCC ?= $(KLIBCLIBGCC_DEF) +KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) $(if $(filter gcc,$(cc-name)),--print-libgcc,--print-libgcc-file-name)) +KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o KLIBCLIBC := $(KLIBCOBJ)/libc.a KLIBCCRTSHARED := $(KLIBCOBJ)/interp.o diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild index c6338851..ae5eb6dc 100644 --- a/usr/klibc/Kbuild +++ b/usr/klibc/Kbuild @@ -85,8 +85,8 @@ endif # These pass a huge maximum length to the corresponding length-limiting # functions -KLIBCCFLAGS_sprintf.o += -Wno-for...

- 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

...MBLY__ $(KLI KLIBCSTRIPFLAGS := --strip-all -R .comment -R .note KLIBCLIBGCC := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc) -KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCH)/crt0.o +KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o KLIBCLIBC := $(KLIBCOBJ)/libc.a KLIBCCRTSHARED := $(KLIBCOBJ)/interp.o KLIBCLIBCSHARED := $(KLIBCOBJ)/libc.so diff -purN a/usr/include/arch/s390/klibc/archsetjmp.h b/usr/include/arch/s390/klibc/archsetjmp.h --- a/usr/include/arch/s390/klibc/archsetjmp.h 2006-05-11 08:09:08.000000000 +0200 +++ b/usr/include/arch/s390/klibc/archsetjmp.h 2006-...

...strip-all -R .comment -R .note KLIBCLIBGCC_DEF := $(shell $(KLIBCCC) $(KLIBCCFLAGS) --print-libgcc) KLIBCLIBGCC ?= $(KLIBCLIBGCC_DEF) -KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCH)/crt0.o +KLIBCCRT0 := $(KLIBCOBJ)/arch/$(KLIBCARCHDIR)/crt0.o KLIBCLIBC := $(KLIBCOBJ)/libc.a KLIBCCRTSHARED := $(KLIBCOBJ)/interp.o KLIBCLIBCSHARED := $(KLIBCOBJ)/libc.so diff -purN a/usr/include/arch/s390/klibc/archsetjmp.h b/usr/include/arch/s390/klibc/archsetjmp.h --- a/usr/include/arch/s390/klibc/archsetjmp.h 2006-05-24 15:19:12.000000000 +0200 +++ b/usr/include/arch/s390/klibc/archsetjmp.h 2006-...

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: