From b1638b692bb9081b3ac76f09500d4b10ceb5392f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Aug 2022 01:20:10 +0200 Subject: fix ARCH_NATIVE_BIT for aarch64 Patch suggested by Thomas Petazzoni and tested by me. Reported-by: Thomas Petazzoni --- Rules.mak | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'Rules.mak') diff --git a/Rules.mak b/Rules.mak index 3fb64c728..a0b012d7f 100644 --- a/Rules.mak +++ b/Rules.mak @@ -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 -- cgit v1.2.3