search for: klibcldflags

...ing early userspace (klibc programs) +# --------------------------------------------------------------------------- + +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 := $...

...think that would have oops instead. So really not sure how trinity would cause this. I am motivated to figure out but I am stuck! diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc index f500d5358ef6..b825daeb8277 100644 --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -77,7 +77,8 @@ KLIBCLDFLAGS := KLIBCCFLAGS := # 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...

...; quiet build (default), 1 => verbose build' @echo 'make V=2 [targets] 2 => give reason for rebuild of target' @echo diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc index 35c375e..de1cd27 100644 --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -78,7 +78,7 @@ KLIBCLDFLAGS := KLIBCCFLAGS := # Defaults for arch to override -KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include +KLIBCARCHINCFLAGS = # Arch specific definitions for klibc include $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG @@ -113,10 +113,8 @@ KLIBCCPPFLAGS := -no...

...++- usr/klibc/arch/ppc64/MCONFIG | 5 ++++- usr/klibc/arch/x86_64/MCONFIG | 5 ++++- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc index f500d53..989a065 100644 --- a/scripts/Kbuild.klibc +++ b/scripts/Kbuild.klibc @@ -77,7 +77,10 @@ KLIBCLDFLAGS := KLIBCCFLAGS := # Defaults for arch to override -KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include +KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/uapi \ + -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated/uapi \ +...

...$(LD_IMAGE_BASE_OPT) 0x00200000 # Kernel has never used stack trampolines KLIBCEXECSTACK := n diff --git a/usr/klibc/arch/sparc64/MCONFIG b/usr/klibc/arch/sparc64/MCONFIG index 6f5dfbe9..81ad959e 100644 --- a/usr/klibc/arch/sparc64/MCONFIG +++ b/usr/klibc/arch/sparc64/MCONFIG @@ -18,7 +18,7 @@ KLIBCLDFLAGS = -m elf64_sparc # calls, and work on the memory models for this architecture # Normal binaries start at 1 MB; the linker wants 1 MB alignment, # and call instructions have a 30-bit signed offset, << 2. -KLIBCSHAREDFLAGS = -Ttext-segment 0x80000000 +KLIBCSHAREDFLAGS = $(LD_IMAGE_BASE_...

...KLIBCSHAREDFLAGS =-Ttext-segment 0x00200000 +KLIBCSHAREDFLAGS = $(IMAGE_BASE) 0x00200000 diff --git a/usr/klibc/arch/sparc64/MCONFIG b/usr/klibc/arch/sparc64/MCONFIG index c83398559f84..767232fce80e 100644 --- a/usr/klibc/arch/sparc64/MCONFIG +++ b/usr/klibc/arch/sparc64/MCONFIG @@ -18,4 +18,4 @@ KLIBCLDFLAGS = -m elf64_sparc # calls, and work on the memory models for this architecture # Normal binaries start at 1 MB; the linker wants 1 MB alignment, # and call instructions have a 30-bit signed offset, << 2. -KLIBCSHAREDFLAGS = -Ttext-segment 0x80000000 +KLIBCSHAREDFLAGS = $(IMAGE_BASE) 0x...

...KLIBCSHAREDFLAGS =-Ttext-segment 0x00200000 +KLIBCSHAREDFLAGS = $(IMAGE_BASE) 0x00200000 diff --git a/usr/klibc/arch/sparc64/MCONFIG b/usr/klibc/arch/sparc64/MCONFIG index c83398559f84..767232fce80e 100644 --- a/usr/klibc/arch/sparc64/MCONFIG +++ b/usr/klibc/arch/sparc64/MCONFIG @@ -18,4 +18,4 @@ KLIBCLDFLAGS = -m elf64_sparc # calls, and work on the memory models for this architecture # Normal binaries start at 1 MB; the linker wants 1 MB alignment, # and call instructions have a 30-bit signed offset, << 2. -KLIBCSHAREDFLAGS = -Ttext-segment 0x80000000 +KLIBCSHAREDFLAGS = $(IMAGE_BASE) 0x...

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:

...AGS = -Ttext-segment 0x1c0000000 +KLIBCSHAREDFLAGS = $(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 usi...

...y. -KLIBCSHAREDFLAGS = -Ttext 0x1c0000200 +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 norm...

...-asynchronous-unwind-tables endif + +ifneq ($(cc-name),clang) +# These options are not supported by clang but only result in a warning +# so we can't use a cc-option test to filter them. +KLIBCOPTFLAGS += -falign-functions=1 -falign-jumps=1 -falign-loops=1 +endif + KLIBCBITSIZE = 64 KLIBCLDFLAGS = -m elf_x86_64 -- 2.26.0.rc2.310.g2932bb562d-goog

...# Kernel uses stack trampoline for signal return unless we set +# sa_restorer +KLIBCEXECSTACK := y diff --git a/usr/klibc/arch/sparc64/MCONFIG b/usr/klibc/arch/sparc64/MCONFIG index c8339855..6f5dfbe9 100644 --- a/usr/klibc/arch/sparc64/MCONFIG +++ b/usr/klibc/arch/sparc64/MCONFIG @@ -19,3 +19,6 @@ KLIBCLDFLAGS = -m elf64_sparc # Normal binaries start at 1 MB; the linker wants 1 MB alignment, # and call instructions have a 30-bit signed offset, << 2. KLIBCSHAREDFLAGS = -Ttext-segment 0x80000000 + +# Kernel has never used stack trampolines +KLIBCEXECSTACK := n diff --git a/usr/klibc/arch/x86_...

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]

On Sat, 2020-07-25 at 15:16 -0700, Bill Wendling wrote: > On Sat, Jul 25, 2020 at 2:56 PM Ben Hutchings <ben at decadent.org.uk> wrote: > > On Sat, 2020-07-25 at 14:36 -0700, Bill Wendling wrote: > > [...] > > > I upstreamed a few patches to klibc to fix a few linker errors. Some > > > of these might help: > > > > I applied v3 of your patch

...,26 @@ +# -*- makefile -*- +# +# arch/ppc64/MCONFIG +# +# Special rules for this architecture. Note that this is actually +# included from the main Makefile, and that pathnames should be +# accordingly. +# + +KLIBCARCHREQFLAGS = -m64 -mcall-aixdesc +KLIBCOPTFLAGS = -Os +KLIBCBITSIZE = 64 +KLIBCLDFLAGS = -m elf64ppc + +# 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 +# 256-16 MB - normal binaries start at 256 MB, and jumps are limited +# to +/- 16 MB...

...uses all klibc executables to crash immediately. Since there's no architectural page size betwen 4 KB and 2MB, set max-page-size to 4 KB. Signed-off-by: Ben Hutchings <ben at decadent.org.uk> --- --- a/usr/klibc/arch/x86_64/MCONFIG +++ b/usr/klibc/arch/x86_64/MCONFIG @@ -30,10 +30,12 @@ KLIBCLDFLAGS = -m elf_x86_64 # calls, and work on the memory models for this architecture # 2 MB - normal binaries start at 4 MB # -# Recent binutils use max-page-size=0x200000 by default, which pushes +# binutils now uses max-page-size=0x200000 by default, which pushes # klibc.so data over the 4 MB ma...

...MIPS recently. Signed-off-by: Ben Hutchings <ben at decadent.org.uk> --- This needs to be applied on top of my fix for binutils 2.30 in https://www.zytor.com/pipermail/klibc/2018-July/003998.html Ben. --- a/usr/klibc/arch/x86_64/MCONFIG +++ b/usr/klibc/arch/x86_64/MCONFIG @@ -35,7 +35,7 @@ KLIBCLDFLAGS = -m elf_x86_64 # The old default was max-page-size=0x100000, but that also results # in a broken layout with binutils 2.30. Since there's no # architectural page size betwen 4 KB and 2MB, set it to 4 KB. -KLIBCSHAREDFLAGS = -Ttext 0x00200200 -z max-page-size=0x1000 +KLIBCSHAREDFLA...

...nt.org.uk> --- usr/klibc/arch/x86_64/MCONFIG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/klibc/arch/x86_64/MCONFIG b/usr/klibc/arch/x86_64/MCONFIG index fbb6b94..606f041 100644 --- a/usr/klibc/arch/x86_64/MCONFIG +++ b/usr/klibc/arch/x86_64/MCONFIG @@ -35,7 +35,7 @@ KLIBCLDFLAGS = -m elf_x86_64 # The old default was max-page-size=0x100000, but that also results # in a broken layout with binutils 2.30. Since there's no # architectural page size betwen 4 KB and 2MB, set it to 4 KB. -KLIBCSHAREDFLAGS = -Ttext 0x00200200 -z max-page-size=0x1000 +KLIBCSHAREDFLA...

...:= $(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.

...+++ b/klcc/Kbuild @@ -18,7 +18,7 @@ $(obj)/$(KLIBCCROSS)klibc.config: $(src)/Kbuild \ $(Q)echo 'REQFLAGS=$(filter-out -I%,$(KLIBCDEFS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS) $(KLIBCCPPFLAGS))' >> $@ $(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)' >> $@