search for: klibcemain

...scripts/Kbuild.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 ; \...

...-git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG index addbe40..53bc1dc 100644 --- a/usr/klibc/arch/arm/MCONFIG +++ b/usr/klibc/arch/arm/MCONFIG @@ -19,7 +19,7 @@ ifeq ($(CONFIG_KLIBC_THUMB),y) CPU_ARCH := $(CPU_ARCH)t KLIBCREQFLAGS += -mthumb KLIBCLDFLAGS += --thumb-entry _start -KLIBCEMAIN = --thumb-entry _start +KLIBCEMAIN = --thumb-entry main KLIBCREQFLAGS += -mabi=aapcs-linux KLIBCSHAREDFLAGS = -Ttext 0x380200 else

...a/klcc/Kbuild b/klcc/Kbuild index 0e625802..ca46c6ce 100644 --- a/klcc/Kbuild +++ b/klcc/Kbuild @@ -21,6 +21,7 @@ $(obj)/$(KLIBCCROSS)klibc.config: $(src)/Kbuild \ $(Q)echo 'STRIP=$(STRIP)' >> $@ $(Q)echo 'STRIPFLAGS=$(KLIBCSTRIPFLAGS)' >> $@ $(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@ + $(Q)echo 'CRTSHARED=$(notdir $(KLIBCCRTSHARED))' >> $@ $(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@ $(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@ $(Q)echo 'prefix=$(INSTALLDIR)' >> $@ diff --git a/klc...

...Ds) -KLIBCSTRIP := $(STRIP) +KLIBCSTRIP := $(if $(CONFIG_DEBUG_INFO),true,$(STRIP)) KLIBCNM := $(NM) KLIBCOBJCOPY := $(OBJCOPY) KLIBCOBJDUMP := $(OBJDUMP) @@ -136,6 +136,10 @@ KLIBCLIBCSHARED := $(KLIBCOBJ)/libc.so # How to tell the linker main() is the entrypoint KLIBCEMAIN ?= -e main +ifdef CONFIG_DEBUG_INFO +KLIBCLDFLAGS += --build-id=sha1 +endif + # # This indicates the location of the final version of the shared library. # THIS MUST BE AN ABSOLUTE PATH WITH NO FINAL SLASH.

...Q)echo 'OPTFLAGS=$(KLIBCOPTFLAGS)' >> $@ $(Q)echo 'LDFLAGS=$(KLIBCLDFLAGS)' >> $@ - $(Q)echo 'STRIP=$(KLIBCSTRIP)' >> $@ + $(Q)echo 'STRIP=$(STRIP)' >> $@ $(Q)echo 'STRIPFLAGS=$(KLIBCSTRIPFLAGS)' >> $@ $(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@ $(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@

...scripts/Kbuild.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 ; \...

...LIBCCFLAGS) --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 make it the root. +# +SHLIBDIR = /lib + +export KLIBCLD KLIBCCC KLIBCAR KLIBCSTRIP KLIBCNM +export KLIBCCFLAGS KLIBCAFLAGS KLIBCLI...

...or now, disable gp-relative addressing. -KLIBCLDFLAGS = --no-relax KLIBCOPTFLAGS += -Os -fomit-frame-pointer ifeq ($(DEBUG),y) KLIBCOPTFLAGS += -g @@ -21,3 +18,6 @@ KLIBCSHAREDFLAGS = $(LD_IMAGE_BASE_OPT) 0x00200000 # Kernel has never used stack trampolines KLIBCEXECSTACK := n + +KLIBCEMAIN := -e _main +KLIBCCRTSHARED += $(KLIBCOBJ)/arch/riscv64/_main.o diff --git a/usr/klibc/arch/riscv64/_main.S b/usr/klibc/arch/riscv64/_main.S new file mode 100644 index 00000000..284a2222 --- /dev/null +++ b/usr/klibc/arch/riscv64/_main.S @@ -0,0 +1,17 @@ +# +# arch/riscv64/_main.S +# +# D...

...+= -g @@ -18,6 +15,10 @@ KLIBCBITSIZE = 64 # Normal binaries start at 64 KB, so start the libary at 2 MB. KLIBCSHAREDFLAGS = $(LD_IMAGE_BASE_OPT) 0x00200000 +KLIBCSHAREDFLAGS += --defsym '__global_pointer$$=0' # Kernel has never used stack trampolines KLIBCEXECSTACK := n + +KLIBCEMAIN := -e _main +KLIBCCRTSHARED += $(KLIBCOBJ)/arch/riscv64/_main.o diff --git a/usr/klibc/arch/riscv64/_main.S b/usr/klibc/arch/riscv64/_main.S new file mode 100644 index 00000000..284a2222 --- /dev/null +++ b/usr/klibc/arch/riscv64/_main.S @@ -0,0 +1,17 @@ +# +# arch/riscv64/_main.S +# +# D...

...00 +KLIBCSHAREDFLAGS = -Ttext-segment 0x1c0000000 diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG index 53bc1dc..8a7096b 100644 --- a/usr/klibc/arch/arm/MCONFIG +++ b/usr/klibc/arch/arm/MCONFIG @@ -21,12 +21,12 @@ KLIBCREQFLAGS += -mthumb KLIBCLDFLAGS += --thumb-entry _start KLIBCEMAIN = --thumb-entry main KLIBCREQFLAGS += -mabi=aapcs-linux -KLIBCSHAREDFLAGS = -Ttext 0x380200 +KLIBCSHAREDFLAGS = -Ttext-segment 0x380000 else # Extra linkflags when building the shared version of the library # This address needs to be reachable using normal inter-module # calls, and work on...

...SHAREDFLAGS = $(IMAGE_BASE) 0x1c0000000 diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCONFIG index 8a7096b8cced..34a3305da878 100644 --- a/usr/klibc/arch/arm/MCONFIG +++ b/usr/klibc/arch/arm/MCONFIG @@ -21,12 +21,12 @@ KLIBCREQFLAGS += -mthumb KLIBCLDFLAGS += --thumb-entry _start KLIBCEMAIN = --thumb-entry main KLIBCREQFLAGS += -mabi=aapcs-linux -KLIBCSHAREDFLAGS = -Ttext-segment 0x380000 +KLIBCSHAREDFLAGS = $(IMAGE_BASE) 0x380000 else # Extra linkflags when building the shared version of the library # This address needs to be reachable using normal inter-module # calls, and...

...v4 +CPU_TUNE := strongarm + +KLIBCOPTFLAGS = -Os -march=$(CPU_ARCH) -mtune=$(CPU_TUNE) +KLIBCBITSIZE = 32 +KLIBCREQFLAGS = -fno-exceptions +KLIBCSTRIPFLAGS += -R .ARM.exidx + +ifeq ($(CONFIG_KLIBC_THUMB),y) +CPU_ARCH := $(CPU_ARCH)t +KLIBCREQFLAGS += -mthumb +KLIBCLDFLAGS += --thumb-entry _start +KLIBCEMAIN = --thumb-entry _start +KLIBCREQFLAGS += -mabi=aapcs-linux +KLIBCSHAREDFLAGS = -Ttext 0x380200 +else +# Extra linkflags when building the shared version of the library +# This address needs to be reachable using normal inter-module +# calls, and work on the memory models for this architecture +...

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: