diff options
author | Khem Raj <raj.khem@gmail.com> | 2013-11-21 06:59:44 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-22 12:03:01 +0000 |
commit | b4a0164418bc34f6870d45da2e542ebe69a203b7 (patch) | |
tree | 4e36f500c7da26146c50dd764bf60ead5e4ac868 /meta/recipes-devtools/gcc | |
parent | fd32fcb9d4eb5c882e0a66282d42bc836cc2d8b4 (diff) | |
download | poky-b4a0164418bc34f6870d45da2e542ebe69a203b7.tar.gz |
gcc: Upgrade to 4.8.2
The details for bug fixes between 4.8.1 and 4.8.2 is here
http://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=4.8.2
Remove the patches that were applied upstream
(From OE-Core rev: 3e5922a2ed250361e76ea616baba2f8d9332e20f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc')
-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 @@ | |||
1 | require gcc-common.inc | 1 | require gcc-common.inc |
2 | 2 | ||
3 | # Third digit in PV should be incremented after a minor release | 3 | # Third digit in PV should be incremented after a minor release |
4 | # happens from this branch on gcc e.g. currently its 4.7.1 | ||
5 | # when 4.7.2 is releases and we bump SRCREV beyond the release | ||
6 | # on branch then PV should be incremented to 4.7.2+svnr${SRCPV} | ||
7 | # to reflect that change | ||
8 | 4 | ||
9 | PV = "4.8.1" | 5 | PV = "4.8.2" |
10 | 6 | ||
11 | # BINV should be incremented after updating to a revision | 7 | # BINV should be incremented to a revision after a minor gcc release |
12 | # after a minor gcc release (e.g. 4.7.1 or 4.7.2) has been made | ||
13 | # the value will be minor-release+1 e.g. if current minor release was | ||
14 | # 4.7.1 then the value below will have 2 which will mean 4.7.2 | ||
15 | # which will be next minor release and so on. | ||
16 | 8 | ||
17 | BINV = "4.8.1" | 9 | BINV = "4.8.2" |
18 | 10 | ||
19 | FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.8' ], d)}" | 11 | FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.8' ], d)}" |
20 | 12 | ||
@@ -65,7 +57,6 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ | |||
65 | file://0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ | 57 | file://0033-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch \ |
66 | file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ | 58 | file://0034-Use-the-multilib-config-files-from-B-instead-of-usin.patch \ |
67 | file://0035-wcast-qual-PR-55383.patch \ | 59 | file://0035-wcast-qual-PR-55383.patch \ |
68 | file://0036-PR-target-56102.patch \ | ||
69 | file://0037-gcc-4.8-PR56797.patch \ | 60 | file://0037-gcc-4.8-PR56797.patch \ |
70 | file://0038-gcc-4.8-build-args.patch \ | 61 | file://0038-gcc-4.8-build-args.patch \ |
71 | file://0039-gcc-4.8-PR57717.patch \ | 62 | file://0039-gcc-4.8-PR57717.patch \ |
@@ -78,8 +69,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ | |||
78 | file://0046-libatomic-deptracking.patch \ | 69 | file://0046-libatomic-deptracking.patch \ |
79 | file://0047-repomembug.patch \ | 70 | file://0047-repomembug.patch \ |
80 | " | 71 | " |
81 | SRC_URI[md5sum] = "3b2386c114cd74185aa3754b58a79304" | 72 | SRC_URI[md5sum] = "a3d7d63b9cb6b6ea049469a0c4a43c9d" |
82 | SRC_URI[sha256sum] = "545b44be3ad9f2c4e90e6880f5c9d4f0a8f0e5f67e1ffb0d45da9fa01bb05813" | 73 | SRC_URI[sha256sum] = "09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8" |
83 | 74 | ||
84 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" | 75 | S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" |
85 | B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" | 76 | 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 @@ | |||
1 | From fa049b3584a1cc36c250205e3d5841e6a40ff677 Mon Sep 17 00:00:00 2001 | ||
2 | From: amker <amker@138bc75d-0d04-0410-961f-82ee72b054a4> | ||
3 | Date: Wed, 27 Mar 2013 08:16:54 +0000 | ||
4 | Subject: [PATCH] PR target/56102 | ||
5 | |||
6 | * 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. | ||
7 | |||
8 | git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@197155 138bc75d-0d04-0410-961f-82ee72b054a4 | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57329 | ||
12 | |||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | --- | ||
15 | gcc/config/arm/arm.c | 17 ++++++++++++++--- | ||
16 | 1 file changed, 14 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c | ||
19 | index 460d333..edf850d 100644 | ||
20 | --- a/gcc/config/arm/arm.c | ||
21 | +++ b/gcc/config/arm/arm.c | ||
22 | @@ -7094,7 +7094,7 @@ static inline int | ||
23 | thumb1_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) | ||
24 | { | ||
25 | enum machine_mode mode = GET_MODE (x); | ||
26 | - int total; | ||
27 | + int total, words; | ||
28 | |||
29 | switch (code) | ||
30 | { | ||
31 | @@ -7102,6 +7102,8 @@ thumb1_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) | ||
32 | case ASHIFTRT: | ||
33 | case LSHIFTRT: | ||
34 | case ROTATERT: | ||
35 | + return (mode == SImode) ? COSTS_N_INSNS (1) : COSTS_N_INSNS (2); | ||
36 | + | ||
37 | case PLUS: | ||
38 | case MINUS: | ||
39 | case COMPARE: | ||
40 | @@ -7125,7 +7127,10 @@ thumb1_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) | ||
41 | return COSTS_N_INSNS (1) + 16; | ||
42 | |||
43 | case SET: | ||
44 | - return (COSTS_N_INSNS (1) | ||
45 | + /* A SET doesn't have a mode, so let's look at the SET_DEST to get | ||
46 | + the mode. */ | ||
47 | + words = ARM_NUM_INTS (GET_MODE_SIZE (GET_MODE (SET_DEST (x)))); | ||
48 | + return (COSTS_N_INSNS (words) | ||
49 | + 4 * ((MEM_P (SET_SRC (x))) | ||
50 | + MEM_P (SET_DEST (x)))); | ||
51 | |||
52 | @@ -7822,6 +7827,7 @@ static inline int | ||
53 | thumb1_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) | ||
54 | { | ||
55 | enum machine_mode mode = GET_MODE (x); | ||
56 | + int words; | ||
57 | |||
58 | switch (code) | ||
59 | { | ||
60 | @@ -7829,6 +7835,8 @@ thumb1_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) | ||
61 | case ASHIFTRT: | ||
62 | case LSHIFTRT: | ||
63 | case ROTATERT: | ||
64 | + return (mode == SImode) ? COSTS_N_INSNS (1) : COSTS_N_INSNS (2); | ||
65 | + | ||
66 | case PLUS: | ||
67 | case MINUS: | ||
68 | case COMPARE: | ||
69 | @@ -7847,7 +7855,10 @@ thumb1_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) | ||
70 | return COSTS_N_INSNS (1); | ||
71 | |||
72 | case SET: | ||
73 | - return (COSTS_N_INSNS (1) | ||
74 | + /* A SET doesn't have a mode, so let's look at the SET_DEST to get | ||
75 | + the mode. */ | ||
76 | + words = ARM_NUM_INTS (GET_MODE_SIZE (GET_MODE (SET_DEST (x)))); | ||
77 | + return (COSTS_N_INSNS (words) | ||
78 | + 4 * ((MEM_P (SET_SRC (x))) | ||
79 | + MEM_P (SET_DEST (x)))); | ||
80 | |||
81 | -- | ||
82 | 1.8.2.1 | ||
83 | |||