diff options
Diffstat (limited to 'Rules.mak')
-rw-r--r-- | Rules.mak | 34 |
1 files changed, 18 insertions, 16 deletions
@@ -1,7 +1,7 @@ # Rules.mak for uClibc-ng # # Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> -# Copyright (C) 2015-2021 Waldemar Brodkorb <wbx@uclibc-ng.org> +# Copyright (C) 2015-2024 Waldemar Brodkorb <wbx@uclibc-ng.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -128,7 +128,7 @@ export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS MULTILIB_DIR # Now config hard core MAJOR_VERSION := 1 MINOR_VERSION := 0 -SUBLEVEL := 38 +SUBLEVEL := 47 EXTRAVERSION := VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL) ABI_VERSION := $(MAJOR_VERSION) @@ -142,17 +142,8 @@ export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION ABI_VERSION LC_ALL LIBC := libc SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) -UCLIBC_LDSO_NAME := ld-uClibc -ARCH_NATIVE_BIT := 32 -ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 powerpc64 s390x sparc64 x86_64 kvx ),) -UCLIBC_LDSO_NAME := ld64-uClibc -ARCH_NATIVE_BIT := 64 -else -ifeq ($(CONFIG_MIPS_N64_ABI),y) -UCLIBC_LDSO_NAME := ld64-uClibc -ARCH_NATIVE_BIT := 64 -endif -endif +UCLIBC_LDSO_NAME := $(call qstrip,$(TARGET_LDSO_NAME)) +ARCH_NATIVE_BIT := $(call qstrip,$(TARGET_ARCH_BITS)) UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION) NONSHARED_LIBNAME := uclibc_nonshared.a @@ -176,6 +167,8 @@ endif ifneq ($(HAVE_SHARED),y) libc := +endif +ifneq ($(HAVE_LDSO),y) interp := ldso := endif @@ -305,6 +298,7 @@ ifneq ($(TARGET_ARCH),c6x) ifneq ($(TARGET_ARCH),h8300) ifneq ($(TARGET_ARCH),arc) ifneq ($(TARGET_ARCH),aarch64) +ifneq ($(TARGET_ARCH),riscv32) CPU_CFLAGS-y += -msoft-float endif endif @@ -316,6 +310,7 @@ endif endif endif endif +endif ifeq ($(TARGET_ARCH),aarch64) CPU_CFLAGS-y += -ftls-model=initial-exec @@ -341,8 +336,6 @@ $(eval $(call check-gcc-var,-ffunction-sections)) # Some nice CPU specific optimizations ifeq ($(TARGET_ARCH),i386) -$(eval $(call check-gcc-var,-fomit-frame-pointer)) - OPTIMIZATION += $(CFLAG_-fomit-frame-pointer) ifeq ($(CONFIG_386)$(CONFIG_486)$(CONFIG_586),y) # TODO: Change this to a gcc version check. This bug @@ -466,7 +459,8 @@ ifeq ($(TARGET_ARCH),csky) endif ifeq ($(TARGET_ARCH),kvx) - CPU_CFLAGS-$(CONFIG_KVX) += -march=kvx + CPU_CFLAGS-y += -march=$(call qstrip,$(TARGET_MARCH)) + CPU_LDFLAGS-y += -march=$(call qstrip,$(TARGET_MARCH)) endif ifeq ($(TARGET_ARCH),m68k) @@ -610,6 +604,7 @@ CFLAGS := $(XWARNINGS) $(CPU_CFLAGS) $(SSP_CFLAGS) \ -nostdinc -I$(top_builddir)include \ -I$(top_srcdir)include -include libc-symbols.h \ -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) \ + -I$(top_builddir)libc/sysdeps/linux/$(TARGET_ARCH) \ -I$(top_srcdir)libc/sysdeps/linux \ -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \ -I$(top_srcdir)ldso/include -I. @@ -666,6 +661,9 @@ endif ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"") CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS)) endif +ifeq ($(TARGET_ARCH),i386) +CFLAGS += -fno-omit-frame-pointer +endif ifneq ($(strip $(UCLIBC_EXTRA_LDFLAGS)),"") LDFLAGS += $(call qstrip,$(UCLIBC_EXTRA_LDFLAGS)) endif @@ -674,6 +672,10 @@ ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) CFLAGS += -D__USE_STDIO_FUTEXES__ endif +ifeq ($(UCLIBC_USE_TIME64),y) +CFLAGS += -D__UCLIBC_HAVE_STATX__ +endif + ifeq ($(UCLIBC_HAS_THREADS),y) ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) PTNAME := nptl |