search for: klibcbitsize

.../arch/sparc64/MCONFIG | 3 +++ usr/klibc/arch/x86_64/MCONFIG | 3 +++ 17 files changed, 55 insertions(+) diff --git a/usr/klibc/arch/alpha/MCONFIG b/usr/klibc/arch/alpha/MCONFIG index ad11372f..072adb85 100644 --- a/usr/klibc/arch/alpha/MCONFIG +++ b/usr/klibc/arch/alpha/MCONFIG @@ -14,3 +14,7 @@ KLIBCBITSIZE = 64 # 7 GB - normal binaries start at 4.5 GB, and the stack is below # the binary. KLIBCSHAREDFLAGS = -Ttext-segment 0x1c0000000 + +# Kernel uses stack trampoline for signal return unless we set +# sa_restorer +KLIBCEXECSTACK := y diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MC...

This reverts commit 9d8d648e604026b32cad00a84ed6c29cbd157641, which broke signal handing on some architectures. On m68k and parisc, signal return depends on a trampoline that the kernel writes on the stack. On alpha, s390, and sparc (32-bit), we can avoid this by providing our own function as sa_restorer, but we currently don't. Signed-off-by: Ben Hutchings <ben at decadent.org.uk>

...CONFIG | 2 +- usr/klibc/arch/sparc64/MCONFIG | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/usr/klibc/arch/alpha/MCONFIG b/usr/klibc/arch/alpha/MCONFIG index e7dc61a..ad11372 100644 --- a/usr/klibc/arch/alpha/MCONFIG +++ b/usr/klibc/arch/alpha/MCONFIG @@ -13,4 +13,4 @@ KLIBCBITSIZE = 64 # calls, and work on the memory models for this architecture # 7 GB - normal binaries start at 4.5 GB, and the stack is below # the binary. -KLIBCSHAREDFLAGS = -Ttext 0x1c0000200 +KLIBCSHAREDFLAGS = -Ttext-segment 0x1c0000000 diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/arm/MCO...

...hell $(CC) -print-file-name=include) ARCH := $(shell uname -m | sed -e s/i.86/i386/ \ diff --git a/usr/klibc/arch/alpha/MCONFIG b/usr/klibc/arch/alpha/MCONFIG index ad11372f9266..be56a0d52d4c 100644 --- a/usr/klibc/arch/alpha/MCONFIG +++ b/usr/klibc/arch/alpha/MCONFIG @@ -13,4 +13,4 @@ KLIBCBITSIZE = 64 # calls, and work on the memory models for this architecture # 7 GB - normal binaries start at 4.5 GB, and the stack is below # the binary. -KLIBCSHAREDFLAGS = -Ttext-segment 0x1c0000000 +KLIBCSHAREDFLAGS = $(IMAGE_BASE) 0x1c0000000 diff --git a/usr/klibc/arch/arm/MCONFIG b/usr/klibc/arch/...

...$(shell $(CC) -print-file-name=include) ARCH := $(shell uname -m | sed -e s/i.86/i386/ \ diff --git a/usr/klibc/arch/i386/MCONFIG b/usr/klibc/arch/i386/MCONFIG index 0704669500f0..baa7e59854f8 100644 --- a/usr/klibc/arch/i386/MCONFIG +++ b/usr/klibc/arch/i386/MCONFIG @@ -30,4 +30,4 @@ KLIBCBITSIZE = 32 # This address needs to be reachable using normal inter-module # calls, and work on the memory models for this architecture # 96 MB - normal binaries start at 128 MB -KLIBCSHAREDFLAGS = -Ttext-segment 0x06000000 +KLIBCSHAREDFLAGS = $(IMAGE_BASE) 0x06000000 diff --git a/usr/klibc/arch/mips6...

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:

...-isystem $(shell $(CC) -print-file-name=include) ARCH := $(shell uname -m | sed -e s/i.86/i386/ \ diff --git a/usr/klibc/arch/i386/MCONFIG b/usr/klibc/arch/i386/MCONFIG index c7d3fccd..e6f50dde 100644 --- a/usr/klibc/arch/i386/MCONFIG +++ b/usr/klibc/arch/i386/MCONFIG @@ -30,7 +30,7 @@ KLIBCBITSIZE = 32 # This address needs to be reachable using normal inter-module # calls, and work on the memory models for this architecture # 96 MB - normal binaries start at 128 MB -KLIBCSHAREDFLAGS = -Ttext-segment 0x06000000 +KLIBCSHAREDFLAGS = $(LD_IMAGE_BASE_OPT) 0x06000000 # Kernel uses dedicated...

...$(if $(KBUILD_SRC),-I$(srctree)/include) \ $(KLIBCARCHINCFLAGS) # klibc definitions diff --git a/usr/klibc/arch/i386/MCONFIG b/usr/klibc/arch/i386/MCONFIG index bfec004..0704669 100644 --- a/usr/klibc/arch/i386/MCONFIG +++ b/usr/klibc/arch/i386/MCONFIG @@ -31,6 +31,3 @@ KLIBCBITSIZE = 32 # calls, and work on the memory models for this architecture # 96 MB - normal binaries start at 128 MB KLIBCSHAREDFLAGS = -Ttext-segment 0x06000000 - -# Asm includes for i386 are in the merged x86 tree -KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include diff --git a/usr/klibc/arch/pp...

...m $(shell $(CC) -print-file-name=include) ARCH := $(shell uname -m | sed -e s/i.86/i386/ \ diff --git a/usr/klibc/arch/i386/MCONFIG b/usr/klibc/arch/i386/MCONFIG index 0704669500f0..baa7e59854f8 100644 --- a/usr/klibc/arch/i386/MCONFIG +++ b/usr/klibc/arch/i386/MCONFIG @@ -30,4 +30,4 @@ KLIBCBITSIZE = 32 # This address needs to be reachable using normal inter-module # calls, and work on the memory models for this architecture # 96 MB - normal binaries start at 128 MB -KLIBCSHAREDFLAGS = -Ttext-segment 0x06000000 +KLIBCSHAREDFLAGS = $(IMAGE_BASE) 0x06000000 diff --git a/usr/klibc/arch/mips6...

...+= $(call cc-option,-march=z990) diff -purN a/scripts/Kbuild.klibc b/scripts/Kbuild.klibc --- a/scripts/Kbuild.klibc 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)...

...rg.h> if -nostdinc +# is specified so we have to omit it along with the -iwithprefix option. +# See b/35394554. +KLIBCCPPFLAGS := +else +KLIBCCPPFLAGS := -nostdinc -iwithprefix include +endif +KLIBCCPPFLAGS += -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ -I$(KLIBCOBJ)/../include \ -I$(KLIBCINC) @@ -128,7 +135,13 @@ KLIBCCFLAGS += $(KLIBCCPPFLAGS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS) \ KLIBCAFLAGS += -D__ASSEMBLY__ -Wa,--noexecstack $(KLIBCCFLAGS) KLIBCSTRIPFLAGS += --strip-all -R .comment -R .note +#...

...J)/include2 \ -I$(KLIBCKERNELOBJ)/include -I$(srctree)/include) \ $(KLIBCARCHINCFLAGS) diff --git a/usr/klibc/arch/i386/MCONFIG b/usr/klibc/arch/i386/MCONFIG index 1150ece..eb7a5e9 100644 --- a/usr/klibc/arch/i386/MCONFIG +++ b/usr/klibc/arch/i386/MCONFIG @@ -33,4 +33,7 @@ KLIBCBITSIZE = 32 KLIBCSHAREDFLAGS = -Ttext 0x06000200 # Asm includes for i386 are in the merged x86 tree -KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include +KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include/uapi \ + -I$(KLIBCKERNELOBJ)/arch/x86/include/generated/uapi \ +...

- 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

...r)/man1/$(KCROSS)klcc.1 $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) 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 := $(OBJ...

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]

...-26,6 +26,8 @@ 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 +else +KLIBCOPTFLAGS += -fno-builtin-bcmp endif KLIBCBITSIZE = 64 -- 2.26.0.rc2.310.g2932bb562d-goog

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

...c/arch/x86_64/MCONFIG @@ -27,7 +27,7 @@ ifneq ($(cc-name),clang) # so we can't use a cc-option test to filter them. KLIBCOPTFLAGS += -falign-functions=1 -falign-jumps=1 -falign-loops=1 else -KLIBCOPTFLAGS += -fno-builtin-bcmp +KLIBCOPTFLAGS += -fno-builtin-bcmp -fcommon endif KLIBCBITSIZE = 64 -- 2.26.0.rc2.310.g2932bb562d-goog

...FIG | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/usr/klibc/arch/ppc/MCONFIG b/usr/klibc/arch/ppc/MCONFIG index 8b51e65..5410933 100644 --- a/usr/klibc/arch/ppc/MCONFIG +++ b/usr/klibc/arch/ppc/MCONFIG @@ -7,15 +7,20 @@ # accordingly. # -KLIBCOPTFLAGS = -Os -KLIBCBITSIZE = 32 +gcc_m32_option := $(call cc-option, -m32, ) + +KLIBCOPTFLAGS = -Os +KLIBCLDFLAGS = -m elf32ppclinux +KLIBCARCHREQFLAGS += $(gcc_m32_option) + +KLIBCBITSIZE = 32 # Extra linkflags when building the shared version of the library # This address needs to be reachable using no...

...se to include these options only if cc-name is "gcc". (Doesn't make any difference now, but if we ever add a third compiler then it seems like it ought to work without this.) > +KLIBCCPPFLAGS += -I$(KLIBCINC)/arch/$(KLIBCARCHDIR) \ > -I$(KLIBCINC)/bits$(KLIBCBITSIZE) \ > -I$(KLIBCOBJ)/../include \ > -I$(KLIBCINC) > @@ -128,7 +135,13 @@ KLIBCCFLAGS += $(KLIBCCPPFLAGS) $(KLIBCREQFLAGS) $(KLIBCARCHREQFLAGS) \ > KLIBCAFLAGS += -D__ASSEMBLY__ -Wa,--noexecstack $(KLIBCCFLAGS) > KLIBCSTRIPFLAGS += --strip-all...