* [PATCH 01/10] grub2: Fix passing null to printf formats
@ 2018-12-26 20:09 Khem Raj
2018-12-26 20:09 ` [PATCH 02/10] gnupg: Upgrade to 2.2.12 release Khem Raj
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Khem Raj @ 2018-12-26 20:09 UTC (permalink / raw)
To: openembedded-core
Backport a patch that helps with this error which is found
by gcc9
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...001-grub-setup-Debug-message-cleanup.patch | 34 +++++++++++++++++++
meta/recipes-bsp/grub/grub2.inc | 1 +
2 files changed, 35 insertions(+)
create mode 100644 meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch
diff --git a/meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch b/meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch
new file mode 100644
index 0000000000..e01fcdffb0
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch
@@ -0,0 +1,34 @@
+From 4e9d9358e0cda6d01020005eb6343e3b69f7201a Mon Sep 17 00:00:00 2001
+From: Cao jin <caoj.fnst@cn.fujitsu.com>
+Date: Tue, 3 Jul 2018 18:51:13 +0800
+Subject: [PATCH] grub-setup: Debug message cleanup
+
+Variable "root" is initialized after root device probing and is null in
+current place, so, drop it.
+
+Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/grub.git/commit/?id=4e9d9358e0cda6d01020005eb6343e3b69f7201a]
+
+ util/setup.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/util/setup.c b/util/setup.c
+index 80363075d..9c1e1b7da 100644
+--- a/util/setup.c
++++ b/util/setup.c
+@@ -305,9 +305,8 @@ SETUP (const char *dir,
+ bl.first_block = (struct grub_boot_blocklist *) (core_img
+ + GRUB_DISK_SECTOR_SIZE
+ - sizeof (*bl.block));
+- grub_util_info ("root is `%s', dest is `%s'", root, dest);
+
+- grub_util_info ("Opening dest");
++ grub_util_info ("Opening dest `%s'", dest);
+ dest_dev = grub_device_open (dest);
+ if (! dest_dev)
+ grub_util_error ("%s", grub_errmsg);
+--
+2.17.2 (Apple Git-113)
+
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index 325eca25bb..8e0f86217c 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -20,6 +20,7 @@ SRC_URI = "https://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
file://fix.build.with.gcc-7.patch \
file://gcc8.patch \
file://0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch \
+ file://0001-grub-setup-Debug-message-cleanup.patch \
"
SRC_URI[md5sum] = "1116d1f60c840e6dbd67abbc99acb45d"
SRC_URI[sha256sum] = "660ee136fbcee08858516ed4de2ad87068bfe1b6b8b37896ce3529ff054a726d"
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 02/10] gnupg: Upgrade to 2.2.12 release
2018-12-26 20:09 [PATCH 01/10] grub2: Fix passing null to printf formats Khem Raj
@ 2018-12-26 20:09 ` Khem Raj
2018-12-26 20:09 ` [PATCH 03/10] gnupg: Do not apply -Woverride-init guard for gcc >= 9 Khem Raj
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Khem Raj @ 2018-12-26 20:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...nfigure.ac-use-a-custom-value-for-the-location-of-.patch | 6 +++---
meta/recipes-support/gnupg/gnupg/relocate.patch | 2 +-
.../gnupg/{gnupg_2.2.11.bb => gnupg_2.2.12.bb} | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-support/gnupg/{gnupg_2.2.11.bb => gnupg_2.2.12.bb} (92%)
diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
index ab0b6dccc4..3f1c3abaeb 100644
--- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
+++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
@@ -1,4 +1,4 @@
-From 5f38f1276a3651c30bddc508122da2e7d2d3ca92 Mon Sep 17 00:00:00 2001
+From 8eb4d25c25a1c1323797d94e0727a3e42b7f3287 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 22 Jan 2018 18:00:21 +0200
Subject: [PATCH] configure.ac: use a custom value for the location of
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 8c80377..a66d393 100644
+index 4d66af9..b9ef235 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1841,7 +1841,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
+@@ -1848,7 +1848,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch
index 860f7f1d96..c494ef80b7 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
-From 1eaf630343cc77d8b5d41d0b0a3551fa193c5fcf Mon Sep 17 00:00:00 2001
+From f9fc214b0bf2f67b515ca8a5333f39c497d1b518 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Wed, 19 Sep 2018 14:44:40 +0100
Subject: [PATCH] Allow the environment to override where gnupg looks for its
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.11.bb b/meta/recipes-support/gnupg/gnupg_2.2.12.bb
similarity index 92%
rename from meta/recipes-support/gnupg/gnupg_2.2.11.bb
rename to meta/recipes-support/gnupg/gnupg_2.2.12.bb
index d259ed5324..1f381c2d91 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.11.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.12.bb
@@ -19,8 +19,8 @@ SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-
file://relocate.patch"
-SRC_URI[md5sum] = "e23a896d634e8b81681314780f5158a4"
-SRC_URI[sha256sum] = "496c3e123ef53f35436ddccca58e82acaa901ca4e21174e77386c0cea0c49cd9"
+SRC_URI[md5sum] = "421b17028878b253c5acfef056bc6141"
+SRC_URI[sha256sum] = "db030f8b4c98640e91300d36d516f1f4f8fe09514a94ea9fc7411ee1a34082cb"
EXTRA_OECONF = "--disable-ldap \
--disable-ccid-driver \
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 03/10] gnupg: Do not apply -Woverride-init guard for gcc >= 9
2018-12-26 20:09 [PATCH 01/10] grub2: Fix passing null to printf formats Khem Raj
2018-12-26 20:09 ` [PATCH 02/10] gnupg: Upgrade to 2.2.12 release Khem Raj
@ 2018-12-26 20:09 ` Khem Raj
2018-12-26 20:09 ` [PATCH 04/10] nfs-utils: Disable format-overflow as Werror Khem Raj
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Khem Raj @ 2018-12-26 20:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...erride-init-is-not-needed-with-gcc-9.patch | 31 +++++++++++++++++++
...-a-custom-value-for-the-location-of-.patch | 6 ++--
.../gnupg/gnupg/relocate.patch | 2 +-
meta/recipes-support/gnupg/gnupg_2.2.12.bb | 3 +-
4 files changed, 37 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch
diff --git a/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch
new file mode 100644
index 0000000000..4a280f9d5c
--- /dev/null
+++ b/meta/recipes-support/gnupg/gnupg/0001-Woverride-init-is-not-needed-with-gcc-9.patch
@@ -0,0 +1,31 @@
+From 0df5800cc2e720aad883a517f7d24a9722fe5845 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 20 Dec 2018 17:37:48 -0800
+Subject: [PATCH] Woverride-init is not needed with gcc 9
+
+Fixes
+| ../../gnupg-2.2.12/dirmngr/dns.h:525:16: error: lvalue required as
+unary '&' operand |
+525 | dns_rr_i_init(&dns_quietinit((struct dns_rr_i){ 0, __VA_ARGS__
+}), (P))
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ dirmngr/dns.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dirmngr/dns.h b/dirmngr/dns.h
+index 30d0b45..98fe412 100644
+--- a/dirmngr/dns.h
++++ b/dirmngr/dns.h
+@@ -154,7 +154,7 @@ DNS_PUBLIC int *dns_debug_p(void);
+
+ #define dns_quietinit(...) \
+ DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP
+-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4
++#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || (__GNUC__ > 4 && __GNUC__ < 9)
+ #define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push")
+ #define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"")
+ #define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop")
diff --git a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
index 3f1c3abaeb..c43ecdf861 100644
--- a/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
+++ b/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
@@ -1,4 +1,4 @@
-From 8eb4d25c25a1c1323797d94e0727a3e42b7f3287 Mon Sep 17 00:00:00 2001
+From c69c3a49f3295179c247db5ceb3ef8952928a724 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 22 Jan 2018 18:00:21 +0200
Subject: [PATCH] configure.ac: use a custom value for the location of
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 4d66af9..b9ef235 100644
+index 919ab31..cd58fdb 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1848,7 +1848,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
+@@ -1855,7 +1855,7 @@ AC_DEFINE_UNQUOTED(GPGCONF_DISP_NAME, "GPGConf",
AC_DEFINE_UNQUOTED(GPGTAR_NAME, "gpgtar", [The name of the gpgtar tool])
diff --git a/meta/recipes-support/gnupg/gnupg/relocate.patch b/meta/recipes-support/gnupg/gnupg/relocate.patch
index c494ef80b7..1a5ea4aa2b 100644
--- a/meta/recipes-support/gnupg/gnupg/relocate.patch
+++ b/meta/recipes-support/gnupg/gnupg/relocate.patch
@@ -1,4 +1,4 @@
-From f9fc214b0bf2f67b515ca8a5333f39c497d1b518 Mon Sep 17 00:00:00 2001
+From 6d31b04d7a75f1d73c3518bf043b5b0a2dc40cb1 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Wed, 19 Sep 2018 14:44:40 +0100
Subject: [PATCH] Allow the environment to override where gnupg looks for its
diff --git a/meta/recipes-support/gnupg/gnupg_2.2.12.bb b/meta/recipes-support/gnupg/gnupg_2.2.12.bb
index 1f381c2d91..a02c66a0c8 100644
--- a/meta/recipes-support/gnupg/gnupg_2.2.12.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.2.12.bb
@@ -14,7 +14,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://0002-use-pkgconfig-instead-of-npth-config.patch \
file://0003-dirmngr-uses-libgpg-error.patch \
file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \
- "
+ file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \
+ "
SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \
file://relocate.patch"
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 04/10] nfs-utils: Disable format-overflow as Werror
2018-12-26 20:09 [PATCH 01/10] grub2: Fix passing null to printf formats Khem Raj
2018-12-26 20:09 ` [PATCH 02/10] gnupg: Upgrade to 2.2.12 release Khem Raj
2018-12-26 20:09 ` [PATCH 03/10] gnupg: Do not apply -Woverride-init guard for gcc >= 9 Khem Raj
@ 2018-12-26 20:09 ` Khem Raj
2018-12-26 20:09 ` [PATCH 05/10] musl: Update to latest master Khem Raj
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Khem Raj @ 2018-12-26 20:09 UTC (permalink / raw)
To: openembedded-core
These warnings are intricate and we can ignore that for now as they are
being found by gcc 9, eventually this should be not needed when code
upstream is fixed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb
index 6be2aab47c..63aa6add5a 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.3.bb
@@ -64,6 +64,8 @@ EXTRA_OECONF = "--with-statduser=rpcuser \
--with-statdpath=/var/lib/nfs/statd \
"
+CFLAGS += "-Wno-error=format-overflow"
+
PACKAGECONFIG ??= "tcp-wrappers \
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
"
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 05/10] musl: Update to latest master
2018-12-26 20:09 [PATCH 01/10] grub2: Fix passing null to printf formats Khem Raj
` (2 preceding siblings ...)
2018-12-26 20:09 ` [PATCH 04/10] nfs-utils: Disable format-overflow as Werror Khem Raj
@ 2018-12-26 20:09 ` Khem Raj
2018-12-26 20:09 ` [PATCH 06/10] libxcrypt: Upgrade to 4.4.2 Khem Raj
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Khem Raj @ 2018-12-26 20:09 UTC (permalink / raw)
To: openembedded-core
* sync APIs from kernel v4.18
* Misc bug fixes
Full logs
https://git.musl-libc.org/cgit/musl/log/?qt=range&q=39ef612aa193cc6e954ac5a01574300ccd4b7ef9..21a172dd36cae7a08492fd3a7500d7bf0daee13e
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/musl/musl_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 046a08aec2..33d6e69130 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -4,7 +4,7 @@
require musl.inc
inherit linuxloader
-SRCREV = "39ef612aa193cc6e954ac5a01574300ccd4b7ef9"
+SRCREV = "21a172dd36cae7a08492fd3a7500d7bf0daee13e"
PV = "1.1.20+git${SRCPV}"
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 06/10] libxcrypt: Upgrade to 4.4.2
2018-12-26 20:09 [PATCH 01/10] grub2: Fix passing null to printf formats Khem Raj
` (3 preceding siblings ...)
2018-12-26 20:09 ` [PATCH 05/10] musl: Update to latest master Khem Raj
@ 2018-12-26 20:09 ` Khem Raj
2018-12-26 20:09 ` [PATCH 07/10] gdb: Backport a fix to build with gcc9 Khem Raj
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Khem Raj @ 2018-12-26 20:09 UTC (permalink / raw)
To: openembedded-core
Licence-Update: Copyright Alexander Peslyak; 0-clause BSD added
see https://github.com/besser82/libxcrypt/commit/e07290ec7c3de301ce2b813ee2b42131bef2b119
Rename recipe to ve versionless and add PV in recipe itself, makes it
easy to traverse git history
Drop upstreamed patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../0001-Add-x32-specific-inline-asm.patch | 42 -------------------
.../{libxcrypt_4.4.1.bb => libxcrypt.bb} | 8 ++--
2 files changed, 4 insertions(+), 46 deletions(-)
delete mode 100644 meta/recipes-core/libxcrypt/files/0001-Add-x32-specific-inline-asm.patch
rename meta/recipes-core/libxcrypt/{libxcrypt_4.4.1.bb => libxcrypt.bb} (80%)
diff --git a/meta/recipes-core/libxcrypt/files/0001-Add-x32-specific-inline-asm.patch b/meta/recipes-core/libxcrypt/files/0001-Add-x32-specific-inline-asm.patch
deleted file mode 100644
index 9e31b03561..0000000000
--- a/meta/recipes-core/libxcrypt/files/0001-Add-x32-specific-inline-asm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7d01f2acf6fde6341a68a91f9b343841cc424af7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 17 Dec 2018 11:33:35 -0800
-Subject: [PATCH] Add x32 specific inline asm
-
-Upstream-Status: Pending [https://github.com/besser82/libxcrypt/issues/74#issuecomment-447966455]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- alg-yescrypt-opt.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/alg-yescrypt-opt.c b/alg-yescrypt-opt.c
-index 5dbd822..060caf4 100644
---- a/alg-yescrypt-opt.c
-+++ b/alg-yescrypt-opt.c
-@@ -528,6 +528,11 @@ static volatile uint64_t Smask2var = Smask2;
- #undef MAYBE_MEMORY_BARRIER
- #define MAYBE_MEMORY_BARRIER \
- __asm__("" : : : "memory");
-+#ifdef __ILP32__ /* x32 */
-+#define REGISTER_PREFIX "e"
-+#else
-+#define REGISTER_PREFIX "r"
-+#endif
- #define PWXFORM_SIMD(X) { \
- __m128i H; \
- __asm__( \
-@@ -537,8 +542,8 @@ static volatile uint64_t Smask2var = Smask2;
- "pmuludq %1, %0\n\t" \
- "movl %%eax, %%ecx\n\t" \
- "shrq $0x20, %%rax\n\t" \
-- "paddq (%3,%%rcx), %0\n\t" \
-- "pxor (%4,%%rax), %0\n\t" \
-+ "paddq (%3,%%" REGISTER_PREFIX "cx), %0\n\t" \
-+ "pxor (%4,%%" REGISTER_PREFIX "ax), %0\n\t" \
- : "+x" (X), "=x" (H) \
- : "d" (Smask2), "S" (S0), "D" (S1) \
- : "cc", "ax", "cx"); \
---
-2.20.1
-
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.4.1.bb b/meta/recipes-core/libxcrypt/libxcrypt.bb
similarity index 80%
rename from meta/recipes-core/libxcrypt/libxcrypt_4.4.1.bb
rename to meta/recipes-core/libxcrypt/libxcrypt.bb
index 594203a59c..3b9af6d739 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.4.1.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt.bb
@@ -3,18 +3,18 @@ DESCRIPTION = "Forked code from glibc libary to extract only crypto part."
HOMEPAGE = "https://github.com/besser82/libxcrypt"
SECTION = "libs"
LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM ?= "file://LICENSING;md5=e28ba6195a4e39904919b78a92bcf27e \
+LIC_FILES_CHKSUM ?= "file://LICENSING;md5=be275bc7f91642efe7709a8ae7a1433b \
file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
"
inherit autotools pkgconfig
-# v4.4.1
-SRCREV ?= "b8714d4e9e37cf0d511917bd5eea0e51e4a397d5"
+PV = "4.4.2"
+# v4.4.2
+SRCREV ?= "cf6abf18083566ec1612af27982a5160c9e0f137"
SRCBRANCH ?= "develop"
SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH} \
- file://0001-Add-x32-specific-inline-asm.patch \
"
PROVIDES = "virtual/crypt"
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 07/10] gdb: Backport a fix to build with gcc9
2018-12-26 20:09 [PATCH 01/10] grub2: Fix passing null to printf formats Khem Raj
` (4 preceding siblings ...)
2018-12-26 20:09 ` [PATCH 06/10] libxcrypt: Upgrade to 4.4.2 Khem Raj
@ 2018-12-26 20:09 ` Khem Raj
2018-12-26 20:09 ` [PATCH 08/10] valgrind: Fix x86_64 build failure " Khem Raj
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Khem Raj @ 2018-12-26 20:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gdb/gdb-8.2.inc | 1 +
...1-Fix-build-with-latest-GCC-9.0-tree.patch | 50 +++++++++++++++++++
2 files changed, 51 insertions(+)
create mode 100644 meta/recipes-devtools/gdb/gdb/0001-Fix-build-with-latest-GCC-9.0-tree.patch
diff --git a/meta/recipes-devtools/gdb/gdb-8.2.inc b/meta/recipes-devtools/gdb/gdb-8.2.inc
index 7e0809de72..f6d75ed081 100644
--- a/meta/recipes-devtools/gdb/gdb-8.2.inc
+++ b/meta/recipes-devtools/gdb/gdb-8.2.inc
@@ -16,6 +16,7 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \
file://0010-resolve-restrict-keyword-conflict.patch \
file://0011-Fix-invalid-sigprocmask-call.patch \
file://gdbserver-ctrl-c-handling.patch \
+ file://0001-Fix-build-with-latest-GCC-9.0-tree.patch \
"
SRC_URI[md5sum] = "b5a49dbff00d9a87fbe114d14b3101c0"
SRC_URI[sha256sum] = "c3a441a29c7c89720b734e5a9c6289c0a06be7e0c76ef538f7bbcef389347c39"
diff --git a/meta/recipes-devtools/gdb/gdb/0001-Fix-build-with-latest-GCC-9.0-tree.patch b/meta/recipes-devtools/gdb/gdb/0001-Fix-build-with-latest-GCC-9.0-tree.patch
new file mode 100644
index 0000000000..2a962929d7
--- /dev/null
+++ b/meta/recipes-devtools/gdb/gdb/0001-Fix-build-with-latest-GCC-9.0-tree.patch
@@ -0,0 +1,50 @@
+From 7406a50077773e78282a495cb32ef5b8179f6a33 Mon Sep 17 00:00:00 2001
+From: Dimitar Dimitrov <dimitar@dinux.eu>
+Date: Mon, 17 Dec 2018 21:30:52 +0200
+Subject: [PATCH] Fix build with latest GCC 9.0 tree
+
+A recent patch [1] to fix a GCC PR [2] actually broke the GDB build.
+To fix, remove the stack pointer clobber. GCC will ignore the clobber
+marker, and will not save or restore the stack pointer.
+
+I ran "make check-gdb" on x86_64 to ensure there are no regressions.
+
+gdb/ChangeLog:
+
+2018-12-17 Dimitar Dimitrov <dimitar@dinux.eu>
+
+ * nat/linux-ptrace.c (linux_ptrace_test_ret_to_nx): Remove sp clobbers.
+
+[1] https://gcc.gnu.org/ml/gcc-patches/2018-12/msg00532.html
+[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813
+
+Upstream-Status: Backport
+Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu>
+---
+ gdb/ChangeLog | 5 +++++
+ gdb/nat/linux-ptrace.c | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
+index d4c1b8f9fd..187cfeb9bc 100644
+--- a/gdb/nat/linux-ptrace.c
++++ b/gdb/nat/linux-ptrace.c
+@@ -161,14 +161,14 @@ linux_ptrace_test_ret_to_nx (void)
+ ".globl linux_ptrace_test_ret_to_nx_instr;"
+ "linux_ptrace_test_ret_to_nx_instr:"
+ "ret"
+- : : "r" (return_address) : "%esp", "memory");
++ : : "r" (return_address) : "memory");
+ #elif defined __x86_64__
+ asm volatile ("pushq %0;"
+ ".globl linux_ptrace_test_ret_to_nx_instr;"
+ "linux_ptrace_test_ret_to_nx_instr:"
+ "ret"
+ : : "r" ((uint64_t) (uintptr_t) return_address)
+- : "%rsp", "memory");
++ : "memory");
+ #else
+ # error "!__i386__ && !__x86_64__"
+ #endif
+--
+2.20.1
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 08/10] valgrind: Fix x86_64 build failure with gcc9
2018-12-26 20:09 [PATCH 01/10] grub2: Fix passing null to printf formats Khem Raj
` (5 preceding siblings ...)
2018-12-26 20:09 ` [PATCH 07/10] gdb: Backport a fix to build with gcc9 Khem Raj
@ 2018-12-26 20:09 ` Khem Raj
2018-12-26 20:09 ` [PATCH 09/10] ffmpeg: Backport patch to fix build " Khem Raj
2018-12-26 20:09 ` [PATCH 10/10] binutils: Upgrade to latest on 2.31 release branch Khem Raj
8 siblings, 0 replies; 10+ messages in thread
From: Khem Raj @ 2018-12-26 20:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...ts-amd64-Do-not-clobber-rsp-register.patch | 37 +++++++++++++++++++
.../valgrind/valgrind_3.14.0.bb | 1 +
2 files changed, 38 insertions(+)
create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-tests-amd64-Do-not-clobber-rsp-register.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-amd64-Do-not-clobber-rsp-register.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-amd64-Do-not-clobber-rsp-register.patch
new file mode 100644
index 0000000000..657f80335d
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-amd64-Do-not-clobber-rsp-register.patch
@@ -0,0 +1,37 @@
+From 8c1ebb564f5eca2baeedc27a703200786d1abb0b Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 22 Dec 2018 15:28:40 -0800
+Subject: [PATCH] tests/amd64: Do not clobber %rsp register
+
+This is seen with gcc-9.0 compiler now which is fix that gcc community
+did recently
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813
+
+Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=402480]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ none/tests/amd64-linux/bug345887.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/none/tests/amd64-linux/bug345887.c b/none/tests/amd64-linux/bug345887.c
+index 0f9237d..4b07fe1 100644
+--- a/none/tests/amd64-linux/bug345887.c
++++ b/none/tests/amd64-linux/bug345887.c
+@@ -20,13 +20,14 @@ static void inner(void)
+ "movq $0x10d, %%r14\n"
+ "movq $0x10e, %%r15\n"
+ // not %rbp as mdb is then not able to reconstruct stack trace
+- "movq $0x10f, %%rsp\n"
++ // not %rsp since gcc ignores it and since gcc >= 9.0 errors about it
++ // see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52813
+ "movq $0x1234, (%%rax)\n" // should cause SEGV here
+ "ud2" // should never get here
+ : // no output registers
+ : // no input registers
+ : "memory", "%rax", "%rbx", "%rcx", "%rdx", "%rsi", "%rdi",
+- "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "%rsp");
++ "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15");
+ }
+
+ __attribute__((noinline))
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb
index 50f8221ebb..bbbc3bf695 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.14.0.bb
@@ -36,6 +36,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
file://0001-fix-opcode-not-supported-on-mips32-linux.patch \
file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \
file://0001-Make-local-functions-static-to-avoid-assembler-error.patch \
+ file://0001-tests-amd64-Do-not-clobber-rsp-register.patch \
"
SRC_URI[md5sum] = "74175426afa280184b62591b58c671b3"
SRC_URI[sha256sum] = "037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5"
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 09/10] ffmpeg: Backport patch to fix build with gcc9
2018-12-26 20:09 [PATCH 01/10] grub2: Fix passing null to printf formats Khem Raj
` (6 preceding siblings ...)
2018-12-26 20:09 ` [PATCH 08/10] valgrind: Fix x86_64 build failure " Khem Raj
@ 2018-12-26 20:09 ` Khem Raj
2018-12-26 20:09 ` [PATCH 10/10] binutils: Upgrade to latest on 2.31 release branch Khem Raj
8 siblings, 0 replies; 10+ messages in thread
From: Khem Raj @ 2018-12-26 20:09 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...cess_template-remove-FF_REG_sp-from-.patch | 31 +++++++++++++++++++
.../recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb | 1 +
2 files changed, 32 insertions(+)
create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch
new file mode 100644
index 0000000000..83fb4b81af
--- /dev/null
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch
@@ -0,0 +1,31 @@
+From c1cbeb87db4bfc6e281e4254a6c7fdd3854fc9b9 Mon Sep 17 00:00:00 2001
+From: Michael Niedermayer <michael@niedermayer.cc>
+Date: Thu, 20 Dec 2018 22:40:06 +0100
+Subject: [PATCH] postproc/postprocess_template: remove FF_REG_sp from clobber
+ list
+
+Future gcc may no longer support this
+
+Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/c1cbeb87db4bfc6e281e4254a6c7fdd3854fc9b9]
+Tested-by: James Almer <jamrial@gmail.com>
+Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
+---
+ libpostproc/postprocess_template.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
+index 485eb5cfc0..b0adfd168c 100644
+--- a/libpostproc/postprocess_template.c
++++ b/libpostproc/postprocess_template.c
+@@ -1317,7 +1317,7 @@ DERING_CORE((%0, %1, 8) ,(%%FF_REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5,
+ "1: \n\t"
+ : : "r" (src), "r" ((x86_reg)stride), "m" (c->pQPb), "m"(c->pQPb2), "q"(tmp)
+ NAMED_CONSTRAINTS_ADD(deringThreshold,b00,b02,b08)
+- : "%"FF_REG_a, "%"FF_REG_d, "%"FF_REG_sp
++ : "%"FF_REG_a, "%"FF_REG_d
+ );
+ #else // HAVE_7REGS && (TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW)
+ int y;
+--
+2.20.1
+
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb
index 7d1af04047..0c227b7fc9 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_4.0.2.bb
@@ -26,6 +26,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
file://mips64_cpu_detection.patch \
file://CVE-2018-15822.patch \
+ file://0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch \
"
SRC_URI[md5sum] = "ae0bfdf809306a212b4f0e6eb8d1c75e"
SRC_URI[sha256sum] = "a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97"
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 10/10] binutils: Upgrade to latest on 2.31 release branch
2018-12-26 20:09 [PATCH 01/10] grub2: Fix passing null to printf formats Khem Raj
` (7 preceding siblings ...)
2018-12-26 20:09 ` [PATCH 09/10] ffmpeg: Backport patch to fix build " Khem Raj
@ 2018-12-26 20:09 ` Khem Raj
8 siblings, 0 replies; 10+ messages in thread
From: Khem Raj @ 2018-12-26 20:09 UTC (permalink / raw)
To: openembedded-core; +Cc: Cupertino Miranda, Romain Naour, Alexey Brodkin
* Append minor version to PV so recipe checker is happy
* Drop upstreamed patches
* Remove changelog from CVE patches, they dont apply and are in patch
log anyway
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../binutils/binutils-2.31.inc | 8 +-
...-for-input-file-matching-output-file.patch | 59 -----
...ion-where-GOT-information-is-collect.patch | 201 ------------------
...ess.-Return-FALSE-in-case-of-NULL-po.patch | 38 ----
...-symbol-is-not-an-indirect-or-warnin.patch | 46 ----
...was-still-being-generated-when-symbo.patch | 40 ----
.../binutils/binutils/CVE-2018-17358.patch | 37 +---
.../binutils/binutils/CVE-2018-17360.patch | 24 +--
.../binutils/binutils/CVE-2018-18309.patch | 87 ++------
.../binutils/binutils/CVE-2018-18605.patch | 20 +-
.../binutils/binutils/CVE-2018-18606.patch | 22 +-
.../binutils/binutils/CVE-2018-18607.patch | 25 +--
.../binutils/binutils/clang-bfd-fix.patch | 8 +-
13 files changed, 33 insertions(+), 582 deletions(-)
delete mode 100644 meta/recipes-devtools/binutils/binutils/0017-improve-check-for-input-file-matching-output-file.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/0018-Refactored-location-where-GOT-information-is-collect.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/0019-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/0020-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch
delete mode 100644 meta/recipes-devtools/binutils/binutils/0021-PLT-information-was-still-being-generated-when-symbo.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.31.inc b/meta/recipes-devtools/binutils/binutils-2.31.inc
index c3c15fb416..b8b2d97884 100644
--- a/meta/recipes-devtools/binutils/binutils-2.31.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.31.inc
@@ -15,10 +15,11 @@ def binutils_branch_version(d):
return pvsplit[0] + "_" + pvsplit[1]
BINUPV = "${@binutils_branch_version(d)}"
+PV .= ".1"
UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
-SRCREV ?= "4568e49ff799192fea4f66063fe13e2b871ec75a"
+SRCREV ?= "c909e7afdc4710851a53e86ebed8cea3879b26e5"
BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git"
SRC_URI = "\
${BINUTILS_GIT_URI} \
@@ -36,11 +37,6 @@ SRC_URI = "\
file://0014-Detect-64-bit-MIPS-targets.patch \
file://0015-sync-with-OE-libtool-changes.patch \
file://0016-add-i386pep-emulation-for-x86_64.patch \
- file://0017-improve-check-for-input-file-matching-output-file.patch \
- file://0018-Refactored-location-where-GOT-information-is-collect.patch \
- file://0019-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch \
- file://0020-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch \
- file://0021-PLT-information-was-still-being-generated-when-symbo.patch \
file://clang-bfd-fix.patch \
file://CVE-2018-17358.patch \
file://CVE-2018-17360.patch \
diff --git a/meta/recipes-devtools/binutils/binutils/0017-improve-check-for-input-file-matching-output-file.patch b/meta/recipes-devtools/binutils/binutils/0017-improve-check-for-input-file-matching-output-file.patch
deleted file mode 100644
index 265e52633b..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0017-improve-check-for-input-file-matching-output-file.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 2a50366ded329bfb39d387253450c9d5302c3503 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Tue, 14 Aug 2018 12:22:35 +0100
-Subject: [PATCH] as.c: Improve check for input file matching output file.
-
-When the assembler reports that the input and output are the same, report the
-file names involved, in order to help debugging. Also do not equate two files
-are the same if the have the same inode value but reside on different file
-systems.
-
-Upstream-Status: Backport
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- gas/as.c | 27 ++++++++++++++++++++-------
- 2 files changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/gas/as.c b/gas/as.c
-index b2a908a..3105d06 100644
---- a/gas/as.c
-+++ b/gas/as.c
-@@ -1259,14 +1259,27 @@ main (int argc, char ** argv)
- {
- struct stat sib;
-
-- if (stat (argv[i], &sib) == 0)
-+ /* Check that the input file and output file are different. */
-+ if (stat (argv[i], &sib) == 0
-+ && sib.st_ino == sob.st_ino
-+ /* POSIX emulating systems may support stat() but if the
-+ underlying file system does not support a file serial number
-+ of some kind then they will return 0 for the inode. So
-+ two files with an inode of 0 may not actually be the same.
-+ On real POSIX systems no ordinary file will ever have an
-+ inode of 0. */
-+ && sib.st_ino != 0
-+ /* Different files may have the same inode number if they
-+ reside on different devices, so check the st_dev field as
-+ well. */
-+ && sib.st_dev == sob.st_dev)
- {
-- if (sib.st_ino == sob.st_ino && sib.st_ino != 0)
-- {
-- /* Don't let as_fatal remove the output file! */
-- out_file_name = NULL;
-- as_fatal (_("The input and output files must be distinct"));
-- }
-+ const char *saved_out_file_name = out_file_name;
-+
-+ /* Don't let as_fatal remove the output file! */
-+ out_file_name = NULL;
-+ as_fatal (_("The input '%s' and output '%s' files are the same"),
-+ argv[i], saved_out_file_name);
- }
- }
- }
---
-2.7.4
-
diff --git a/meta/recipes-devtools/binutils/binutils/0018-Refactored-location-where-GOT-information-is-collect.patch b/meta/recipes-devtools/binutils/binutils/0018-Refactored-location-where-GOT-information-is-collect.patch
deleted file mode 100644
index d41339a9a6..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0018-Refactored-location-where-GOT-information-is-collect.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From d930affa2d475d1cc6792f1e6d56bef3d6c617db Mon Sep 17 00:00:00 2001
-From: Cupertino Miranda <cmiranda@synopsys.com>
-Date: Fri, 2 Mar 2018 17:16:21 +0100
-Subject: [PATCH] Refactored location where GOT information is collected.
-
-Change location where GOT information is collected for ARC target, avoiding
-posible use conflicts of the previous .got field in the symbols hash_entry.
-
-bfd/
-2018-03-01 Cupertino Miranda <cmiranda@synopsys.com>
-
- * arc-got.h (get_got_entry_list_for_symbol): Changed.
- * ef32-arc.c (struct elf_arc_link_hash_entry): Moved and changed.
- (elf_arc_link_hash_newfunc): Changed.
- (arc_elf_link_hash_table_create): Removed old initializations.
- (elf_arc_relocate_section, elf_arc_finish_dynamic_symbol): Changed.
-
-Signed-off-by: Cupertino Miranda <cmiranda@synopsys.com>
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
-[Romain: rebase on top of 2.31]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
-
-Upstream-Status: Pending
----
- bfd/arc-got.h | 6 +++--
- bfd/elf32-arc.c | 77 +++++++++++++++++++++++++++++++--------------------------
- 2 files changed, 46 insertions(+), 37 deletions(-)
-
-diff --git a/bfd/arc-got.h b/bfd/arc-got.h
-index a86061bcb38..81ce88fe21a 100644
---- a/bfd/arc-got.h
-+++ b/bfd/arc-got.h
-@@ -156,9 +156,11 @@ get_got_entry_list_for_symbol (bfd *abfd,
- unsigned long r_symndx,
- struct elf_link_hash_entry *h)
- {
-- if (h != NULL)
-+ struct elf_arc_link_hash_entry *h1 =
-+ ((struct elf_arc_link_hash_entry *) h);
-+ if (h1 != NULL)
- {
-- return &h->got.glist;
-+ return &h1->got_ents;
- }
- else
- {
-diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
-index a48ef0ca15f..ab84de43815 100644
---- a/bfd/elf32-arc.c
-+++ b/bfd/elf32-arc.c
-@@ -160,6 +160,18 @@ struct arc_relocation_data
- const char * symbol_name;
- };
-
-+/* ARC ELF linker hash entry. */
-+struct elf_arc_link_hash_entry
-+{
-+ struct elf_link_hash_entry root;
-+
-+ /* Track dynamic relocs copied for this symbol. */
-+ struct elf_dyn_relocs *dyn_relocs;
-+
-+ struct got_entry *got_ents;
-+};
-+
-+
- /* Should be included at this location due to static declarations
- defined before this point. */
- #include "arc-got.h"
-@@ -281,15 +293,6 @@ struct arc_reloc_map
- unsigned char elf_reloc_val;
- };
-
--/* ARC ELF linker hash entry. */
--struct elf_arc_link_hash_entry
--{
-- struct elf_link_hash_entry root;
--
-- /* Track dynamic relocs copied for this symbol. */
-- struct elf_dyn_relocs *dyn_relocs;
--};
--
- /* ARC ELF linker hash table. */
- struct elf_arc_link_hash_table
- {
-@@ -301,28 +304,28 @@ elf_arc_link_hash_newfunc (struct bfd_hash_entry *entry,
- struct bfd_hash_table *table,
- const char *string)
- {
-+ struct elf_arc_link_hash_entry * ret =
-+ (struct elf_arc_link_hash_entry *) entry;
-+
- /* Allocate the structure if it has not already been allocated by a
- subclass. */
-- if (entry == NULL)
-- {
-- entry = (struct bfd_hash_entry *)
-- bfd_hash_allocate (table,
-- sizeof (struct elf_arc_link_hash_entry));
-- if (entry == NULL)
-- return entry;
-- }
-+ if (ret == NULL)
-+ ret = (struct elf_arc_link_hash_entry *)
-+ bfd_hash_allocate (table, sizeof (struct elf_arc_link_hash_entry));
-+ if (ret == NULL)
-+ return (struct bfd_hash_entry *) ret;
-
- /* Call the allocation method of the superclass. */
-- entry = _bfd_elf_link_hash_newfunc (entry, table, string);
-- if (entry != NULL)
-+ ret = ((struct elf_arc_link_hash_entry *)
-+ _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-+ table, string));
-+ if (ret != NULL)
- {
-- struct elf_arc_link_hash_entry *eh;
--
-- eh = (struct elf_arc_link_hash_entry *) entry;
-- eh->dyn_relocs = NULL;
-+ ret->dyn_relocs = NULL;
-+ ret->got_ents = NULL;
- }
-
-- return entry;
-+ return (struct bfd_hash_entry *) ret;
- }
-
- /* Destroy an ARC ELF linker hash table. */
-@@ -352,11 +355,6 @@ arc_elf_link_hash_table_create (bfd *abfd)
- return NULL;
- }
-
-- ret->elf.init_got_refcount.refcount = 0;
-- ret->elf.init_got_refcount.glist = NULL;
-- ret->elf.init_got_offset.offset = 0;
-- ret->elf.init_got_offset.glist = NULL;
--
- ret->elf.root.hash_table_free = elf_arc_link_hash_table_free;
-
- return &ret->elf.root;
-@@ -1615,10 +1613,14 @@ elf_arc_relocate_section (bfd * output_bfd,
- while (h->root.type == bfd_link_hash_indirect
- || h->root.type == bfd_link_hash_warning)
- {
-- struct elf_link_hash_entry *h_old = h;
-+ struct elf_arc_link_hash_entry *ah_old =
-+ (struct elf_arc_link_hash_entry *) h;
- h = (struct elf_link_hash_entry *) h->root.u.i.link;
-- if (h->got.glist == 0 && h_old->got.glist != h->got.glist)
-- h->got.glist = h_old->got.glist;
-+ struct elf_arc_link_hash_entry *ah =
-+ (struct elf_arc_link_hash_entry *) h;
-+
-+ if (ah->got_ents == 0 && ah_old->got_ents != ah->got_ents)
-+ ah->got_ents = ah_old->got_ents;
- }
-
- /* TODO: Need to validate what was the intention. */
-@@ -1636,6 +1638,8 @@ elf_arc_relocate_section (bfd * output_bfd,
-
- if (is_reloc_for_GOT (howto) && !bfd_link_pic (info))
- {
-+ struct elf_arc_link_hash_entry *ah =
-+ (struct elf_arc_link_hash_entry *) h;
- /* TODO: Change it to use arc_do_relocation with
- ARC_32 reloc. Try to use ADD_RELA macro. */
- bfd_vma relocation =
-@@ -1645,8 +1649,8 @@ elf_arc_relocate_section (bfd * output_bfd,
- + reloc_data.sym_section->output_section->vma)
- : 0);
-
-- BFD_ASSERT (h->got.glist);
-- bfd_vma got_offset = h->got.glist->offset;
-+ BFD_ASSERT (ah->got_ents);
-+ bfd_vma got_offset = ah->got_ents->offset;
- bfd_put_32 (output_bfd, relocation,
- htab->sgot->contents + got_offset);
- }
-@@ -1958,6 +1962,7 @@ elf_arc_check_relocs (bfd * abfd,
- else /* Global one. */
- h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-
-+
- switch (r_type)
- {
- case R_ARC_32:
-@@ -2404,7 +2409,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd,
- create respective dynamic relocs. */
- /* TODO: Make function to get list and not access the list directly. */
- /* TODO: Move function to relocate_section create this relocs eagerly. */
-- create_got_dynrelocs_for_got_info (&h->got.glist,
-+ struct elf_arc_link_hash_entry *ah =
-+ (struct elf_arc_link_hash_entry *) h;
-+ create_got_dynrelocs_for_got_info (&ah->got_ents,
- output_bfd,
- info,
- h);
---
-2.14.4
-
diff --git a/meta/recipes-devtools/binutils/binutils/0019-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch b/meta/recipes-devtools/binutils/binutils/0019-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch
deleted file mode 100644
index 6a58ee06ac..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0019-Improved-robustness.-Return-FALSE-in-case-of-NULL-po.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 955176bd999fe80c5b937ab8786665079e35c387 Mon Sep 17 00:00:00 2001
-From: Cupertino Miranda <cmiranda@synopsys.com>
-Date: Fri, 2 Mar 2018 17:33:48 +0100
-Subject: [PATCH] Improved robustness. Return FALSE in case of NULL pointer.
-
-bfd/
-2018-03-01 Cupertino Miranda <cmiranda@synopsys.com>
-
- * elf32-arc.c (elf_arc_finish_dynamic_symbol) Return FALSE in case
- arc_htab is NULL.
-
-Signed-off-by: Cupertino Miranda <cmiranda@synopsys.com>
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
-[Romain: rebase on top of 2.31]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
-
-Upstream-Status: Pending
----
- bfd/elf32-arc.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
-index ab84de43815..33fc72cff6e 100644
---- a/bfd/elf32-arc.c
-+++ b/bfd/elf32-arc.c
-@@ -2420,6 +2420,9 @@ elf_arc_finish_dynamic_symbol (bfd * output_bfd,
- {
- struct elf_arc_link_hash_table *arc_htab = elf_arc_hash_table (info);
-
-+ if(arc_htab == NULL)
-+ return FALSE;
-+
- if (h->dynindx == -1
- || (h->root.type != bfd_link_hash_defined
- && h->root.type != bfd_link_hash_defweak)
---
-2.14.4
-
diff --git a/meta/recipes-devtools/binutils/binutils/0020-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch b/meta/recipes-devtools/binutils/binutils/0020-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch
deleted file mode 100644
index 01e42c03bb..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0020-Make-sure-global-symbol-is-not-an-indirect-or-warnin.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9d09ce14b4eef2b56f24660fd69a44acd45128b2 Mon Sep 17 00:00:00 2001
-From: Cupertino Miranda <cmiranda@synopsys.com>
-Date: Fri, 2 Mar 2018 17:38:14 +0100
-Subject: [PATCH] Make sure global symbol is not an indirect or warning.
-
-Problem identified in the context of glibc with latest upstream binutils.
-Dynamic symbol space was being reserved but, no actual information for the
-symbol was being set. Data for the symbol was kept initialized with -1.
-No easy test case was possible to be created.
-
-bfd/
-2018-03-01 Cupertino Miranda <cmiranda@synopsys.com>
-
- * elf32-arc.c (elf_arc_check_relocs): Changed.
-
-Signed-off-by: Cupertino Miranda <cmiranda@synopsys.com>
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
-[Romain: rebase on top of 2.31]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
-
-Upstream-Status: Pending
----
- bfd/elf32-arc.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
-index 33fc72cff6e..9b72c5b4f4f 100644
---- a/bfd/elf32-arc.c
-+++ b/bfd/elf32-arc.c
-@@ -1960,7 +1960,12 @@ elf_arc_check_relocs (bfd * abfd,
- if (r_symndx < symtab_hdr->sh_info) /* Is a local symbol. */
- h = NULL;
- else /* Global one. */
-- h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-+ {
-+ h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-+ while (h->root.type == bfd_link_hash_indirect
-+ || h->root.type == bfd_link_hash_warning)
-+ h = (struct elf_link_hash_entry *) h->root.u.i.link;
-+ }
-
-
- switch (r_type)
---
-2.14.4
-
diff --git a/meta/recipes-devtools/binutils/binutils/0021-PLT-information-was-still-being-generated-when-symbo.patch b/meta/recipes-devtools/binutils/binutils/0021-PLT-information-was-still-being-generated-when-symbo.patch
deleted file mode 100644
index 9e942399c0..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0021-PLT-information-was-still-being-generated-when-symbo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e4861c68067cb2166b4c2bb9c052abeb6ad9aaa1 Mon Sep 17 00:00:00 2001
-From: Cupertino Miranda <cmiranda@synopsys.com>
-Date: Fri, 2 Mar 2018 17:44:29 +0100
-Subject: [PATCH] PLT information was still being generated when symbol was
- forced_local.
-
-A change upstream reveiled this issue, triggering an assert when linking glibc.
-
-bfd/
-2018-03-01 Cupertino Miranda <cmiranda@synopsys.com>
-
- * elf32-arc.c (elf_arc_check_relocs): Changed.
-
-Signed-off-by: Cupertino Miranda <cmiranda@synopsys.com>
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
-[Romain: rebase on top of 2.31]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
-
-Upstream-Status: Pending
----
- bfd/elf32-arc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
-index 9b72c5b4f4f..b40b463d34d 100644
---- a/bfd/elf32-arc.c
-+++ b/bfd/elf32-arc.c
-@@ -2041,7 +2041,8 @@ elf_arc_check_relocs (bfd * abfd,
- if (h == NULL)
- continue;
- else
-- h->needs_plt = 1;
-+ if(h->forced_local == 0)
-+ h->needs_plt = 1;
- }
-
- /* Add info to the symbol got_entry_list. */
---
-2.14.4
-
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-17358.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-17358.patch
index 813509160f..d5a1ea1dc4 100644
--- a/meta/recipes-devtools/binutils/binutils/CVE-2018-17358.patch
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2018-17358.patch
@@ -21,25 +21,6 @@ Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
bfd/syms.c | 22 ++++++++++++++++------
3 files changed, 33 insertions(+), 7 deletions(-)
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index 04c0c2a..fef5479 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1,3 +1,12 @@
-+2018-09-20 Alan Modra <amodra@gmail.com>
-+
-+ PR 23686
-+ * dwarf2.c (read_section): Error when attempting to malloc
-+ "(bfd_size_type) -1".
-+ * syms.c (_bfd_stab_section_find_nearest_line): Bounds check
-+ function_name. Bounds check reloc address. Formatting. Ensure
-+ .stabstr zero terminated.
-+
- 2018-08-12 H.J. Lu <hongjiu.lu@intel.com>
-
- PR ld/23428
-diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
-index 3b28855..77a7368 100644
--- a/bfd/dwarf2.c
+++ b/bfd/dwarf2.c
@@ -527,6 +527,7 @@ read_section (bfd * abfd,
@@ -65,11 +46,9 @@ index 3b28855..77a7368 100644
if (contents == NULL)
return FALSE;
if (syms
-diff --git a/bfd/syms.c b/bfd/syms.c
-index 187071f..e09640a 100644
--- a/bfd/syms.c
+++ b/bfd/syms.c
-@@ -1035,6 +1035,10 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
+@@ -1035,6 +1035,10 @@ _bfd_stab_section_find_nearest_line (bfd
0, strsize))
return FALSE;
@@ -80,7 +59,7 @@ index 187071f..e09640a 100644
/* If this is a relocatable object file, we have to relocate
the entries in .stab. This should always be simple 32 bit
relocations against symbols defined in this object file, so
-@@ -1073,7 +1077,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
+@@ -1073,7 +1077,8 @@ _bfd_stab_section_find_nearest_line (bfd
|| r->howto->bitsize != 32
|| r->howto->pc_relative
|| r->howto->bitpos != 0
@@ -90,7 +69,7 @@ index 187071f..e09640a 100644
{
_bfd_error_handler
(_("unsupported .stab relocation"));
-@@ -1195,7 +1200,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
+@@ -1195,7 +1200,8 @@ _bfd_stab_section_find_nearest_line (bfd
{
nul_fun = stab;
nul_str = str;
@@ -100,7 +79,7 @@ index 187071f..e09640a 100644
file_name = NULL;
if (stab + STABSIZE + TYPEOFF < info->stabs + stabsize
&& *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO)
-@@ -1206,7 +1212,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
+@@ -1206,7 +1212,8 @@ _bfd_stab_section_find_nearest_line (bfd
directory_name = file_name;
file_name = ((char *) str
+ bfd_get_32 (abfd, stab + STRDXOFF));
@@ -110,7 +89,7 @@ index 187071f..e09640a 100644
file_name = NULL;
}
}
-@@ -1217,7 +1224,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
+@@ -1217,7 +1224,8 @@ _bfd_stab_section_find_nearest_line (bfd
file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
/* PR 17512: file: 0c680a1f. */
/* PR 17512: file: 5da8aec4. */
@@ -120,7 +99,7 @@ index 187071f..e09640a 100644
file_name = NULL;
break;
-@@ -1226,7 +1234,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
+@@ -1226,7 +1234,8 @@ _bfd_stab_section_find_nearest_line (bfd
function_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
if (function_name == (char *) str)
continue;
@@ -130,7 +109,7 @@ index 187071f..e09640a 100644
function_name = NULL;
nul_fun = NULL;
-@@ -1335,7 +1344,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
+@@ -1335,7 +1344,8 @@ _bfd_stab_section_find_nearest_line (bfd
if (val <= offset)
{
file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
@@ -140,5 +119,3 @@ index 187071f..e09640a 100644
file_name = NULL;
*pline = 0;
}
---
-2.9.3
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-17360.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-17360.patch
index cef10a7546..45c637967b 100644
--- a/meta/recipes-devtools/binutils/binutils/CVE-2018-17360.patch
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2018-17360.patch
@@ -15,27 +15,9 @@ Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
bfd/peXXigen.c | 11 ++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index fef5479..81b9e56 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1,5 +1,11 @@
- 2018-09-20 Alan Modra <amodra@gmail.com>
-
-+ PR 23685
-+ * peXXigen.c (pe_print_edata): Correct export address table
-+ overflow checks. Check dataoff against section size too.
-+
-+2018-09-20 Alan Modra <amodra@gmail.com>
-+
- PR 23686
- * dwarf2.c (read_section): Error when attempting to malloc
- "(bfd_size_type) -1".
-diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
-index 598f2ca..1645ef4 100644
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
-@@ -1661,7 +1661,8 @@ pe_print_edata (bfd * abfd, void * vfile)
+@@ -1661,7 +1661,8 @@ pe_print_edata (bfd * abfd, void * vfile
dataoff = addr - section->vma;
datasize = extra->DataDirectory[PE_EXPORT_TABLE].Size;
@@ -45,7 +27,7 @@ index 598f2ca..1645ef4 100644
{
fprintf (file,
_("\nThere is an export table in %s, but it does not fit into that section\n"),
-@@ -1778,11 +1779,11 @@ pe_print_edata (bfd * abfd, void * vfile)
+@@ -1778,11 +1779,11 @@ pe_print_edata (bfd * abfd, void * vfile
edt.base);
/* PR 17512: Handle corrupt PE binaries. */
@@ -61,5 +43,3 @@ index 598f2ca..1645ef4 100644
fprintf (file, _("\tInvalid Export Address Table rva (0x%lx) or entry count (0x%lx)\n"),
(long) edt.eat_addr,
(long) edt.num_functions);
---
-2.9.3
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-18309.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-18309.patch
index b240a3f994..010e6b5d53 100644
--- a/meta/recipes-devtools/binutils/binutils/CVE-2018-18309.patch
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2018-18309.patch
@@ -49,39 +49,9 @@ Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
bfd/reloc.c | 19 +++++++++++++------
14 files changed, 50 insertions(+), 23 deletions(-)
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index 68c1ff665b..e9696ee314 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1,3 +1,23 @@
-+2018-10-13 Alan Modra <amodra@gmail.com>
-+
-+ PR 23770
-+ PR 23425
-+ * reloc.c (_bfd_clear_contents): Replace "location" param with
-+ "buf" and "off". Bounds check "off". Return status.
-+ * cofflink.c (_bfd_coff_generic_relocate_section): Update
-+ _bfd_clear_contents call.
-+ * elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Likewise.
-+ * elf32-arc.c (elf_arc_relocate_section): Likewise.
-+ * elf32-i386.c (elf_i386_relocate_section): Likewise.
-+ * elf32-metag.c (metag_final_link_relocate): Likewise.
-+ * elf32-nds32.c (nds32_elf_get_relocated_section_contents): Likewise.
-+ * elf32-ppc.c (ppc_elf_relocate_section): Likewise.
-+ * elf32-visium.c (visium_elf_relocate_section): Likewise.
-+ * elf64-ppc.c (ppc64_elf_relocate_section): Likewise.
-+ * elf64-x86-64.c *(elf_x86_64_relocate_section): Likewise.
-+ * libbfd-in.h (_bfd_clear_contents): Update prototype.
-+ * libbfd.h: Regenerate.
-+
- 2018-09-20 Alan Modra <amodra@gmail.com>
-
- PR 23685
-diff --git a/bfd/cofflink.c b/bfd/cofflink.c
-index 2f73f72e31..b7ea69b7f9 100644
--- a/bfd/cofflink.c
+++ b/bfd/cofflink.c
-@@ -3080,7 +3080,7 @@ _bfd_coff_generic_relocate_section (bfd *output_bfd,
+@@ -3080,7 +3080,7 @@ _bfd_coff_generic_relocate_section (bfd
if (sec != NULL && discarded_section (sec))
{
_bfd_clear_contents (howto, input_bfd, input_section,
@@ -90,11 +60,9 @@ index 2f73f72e31..b7ea69b7f9 100644
continue;
}
-diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
-index cf256f70e0..3374f411f9 100644
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
-@@ -2811,7 +2811,7 @@ extern asection _bfd_elf_large_com_section;
+@@ -2811,7 +2811,7 @@ extern asection _bfd_elf_large_com_secti
{ \
int i_; \
_bfd_clear_contents (howto, input_bfd, input_section, \
@@ -103,11 +71,9 @@ index cf256f70e0..3374f411f9 100644
\
if (bfd_link_relocatable (info) \
&& (input_section->flags & SEC_DEBUGGING)) \
-diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
-index 7a1b3042ae..30f47a5b22 100644
--- a/bfd/elf32-arc.c
+++ b/bfd/elf32-arc.c
-@@ -1549,7 +1549,7 @@ elf_arc_relocate_section (bfd * output_bfd,
+@@ -1552,7 +1552,7 @@ elf_arc_relocate_section (bfd * outp
if (sec != NULL && discarded_section (sec))
{
_bfd_clear_contents (howto, input_bfd, input_section,
@@ -116,11 +82,9 @@ index 7a1b3042ae..30f47a5b22 100644
rel->r_info = 0;
rel->r_addend = 0;
-diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
-index 49797dcbfa..177471777d 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
-@@ -2197,7 +2197,7 @@ elf_i386_relocate_section (bfd *output_bfd,
+@@ -2197,7 +2197,7 @@ elf_i386_relocate_section (bfd *output_b
if (sec != NULL && discarded_section (sec))
{
_bfd_clear_contents (howto, input_bfd, input_section,
@@ -129,11 +93,9 @@ index 49797dcbfa..177471777d 100644
wrel->r_offset = rel->r_offset;
wrel->r_info = 0;
wrel->r_addend = 0;
-diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c
-index efe95bddff..7f96246e5d 100644
--- a/bfd/elf32-metag.c
+++ b/bfd/elf32-metag.c
-@@ -1396,7 +1396,7 @@ metag_final_link_relocate (reloc_howto_type *howto,
+@@ -1396,7 +1396,7 @@ metag_final_link_relocate (reloc_howto_t
rel, relend, howto, contents) \
{ \
_bfd_clear_contents (howto, input_bfd, input_section, \
@@ -142,11 +104,9 @@ index efe95bddff..7f96246e5d 100644
\
if (bfd_link_relocatable (info) \
&& (input_section->flags & SEC_DEBUGGING)) \
-diff --git a/bfd/elf32-nds32.c b/bfd/elf32-nds32.c
-index 0d86e5b865..184cf320f7 100644
--- a/bfd/elf32-nds32.c
+++ b/bfd/elf32-nds32.c
-@@ -12582,14 +12582,14 @@ nds32_elf_get_relocated_section_contents (bfd *abfd,
+@@ -12582,14 +12582,14 @@ nds32_elf_get_relocated_section_contents
symbol = *(*parent)->sym_ptr_ptr;
if (symbol->section && discarded_section (symbol->section))
{
@@ -165,11 +125,9 @@ index 0d86e5b865..184cf320f7 100644
(*parent)->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
(*parent)->addend = 0;
(*parent)->howto = &none_howto;
-diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
-index 61f70de12e..c31e26efd7 100644
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
-@@ -8232,7 +8232,7 @@ ppc_elf_relocate_section (bfd *output_bfd,
+@@ -8232,7 +8232,7 @@ ppc_elf_relocate_section (bfd *output_bf
howto = ppc_elf_howto_table[r_type];
_bfd_clear_contents (howto, input_bfd, input_section,
@@ -178,11 +136,9 @@ index 61f70de12e..c31e26efd7 100644
wrel->r_offset = rel->r_offset;
wrel->r_info = 0;
wrel->r_addend = 0;
-diff --git a/bfd/elf32-visium.c b/bfd/elf32-visium.c
-index e8f1c4c9e4..961366cd87 100644
--- a/bfd/elf32-visium.c
+++ b/bfd/elf32-visium.c
-@@ -621,7 +621,7 @@ visium_elf_relocate_section (bfd *output_bfd,
+@@ -621,7 +621,7 @@ visium_elf_relocate_section (bfd *output
or sections discarded by a linker script, we just want the
section contents zeroed. Avoid any special processing. */
_bfd_clear_contents (howto, input_bfd, input_section,
@@ -191,11 +147,9 @@ index e8f1c4c9e4..961366cd87 100644
rel->r_info = 0;
rel->r_addend = 0;
-diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
-index eadde17615..7c3534ac65 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
-@@ -14073,7 +14073,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
+@@ -14074,7 +14074,7 @@ ppc64_elf_relocate_section (bfd *output_
{
_bfd_clear_contents (ppc64_elf_howto_table[r_type],
input_bfd, input_section,
@@ -204,11 +158,9 @@ index eadde17615..7c3534ac65 100644
wrel->r_offset = rel->r_offset;
wrel->r_info = 0;
wrel->r_addend = 0;
-diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
-index c3a6c31ed2..4dcab43478 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
-@@ -2490,7 +2490,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
+@@ -2490,7 +2490,7 @@ elf_x86_64_relocate_section (bfd *output
if (sec != NULL && discarded_section (sec))
{
_bfd_clear_contents (howto, input_bfd, input_section,
@@ -217,11 +169,9 @@ index c3a6c31ed2..4dcab43478 100644
wrel->r_offset = rel->r_offset;
wrel->r_info = 0;
wrel->r_addend = 0;
-diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h
-index e53b255dad..f6d9565f03 100644
--- a/bfd/libbfd-in.h
+++ b/bfd/libbfd-in.h
-@@ -696,8 +696,8 @@ extern bfd_reloc_status_type _bfd_relocate_contents
+@@ -696,8 +696,8 @@ extern bfd_reloc_status_type _bfd_reloca
(reloc_howto_type *, bfd *, bfd_vma, bfd_byte *) ATTRIBUTE_HIDDEN;
/* Clear a given location using a given howto. */
@@ -232,11 +182,9 @@ index e53b255dad..f6d9565f03 100644
/* Link stabs in sections in the first pass. */
-diff --git a/bfd/libbfd.h b/bfd/libbfd.h
-index a8851c8026..1189e63358 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
-@@ -701,8 +701,8 @@ extern bfd_reloc_status_type _bfd_relocate_contents
+@@ -701,8 +701,8 @@ extern bfd_reloc_status_type _bfd_reloca
(reloc_howto_type *, bfd *, bfd_vma, bfd_byte *) ATTRIBUTE_HIDDEN;
/* Clear a given location using a given howto. */
@@ -247,11 +195,9 @@ index a8851c8026..1189e63358 100644
/* Link stabs in sections in the first pass. */
-diff --git a/bfd/reloc.c b/bfd/reloc.c
-index 8dbb8896d3..1686780669 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
-@@ -1613,16 +1613,22 @@ _bfd_relocate_contents (reloc_howto_type *howto,
+@@ -1613,16 +1613,22 @@ _bfd_relocate_contents (reloc_howto_type
relocations against discarded symbols, to make ignorable debug or unwind
information more obvious. */
@@ -276,7 +222,7 @@ index 8dbb8896d3..1686780669 100644
size = bfd_get_reloc_size (howto);
switch (size)
{
-@@ -1687,6 +1693,7 @@ _bfd_clear_contents (reloc_howto_type *howto,
+@@ -1681,6 +1687,7 @@ _bfd_clear_contents (reloc_howto_type *h
#endif
break;
}
@@ -284,7 +230,7 @@ index 8dbb8896d3..1686780669 100644
}
/*
-@@ -8275,14 +8282,14 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
+@@ -8268,14 +8275,14 @@ bfd_generic_get_relocated_section_conten
if (symbol->section && discarded_section (symbol->section))
{
@@ -303,6 +249,3 @@ index 8dbb8896d3..1686780669 100644
(*parent)->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
(*parent)->addend = 0;
(*parent)->howto = &none_howto;
---
-2.13.3
-
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-18605.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-18605.patch
index d6c7067715..a117f95df1 100644
--- a/meta/recipes-devtools/binutils/binutils/CVE-2018-18605.patch
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2018-18605.patch
@@ -15,25 +15,9 @@ Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
bfd/merge.c | 3 +++
2 files changed, 9 insertions(+)
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index 31ff3d6..da423b1 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1,3 +1,9 @@
-+2018-10-23 Alan Modra <amodra@gmail.com>
-+
-+ PR 23804
-+ * merge.c (_bfd_add_merge_section): Don't attempt to merge
-+ sections where size is not a multiple of entsize.
-+
- 2018-10-13 Alan Modra <amodra@gmail.com>
-
- PR 23770
-diff --git a/bfd/merge.c b/bfd/merge.c
-index 7904552..5e3bba0 100644
--- a/bfd/merge.c
+++ b/bfd/merge.c
-@@ -376,6 +376,9 @@ _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec,
+@@ -376,6 +376,9 @@ _bfd_add_merge_section (bfd *abfd, void
|| sec->entsize == 0)
return TRUE;
@@ -43,5 +27,3 @@ index 7904552..5e3bba0 100644
if ((sec->flags & SEC_RELOC) != 0)
{
/* We aren't prepared to handle relocations in merged sections. */
---
-2.9.3
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch
index 35cf328a14..325c339b88 100644
--- a/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2018-18606.patch
@@ -15,24 +15,6 @@ Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
bfd/merge.c | 15 +++++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index 1f3fc1c..c5f7ec7 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1,5 +1,11 @@
- 2018-10-23 Alan Modra <amodra@gmail.com>
-
-+ PR 23806
-+ * merge.c (_bfd_add_merge_section): Don't attempt to merge
-+ sections with ridiculously large alignments.
-+
-+2018-10-23 Alan Modra <amodra@gmail.com>
-+
- PR 23804
- * merge.c (_bfd_add_merge_section): Don't attempt to merge
- sections where size is not a multiple of entsize.
-diff --git a/bfd/merge.c b/bfd/merge.c
-index 5e3bba0..7de0c88 100644
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -24,6 +24,7 @@
@@ -43,7 +25,7 @@ index 5e3bba0..7de0c88 100644
#include "bfd.h"
#include "elf-bfd.h"
#include "libbfd.h"
-@@ -385,12 +386,18 @@ _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec,
+@@ -385,12 +386,18 @@ _bfd_add_merge_section (bfd *abfd, void
return TRUE;
}
@@ -66,5 +48,3 @@ index 5e3bba0..7de0c88 100644
{
/* Sanity check. If string character size is smaller than
alignment, then we require character size to be a power
---
-2.9.3
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch b/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch
index 38225d171e..902a90dbc3 100644
--- a/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2018-18607.patch
@@ -16,28 +16,9 @@ Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
bfd/elflink.c | 20 ++++++++++++++------
2 files changed, 21 insertions(+), 6 deletions(-)
-diff --git a/bfd/ChangeLog b/bfd/ChangeLog
-index da423b1..1f3fc1c 100644
---- a/bfd/ChangeLog
-+++ b/bfd/ChangeLog
-@@ -1,5 +1,12 @@
- 2018-10-23 Alan Modra <amodra@gmail.com>
-
-+ PR 23805
-+ * elflink.c (elf_link_input_bfd): Don't segfault on finding
-+ STT_TLS symbols without any TLS sections. Instead, change the
-+ symbol type to STT_NOTYPE.
-+
-+2018-10-23 Alan Modra <amodra@gmail.com>
-+
- PR 23806
- * merge.c (_bfd_add_merge_section): Don't attempt to merge
- sections with ridiculously large alignments.
-diff --git a/bfd/elflink.c b/bfd/elflink.c
-index c3876cb..87440db 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
-@@ -10489,8 +10489,11 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd)
+@@ -10496,8 +10496,11 @@ elf_link_input_bfd (struct elf_final_lin
if (ELF_ST_TYPE (osym.st_info) == STT_TLS)
{
/* STT_TLS symbols are relative to PT_TLS segment base. */
@@ -51,7 +32,7 @@ index c3876cb..87440db 100644
}
}
-@@ -11046,12 +11049,17 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd)
+@@ -11053,12 +11056,17 @@ elf_link_input_bfd (struct elf_final_lin
sym.st_value += osec->vma;
if (ELF_ST_TYPE (sym.st_info) == STT_TLS)
{
@@ -73,5 +54,3 @@ index c3876cb..87440db 100644
}
}
---
-2.9.3
diff --git a/meta/recipes-devtools/binutils/binutils/clang-bfd-fix.patch b/meta/recipes-devtools/binutils/binutils/clang-bfd-fix.patch
index caf78488df..29c0d48fed 100644
--- a/meta/recipes-devtools/binutils/binutils/clang-bfd-fix.patch
+++ b/meta/recipes-devtools/binutils/binutils/clang-bfd-fix.patch
@@ -17,11 +17,9 @@ Upstream-Status: Backport [Fixes differently]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Index: git/bfd/reloc.c
-===================================================================
---- git.orig/bfd/reloc.c
-+++ git/bfd/reloc.c
-@@ -1635,7 +1635,7 @@ _bfd_clear_contents (reloc_howto_type *h
+--- a/bfd/reloc.c
++++ b/bfd/reloc.c
+@@ -1629,7 +1629,7 @@ _bfd_clear_contents (reloc_howto_type *h
default:
abort ();
case 0:
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-12-26 20:10 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-26 20:09 [PATCH 01/10] grub2: Fix passing null to printf formats Khem Raj
2018-12-26 20:09 ` [PATCH 02/10] gnupg: Upgrade to 2.2.12 release Khem Raj
2018-12-26 20:09 ` [PATCH 03/10] gnupg: Do not apply -Woverride-init guard for gcc >= 9 Khem Raj
2018-12-26 20:09 ` [PATCH 04/10] nfs-utils: Disable format-overflow as Werror Khem Raj
2018-12-26 20:09 ` [PATCH 05/10] musl: Update to latest master Khem Raj
2018-12-26 20:09 ` [PATCH 06/10] libxcrypt: Upgrade to 4.4.2 Khem Raj
2018-12-26 20:09 ` [PATCH 07/10] gdb: Backport a fix to build with gcc9 Khem Raj
2018-12-26 20:09 ` [PATCH 08/10] valgrind: Fix x86_64 build failure " Khem Raj
2018-12-26 20:09 ` [PATCH 09/10] ffmpeg: Backport patch to fix build " Khem Raj
2018-12-26 20:09 ` [PATCH 10/10] binutils: Upgrade to latest on 2.31 release branch Khem Raj
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox