From 21f495ec085cade7a28bd402f2acbbed7e550189 Mon Sep 17 00:00:00 2001 From: Sai Hari Chandana Kalluri Date: Thu, 8 Jul 2021 11:00:54 -0700 Subject: Upgrade newlib, libgloss 3.3 -> 4.1 Upgrade newlib, libgloss recipes from 3.3 -> 4.1 Signed-off-by: Sai Hari Chandana Kalluri --- .../recipes-core/newlib/libgloss_3.3.%.bbappend | 13 ------------- .../recipes-core/newlib/libgloss_4.1.%.bbappend | 13 +++++++++++++ .../recipes-core/newlib/newlib_3.3.%.bbappend | 7 ------- .../recipes-core/newlib/newlib_4.1.%.bbappend | 7 +++++++ .../recipes-core/newlib/libgloss_3.%.bbappend | 12 ------------ .../recipes-core/newlib/libgloss_4.%.bbappend | 12 ++++++++++++ .../recipes-core/newlib/newlib_3.%.bbappend | 20 -------------------- .../recipes-core/newlib/newlib_4.%.bbappend | 20 ++++++++++++++++++++ 8 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 meta-microblaze/recipes-core/newlib/libgloss_3.3.%.bbappend create mode 100644 meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend delete mode 100644 meta-microblaze/recipes-core/newlib/newlib_3.3.%.bbappend create mode 100644 meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend delete mode 100644 meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend create mode 100644 meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend delete mode 100644 meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend create mode 100644 meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend diff --git a/meta-microblaze/recipes-core/newlib/libgloss_3.3.%.bbappend b/meta-microblaze/recipes-core/newlib/libgloss_3.3.%.bbappend deleted file mode 100644 index e7f0a9a3..00000000 --- a/meta-microblaze/recipes-core/newlib/libgloss_3.3.%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -require microblaze-newlib.inc - -do_configure_prepend_microblaze() { - # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) - export CC="${CC} -L${S}/libgloss/microblaze" -} - -# Libgloss provides various .o files in libdir -# These must NOT be stripped, but for some reason they are installed +x -# which triggers them to be stripped. -do_install_append_microblaze() { - chmod 0644 ${D}${libdir}/*.o -} diff --git a/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend b/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend new file mode 100644 index 00000000..e7f0a9a3 --- /dev/null +++ b/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend @@ -0,0 +1,13 @@ +require microblaze-newlib.inc + +do_configure_prepend_microblaze() { + # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) + export CC="${CC} -L${S}/libgloss/microblaze" +} + +# Libgloss provides various .o files in libdir +# These must NOT be stripped, but for some reason they are installed +x +# which triggers them to be stripped. +do_install_append_microblaze() { + chmod 0644 ${D}${libdir}/*.o +} diff --git a/meta-microblaze/recipes-core/newlib/newlib_3.3.%.bbappend b/meta-microblaze/recipes-core/newlib/newlib_3.3.%.bbappend deleted file mode 100644 index d459bf19..00000000 --- a/meta-microblaze/recipes-core/newlib/newlib_3.3.%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -require microblaze-newlib.inc - -do_configure_prepend_microblaze() { - # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) - export CC="${CC} -L${S}/libgloss/microblaze" -} - diff --git a/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend b/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend new file mode 100644 index 00000000..d459bf19 --- /dev/null +++ b/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend @@ -0,0 +1,7 @@ +require microblaze-newlib.inc + +do_configure_prepend_microblaze() { + # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC) + export CC="${CC} -L${S}/libgloss/microblaze" +} + diff --git a/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend deleted file mode 100644 index 646d0e9a..00000000 --- a/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -COMPATIBLE_HOST = ".*-elf" -COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi" - -# When building multiple, we need to depend on the multilib newlib -DEPENDS_append_xilinx-standalone = " ${MLPREFIX}newlib" - -EXTRA_OECONF_append_xilinx-standalone = " \ - --enable-newlib-io-c99-formats \ - --enable-newlib-io-long-long \ - --enable-newlib-io-float \ - --enable-newlib-io-long-double \ -" diff --git a/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend new file mode 100644 index 00000000..646d0e9a --- /dev/null +++ b/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend @@ -0,0 +1,12 @@ +COMPATIBLE_HOST = ".*-elf" +COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi" + +# When building multiple, we need to depend on the multilib newlib +DEPENDS_append_xilinx-standalone = " ${MLPREFIX}newlib" + +EXTRA_OECONF_append_xilinx-standalone = " \ + --enable-newlib-io-c99-formats \ + --enable-newlib-io-long-long \ + --enable-newlib-io-float \ + --enable-newlib-io-long-double \ +" diff --git a/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend deleted file mode 100644 index 90522cfb..00000000 --- a/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -COMPATIBLE_HOST = ".*-elf" -COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi" - -EXTRA_OECONF_append_xilinx-standalone = " \ - --enable-newlib-io-c99-formats \ - --enable-newlib-io-long-long \ - --enable-newlib-io-float \ - --enable-newlib-io-long-double \ -" - -# Avoid trimmping CCARGS from CC by newlib configure -do_configure_prepend_xilinx-standalone(){ - export CC_FOR_TARGET="${CC}" -} - -# Fix for multilib newlib installations -do_install_prepend_xilinx-standalone() { - mkdir -p $(dirname ${D}${libdir}) - mkdir -p $(dirname ${D}${includedir}) -} diff --git a/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend new file mode 100644 index 00000000..90522cfb --- /dev/null +++ b/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend @@ -0,0 +1,20 @@ +COMPATIBLE_HOST = ".*-elf" +COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi" + +EXTRA_OECONF_append_xilinx-standalone = " \ + --enable-newlib-io-c99-formats \ + --enable-newlib-io-long-long \ + --enable-newlib-io-float \ + --enable-newlib-io-long-double \ +" + +# Avoid trimmping CCARGS from CC by newlib configure +do_configure_prepend_xilinx-standalone(){ + export CC_FOR_TARGET="${CC}" +} + +# Fix for multilib newlib installations +do_install_prepend_xilinx-standalone() { + mkdir -p $(dirname ${D}${libdir}) + mkdir -p $(dirname ${D}${includedir}) +} -- cgit v1.2.3-54-g00ecf