summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/vars.mk4
-rw-r--r--package/openssl/Makefile6
-rw-r--r--target/arc/uclibc-ng.config3
-rw-r--r--target/config/Config.in.cpu2
-rw-r--r--target/config/Config.in.float7
-rw-r--r--target/config/Config.in.fpu3
-rw-r--r--target/config/Config.in.qemuopts1
-rw-r--r--target/csky/Makefile2
-rw-r--r--target/or1k/uclibc-ng.config3
-rw-r--r--toolchain/binutils/Makefile.inc2
-rw-r--r--toolchain/gcc/Makefile2
-rw-r--r--toolchain/gcc/Makefile.inc2
-rw-r--r--toolchain/gcc/patches/15.1.0/add-crtreloc.frv12
-rw-r--r--toolchain/gcc/patches/15.1.0/csky.patch12
-rw-r--r--toolchain/gcc/patches/15.1.0/libgcc-fdpic-bfin.patch12
15 files changed, 60 insertions, 13 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index 1a35f6251..91dfc700e 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -168,6 +168,10 @@ ifeq ($(ADK_TARGET_ARCH_MIPS),y)
TARGET_CFLAGS+= -m$(ADK_TARGET_FLOAT)-float
TARGET_CXXFLAGS+= -m$(ADK_TARGET_FLOAT)-float
endif
+ifeq ($(ADK_TARGET_ARCH_OR1K),y)
+TARGET_CFLAGS+= -m$(ADK_TARGET_FLOAT)-float
+TARGET_CXXFLAGS+= -m$(ADK_TARGET_FLOAT)-float
+endif
endif
ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 0c68a5800..6e1b4e4ad 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= openssl
-PKG_VERSION:= 3.4.1
+PKG_VERSION:= 3.5.0
PKG_RELEASE:= 1
-PKG_HASH:= 002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3
+PKG_HASH:= 344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0
PKG_DESCR:= ssl/tls library
PKG_SECTION:= libs/crypto
PKG_URL:= https://openssl-library.org/
@@ -66,7 +66,7 @@ OPENSSL_OPTIONS+= no-asm
endif
host-configure:
- (cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC -ldl)
+ (cd $(WRKBUILD); ./config --prefix='$(STAGING_HOST_DIR)/usr' -fPIC -ldl no-docs no-tests)
host-build:
(cd $(WRKBUILD); $(MAKE))
diff --git a/target/arc/uclibc-ng.config b/target/arc/uclibc-ng.config
index 2842123a9..083e6489d 100644
--- a/target/arc/uclibc-ng.config
+++ b/target/arc/uclibc-ng.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.45 C Library Configuration
+# uClibc-ng 1.0.52 C Library Configuration
#
# TARGET_aarch64 is not set
# TARGET_alpha is not set
@@ -61,6 +61,7 @@ UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
DO_C99_MATH=y
DO_XSI_MATH=y
+UCLIBC_HAS_FENV=y
UCLIBC_HAS_LONG_DOUBLE_MATH=y
KERNEL_HEADERS=""
HAVE_DOT_CONFIG=y
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index 4124d9ebe..aea2b04b7 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -93,6 +93,7 @@ config ADK_TARGET_CPU_ARC_ARCHS
select ADK_TARGET_SUPPORTS_NPTL
select ADK_TARGET_SUPPORTS_LT
select ADK_TARGET_WITH_MMU
+ select ADK_TARGET_CPU_WITH_FPU
depends on ADK_TARGET_ARCH_ARC
config ADK_TARGET_CPU_ARC_ARC32
@@ -1059,6 +1060,7 @@ config ADK_TARGET_CPU_OR1K
select ADK_TARGET_SUPPORTS_LT
select ADK_TARGET_SUPPORTS_NPTL
select ADK_TARGET_WITH_MMU
+ select ADK_TARGET_CPU_WITH_FPU
depends on ADK_TARGET_ARCH_OR1K
# ppc32
diff --git a/target/config/Config.in.float b/target/config/Config.in.float
index 3fd79d2b9..38d77d027 100644
--- a/target/config/Config.in.float
+++ b/target/config/Config.in.float
@@ -3,11 +3,13 @@
choice ADK_TARGET_FLOAT_MODE
prompt "Float configuration"
-depends on ADK_TARGET_ARCH_ARM || \
+depends on ADK_TARGET_ARCH_ARC || \
+ ADK_TARGET_ARCH_ARM || \
ADK_TARGET_ARCH_CSKY || \
ADK_TARGET_ARCH_M68K || \
ADK_TARGET_ARCH_MIPS || \
ADK_TARGET_ARCH_NIOS2 || \
+ ADK_TARGET_ARCH_OR1K || \
ADK_TARGET_ARCH_PPC
config ADK_TARGET_HARD_FLOAT
@@ -34,7 +36,8 @@ endchoice
config ADK_TARGET_FLOAT
string
- depends on !ADK_TARGET_ARCH_M68K \
+ depends on !ADK_TARGET_ARCH_ARC \
+ && !ADK_TARGET_ARCH_M68K \
&& !ADK_TARGET_ARCH_NIOS2
default "hard" if ADK_TARGET_HARD_FLOAT || ADK_TARGET_HARD_FLOAT_SP || ADK_TARGET_HARD_FLOAT_DP
default "soft" if ADK_TARGET_SOFT_FLOAT
diff --git a/target/config/Config.in.fpu b/target/config/Config.in.fpu
index 1018937cd..408106086 100644
--- a/target/config/Config.in.fpu
+++ b/target/config/Config.in.fpu
@@ -21,7 +21,8 @@ config ADK_TARGET_ARCH_ARM_WITH_NEON
config ADK_TARGET_FPU
string
- depends on ADK_TARGET_ARCH_ARM
+ depends on ADK_TARGET_ARCH_ARC || ADK_TARGET_ARCH_ARM
+ default "fpus" if ADK_TARGET_CPU_WITH_FPU
default "vfp" if ADK_TARGET_CPU_WITH_FPU_VFP
default "vfpv3-fp16" if ADK_TARGET_CPU_ARM_CORTEX_A5 && !ADK_TARGET_ARCH_ARM_WITH_NEON
default "vfpv4" if ADK_TARGET_CPU_ARM_CORTEX_A7 && !ADK_TARGET_ARCH_ARM_WITH_NEON
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index 8de8df429..d2bc23139 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -28,7 +28,6 @@ config ADK_TARGET_QEMU_WITH_BLOCK
menu "Qemu system configuration"
depends on ADK_TARGET_QEMU && (ADK_TARGET_SYSTEM_QEMU_X86_64 \
- || ADK_TARGET_SYSTEM_QEMU_CSKY \
|| ADK_TARGET_SYSTEM_QEMU_X86 \
|| ADK_TARGET_SYSTEM_QEMU_ARC \
|| ADK_TARGET_SYSTEM_QEMU_M68K_VIRT \
diff --git a/target/csky/Makefile b/target/csky/Makefile
index a79b2c4d7..7b668d815 100644
--- a/target/csky/Makefile
+++ b/target/csky/Makefile
@@ -8,10 +8,8 @@ include $(ADK_TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL)
QEMU:=qemu-system-cskyv2
-ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
QEMU_ARGS:=${ADK_QEMU_ARGS} -M virt
QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0
-endif
# target helper text
ifeq ($(ADK_TARGET_FS),archive)
diff --git a/target/or1k/uclibc-ng.config b/target/or1k/uclibc-ng.config
index 881c73107..7f680d4e4 100644
--- a/target/or1k/uclibc-ng.config
+++ b/target/or1k/uclibc-ng.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# uClibc-ng 1.0.45 C Library Configuration
+# uClibc-ng 1.0.52 C Library Configuration
#
# TARGET_aarch64 is not set
# TARGET_alpha is not set
@@ -58,6 +58,7 @@ UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_FPU=y
DO_C99_MATH=y
DO_XSI_MATH=y
+UCLIBC_HAS_FENV=y
UCLIBC_HAS_LONG_DOUBLE_MATH=y
KERNEL_HEADERS=""
HAVE_DOT_CONFIG=y
diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc
index 1fcab41a2..af6479f15 100644
--- a/toolchain/binutils/Makefile.inc
+++ b/toolchain/binutils/Makefile.inc
@@ -73,7 +73,7 @@ PKG_SITES:= https://github.com/kalray/gdb-binutils.git
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
endif
ifeq ($(ADK_TOOLCHAIN_BINUTILS_ARC),y)
-PKG_VERSION:= arc-2023.09
+PKG_VERSION:= arc-2024.12
PKG_GIT:= tag
PKG_RELEASE:= 1
PKG_SITES:= https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb.git
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index af036de1a..51fc1fe8b 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -132,8 +132,10 @@ GCC_CONFOPTS+= --with-arch=$(ADK_TARGET_GCC_ARCH)
endif
ifneq ($(ADK_TARGET_FLOAT),)
+ifneq ($(ADK_TARGET_ARCH_OR1K),y)
GCC_CONFOPTS+= --with-float=$(ADK_TARGET_FLOAT)
endif
+endif
ifneq ($(ADK_TARGET_FPU),)
GCC_CONFOPTS+= --with-fpu=$(ADK_TARGET_FPU)
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index fc35d15a5..e88b0ed10 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -99,7 +99,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
LIBSTDCXXVER:= 20
endif
ifeq ($(ADK_TOOLCHAIN_GCC_ARC),y)
-PKG_VERSION:= arc-2023.09
+PKG_VERSION:= arc-2024.12
PKG_GIT:= tag
PKG_SITES:= https://github.com/foss-for-synopsys-dwc-arc-processors/gcc.git
PKG_RELEASE:= 1
diff --git a/toolchain/gcc/patches/15.1.0/add-crtreloc.frv b/toolchain/gcc/patches/15.1.0/add-crtreloc.frv
new file mode 100644
index 000000000..30de24cdc
--- /dev/null
+++ b/toolchain/gcc/patches/15.1.0/add-crtreloc.frv
@@ -0,0 +1,12 @@
+diff -Nur gcc-8.3.0.orig/gcc/config/frv/linux.h gcc-8.3.0/gcc/config/frv/linux.h
+--- gcc-8.3.0.orig/gcc/config/frv/linux.h 2018-01-03 11:03:58.000000000 +0100
++++ gcc-8.3.0/gcc/config/frv/linux.h 2019-10-08 10:52:00.176295821 +0200
+@@ -27,7 +27,7 @@
+
+ #undef STARTFILE_SPEC
+ #define STARTFILE_SPEC \
+- "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
++ "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} crtreloc.o%s \
+ crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
+
+ #undef ENDFILE_SPEC
diff --git a/toolchain/gcc/patches/15.1.0/csky.patch b/toolchain/gcc/patches/15.1.0/csky.patch
new file mode 100644
index 000000000..ee352951b
--- /dev/null
+++ b/toolchain/gcc/patches/15.1.0/csky.patch
@@ -0,0 +1,12 @@
+diff -Nur gcc-11.2.0.orig/libgcc/config/csky/linux-atomic.c gcc-11.2.0/libgcc/config/csky/linux-atomic.c
+--- gcc-11.2.0.orig/libgcc/config/csky/linux-atomic.c 2021-07-28 08:55:08.760307899 +0200
++++ gcc-11.2.0/libgcc/config/csky/linux-atomic.c 2021-12-14 14:19:23.685729233 +0100
+@@ -24,7 +24,7 @@
+ <http://www.gnu.org/licenses/>. */
+
+ /* Kernel helper for compare-and-exchange. */
+-inline int
++int
+ __kernel_cmpxchg (int oldval, int newval, volatile int *ptr)
+ {
+ register int _a0 asm ("a0") = oldval;
diff --git a/toolchain/gcc/patches/15.1.0/libgcc-fdpic-bfin.patch b/toolchain/gcc/patches/15.1.0/libgcc-fdpic-bfin.patch
new file mode 100644
index 000000000..df0b94fc9
--- /dev/null
+++ b/toolchain/gcc/patches/15.1.0/libgcc-fdpic-bfin.patch
@@ -0,0 +1,12 @@
+diff -Nur gcc-14.2.0.orig/libgcc/unwind-pe.h gcc-14.2.0/libgcc/unwind-pe.h
+--- gcc-14.2.0.orig/libgcc/unwind-pe.h 2024-08-01 10:17:17.000000000 +0200
++++ gcc-14.2.0/libgcc/unwind-pe.h 2025-03-10 10:40:25.191585648 +0100
+@@ -264,7 +264,7 @@
+
+ if (result != 0)
+ {
+-#if __FDPIC__
++#if defined(__FDPIC__) && !defined(__BFIN_FDPIC__)
+ /* FDPIC relative addresses imply taking the GOT address
+ into account. */
+ if ((encoding & DW_EH_PE_pcrel) && (encoding & DW_EH_PE_indirect))
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 16:26:43 +0000