From 626f7c1b848defe1fb34c2b2c3f0664dca2a8366 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 9 Jul 2015 10:52:38 -0700 Subject: gcc-4.9: Upgrade to 4.9.3 Drop upsteamed patch for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66483 which is already in 4.9.3 rename 0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch to 0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch to keep the sequence Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-4.9.inc | 11 +++--- ...IBS_DIR-replacement-instead-of-hardcoding.patch | 24 +++++++++++++ ...racking.c-backport-from-gcc-trunk-r212178.patch | 39 ---------------------- ...IBS_DIR-replacement-instead-of-hardcoding.patch | 24 ------------- 4 files changed, 29 insertions(+), 69 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch delete mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch delete mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 9ed3e09dbd..d61eca7672 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -2,11 +2,11 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -PV = "4.9.2" +PV = "4.9.3" # BINV should be incremented to a revision after a minor gcc release -BINV = "4.9.2" +BINV = "4.9.3" FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-4.9:" @@ -77,11 +77,10 @@ SRC_URI = "\ file://0059-gcc-PR-rtl-optimization-63348.patch \ file://0060-Only-allow-e500-double-in-SPE_SIMD_REGNO_P-registers.patch \ file://0061-target-gcc-includedir.patch \ - file://0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch \ - file://0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ + file://0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \ " -SRC_URI[md5sum] = "4df8ee253b7f3863ad0b86359cd39c43" -SRC_URI[sha256sum] = "2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd" +SRC_URI[md5sum] = "6f831b4d251872736e8e9cc09746f327" +SRC_URI[sha256sum] = "2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e" S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-4.9/0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch new file mode 100644 index 0000000000..c48bd48478 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0062-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch @@ -0,0 +1,24 @@ +From 861bcfd4ae814f351e0c668ee26d01d1331e0422 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 28 Apr 2015 23:15:27 -0700 +Subject: [PATCH 36/37] Use SYSTEMLIBS_DIR replacement instead of hardcoding + base_libdir + +Signed-off-by: Khem Raj +--- + gcc/config/aarch64/aarch64-linux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: gcc-4.9.2/gcc/config/aarch64/aarch64-linux.h +=================================================================== +--- gcc-4.9.2.orig/gcc/config/aarch64/aarch64-linux.h ++++ gcc-4.9.2/gcc/config/aarch64/aarch64-linux.h +@@ -21,7 +21,7 @@ + #ifndef GCC_AARCH64_LINUX_H + #define GCC_AARCH64_LINUX_H + +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1" ++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}.so.1" + + #define CPP_SPEC "%{pthread:-D_REENTRANT}" + diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch b/meta/recipes-devtools/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch deleted file mode 100644 index c0ea62f0ef..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b30ffb8097749fdb55704aa7d8307ca1a58255d6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= -Date: Tue, 7 Apr 2015 16:15:11 +0200 -Subject: [PATCH] gcc/var-tracking.c: backport from gcc trunk r212178 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -resolves a bug seen on cortexa8 building qt5 libraries. - -2014-06-30 Joseph Myers - - * var-tracking.c (add_stores): Return instead of asserting if old - and new values for conditional store are the same. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212178 138bc75d-0d04-0410-961f-82ee72b054a4 - -Signed-off-by: Stefan Müller-Klieser ---- - gcc/var-tracking.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c -index 65d8285..7c38910 100644 ---- a/gcc/var-tracking.c -+++ b/gcc/var-tracking.c -@@ -5997,7 +5997,8 @@ add_stores (rtx loc, const_rtx expr, void *cuip) - { - cselib_val *oval = cselib_lookup (oloc, GET_MODE (oloc), 0, VOIDmode); - -- gcc_assert (oval != v); -+ if (oval == v) -+ return; - gcc_assert (REG_P (oloc) || MEM_P (oloc)); - - if (oval && !cselib_preserved_value_p (oval)) --- -1.9.1 - diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-4.9/0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch deleted file mode 100644 index c48bd48478..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.9/0063-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 861bcfd4ae814f351e0c668ee26d01d1331e0422 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 28 Apr 2015 23:15:27 -0700 -Subject: [PATCH 36/37] Use SYSTEMLIBS_DIR replacement instead of hardcoding - base_libdir - -Signed-off-by: Khem Raj ---- - gcc/config/aarch64/aarch64-linux.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gcc-4.9.2/gcc/config/aarch64/aarch64-linux.h -=================================================================== ---- gcc-4.9.2.orig/gcc/config/aarch64/aarch64-linux.h -+++ gcc-4.9.2/gcc/config/aarch64/aarch64-linux.h -@@ -21,7 +21,7 @@ - #ifndef GCC_AARCH64_LINUX_H - #define GCC_AARCH64_LINUX_H - --#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1" -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}.so.1" - - #define CPP_SPEC "%{pthread:-D_REENTRANT}" - -- cgit 1.2.3-korg