Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -0,0 +1,49 @@
|
||||
From 1c27982bb8a007bb1a6a29db8e6efb1f40975879 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sun, 28 Jan 2018 13:59:30 +0100
|
||||
Subject: [PATCH 1/1] aarch64/sys/ucontext.h: include bits/sigcontext.h
|
||||
|
||||
Fixes a buildroot build error with ffmpeg
|
||||
|
||||
In file included from /home/bernd/buildroot/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/include/signal.h:329:0,
|
||||
from fftools/ffmpeg.h:26,
|
||||
from fftools/ffmpeg_opt.c:23:
|
||||
/home/bernd/buildroot/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/include/sys/ucontext.h:52:16:
|
||||
error: field 'uc_mcontext' has incomplete type
|
||||
mcontext_t uc_mcontext;
|
||||
^~~~~~~~~~~
|
||||
|
||||
using this defconfig:
|
||||
|
||||
BR2_aarch64=y
|
||||
BR2_PACKAGE_FFMPEG=y
|
||||
|
||||
sys/ucontext.h for other archs already include bits/sigcontext.h,
|
||||
on aarch64 this is needed as well.
|
||||
|
||||
Patch sent upstream:
|
||||
https://mailman.uclibc-ng.org/pipermail/devel/2018-January/001622.html
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
libc/sysdeps/linux/aarch64/sys/ucontext.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/libc/sysdeps/linux/aarch64/sys/ucontext.h b/libc/sysdeps/linux/aarch64/sys/ucontext.h
|
||||
index d17458896..dc7303b54 100644
|
||||
--- a/libc/sysdeps/linux/aarch64/sys/ucontext.h
|
||||
+++ b/libc/sysdeps/linux/aarch64/sys/ucontext.h
|
||||
@@ -26,6 +26,10 @@
|
||||
|
||||
#include <sys/procfs.h>
|
||||
|
||||
+/* We need the signal context definitions even if they are not used
|
||||
+ included in <signal.h>. */
|
||||
+#include <bits/sigcontext.h>
|
||||
+
|
||||
typedef elf_greg_t greg_t;
|
||||
|
||||
/* Container for all general registers. */
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From 71127e5cc937878883e6021da3da337a7aa9c099 Mon Sep 17 00:00:00 2001
|
||||
From: Waldemar Brodkorb <wbx@openadk.org>
|
||||
Date: Fri, 3 Feb 2017 06:04:16 +0100
|
||||
Subject: [PATCH 10229/10229] fstat: make new code aarch64 specific
|
||||
|
||||
The new code get's used by MIPS64 N64 and fails.
|
||||
Make the new code aarch64 specific.
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
---
|
||||
libc/sysdeps/linux/common/fstat.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
|
||||
index ac77eb2..c27f926 100644
|
||||
--- a/libc/sysdeps/linux/common/fstat.c
|
||||
+++ b/libc/sysdeps/linux/common/fstat.c
|
||||
@@ -21,7 +21,7 @@ int fstat(int fd, struct stat *buf)
|
||||
}
|
||||
libc_hidden_def(fstat)
|
||||
|
||||
-#elif __WORDSIZE == 64 && defined __NR_newfstatat
|
||||
+#elif __WORDSIZE == 64 && defined __NR_newfstatat && __aarch64__
|
||||
#include <fcntl.h>
|
||||
|
||||
int fstat(int fd, struct stat *buf)
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
From 94810a91c48ac62daed55b4aec70d04a44c10795 Mon Sep 17 00:00:00 2001
|
||||
From: Waldemar Brodkorb <wbx@openadk.org>
|
||||
Date: Thu, 16 Feb 2017 20:22:21 +0100
|
||||
Subject: [PATCH] arm: fix static linking issues
|
||||
|
||||
As reported by Buildroot developers these files causing static
|
||||
linking issues. The original contribution with the ARM unwind-resume
|
||||
rework and GNU libc sync was made before the combined libc change.
|
||||
But the patch was applied later, after the libc change and
|
||||
it seems the test coverage for static linking didn't catch it in
|
||||
the regression testing. Remove the files.
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
---
|
||||
libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c | 2 --
|
||||
libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c | 1 -
|
||||
2 files changed, 3 deletions(-)
|
||||
delete mode 100644 libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
|
||||
delete mode 100644 libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
|
||||
|
||||
diff --git a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
|
||||
deleted file mode 100644
|
||||
index fd0cec4..0000000
|
||||
--- a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
|
||||
+++ /dev/null
|
||||
@@ -1,2 +0,0 @@
|
||||
-__asm__ (".set __libgcc_s_init, pthread_cancel_init");
|
||||
-#include <arm-unwind-resume.c>
|
||||
diff --git a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
|
||||
deleted file mode 100644
|
||||
index 2641dc5..0000000
|
||||
--- a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
|
||||
+++ /dev/null
|
||||
@@ -1 +0,0 @@
|
||||
-#include <arm-unwind-resume.c>
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 228d03bf0032e5799e9bf04810170c0653ca846d Mon Sep 17 00:00:00 2001
|
||||
From: Waldemar Brodkorb <wbx@openadk.org>
|
||||
Date: Fri, 17 Feb 2017 22:33:49 +0100
|
||||
Subject: [PATCH] or1k: add missing definition of ucontext
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
---
|
||||
libc/sysdeps/linux/or1k/sys/ucontext.h | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libc/sysdeps/linux/or1k/sys/ucontext.h b/libc/sysdeps/linux/or1k/sys/ucontext.h
|
||||
index b11928e..dd97b60 100644
|
||||
--- a/libc/sysdeps/linux/or1k/sys/ucontext.h
|
||||
+++ b/libc/sysdeps/linux/or1k/sys/ucontext.h
|
||||
@@ -20,6 +20,14 @@
|
||||
|
||||
#include <features.h>
|
||||
#include <signal.h>
|
||||
-#include <asm/ucontext.h>
|
||||
+#include <bits/sigcontext.h>
|
||||
+
|
||||
+typedef struct ucontext {
|
||||
+ unsigned long uc_flags;
|
||||
+ struct ucontext *uc_link;
|
||||
+ stack_t uc_stack;
|
||||
+ struct sigcontext uc_mcontext;
|
||||
+ sigset_t uc_sigmask; /* mask last for extensibility */
|
||||
+} ucontext_t;
|
||||
|
||||
#endif /* sys/ucontext.h */
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -11,23 +11,16 @@ config BR2_UCLIBC_CONFIG
|
||||
string "uClibc configuration file to use?"
|
||||
default "package/uclibc/uClibc-ng.config"
|
||||
help
|
||||
Some people may wish to use their own modified uClibc configuration
|
||||
file and will specify their config file location with this option.
|
||||
See also docs/README in this package.
|
||||
If unsure, use the default.
|
||||
Some people may wish to use their own modified uClibc
|
||||
configuration file and will specify their config file
|
||||
location with this option. See also docs/README in this
|
||||
package. If unsure, use the default.
|
||||
|
||||
config BR2_UCLIBC_CONFIG_FRAGMENT_FILES
|
||||
string "Additional uClibc configuration fragment files"
|
||||
help
|
||||
A space-separated list of configuration fragment files,
|
||||
that will be merged to the main uClibc configuration file.
|
||||
|
||||
config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
|
||||
bool "Enable RPC support"
|
||||
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
help
|
||||
Enable this option if you want your toolchain to support
|
||||
RPC (needed for NFS, for example).
|
||||
A space-separated list of configuration fragment files, that
|
||||
will be merged to the main uClibc configuration file.
|
||||
|
||||
config BR2_TOOLCHAIN_BUILDROOT_WCHAR
|
||||
bool "Enable WCHAR support"
|
||||
@@ -52,20 +45,19 @@ choice
|
||||
Use this option to select the thread library implementation
|
||||
that should be used in your toolchain.
|
||||
|
||||
config BR2_PTHREADS_NATIVE
|
||||
bool "Native POSIX Threading (NPTL)"
|
||||
select BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_m68k && !BR2_microblaze && !BR2_or1k
|
||||
config BR2_PTHREADS_NATIVE
|
||||
bool "Native POSIX Threading (NPTL)"
|
||||
depends on BR2_USE_MMU
|
||||
select BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
|
||||
config BR2_PTHREADS
|
||||
bool "linuxthreads"
|
||||
select BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_bfin || BR2_m68k || BR2_microblaze || BR2_or1k || BR2_arm || BR2_armeb || BR2_xtensa
|
||||
config BR2_PTHREADS
|
||||
bool "linuxthreads"
|
||||
depends on BR2_bfin || BR2_m68k || BR2_microblaze || BR2_or1k || BR2_arm || BR2_armeb || BR2_xtensa
|
||||
select BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PTHREADS_NONE
|
||||
bool "none"
|
||||
config BR2_PTHREADS_NONE
|
||||
bool "none"
|
||||
|
||||
endchoice
|
||||
|
||||
@@ -83,7 +75,8 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
|
||||
Enable stack smashing protection support using GCCs
|
||||
-fstack-protector-all option in uClibc.
|
||||
|
||||
See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
|
||||
See
|
||||
http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
|
||||
for details.
|
||||
|
||||
config BR2_UCLIBC_INSTALL_UTILS
|
||||
@@ -116,45 +109,44 @@ config BR2_UCLIBC_TARGET_ARCH
|
||||
|
||||
config BR2_UCLIBC_ARC_TYPE
|
||||
string
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "arc"
|
||||
default "ARC_CPU_700" if BR2_arc750d
|
||||
default "ARC_CPU_700" if BR2_arc770d
|
||||
default "ARC_CPU_HS" if BR2_archs38
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "arc"
|
||||
|
||||
config BR2_UCLIBC_MIPS_ABI
|
||||
string
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "mips"
|
||||
default "O32" if BR2_MIPS_OABI32
|
||||
default "N32" if BR2_MIPS_NABI32
|
||||
default "N64" if BR2_MIPS_NABI64
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "mips"
|
||||
|
||||
config BR2_UCLIBC_MIPS_NAN
|
||||
string
|
||||
default "LEGACY" if BR2_MIPS_NAN_LEGACY
|
||||
default "2008" if BR2_MIPS_NAN_2008
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "mips"
|
||||
default "LEGACY" if BR2_MIPS_CPU_MIPS32 || BR2_MIPS_CPU_MIPS64
|
||||
default "2008" if BR2_MIPS_CPU_MIPS32R6 || BR2_MIPS_CPU_MIPS64R6
|
||||
|
||||
config BR2_UCLIBC_SH_TYPE
|
||||
string
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "sh"
|
||||
default "SH2A" if BR2_sh2a
|
||||
default "SH4" if BR2_sh4 || BR2_sh4eb
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "sh"
|
||||
|
||||
config BR2_UCLIBC_SPARC_TYPE
|
||||
string
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "sparc"
|
||||
default "V7" if BR2_sparc_v7 || BR2_sparc_sparchfleon || BR2_sparc_sparcsfleon
|
||||
default "V8" if BR2_sparc_v8 || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleonv8
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "sparc"
|
||||
|
||||
config BR2_UCLIBC_POWERPC_TYPE
|
||||
string
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "powerpc"
|
||||
default "CLASSIC" if !BR2_powerpc_8540 && !BR2_powerpc_8548
|
||||
default "E500" if BR2_powerpc_8540 || BR2_powerpc_8548
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "powerpc"
|
||||
|
||||
config BR2_UCLIBC_X86_TYPE
|
||||
string
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "i386"
|
||||
default "486" if BR2_x86_i486
|
||||
default "586" if BR2_x86_i586
|
||||
default "586MMX" if BR2_x86_pentium_mmx
|
||||
@@ -163,5 +155,6 @@ config BR2_UCLIBC_X86_TYPE
|
||||
default "PENTIUMIII" if BR2_x86_pentium3
|
||||
default "PENTIUM4" if BR2_x86_pentium4 || BR2_x86_pentium_m || \
|
||||
BR2_x86_nocona || BR2_x86_core2 || BR2_x86_corei7
|
||||
depends on BR2_UCLIBC_TARGET_ARCH = "i386"
|
||||
|
||||
endif # BR2_TOOLCHAIN_BUILDROOT_UCLIBC
|
||||
|
||||
@@ -23,6 +23,7 @@ UCLIBC_HAS_RESOLVER_SUPPORT=y
|
||||
UCLIBC_HAS_LIBRESOLV_STUB=y
|
||||
UCLIBC_HAS_LIBNSL_STUB=y
|
||||
UCLIBC_HAS_CTYPE_CHECKED=y
|
||||
UCLIBC_HAS_LIBINTL=y
|
||||
UCLIBC_HAS_HEXADECIMAL_FLOATS=y
|
||||
UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
|
||||
UCLIBC_HAS_STDIO_GETC_MACRO=y
|
||||
@@ -30,8 +31,7 @@ UCLIBC_HAS_STDIO_PUTC_MACRO=y
|
||||
UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
|
||||
UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
|
||||
UCLIBC_HAS_PRINTF_M_SPEC=y
|
||||
# UCLIBC_HAS_REGEX_OLD is not set
|
||||
# UCLIBC_HAS_FNMATCH_OLD is not set
|
||||
UCLIBC_HAS_WORDEXP=y
|
||||
UCLIBC_HAS_NFTW=y
|
||||
UCLIBC_HAS_FTW=y
|
||||
UCLIBC_HAS_GNU_GLOB=y
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://www.uclibc-ng.org/
|
||||
sha256 f2004c85db8e07e9f1c2e8b7c513fa7c237bc9f9685d8e1bfc89535b8a85449b uClibc-ng-1.0.22.tar.xz
|
||||
# From https://uclibc-ng.org/
|
||||
sha256 a1504ddc34a29cc9bfd1f5a7419c4b63bb510d9e2faed81618d1b596ceb0a5a9 uClibc-ng-1.0.28.tar.xz
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
UCLIBC_VERSION = 1.0.22
|
||||
UCLIBC_VERSION = 1.0.28
|
||||
UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
|
||||
UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
|
||||
UCLIBC_LICENSE = LGPLv2.1+
|
||||
UCLIBC_LICENSE = LGPL-2.1+
|
||||
UCLIBC_LICENSE_FILES = COPYING.LIB
|
||||
UCLIBC_INSTALL_STAGING = YES
|
||||
|
||||
@@ -35,7 +35,7 @@ UCLIBC_KCONFIG_OPTS = \
|
||||
$(UCLIBC_MAKE_FLAGS) \
|
||||
PREFIX=$(STAGING_DIR) \
|
||||
DEVEL_PREFIX=/usr/ \
|
||||
RUNTIME_PREFIX=$(STAGING_DIR)/ \
|
||||
RUNTIME_PREFIX=$(STAGING_DIR)/
|
||||
|
||||
UCLIBC_TARGET_ARCH = $(call qstrip,$(BR2_UCLIBC_TARGET_ARCH))
|
||||
|
||||
@@ -54,34 +54,34 @@ endif
|
||||
# noMMU binary formats
|
||||
ifeq ($(BR2_BINFMT_FDPIC),y)
|
||||
define UCLIBC_BINFMT_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
ifeq ($(BR2_BINFMT_FLAT_ONE),y)
|
||||
define UCLIBC_BINFMT_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y)
|
||||
define UCLIBC_BINFMT_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
|
||||
define UCLIBC_BINFMT_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -101,6 +101,12 @@ define UCLIBC_ARC_PAGE_SIZE_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_PAGE_SIZE),$(@D)/.config)
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_ARC_ATOMIC_EXT),)
|
||||
define UCLIBC_ARC_ATOMICS_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,CONFIG_ARC_HAS_ATOMICS,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
|
||||
endif # arc
|
||||
|
||||
#
|
||||
@@ -113,12 +119,6 @@ define UCLIBC_ARM_ABI_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI,$(@D)/.config)
|
||||
endef
|
||||
|
||||
# Thumb1 build is broken with threads with old gcc versions (< 4.8). Since
|
||||
# all cores supporting Thumb1 also support ARM, we use ARM code in this case.
|
||||
ifeq ($(BR2_GCC_VERSION_4_8_X)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),yyy)
|
||||
UCLIBC_EXTRA_CFLAGS += -marm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_BINFMT_FLAT),y)
|
||||
define UCLIBC_ARM_BINFMT_FLAT
|
||||
$(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config)
|
||||
@@ -253,10 +253,12 @@ endif
|
||||
|
||||
ifeq ($(BR2_USE_MMU),y)
|
||||
define UCLIBC_MMU_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_HAS_MMU,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_USE_MMU,$(@D)/.config)
|
||||
endef
|
||||
else
|
||||
define UCLIBC_MMU_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_HAS_MMU,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_USE_MMU,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
@@ -267,24 +269,6 @@ endif
|
||||
|
||||
UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config)
|
||||
|
||||
#
|
||||
# RPC
|
||||
#
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_RPC),y)
|
||||
define UCLIBC_RPC_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_RPC,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FULL_RPC,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_REENTRANT_RPC,$(@D)/.config)
|
||||
endef
|
||||
else
|
||||
define UCLIBC_RPC_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_RPC,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FULL_RPC,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_REENTRANT_RPC,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
|
||||
#
|
||||
# soft-float
|
||||
#
|
||||
@@ -413,6 +397,7 @@ define UCLIBC_KCONFIG_FIXUP_CMDS
|
||||
$(UCLIBC_BINFMT_CONFIG)
|
||||
$(UCLIBC_ARC_TYPE_CONFIG)
|
||||
$(UCLIBC_ARC_PAGE_SIZE_CONFIG)
|
||||
$(UCLIBC_ARC_ATOMICS_CONFIG)
|
||||
$(UCLIBC_ARM_ABI_CONFIG)
|
||||
$(UCLIBC_ARM_BINFMT_FLAT)
|
||||
$(UCLIBC_ARM_NO_CONTEXT_FUNCS)
|
||||
@@ -427,7 +412,6 @@ define UCLIBC_KCONFIG_FIXUP_CMDS
|
||||
$(UCLIBC_ENDIAN_CONFIG)
|
||||
$(UCLIBC_LARGEFILE_CONFIG)
|
||||
$(UCLIBC_IPV6_CONFIG)
|
||||
$(UCLIBC_RPC_CONFIG)
|
||||
$(UCLIBC_FLOAT_CONFIG)
|
||||
$(UCLIBC_SSP_CONFIG)
|
||||
$(UCLIBC_THREAD_CONFIG)
|
||||
@@ -469,10 +453,10 @@ endef
|
||||
# STATIC has no ld* tools, only getconf
|
||||
ifeq ($(BR2_STATIC_LIBS),)
|
||||
define UCLIBC_INSTALL_UTILS_STAGING
|
||||
$(INSTALL) -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/usr/bin/ldd
|
||||
ln -sf ldd $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldd
|
||||
$(INSTALL) -D -m 0755 $(@D)/utils/ldconfig.host $(HOST_DIR)/usr/bin/ldconfig
|
||||
ln -sf ldconfig $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig
|
||||
$(INSTALL) -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/bin/ldd
|
||||
ln -sf ldd $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-ldd
|
||||
$(INSTALL) -D -m 0755 $(@D)/utils/ldconfig.host $(HOST_DIR)/bin/ldconfig
|
||||
ln -sf ldconfig $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-ldconfig
|
||||
endef
|
||||
endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user