This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[sso] Merge from trunk @200329
- From: Eric Botcazou <ebotcazou at adacore dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Sat, 22 Jun 2013 22:18:23 +0200
- Subject: [sso] Merge from trunk @200329
Only 3 minor (self-inflicted) conflicts, but the attached patchlet is needed
after the latest LTO changes.
Bootstrapped/regtested on x86_64-suse-linux, applied on the branch.
2013-06-22 Eric Botcazou <ebotcazou@adacore.com>
* lto-streamer-out.c (hash_tree): Deal with TYPE_REVERSE_STORAGE_ORDER.
lto/
* lto.c (compare_tree_sccs_1): Likewise.
--
Eric Botcazou
--- /home/eric/svn/gcc/gcc/lto-streamer-out.c 2013-06-19 09:28:43.643284602 +0200
+++ /home/eric/svn/sso/gcc/lto-streamer-out.c 2013-06-22 16:44:02.124648377 +0200
@@ -707,7 +707,9 @@ hash_tree (struct streamer_tree_cache_d
if (code != TREE_BINFO)
v = iterative_hash_host_wide_int (TREE_PRIVATE (t), v);
if (TYPE_P (t))
- v = iterative_hash_host_wide_int (TYPE_SATURATING (t)
+ v = iterative_hash_host_wide_int ((AGGREGATE_TYPE_P (t)
+ ? TYPE_REVERSE_STORAGE_ORDER (t)
+ : TYPE_SATURATING (t))
| (TYPE_ADDR_SPACE (t) << 1), v);
else if (code == SSA_NAME)
v = iterative_hash_host_wide_int (SSA_NAME_IS_DEFAULT_DEF (t), v);
--- /home/eric/svn/gcc/gcc/lto/lto.c 2013-06-22 08:40:34.458244488 +0200
+++ /home/eric/svn/sso/gcc/lto/lto.c 2013-06-22 20:36:48.312324302 +0200
@@ -1799,7 +1799,10 @@ compare_tree_sccs_1 (tree t1, tree t2, t
compare_values (TREE_DEPRECATED);
if (TYPE_P (t1))
{
- compare_values (TYPE_SATURATING);
+ if (AGGREGATE_TYPE_P (t1))
+ compare_values (TYPE_REVERSE_STORAGE_ORDER);
+ else
+ compare_values (TYPE_SATURATING);
compare_values (TYPE_ADDR_SPACE);
}
else if (code == SSA_NAME)