Skip to contentSkip to conversation

glibc: upgrade glibc-2.33 to latest version

PATCH New pgowda 1 participant 3 messages Jan 22, 2022

lore
Share & tools
lore

pgowda

author
#0 lore raw

PATCH 1/3 glibc: upgrade glibc-2.33 to latest version

glibc-2.33 has been upgraded to latest version that includes many CVE and other bug fixes.

---
 meta/recipes-core/glibc/glibc-version.inc     |   2 +-
 .../glibc/glibc/0031-CVE-2021-43396.patch     | 182 ------------------
 meta/recipes-core/glibc/glibc_2.33.bb         |   1 -
 3 files changed, 1 insertion(+), 184 deletions(-)
 delete mode 100644 meta/recipes-core/glibc/glibc/0031-CVE-2021-43396.patch
meta/recipes-core/glibc/glibc-version.inc +1 -1
index 4d69187961..63241ee951 100644
@@ -1,6 +1,6 @@
 SRCBRANCH ?= "release/2.33/master"
 PV = "2.33"
-SRCREV_glibc ?= "6090cf1330faf2deb17285758f327cb23b89ebf1"
+SRCREV_glibc ?= "55b99e9ed07688019609bd4dcd17d3ebf4572948"
 SRCREV_localedef ?= "bd644c9e6f3e20c5504da1488448173c69c56c28"
 
 GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
meta/recipes-core/glibc/glibc/0031-CVE-2021-43396.patch deleted +0 -182

182 lines not on this page · raw message

meta/recipes-core/glibc/glibc_2.33.bb +0 -1
index b7736359b1..a1e9eb3a16 100644
@@ -56,7 +56,6 @@ SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \
            file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \
            file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \
-           file://0031-CVE-2021-43396.patch \
            "
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build-${TARGET_SYS}"
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH 2/3 binutils: upgrade binutils-2.36 to latest version

binutils-2.36 in Hardknott branch has been upgraded to latest version that includes many bug fixes.
Regression tested on X86-64, Arm and Aarch64 without any new issues.

---
 .../binutils/binutils-2.36.inc                |   5 +-
 .../binutils/0001-CVE-2021-20197.patch        | 201 ------------------
 .../binutils/0001-CVE-2021-42574.patch        |   4 +-
 .../binutils/0002-CVE-2021-20197.patch        | 170 ---------------
 .../binutils/0003-CVE-2021-20197.patch        | 171 ---------------
 5 files changed, 3 insertions(+), 548 deletions(-)
 delete mode 100644 meta/recipes-devtools/binutils/binutils/0001-CVE-2021-20197.patch
 delete mode 100644 meta/recipes-devtools/binutils/binutils/0002-CVE-2021-20197.patch
 delete mode 100644 meta/recipes-devtools/binutils/binutils/0003-CVE-2021-20197.patch
meta/recipes-devtools/binutils/binutils-2.36.inc +1 -4
index 9574ddb6e1..fa28358c2d 100644
@@ -24,7 +24,7 @@ BRANCH ?= "binutils-2_36-branch"
 
 UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
 
-SRCREV ?= "7651a4871c225925ffdfda0a8c91a6ed370cd9a1"
+SRCREV ?= "a281816c8aeb12619d34eec8959a43dfa5c6b4ec"
 BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${BRANCH};protocol=git"
 SRC_URI = "\
      ${BINUTILS_GIT_URI} \
@@ -41,9 +41,6 @@ SRC_URI = "\
      file://0014-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch \
      file://0015-sync-with-OE-libtool-changes.patch \
      file://0016-Check-for-clang-before-checking-gcc-version.patch \
-     file://0001-CVE-2021-20197.patch \
-     file://0002-CVE-2021-20197.patch \
-     file://0003-CVE-2021-20197.patch \
      file://0017-CVE-2021-3530.patch \
      file://0018-CVE-2021-3530.patch \
      file://0001-CVE-2021-42574.patch \
meta/recipes-devtools/binutils/binutils/0001-CVE-2021-20197.patch deleted +0 -201

201 lines not on this page · raw message

meta/recipes-devtools/binutils/binutils/0001-CVE-2021-42574.patch +2 -2
index c93fd770b3..6adc438b5c 100644
@@ -50,9 +50,9 @@ diff --git a/binutils/ChangeLog b/binutils/ChangeLog
 +	* testsuite/binutils-all/objdump.highlight.unicode
 +	* testsuite/binutils-all/readelf.invalid.unicode
 +
- 2021-02-09  Alan Modra  <[email protected]>
+ 2021-04-15  Alan Modra  <[email protected]>
  
- 	PR 27382
+ 	PR 27456
 diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
 --- a/binutils/doc/binutils.texi	2021-12-23 03:23:38.441843395 -0800
 +++ b/binutils/doc/binutils.texi	2021-12-23 03:30:31.094968942 -0800
meta/recipes-devtools/binutils/binutils/0002-CVE-2021-20197.patch deleted +0 -170

170 lines not on this page · raw message

meta/recipes-devtools/binutils/binutils/0003-CVE-2021-20197.patch deleted +0 -171

171 lines not on this page · raw message

Signature · 1 line
2.31.1
author
#2 lore raw

PATCH 3/3 gcc: upgrade to gcc-10.3 version

In reply to pgowda

gcc-10.2 in Hardknott branch has been upgraded to gcc-10.3 version that includes many bug fixes.
Regression tested on X86-64, Arm and Aarch64 without issues.

---
 .../gcc/{gcc-10.2.inc => gcc-10.3.inc}        |  12 +-
 ...ian_10.2.bb => gcc-cross-canadian_10.3.bb} |   0
 .../{gcc-cross_10.2.bb => gcc-cross_10.3.bb}  |   0
 ...-crosssdk_10.2.bb => gcc-crosssdk_10.3.bb} |   0
 ...cc-runtime_10.2.bb => gcc-runtime_10.3.bb} |   0
 ...itizers_10.2.bb => gcc-sanitizers_10.3.bb} |   0
 ...{gcc-source_10.2.bb => gcc-source_10.3.bb} |   0
 .../gcc/gcc/0001-CVE-2021-35465.patch         |  22 +-
 ...-up-__aarch64_cas16_acq_rel-fallback.patch |  66 --
 ...ight-Line-Speculation-SLS-mitigation.patch | 202 ------
 ...e-SLS-mitigation-for-RET-and-BR-inst.patch | 607 ----------------
 ...h64-Mitigate-SLS-for-BLR-instruction.patch | 658 ------------------
 ...gcc-Fix-argument-list-too-long-error.patch |   5 +-
 ...Re-introduce-spe-commandline-options.patch |   2 +-
 ...ngw32-Enable-operation_not_supported.patch |   4 +-
 .../gcc/0038-arm-neoverse-n2-support.patch    |  88 ---
 .../gcc/0039-arm64-neoverse-n2-support.patch  |  60 --
 .../gcc/{gcc_10.2.bb => gcc_10.3.bb}          |   0
 ...initial_10.2.bb => libgcc-initial_10.3.bb} |   0
 .../gcc/{libgcc_10.2.bb => libgcc_10.3.bb}    |   0
 ...ibgfortran_10.2.bb => libgfortran_10.3.bb} |   0
 21 files changed, 19 insertions(+), 1707 deletions(-)
 rename meta/recipes-devtools/gcc/{gcc-10.2.inc => gcc-10.3.inc} (90%)
 rename meta/recipes-devtools/gcc/{gcc-cross-canadian_10.2.bb => gcc-cross-canadian_10.3.bb} (100%)
 rename meta/recipes-devtools/gcc/{gcc-cross_10.2.bb => gcc-cross_10.3.bb} (100%)
 rename meta/recipes-devtools/gcc/{gcc-crosssdk_10.2.bb => gcc-crosssdk_10.3.bb} (100%)
 rename meta/recipes-devtools/gcc/{gcc-runtime_10.2.bb => gcc-runtime_10.3.bb} (100%)
 rename meta/recipes-devtools/gcc/{gcc-sanitizers_10.2.bb => gcc-sanitizers_10.3.bb} (100%)
 rename meta/recipes-devtools/gcc/{gcc-source_10.2.bb => gcc-source_10.3.bb} (100%)
 delete mode 100644 meta/recipes-devtools/gcc/gcc/0001-aarch64-Fix-up-__aarch64_cas16_acq_rel-fallback.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc/0001-aarch64-New-Straight-Line-Speculation-SLS-mitigation.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc/0002-aarch64-Introduce-SLS-mitigation-for-RET-and-BR-inst.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc/0003-aarch64-Mitigate-SLS-for-BLR-instruction.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc/0038-arm-neoverse-n2-support.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc/0039-arm64-neoverse-n2-support.patch
 rename meta/recipes-devtools/gcc/{gcc_10.2.bb => gcc_10.3.bb} (100%)
 rename meta/recipes-devtools/gcc/{libgcc-initial_10.2.bb => libgcc-initial_10.3.bb} (100%)
 rename meta/recipes-devtools/gcc/{libgcc_10.2.bb => libgcc_10.3.bb} (100%)
 rename meta/recipes-devtools/gcc/{libgfortran_10.2.bb => libgfortran_10.3.bb} (100%)
meta/recipes-devtools/gcc/gcc-10.3.inc renamed from meta/recipes-devtools/gcc/gcc-10.2.inc +3 -9
similarity index 90%
rename from meta/recipes-devtools/gcc/gcc-10.2.inc
rename to meta/recipes-devtools/gcc/gcc-10.3.inc
index e7e3395c55..1fdfcced8e 100644
@@ -2,11 +2,11 @@ require gcc-common.inc
 
 # Third digit in PV should be incremented after a minor release
 
-PV = "10.2.0"
+PV = "10.3.0"
 
 # BINV should be incremented to a revision after a minor gcc release
 
-BINV = "10.2.0"
+BINV = "10.3.0"
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:"
 
@@ -65,24 +65,18 @@ SRC_URI = "\
            file://0035-gentypes-genmodes-Do-not-use-__LINE__-for-maintainin.patch \
            file://0036-mingw32-Enable-operation_not_supported.patch \
            file://0037-libatomic-Do-not-enforce-march-on-aarch64.patch \
-           file://0001-aarch64-New-Straight-Line-Speculation-SLS-mitigation.patch \
-           file://0002-aarch64-Introduce-SLS-mitigation-for-RET-and-BR-inst.patch \
-           file://0003-aarch64-Mitigate-SLS-for-BLR-instruction.patch \
-           file://0001-aarch64-Fix-up-__aarch64_cas16_acq_rel-fallback.patch \
            file://0001-libatomic-libgomp-libitc-Fix-bootstrap-PR70454.patch \
            file://0001-CVE-2021-35465.patch \
            file://0002-CVE-2021-35465.patch \
            file://0003-CVE-2021-35465.patch \
            file://0004-CVE-2021-35465.patch \
-           file://0038-arm-neoverse-n2-support.patch \
-           file://0039-arm64-neoverse-n2-support.patch \
            file://0001-CVE-2021-42574.patch \
            file://0002-CVE-2021-42574.patch \
            file://0003-CVE-2021-42574.patch \
            file://0004-CVE-2021-42574.patch \
            file://0005-CVE-2021-42574.patch \
 "
-SRC_URI[sha256sum] = "b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c"
+SRC_URI[sha256sum] = "64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344"
 
 S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
 # For dev release snapshotting
meta/recipes-devtools/gcc/gcc-cross-canadian_10.3.bb renamed from meta/recipes-devtools/gcc/gcc-cross-canadian_10.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-cross-canadian_10.2.bb
rename to meta/recipes-devtools/gcc/gcc-cross-canadian_10.3.bb
meta/recipes-devtools/gcc/gcc-cross_10.3.bb renamed from meta/recipes-devtools/gcc/gcc-cross_10.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-cross_10.2.bb
rename to meta/recipes-devtools/gcc/gcc-cross_10.3.bb
meta/recipes-devtools/gcc/gcc-crosssdk_10.3.bb renamed from meta/recipes-devtools/gcc/gcc-crosssdk_10.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-crosssdk_10.2.bb
rename to meta/recipes-devtools/gcc/gcc-crosssdk_10.3.bb
meta/recipes-devtools/gcc/gcc-runtime_10.3.bb renamed from meta/recipes-devtools/gcc/gcc-runtime_10.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-runtime_10.2.bb
rename to meta/recipes-devtools/gcc/gcc-runtime_10.3.bb
meta/recipes-devtools/gcc/gcc-sanitizers_10.3.bb renamed from meta/recipes-devtools/gcc/gcc-sanitizers_10.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-sanitizers_10.2.bb
rename to meta/recipes-devtools/gcc/gcc-sanitizers_10.3.bb
meta/recipes-devtools/gcc/gcc-source_10.3.bb renamed from meta/recipes-devtools/gcc/gcc-source_10.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-source_10.2.bb
rename to meta/recipes-devtools/gcc/gcc-source_10.3.bb
meta/recipes-devtools/gcc/gcc/0001-CVE-2021-35465.patch +11 -11
index b9bca49dd8..4d7c7e3f18 100644
@@ -33,7 +33,7 @@ Signed-off-by: Pgowda <[email protected]>
 diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
 --- a/gcc/config/arm/arm.c	2020-07-22 23:35:17.344384552 -0700
 +++ b/gcc/config/arm/arm.c	2021-11-11 20:16:19.761241867 -0800
-@@ -3595,6 +3595,15 @@ arm_option_override (void)
+@@ -3610,6 +3610,15 @@ arm_option_override (void)
  	fix_cm3_ldrd = 0;
      }
  
@@ -52,7 +52,7 @@ diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
 diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
 --- a/gcc/config/arm/arm-cpus.in	2020-07-22 23:35:17.340384509 -0700
 +++ b/gcc/config/arm/arm-cpus.in	2021-11-11 20:17:01.364573561 -0800
-@@ -190,6 +190,9 @@ define feature quirk_armv6kz
+@@ -186,6 +186,9 @@ define feature quirk_armv6kz
  # Cortex-M3 LDRD quirk.
  define feature quirk_cm3_ldrd
  
@@ -62,7 +62,7 @@ diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
  # Don't use .cpu assembly directive
  define feature quirk_no_asmcpu
  
-@@ -314,7 +317,7 @@ define fgroup DOTPROD	NEON dotprod
+@@ -322,7 +325,7 @@ define implied vfp_base MVE MVE_FP ALL_F
  # architectures.
  # xscale isn't really a 'quirk', but it isn't an architecture either and we
  # need to ignore it for matching purposes.
@@ -71,7 +71,7 @@ diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
  
  # Architecture entries
  # format:
-@@ -1492,6 +1495,7 @@ begin cpu cortex-m33
+@@ -1524,6 +1527,7 @@ begin cpu cortex-m33
   architecture armv8-m.main+dsp+fp
   option nofp remove ALL_FP
   option nodsp remove armv7em
@@ -79,7 +79,7 @@ diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
   costs v7m
  end cpu cortex-m33
  
-@@ -1501,6 +1505,7 @@ begin cpu cortex-m35p
+@@ -1533,6 +1537,7 @@ begin cpu cortex-m35p
   architecture armv8-m.main+dsp+fp
   option nofp remove ALL_FP
   option nodsp remove armv7em
@@ -87,10 +87,10 @@ diff --git a/gcc/config/arm/arm-cpus.in b/gcc/config/arm/arm-cpus.in
   costs v7m
  end cpu cortex-m35p
  
-@@ -1508,7 +1513,7 @@ begin cpu cortex-m55
-  cname cortexm55
-  tune flags LDSCHED
-  architecture armv8.1-m.main+mve.fp+fp.dp
+@@ -1544,7 +1549,7 @@ begin cpu cortex-m55
+  option nomve remove mve mve_float
+  option nofp remove ALL_FP mve_float
+  option nodsp remove MVE mve_float
 - isa quirk_no_asmcpu
 + isa quirk_no_asmcpu quirk_vlldm
   costs v7m
@@ -113,7 +113,7 @@ diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
 diff -upr a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
 --- a/gcc/doc/invoke.texi	2021-11-11 19:30:56.264523105 -0800
 +++ b/gcc/doc/invoke.texi	2021-11-11 20:16:19.769241739 -0800
-@@ -773,6 +773,7 @@ Objective-C and Objective-C++ Dialects}.
+@@ -774,6 +774,7 @@ Objective-C and Objective-C++ Dialects}.
  -mverbose-cost-dump @gol
  -mpure-code @gol
  -mcmse @gol
@@ -121,7 +121,7 @@ diff -upr a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
  -mfdpic}
  
  @emph{AVR Options}
-@@ -21233,6 +21234,14 @@ Use multiply and add/subtract instructio
+@@ -21266,6 +21267,14 @@ Use multiply and add/subtract instructio
  
  Do not use multiply and add/subtract instructions.
  
meta/recipes-devtools/gcc/gcc/0001-aarch64-Fix-up-__aarch64_cas16_acq_rel-fallback.patch deleted +0 -66

66 lines not on this page · raw message

meta/recipes-devtools/gcc/gcc/0001-aarch64-New-Straight-Line-Speculation-SLS-mitigation.patch deleted +0 -202

202 lines not on this page · raw message

meta/recipes-devtools/gcc/gcc/0002-aarch64-Introduce-SLS-mitigation-for-RET-and-BR-inst.patch deleted +0 -607

607 lines not on this page · raw message

meta/recipes-devtools/gcc/gcc/0003-aarch64-Mitigate-SLS-for-BLR-instruction.patch deleted +0 -658

658 lines not on this page · raw message

meta/recipes-devtools/gcc/gcc/0012-gcc-Fix-argument-list-too-long-error.patch +2 -3
index 88e1715b5c..03d7a41633 100644
@@ -30,9 +30,8 @@ diff --git a/gcc/Makefile.in b/gcc/Makefile.in
 index a67d2cc18d6..480c9366418 100644
 --- a/gcc/Makefile.in
 +++ b/gcc/Makefile.in
-@@ -3606,7 +3606,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
- # We keep the directory structure for files in config or c-family and .def
- # files. All other files are flattened to a single directory.
+ # We keep the directory structure for files in config, common/config or
+ # c-family and .def files. All other files are flattened to a single directory.
  	$(mkinstalldirs) $(DESTDIR)$(plugin_includedir)
 -	headers=`echo $(PLUGIN_HEADERS) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \
 +	headers=`echo $(sort $(PLUGIN_HEADERS)) $$(cd $(srcdir); echo *.h *.def) | tr ' ' '\012' | sort -u`; \
meta/recipes-devtools/gcc/gcc/0033-Re-introduce-spe-commandline-options.patch +1 -1
index ba7c2b8fd5..43d881fa5e 100644
@@ -33,6 +33,6 @@ index f95b8279270..0e52d51409d 100644
 +Target RejectNegative Var(rs6000_spe_abi, 0)
 +Do not use the SPE ABI extensions.
 +
+ ; Altivec ABI
  mabi=altivec
  Target RejectNegative Var(rs6000_altivec_abi) Save
- Use the AltiVec ABI extensions.
meta/recipes-devtools/gcc/gcc/0036-mingw32-Enable-operation_not_supported.patch +2 -2
index de82a3a539..4db3d15554 100644
@@ -16,11 +16,11 @@ index 68ac72a78fb..71cd5815b81 100644
 --- a/libstdc++-v3/config/os/mingw32/error_constants.h
 +++ b/libstdc++-v3/config/os/mingw32/error_constants.h
 @@ -107,7 +107,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- #ifdef _GLIBCXX_HAVE_EPERM
+ #ifdef EPERM
        operation_not_permitted = 		EPERM,
  #endif
 -//    operation_not_supported = 		EOPNOTSUPP,
 +      operation_not_supported = 		EOPNOTSUPP,
- #ifdef _GLIBCXX_HAVE_EWOULDBLOCK
+ #ifdef EWOULDBLOCK
        operation_would_block = 			EWOULDBLOCK,
  #endif
meta/recipes-devtools/gcc/gcc/0038-arm-neoverse-n2-support.patch deleted +0 -88

88 lines not on this page · raw message

meta/recipes-devtools/gcc/gcc/0039-arm64-neoverse-n2-support.patch deleted +0 -60

60 lines not on this page · raw message

meta/recipes-devtools/gcc/gcc_10.3.bb renamed from meta/recipes-devtools/gcc/gcc_10.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc_10.2.bb
rename to meta/recipes-devtools/gcc/gcc_10.3.bb
meta/recipes-devtools/gcc/libgcc-initial_10.3.bb renamed from meta/recipes-devtools/gcc/libgcc-initial_10.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gcc/libgcc-initial_10.2.bb
rename to meta/recipes-devtools/gcc/libgcc-initial_10.3.bb
meta/recipes-devtools/gcc/libgcc_10.3.bb renamed from meta/recipes-devtools/gcc/libgcc_10.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gcc/libgcc_10.2.bb
rename to meta/recipes-devtools/gcc/libgcc_10.3.bb
meta/recipes-devtools/gcc/libgfortran_10.3.bb renamed from meta/recipes-devtools/gcc/libgfortran_10.2.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gcc/libgfortran_10.2.bb
rename to meta/recipes-devtools/gcc/libgfortran_10.3.bb
Signature · 1 line
2.31.1