diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2014-10-27 17:36:10 -0700 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-10-27 17:36:10 -0700 |
commit | e872e1a7c9742cc9bb990ef7b304c8dd9837ebdb (patch) | |
tree | 8f368a6106c45588d32de21a9518d9cf600cedde /build/tools/toolchain-patches/gcc | |
parent | c1b45a29e0737a5db543526a2c2dd35ff1e43c48 (diff) | |
download | ndk-e872e1a7c9742cc9bb990ef7b304c8dd9837ebdb.tar.gz |
Remove two local patches for aosp/toolchain/gcc
Due to merge of the following patches:
2d56bf64aecbd0ffa1f682674f2840a3573f0e6a
ab0bb7b89f358e00e28155be52ff96e25947f761
Change-Id: I5591d98b8baa6beb358893727d98918bd37039e5
Diffstat (limited to 'build/tools/toolchain-patches/gcc')
-rw-r--r-- | build/tools/toolchain-patches/gcc/0011-Enable-ifunc-for-bionic.patch | 26 | ||||
-rw-r--r-- | build/tools/toolchain-patches/gcc/0013-Fix-GCC4.9-segfaults-with-fauto-profile-and-Os.patch | 43 |
2 files changed, 0 insertions, 69 deletions
diff --git a/build/tools/toolchain-patches/gcc/0011-Enable-ifunc-for-bionic.patch b/build/tools/toolchain-patches/gcc/0011-Enable-ifunc-for-bionic.patch deleted file mode 100644 index 62996bc23..000000000 --- a/build/tools/toolchain-patches/gcc/0011-Enable-ifunc-for-bionic.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6be63d84382212d54396d5420021b673056b6cd1 Mon Sep 17 00:00:00 2001 -From: Andrew Hsieh <andrewhsieh@google.com> -Date: Tue, 22 Jul 2014 12:19:10 +0800 -Subject: [PATCH 1/2] Enable ifunc for bionic - -Change-Id: I35d41e06fd683f14f81a887de6461f31f3ebf35e ---- - gcc-4.9/gcc/config/linux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc-4.9/gcc/config/linux.c b/gcc-4.9/gcc/config/linux.c -index 6162675..1a5ec63 100644 ---- a/gcc-4.9/gcc/config/linux.c -+++ b/gcc-4.9/gcc/config/linux.c -@@ -28,7 +28,7 @@ along with GCC; see the file COPYING3. If not see - bool - linux_has_ifunc_p (void) - { -- return OPTION_BIONIC ? false : HAVE_GNU_INDIRECT_FUNCTION; -+ return HAVE_GNU_INDIRECT_FUNCTION; - } - - bool --- -2.0.0.526.g5318336 - diff --git a/build/tools/toolchain-patches/gcc/0013-Fix-GCC4.9-segfaults-with-fauto-profile-and-Os.patch b/build/tools/toolchain-patches/gcc/0013-Fix-GCC4.9-segfaults-with-fauto-profile-and-Os.patch deleted file mode 100644 index 7bbba037d..000000000 --- a/build/tools/toolchain-patches/gcc/0013-Fix-GCC4.9-segfaults-with-fauto-profile-and-Os.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6eb7414701d509174dd5e1b6966277463a820534 Mon Sep 17 00:00:00 2001 -From: Dehao Chen <dehao@google.com> -Date: Thu, 16 Oct 2014 16:23:00 +0800 -Subject: [PATCH] Fix GCC4.9 segfaults with -fauto-profile and -Os - -BUG=17997360 - -Change-Id: I0ccae39cb1399e6f058d524141ede990d2645927 ---- - gcc-4.9/gcc/auto-profile.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/gcc-4.9/gcc/auto-profile.c b/gcc-4.9/gcc/auto-profile.c -index 11c2016..c69c1e6 100644 ---- a/gcc-4.9/gcc/auto-profile.c -+++ b/gcc-4.9/gcc/auto-profile.c -@@ -1674,7 +1674,14 @@ afdo_annotate_cfg (const stmt_set &promoted_stmts) - counts_to_freqs (); - } - if (flag_value_profile_transformations) -- gimple_value_profile_transformations (); -+ { -+ gimple_value_profile_transformations (); -+ free_dominance_info (CDI_DOMINATORS); -+ free_dominance_info (CDI_POST_DOMINATORS); -+ calculate_dominance_info (CDI_POST_DOMINATORS); -+ calculate_dominance_info (CDI_DOMINATORS); -+ update_ssa (TODO_update_ssa); -+ } - } - - /* Wrapper function to invoke early inliner. */ -@@ -1756,7 +1763,6 @@ auto_profile (void) - early_inline (); - autofdo::afdo_annotate_cfg (promoted_stmts); - compute_function_frequency (); -- update_ssa (TODO_update_ssa); - - /* Local pure-const may imply need to fixup the cfg. */ - if (execute_fixup_cfg () & TODO_cleanup_cfg) --- -2.1.0.rc2.206.gedb03e5 - |