diff options
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.8.inc | 19 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.8/0036-PR-target-56102.patch | 83 |
2 files changed, 5 insertions, 97 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc index 8d50bf79d0..8d1729b980 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8.inc +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc @@ -1,20 +1,12 @@ require gcc-common.inc # Third digit in PV should be incremented after a minor release -# happens from this branch on gcc e.g. currently its 4.7.1 -# when 4.7.2 is releases and we bump SRCREV beyond the release -# on branch then PV should be incremented to 4.7.2+svnr${SRCPV} -# to reflect that change -PV = "4.8.1" +PV = "4.8.2" -# BINV should be incremented after updating to a revision -# after a minor gcc release (e.g. 4.7.1 or 4.7.2) has been made -# the value will be minor-release+1 e.g. if current minor release was -# 4.7.1 then the value below will have 2 which will mean 4.7.2 -# which will be next minor release and so on. +# BINV should be incremented to a revision after a minor gcc release -BINV = "4.8.1" +BINV = "4.8.2" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.8' ], d)}" @@ -65,7 +57,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ file://0035-wcast-qual-PR-55383.patch \ - file://0036-PR-target-56102.patch \ file://0037-gcc-4.8-PR56797.patch \ file://0038-gcc-4.8-build-args.patch \ file://0039-gcc-4.8-PR57717.patch \ @@ -78,8 +69,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://0046-libatomic-deptracking.patch \ file://0047-repomembug.patch \ " -SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304" -SRC_URI[sha256sum] = "545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813" +SRC_URI[md5sum] = "a3d7d63b9cb6b6ea049469a0c4a43c9d" +SRC_URI[sha256sum] = "09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8" 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.8/0036-PR-target-56102.patch b/meta/recipes-devtools/gcc/gcc-4.8/0036-PR-target-56102.patch deleted file mode 100644 index a9498fcb7e..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.8/0036-PR-target-56102.patch +++ /dev/null @@ -1,83 +0,0 @@ -From fa049b3584a1cc36c250205e3d5841e6a40ff677 Mon Sep 17 00:00:00 2001 -From: amker <amker@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Wed, 27 Mar 2013 08:16:54 +0000 -Subject: [PATCH] PR target/56102 - -* config/arm/arm.c (thumb1_rtx_costs, thumb1_size_rtx_costs): Fix rtx costs for SET/ASHIFT/ASHIFTRT/LSHIFTRT/ROTATERT patterns with mult-word mode. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@197155 138bc75d-0d04-0410-961f-82ee72b054a4 - -Upstream-Status: Backport -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57329 - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - gcc/config/arm/arm.c | 17 ++++++++++++++--- - 1 file changed, 14 insertions(+), 3 deletions(-) - -diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c -index 460d333..edf850d 100644 ---- a/gcc/config/arm/arm.c -+++ b/gcc/config/arm/arm.c -@@ -7094,7 +7094,7 @@ static inline int - thumb1_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) - { - enum machine_mode mode = GET_MODE (x); -- int total; -+ int total, words; - - switch (code) - { -@@ -7102,6 +7102,8 @@ thumb1_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) - case ASHIFTRT: - case LSHIFTRT: - case ROTATERT: -+ return (mode == SImode) ? COSTS_N_INSNS (1) : COSTS_N_INSNS (2); -+ - case PLUS: - case MINUS: - case COMPARE: -@@ -7125,7 +7127,10 @@ thumb1_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) - return COSTS_N_INSNS (1) + 16; - - case SET: -- return (COSTS_N_INSNS (1) -+ /* A SET doesn't have a mode, so let's look at the SET_DEST to get -+ the mode. */ -+ words = ARM_NUM_INTS (GET_MODE_SIZE (GET_MODE (SET_DEST (x)))); -+ return (COSTS_N_INSNS (words) - + 4 * ((MEM_P (SET_SRC (x))) - + MEM_P (SET_DEST (x)))); - -@@ -7822,6 +7827,7 @@ static inline int - thumb1_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) - { - enum machine_mode mode = GET_MODE (x); -+ int words; - - switch (code) - { -@@ -7829,6 +7835,8 @@ thumb1_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) - case ASHIFTRT: - case LSHIFTRT: - case ROTATERT: -+ return (mode == SImode) ? COSTS_N_INSNS (1) : COSTS_N_INSNS (2); -+ - case PLUS: - case MINUS: - case COMPARE: -@@ -7847,7 +7855,10 @@ thumb1_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) - return COSTS_N_INSNS (1); - - case SET: -- return (COSTS_N_INSNS (1) -+ /* A SET doesn't have a mode, so let's look at the SET_DEST to get -+ the mode. */ -+ words = ARM_NUM_INTS (GET_MODE_SIZE (GET_MODE (SET_DEST (x)))); -+ return (COSTS_N_INSNS (words) - + 4 * ((MEM_P (SET_SRC (x))) - + MEM_P (SET_DEST (x)))); - --- -1.8.2.1 - |