From 92add12d667cb08c9222b4b342b3bf6342010ac6 Mon Sep 17 00:00:00 2001
From: Alejandro Hernandez Samaniego <alejandro@enedino.org>
Date: Mon, 15 Jan 2024 23:27:23 -0700
Subject: newlib: Upgrade 4.3.0 -> 4.4.0

- COPYING.LICENSE: Added Apache-2.0-with-LLVM-exception from newlibs commit
  96ec8f868e1a0f5a75badfe4627a41f12cce742d
  applicable to newlib/libc/machine/aarch64.
- Also switch libgloss to use PV from newlib.inc instead to align with the
  newlib recipe behavior.

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/newlib/libgloss_4.3.0.bb | 36 ------------------------------
 meta/recipes-core/newlib/libgloss_git.bb   | 36 ++++++++++++++++++++++++++++++
 meta/recipes-core/newlib/newlib.inc        |  8 +++----
 3 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-core/newlib/libgloss_4.3.0.bb
 create mode 100644 meta/recipes-core/newlib/libgloss_git.bb

(limited to 'meta/recipes-core/newlib')

diff --git a/meta/recipes-core/newlib/libgloss_4.3.0.bb b/meta/recipes-core/newlib/libgloss_4.3.0.bb
deleted file mode 100644
index 7e34e33c7a..0000000000
--- a/meta/recipes-core/newlib/libgloss_4.3.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-require newlib.inc
-
-DEPENDS += "newlib"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/libgloss:"
-
-SRC_URI:append = " file://libgloss-build-without-nostdinc.patch"
-SRC_URI:append:powerpc = " file://fix-rs6000-crt0.patch"
-SRC_URI:append:powerpc = " file://fix-rs6000-cflags.patch"
-
-do_configure() {
-	${S}/libgloss/configure ${EXTRA_OECONF}
-}
-
-do_install:prepend() {
-	# install doesn't create this itself, avoid install error
-	install -d ${D}${prefix}/${TARGET_SYS}/lib
-}
-
-do_install:append() {
-	# Move libs to default directories so they can be picked up later
-	install -d ${D}${libdir}
-	mv -v ${D}${prefix}/${TARGET_SYS}/lib/* ${D}${libdir}
-
-	# Remove original directory
-	rmdir -p --ignore-fail-on-non-empty ${D}${prefix}/${TARGET_SYS}/lib
-}
-
-# Split packages correctly
-FILES:${PN} += "${libdir}/*.ld ${libdir}/*.specs"
-FILES:${PN}-dev += "${libdir}/cpu-init/*"
-# RiscV installation moved the syscall header to this location
-FILES:${PN}-dev += "${prefix}/${TARGET_SYS}/include/machine/*.h"
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/meta/recipes-core/newlib/libgloss_git.bb b/meta/recipes-core/newlib/libgloss_git.bb
new file mode 100644
index 0000000000..7e34e33c7a
--- /dev/null
+++ b/meta/recipes-core/newlib/libgloss_git.bb
@@ -0,0 +1,36 @@
+require newlib.inc
+
+DEPENDS += "newlib"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/libgloss:"
+
+SRC_URI:append = " file://libgloss-build-without-nostdinc.patch"
+SRC_URI:append:powerpc = " file://fix-rs6000-crt0.patch"
+SRC_URI:append:powerpc = " file://fix-rs6000-cflags.patch"
+
+do_configure() {
+	${S}/libgloss/configure ${EXTRA_OECONF}
+}
+
+do_install:prepend() {
+	# install doesn't create this itself, avoid install error
+	install -d ${D}${prefix}/${TARGET_SYS}/lib
+}
+
+do_install:append() {
+	# Move libs to default directories so they can be picked up later
+	install -d ${D}${libdir}
+	mv -v ${D}${prefix}/${TARGET_SYS}/lib/* ${D}${libdir}
+
+	# Remove original directory
+	rmdir -p --ignore-fail-on-non-empty ${D}${prefix}/${TARGET_SYS}/lib
+}
+
+# Split packages correctly
+FILES:${PN} += "${libdir}/*.ld ${libdir}/*.specs"
+FILES:${PN}-dev += "${libdir}/cpu-init/*"
+# RiscV installation moved the syscall header to this location
+FILES:${PN}-dev += "${prefix}/${TARGET_SYS}/include/machine/*.h"
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc
index da753f11ad..6113f5e831 100644
--- a/meta/recipes-core/newlib/newlib.inc
+++ b/meta/recipes-core/newlib/newlib.inc
@@ -3,21 +3,21 @@ HOMEPAGE = "https://sourceware.org/newlib/"
 DESCRIPTION = "C library intended for use on embedded systems. It is a conglomeration of several library parts, all under free software licenses that make them easily usable on embedded products."
 SECTION = "libs"
 
-LICENSE = "GPL-2.0-only & LGPL-3.0-only & GPL-3.0-only & LGPL-2.0-only & BSD-2-Clause & BSD-3-Clause & TCL"
+LICENSE = "GPL-2.0-only & LGPL-3.0-only & GPL-3.0-only & LGPL-2.0-only & BSD-2-Clause & BSD-3-Clause & TCL & Apache-2.0-with-LLVM-exception"
 LIC_FILES_CHKSUM = " \
 		file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 		file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
 		file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
 		file://COPYING.LIBGLOSS;md5=c0469b6ebb847a75781066be515f032d \
 		file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-		file://COPYING.NEWLIB;md5=5a9d477b5f4eab20dccf655a77107a6e \
+		file://COPYING.NEWLIB;md5=4f1a15846ffee91e352418563e1bce27 \
 		file://newlib/libc/posix/COPYRIGHT;md5=103468ff1982be840fdf4ee9f8b51bbf \
 		"
 
-BASEVER = "4.3.0"
+BASEVER = "4.4.0"
 PV = "${BASEVER}+git"
 SRC_URI = "git://sourceware.org/git/newlib-cygwin.git;protocol=https;branch=main"
-SRCREV="9e09d6ed83cce4777a5950412647ccc603040409"
+SRCREV="ad11e2587f83d61357a32c61c36d72ea4f39315e"
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "virtual/${TARGET_PREFIX}gcc"
-- 
cgit 1.2.3-korg