-Index: configure
+Index: libgomp/ChangeLog
===================================================================
---- configure (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ configure (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -7337,6 +7337,12 @@
- #line 7338 "configure"
- #include "confdefs.h"
-
-+#if (__GNUC__ < 3) \
-+ || (__GNUC__ == 3 && (__GNUC_MINOR__ < 3 \
-+ || (__GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ < 1)))
-+#error http://gcc.gnu.org/PR29382
-+#endif
-+
- int main() {
-
- ; return 0; }
-Index: gcc/tree-vrp.c
-===================================================================
---- gcc/tree-vrp.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/tree-vrp.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -195,7 +195,28 @@
- || operand_equal_p (val, TYPE_MIN_VALUE (TREE_TYPE (val)), 0)));
- }
-
-+/* If VAL is now an overflow infinity, return VAL. Otherwise, return
-+ the same value with TREE_OVERFLOW clear. This can be used to avoid
-+ confusing a regular value with an overflow value. */
-
-+static inline tree
-+avoid_overflow_infinity (tree val)
-+{
-+ if (!is_overflow_infinity (val))
-+ return val;
-+
-+ if (operand_equal_p (val, TYPE_MAX_VALUE (TREE_TYPE (val)), 0))
-+ return TYPE_MAX_VALUE (TREE_TYPE (val));
-+ else
-+ {
-+#ifdef ENABLE_CHECKING
-+ gcc_assert (operand_equal_p (val, TYPE_MIN_VALUE (TREE_TYPE (val)), 0));
-+#endif
-+ return TYPE_MIN_VALUE (TREE_TYPE (val));
-+ }
-+}
-+
+--- libgomp/ChangeLog (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libgomp/ChangeLog (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,3 +1,8 @@
++2012-03-22 Jakub Jelinek <jakub@redhat.com>
+
- /* Return whether VAL is equal to the maximum value of its type. This
- will be true for a positive overflow infinity. We can't do a
- simple equality comparison with TYPE_MAX_VALUE because C typedefs
-@@ -351,23 +372,11 @@
- infinity when we shouldn't. */
-
- static inline void
--set_value_range_to_value (value_range_t *vr, tree val)
-+set_value_range_to_value (value_range_t *vr, tree val, bitmap equiv)
- {
- gcc_assert (is_gimple_min_invariant (val));
-- if (is_overflow_infinity (val))
-- {
-- if (operand_equal_p (val, TYPE_MAX_VALUE (TREE_TYPE (val)), 0))
-- val = TYPE_MAX_VALUE (TREE_TYPE (val));
-- else
-- {
--#ifdef ENABLE_CHECKING
-- gcc_assert (operand_equal_p (val,
-- TYPE_MIN_VALUE (TREE_TYPE (val)), 0));
--#endif
-- val = TYPE_MIN_VALUE (TREE_TYPE (val));
-- }
-- }
-- set_value_range (vr, VR_RANGE, val, val, NULL);
-+ val = avoid_overflow_infinity (val);
-+ set_value_range (vr, VR_RANGE, val, val, equiv);
- }
-
- /* Set value range VR to a non-negative range of type TYPE.
-@@ -411,8 +420,7 @@
- static inline void
- set_value_range_to_null (value_range_t *vr, tree type)
- {
-- tree zero = build_int_cst (type, 0);
-- set_value_range (vr, VR_RANGE, zero, zero, vr->equiv);
-+ set_value_range_to_value (vr, build_int_cst (type, 0), vr->equiv);
- }
-
-
-@@ -763,7 +771,9 @@
- if (!TYPE_OVERFLOW_UNDEFINED (TREE_TYPE (val1)))
- return -2;
-
-- if (strict_overflow_p != NULL)
-+ if (strict_overflow_p != NULL
-+ && (code1 == SSA_NAME || !TREE_NO_WARNING (val1))
-+ && (code2 == SSA_NAME || !TREE_NO_WARNING (val2)))
- *strict_overflow_p = true;
-
- if (code1 == SSA_NAME)
-@@ -1028,6 +1038,8 @@
- cond_code = swap_tree_comparison (TREE_CODE (cond));
- }
-
-+ limit = avoid_overflow_infinity (limit);
++ PR middle-end/52547
++ * testsuite/libgomp.c/pr52547.c: New test.
+
- type = TREE_TYPE (limit);
- gcc_assert (limit != var);
-
-@@ -1167,6 +1179,8 @@
- {
- tree one = build_int_cst (type, 1);
- max = fold_build2 (MINUS_EXPR, type, max, one);
-+ if (EXPR_P (max))
-+ TREE_NO_WARNING (max) = 1;
- }
-
- set_value_range (vr_p, VR_RANGE, min, max, vr_p->equiv);
-@@ -1200,6 +1214,8 @@
- {
- tree one = build_int_cst (type, 1);
- min = fold_build2 (PLUS_EXPR, type, min, one);
-+ if (EXPR_P (min))
-+ TREE_NO_WARNING (min) = 1;
- }
+ 2012-03-22 Release Manager
- set_value_range (vr_p, VR_RANGE, min, max, vr_p->equiv);
-@@ -1619,7 +1635,7 @@
- if (TREE_CODE (op0) == SSA_NAME)
- vr0 = *(get_value_range (op0));
- else if (is_gimple_min_invariant (op0))
-- set_value_range_to_value (&vr0, op0);
-+ set_value_range_to_value (&vr0, op0, NULL);
- else
- set_value_range_to_varying (&vr0);
-
-@@ -1627,7 +1643,7 @@
- if (TREE_CODE (op1) == SSA_NAME)
- vr1 = *(get_value_range (op1));
- else if (is_gimple_min_invariant (op1))
-- set_value_range_to_value (&vr1, op1);
-+ set_value_range_to_value (&vr1, op1, NULL);
- else
- set_value_range_to_varying (&vr1);
-
-@@ -2006,7 +2022,7 @@
- if (TREE_CODE (op0) == SSA_NAME)
- vr0 = *(get_value_range (op0));
- else if (is_gimple_min_invariant (op0))
-- set_value_range_to_value (&vr0, op0);
-+ set_value_range_to_value (&vr0, op0, NULL);
- else
- set_value_range_to_varying (&vr0);
-
-@@ -2393,7 +2409,10 @@
- its type may be different from _Bool. Convert VAL to EXPR's
- type. */
- val = fold_convert (TREE_TYPE (expr), val);
-- set_value_range (vr, VR_RANGE, val, val, vr->equiv);
-+ if (is_gimple_min_invariant (val))
-+ set_value_range_to_value (vr, val, vr->equiv);
-+ else
-+ set_value_range (vr, VR_RANGE, val, val, vr->equiv);
- }
- else
- set_value_range_to_varying (vr);
-@@ -2424,7 +2443,7 @@
- else if (TREE_CODE_CLASS (code) == tcc_comparison)
- extract_range_from_comparison (vr, expr);
- else if (is_gimple_min_invariant (expr))
-- set_value_range_to_value (vr, expr);
-+ set_value_range_to_value (vr, expr, NULL);
- else
- set_value_range_to_varying (vr);
-
-@@ -2545,6 +2564,13 @@
- if (compare_values (min, max) == 1)
- return;
- }
+ * GCC 4.7.0 released.
+Index: libgomp/testsuite/libgomp.c/pr52547.c
+===================================================================
+--- libgomp/testsuite/libgomp.c/pr52547.c (.../tags/gcc_4_7_0_release) (wersja 0)
++++ libgomp/testsuite/libgomp.c/pr52547.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,36 @@
++/* PR middle-end/52547 */
++/* { dg-do run } */
+
-+ /* According to the loop information, the variable does not
-+ overflow. If we think it does, probably because of an
-+ overflow due to arithmetic on a different INF value,
-+ reset now. */
-+ if (is_negative_overflow_infinity (min))
-+ min = tmin;
- }
- else
- {
-@@ -2557,13 +2583,62 @@
- if (compare_values (min, max) == 1)
- return;
- }
++extern void abort (void);
+
-+ if (is_positive_overflow_infinity (max))
-+ max = tmax;
- }
-
- set_value_range (vr, VR_RANGE, min, max, vr->equiv);
- }
- }
-
-+/* Return true if VAR may overflow at STMT. This checks any available
-+ loop information to see if we can determine that VAR does not
-+ overflow. */
-
-+static bool
-+vrp_var_may_overflow (tree var, tree stmt)
++__attribute__((noinline, noclone)) int
++baz (int *x, int (*fn) (int *))
+{
-+ struct loop *l;
-+ tree chrec, init, step;
-+
-+ if (current_loops == NULL)
-+ return true;
-+
-+ l = loop_containing_stmt (stmt);
-+ if (l == NULL)
-+ return true;
-+
-+ chrec = instantiate_parameters (l, analyze_scalar_evolution (l, var));
-+ if (TREE_CODE (chrec) != POLYNOMIAL_CHREC)
-+ return true;
-+
-+ init = initial_condition_in_loop_num (chrec, l->num);
-+ step = evolution_part_in_loop_num (chrec, l->num);
-+
-+ if (step == NULL_TREE
-+ || !is_gimple_min_invariant (step)
-+ || !valid_value_p (init))
-+ return true;
-+
-+ /* If we get here, we know something useful about VAR based on the
-+ loop information. If it wraps, it may overflow. */
-+
-+ if (scev_probably_wraps_p (init, step, stmt,
-+ current_loops->parray[CHREC_VARIABLE (chrec)],
-+ true))
-+ return true;
++ return fn (x);
++}
+
-+ if (dump_file && (dump_flags & TDF_DETAILS) != 0)
++__attribute__((noinline, noclone)) int
++foo (int x, int *y)
++{
++ int i, e = 0;
++#pragma omp parallel for reduction(|:e)
++ for (i = 0; i < x; ++i)
+ {
-+ print_generic_expr (dump_file, var, 0);
-+ fprintf (dump_file, ": loop information indicates does not overflow\n");
++ __label__ lab;
++ int bar (int *z) { return z - y; }
++ if (baz (&y[i], bar) != i)
++ e |= 1;
+ }
++ return e;
++}
+
-+ return false;
++int
++main ()
++{
++ int a[100], i;
++ for (i = 0; i < 100; i++)
++ a[i] = i;
++ if (foo (100, a))
++ abort ();
++ return 0;
+}
+Index: libstdc++-v3/include/Makefile.in
+===================================================================
+--- libstdc++-v3/include/Makefile.in (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libstdc++-v3/include/Makefile.in (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1497,7 +1497,7 @@
+ sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \
+ -e "s,define _GLIBCXX_INLINE_VERSION, define _GLIBCXX_INLINE_VERSION $$ns_version," \
+ -e "s,define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY, define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY $$visibility," \
+- -e "s,define _GLIBCXX_EXTERN_TEMPLATE, define _GLIBCXX_EXTERN_TEMPLATE $$externtemplate," \
++ -e "s,define _GLIBCXX_EXTERN_TEMPLATE$$, define _GLIBCXX_EXTERN_TEMPLATE $$externtemplate," \
+ -e "$$ldbl_compat" \
+ < ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
+ sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
+Index: libstdc++-v3/include/debug/safe_iterator.h
+===================================================================
+--- libstdc++-v3/include/debug/safe_iterator.h (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libstdc++-v3/include/debug/safe_iterator.h (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,6 +1,6 @@
+ // Safe iterator implementation -*- C++ -*-
+
+-// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010, 2011
++// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010, 2011, 2012
+ // Free Software Foundation, Inc.
+ //
+ // This file is part of the GNU ISO C++ Library. This library is free
+@@ -169,7 +169,25 @@
+ ._M_iterator(__x, "other"));
+ }
+
++#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ /**
++ * @brief Move construction.
++ * @post __x is singular and unattached
++ */
++ _Safe_iterator(_Safe_iterator&& __x) : _M_current()
++ {
++ _GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
++ || __x._M_current == _Iterator(),
++ _M_message(__msg_init_copy_singular)
++ ._M_iterator(*this, "this")
++ ._M_iterator(__x, "other"));
++ std::swap(_M_current, __x._M_current);
++ this->_M_attach(__x._M_sequence);
++ __x._M_detach();
++ }
++#endif
+
++ /**
+ * @brief Converting constructor from a mutable iterator to a
+ * constant iterator.
+ */
+@@ -208,7 +226,28 @@
+ return *this;
+ }
+
++#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ /**
++ * @brief Move assignment.
++ * @post __x is singular and unattached
++ */
++ _Safe_iterator&
++ operator=(_Safe_iterator&& __x)
++ {
++ _GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
++ || __x._M_current == _Iterator(),
++ _M_message(__msg_copy_singular)
++ ._M_iterator(*this, "this")
++ ._M_iterator(__x, "other"));
++ _M_current = __x._M_current;
++ _M_attach(__x._M_sequence);
++ __x._M_detach();
++ __x._M_current = _Iterator();
++ return *this;
++ }
++#endif
+
- /* Given two numeric value ranges VR0, VR1 and a comparison code COMP:
-
- - Return BOOLEAN_TRUE_NODE if VR0 COMP VR1 always returns true for
-@@ -4156,7 +4231,7 @@
- t = retval = NULL_TREE;
- EXECUTE_IF_SET_IN_BITMAP (e2, 0, i2, bi2)
- {
-- bool sop;
-+ bool sop = false;
-
- value_range_t vr2 = *(vr_value[i2]);
-
-@@ -4773,7 +4848,8 @@
- if (vrp_val_is_max (vr_result.max))
- goto varying;
-
-- if (!needs_overflow_infinity (TREE_TYPE (vr_result.min)))
-+ if (!needs_overflow_infinity (TREE_TYPE (vr_result.min))
-+ || !vrp_var_may_overflow (lhs, phi))
- vr_result.min = TYPE_MIN_VALUE (TREE_TYPE (vr_result.min));
- else if (supports_overflow_infinity (TREE_TYPE (vr_result.min)))
- vr_result.min =
-@@ -4791,7 +4867,8 @@
- if (vrp_val_is_min (vr_result.min))
- goto varying;
-
-- if (!needs_overflow_infinity (TREE_TYPE (vr_result.max)))
-+ if (!needs_overflow_infinity (TREE_TYPE (vr_result.max))
-+ || !vrp_var_may_overflow (lhs, phi))
- vr_result.max = TYPE_MAX_VALUE (TREE_TYPE (vr_result.max));
- else if (supports_overflow_infinity (TREE_TYPE (vr_result.max)))
- vr_result.max =
-@@ -4971,6 +5048,8 @@
- {
- tree one = build_int_cst (TREE_TYPE (op0), 1);
- max = fold_build2 (MINUS_EXPR, TREE_TYPE (op0), max, one);
-+ if (EXPR_P (max))
-+ TREE_NO_WARNING (max) = 1;
- }
- }
- else if (cond_code == GE_EXPR || cond_code == GT_EXPR)
-@@ -4984,6 +5063,8 @@
- {
- tree one = build_int_cst (TREE_TYPE (op0), 1);
- min = fold_build2 (PLUS_EXPR, TREE_TYPE (op0), min, one);
-+ if (EXPR_P (min))
-+ TREE_NO_WARNING (min) = 1;
- }
- }
++ /**
+ * @brief Iterator dereference.
+ * @pre iterator is dereferenceable
+ */
+@@ -422,7 +461,9 @@
+ /// Is this iterator equal to the sequence's before_begin() iterator if
+ /// any?
+ bool _M_is_before_begin() const
+- { return _BeforeBeginHelper<_Sequence>::_M_Is(base(), _M_get_sequence()); }
++ {
++ return _BeforeBeginHelper<_Sequence>::_M_Is(base(), _M_get_sequence());
++ }
+ };
-Index: gcc/DATESTAMP
-===================================================================
---- gcc/DATESTAMP (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/DATESTAMP (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1 +1 @@
--20070514
-+20070609
-Index: gcc/pointer-set.c
+ template<typename _IteratorL, typename _IteratorR, typename _Sequence>
+Index: libstdc++-v3/include/std/array
===================================================================
---- gcc/pointer-set.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/pointer-set.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -22,13 +22,12 @@
- #include "system.h"
- #include "pointer-set.h"
-
--/* A pointer sets is represented as a simple open-addressing hash
-+/* A pointer set is represented as a simple open-addressing hash
- table. Simplifications: The hash code is based on the value of the
- pointer, not what it points to. The number of buckets is always a
- power of 2. Null pointers are a reserved value. Deletion is not
-- supported. There is no mechanism for user control of hash
-- function, equality comparison, initial size, or resizing policy.
--*/
-+ supported (yet). There is no mechanism for user control of hash
-+ function, equality comparison, initial size, or resizing policy. */
-
- struct pointer_set_t
- {
-@@ -114,22 +113,16 @@
- }
- }
+--- libstdc++-v3/include/std/array (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libstdc++-v3/include/std/array (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,6 +1,7 @@
+ // <array> -*- C++ -*-
--/* Subroutine of pointer_set_insert. Inserts P into an empty
-- element of SLOTS, an array of length N_SLOTS. Returns nonzero
-- if P was already present in N_SLOTS. */
--static int
-+/* Subroutine of pointer_set_insert. Return the insertion slot for P into
-+ an empty element of SLOTS, an array of length N_SLOTS. */
-+static inline size_t
- insert_aux (void *p, void **slots, size_t n_slots, size_t log_slots)
- {
- size_t n = hash1 (p, n_slots, log_slots);
- while (true)
- {
-- if (slots[n] == p)
-- return 1;
-- else if (slots[n] == 0)
-- {
-- slots[n] = p;
-- return 0;
-- }
-+ if (slots[n] == p || slots[n] == 0)
-+ return n;
- else
- {
- ++n;
-@@ -144,12 +137,10 @@
- int
- pointer_set_insert (struct pointer_set_t *pset, void *p)
- {
-- if (insert_aux (p, pset->slots, pset->n_slots, pset->log_slots))
-- return 1;
--
-- /* We've inserted a new element. Expand the table if necessary to keep
-- the load factor small. */
-- ++pset->n_elements;
-+ size_t n;
-+
-+ /* For simplicity, expand the set even if P is already there. This can be
-+ superfluous but can happen at most once. */
- if (pset->n_elements > pset->n_slots / 4)
- {
- size_t new_log_slots = pset->log_slots + 1;
-@@ -158,9 +149,10 @@
- size_t i;
-
- for (i = 0; i < pset->n_slots; ++i)
-- {
-- if (pset->slots[i])
-- insert_aux (pset->slots[i], new_slots, new_n_slots, new_log_slots);
-+ {
-+ void *value = pset->slots[i];
-+ n = insert_aux (value, new_slots, new_n_slots, new_log_slots);
-+ new_slots[n] = value;
- }
+-// Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
++// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012
++// Free Software Foundation, Inc.
+ //
+ // This file is part of the GNU ISO C++ Library. This library is free
+ // software; you can redistribute it and/or modify it under the
+@@ -174,8 +175,9 @@
+ const_reference
+ at(size_type __n) const
+ {
+- return __n < _Nm ?
+- _M_instance[__n] : __throw_out_of_range(__N("array::at"));
++ if (__n >= _Nm)
++ std::__throw_out_of_range(__N("array::at"));
++ return _M_instance[__n];
+ }
+ #endif
- XDELETEVEC (pset->slots);
-@@ -169,5 +161,144 @@
- pset->slots = new_slots;
- }
+Index: libstdc++-v3/include/bits/forward_list.h
+===================================================================
+--- libstdc++-v3/include/bits/forward_list.h (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libstdc++-v3/include/bits/forward_list.h (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,6 +1,6 @@
+ // <forward_list.h> -*- C++ -*-
-+ n = insert_aux (p, pset->slots, pset->n_slots, pset->log_slots);
-+ if (pset->slots[n])
-+ return 1;
-+
-+ pset->slots[n] = p;
-+ ++pset->n_elements;
- return 0;
- }
-+
-+/* Pass each pointer in PSET to the function in FN, together with the fixed
-+ parameter DATA. If FN returns false, the iteration stops. */
-+
-+void pointer_set_traverse (struct pointer_set_t *pset,
-+ bool (*fn) (void *, void *), void *data)
-+{
-+ size_t i;
-+ for (i = 0; i < pset->n_slots; ++i)
-+ if (pset->slots[i] && !fn (pset->slots[i], data))
-+ break;
-+}
+-// Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
++// Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ //
+ // This file is part of the GNU ISO C++ Library. This library is free
+ // software; you can redistribute it and/or modify it under the
+@@ -606,8 +606,8 @@
+ * in the range [@a __first,@a __last).
+ *
+ * Note that the assignment completely changes the %forward_list and
+- * that the resulting %forward_list's size is the same as the number
+- * of elements assigned. Old data may be lost.
++ * that the number of elements of the resulting %forward_list's is the
++ * same as the number of elements assigned. Old data is lost.
+ */
+ template<typename _InputIterator>
+ void
+@@ -622,10 +622,10 @@
+ * @param __n Number of elements to be assigned.
+ * @param __val Value to be assigned.
+ *
+- * This function fills a %forward_list with @a __n copies of the given
+- * value. Note that the assignment completely changes the
+- * %forward_list and that the resulting %forward_list's size is the
+- * same as the number of elements assigned. Old data may be lost.
++ * This function fills a %forward_list with @a __n copies of the
++ * given value. Note that the assignment completely changes the
++ * %forward_list, and that the resulting %forward_list has __n
++ * elements. Old data is lost.
+ */
+ void
+ assign(size_type __n, const _Tp& __val)
+@@ -744,7 +744,7 @@
+ { return this->_M_impl._M_head._M_next == 0; }
+
+ /**
+- * Returns the largest possible size of %forward_list.
++ * Returns the largest possible number of elements of %forward_list.
+ */
+ size_type
+ max_size() const noexcept
+@@ -997,9 +997,9 @@
+ *
+ * This function will %resize the %forward_list to the specified
+ * number of elements. If the number is smaller than the
+- * %forward_list's current size the %forward_list is truncated,
+- * otherwise the %forward_list is extended and the new elements
+- * are default constructed.
++ * %forward_list's current number of elements the %forward_list
++ * is truncated, otherwise the %forward_list is extended and the
++ * new elements are default constructed.
+ */
+ void
+ resize(size_type __sz);
+@@ -1012,9 +1012,9 @@
+ *
+ * This function will %resize the %forward_list to the specified
+ * number of elements. If the number is smaller than the
+- * %forward_list's current size the %forward_list is truncated,
+- * otherwise the %forward_list is extended and new elements are
+- * populated with given data.
++ * %forward_list's current number of elements the %forward_list
++ * is truncated, otherwise the %forward_list is extended and new
++ * elements are populated with given data.
+ */
+ void
+ resize(size_type __sz, const value_type& __val);
+@@ -1240,11 +1240,11 @@
+ * @brief Forward list equality comparison.
+ * @param __lx A %forward_list
+ * @param __ly A %forward_list of the same type as @a __lx.
+- * @return True iff the size and elements of the forward lists are equal.
++ * @return True iff the elements of the forward lists are equal.
+ *
+- * This is an equivalence relation. It is linear in the size of the
+- * forward lists. Deques are considered equivalent if corresponding
+- * elements compare equal.
++ * This is an equivalence relation. It is linear in the number of
++ * elements of the forward lists. Deques are considered equivalent
++ * if corresponding elements compare equal.
+ */
+ template<typename _Tp, typename _Alloc>
+ bool
+@@ -1257,8 +1257,9 @@
+ * @param __ly A %forward_list of the same type as @a __lx.
+ * @return True iff @a __lx is lexicographically less than @a __ly.
+ *
+- * This is a total ordering relation. It is linear in the size of the
+- * forward lists. The elements must be comparable with @c <.
++ * This is a total ordering relation. It is linear in the number of
++ * elements of the forward lists. The elements must be comparable
++ * with @c <.
+ *
+ * See std::lexicographical_compare() for how the determination is made.
+ */
+Index: libstdc++-v3/include/Makefile.am
+===================================================================
+--- libstdc++-v3/include/Makefile.am (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libstdc++-v3/include/Makefile.am (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,7 +1,7 @@
+ ## Makefile for the include subdirectory of the GNU C++ Standard library.
+ ##
+ ## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+-## 2011
++## 2011, 2012
+ ## Free Software Foundation, Inc.
+ ##
+ ## This file is part of the libstdc++ version 3 distribution.
+@@ -1105,7 +1105,7 @@
+ sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \
+ -e "s,define _GLIBCXX_INLINE_VERSION, define _GLIBCXX_INLINE_VERSION $$ns_version," \
+ -e "s,define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY, define _GLIBCXX_HAVE_ATTRIBUTE_VISIBILITY $$visibility," \
+- -e "s,define _GLIBCXX_EXTERN_TEMPLATE, define _GLIBCXX_EXTERN_TEMPLATE $$externtemplate," \
++ -e "s,define _GLIBCXX_EXTERN_TEMPLATE$$, define _GLIBCXX_EXTERN_TEMPLATE $$externtemplate," \
+ -e "$$ldbl_compat" \
+ < ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
+ sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
+Index: libstdc++-v3/ChangeLog
+===================================================================
+--- libstdc++-v3/ChangeLog (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libstdc++-v3/ChangeLog (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,3 +1,30 @@
++2012-03-23 David S. Miller <davem@davemloft.net>
+
-+\f
-+/* A pointer map is represented the same way as a pointer_set, so
-+ the hash code is based on the address of the key, rather than
-+ its contents. Null keys are a reserved value. Deletion is not
-+ supported (yet). There is no mechanism for user control of hash
-+ function, equality comparison, initial size, or resizing policy. */
++ * config/abi/post/sparc-linux-gnu/baseline_symbols.txt: Update.
+
-+struct pointer_map_t
-+{
-+ size_t log_slots;
-+ size_t n_slots; /* n_slots = 2^log_slots */
-+ size_t n_elements;
++2012-03-23 Paolo Carlini <paolo.carlini@oracle.com>
+
-+ void **keys;
-+ void **values;
-+};
++ * include/bits/forward_list.h: Fix comments.
+
-+/* Allocate an empty pointer map. */
-+struct pointer_map_t *
-+pointer_map_create (void)
-+{
-+ struct pointer_map_t *result = XNEW (struct pointer_map_t);
++2012-03-23 Paweł Sikora <pawel.sikora@agmk.net>
+
-+ result->n_elements = 0;
-+ result->log_slots = 8;
-+ result->n_slots = (size_t) 1 << result->log_slots;
++ PR libstdc++/52540
++ * include/Makefile.am (c++config.h): Fix sed rule to not break
++ the _GLIBCXX_EXTERN_TEMPLATE redefinition.
++ * include/Makefile.in: Regenerate.
+
-+ result->keys = XCNEWVEC (void *, result->n_slots);
-+ result->values = XCNEWVEC (void *, result->n_slots);
-+ return result;
-+}
++2012-03-22 Jonathan Wakely <jwakely.gcc@gmail.com>
++
++ PR libstdc++/52433
++ * include/debug/safe_iterator.h (_Safe_iterator): Add move
++ constructor and move assignment operator.
++ * testsuite/23_containers/vector/debug/52433.cc: New.
++
++2012-03-22 Paolo Carlini <paolo.carlini@oracle.com>
++
++ * include/std/array (array<>::at(size_type) const): Fix version
++ for undefined __EXCEPTIONS.
++
+ 2012-03-22 Release Manager
+
+ * GCC 4.7.0 released.
+Index: libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc
+===================================================================
+--- libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc (.../tags/gcc_4_7_0_release) (wersja 0)
++++ libstdc++-v3/testsuite/23_containers/vector/debug/52433.cc (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,43 @@
++// Copyright (C) 2012 Free Software Foundation, Inc.
++//
++// This file is part of the GNU ISO C++ Library. This library is free
++// software; you can redistribute it and/or modify it under the
++// terms of the GNU General Public License as published by the
++// Free Software Foundation; either version 3, or (at your option)
++// any later version.
++//
++// This library is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License along
++// with this library; see the file COPYING3. If not see
++// <http://www.gnu.org/licenses/>.
++//
++// { dg-require-debug-mode "" }
++// { dg-options "-std=gnu++0x" }
++// { dg-do compile }
+
-+/* Reclaims all memory associated with PMAP. */
-+void pointer_map_destroy (struct pointer_map_t *pmap)
-+{
-+ XDELETEVEC (pmap->keys);
-+ XDELETEVEC (pmap->values);
-+ XDELETE (pmap);
-+}
++// PR libstdc++/52433
+
-+/* Returns a pointer to the value to which P maps, if PMAP contains P. P
-+ must be nonnull. Return NULL if PMAP does not contain P.
++#include <vector>
+
-+ Collisions are resolved by linear probing. */
-+void **
-+pointer_map_contains (struct pointer_map_t *pmap, void *p)
++struct X
+{
-+ size_t n = hash1 (p, pmap->n_slots, pmap->log_slots);
++ std::vector<int>::iterator i;
+
-+ while (true)
-+ {
-+ if (pmap->keys[n] == p)
-+ return &pmap->values[n];
-+ else if (pmap->keys[n] == 0)
-+ return NULL;
-+ else
-+ {
-+ ++n;
-+ if (n == pmap->n_slots)
-+ n = 0;
-+ }
-+ }
-+}
++ X() = default;
++ X(const X&) = default;
++ X(X&&) = default;
++ X& operator=(const X&) = default;
++ X& operator=(X&&) = default;
++};
+
-+/* Inserts P into PMAP if it wasn't already there. Returns a pointer
-+ to the value. P must be nonnull. */
-+void **
-+pointer_map_insert (struct pointer_map_t *pmap, void *p)
++X test01()
+{
-+ size_t n;
-+
-+ /* For simplicity, expand the map even if P is already there. This can be
-+ superfluous but can happen at most once. */
-+ if (pmap->n_elements > pmap->n_slots / 4)
-+ {
-+ size_t new_log_slots = pmap->log_slots + 1;
-+ size_t new_n_slots = pmap->n_slots * 2;
-+ void **new_keys = XCNEWVEC (void *, new_n_slots);
-+ void **new_values = XCNEWVEC (void *, new_n_slots);
-+ size_t i;
-+
-+ for (i = 0; i < pmap->n_slots; ++i)
-+ if (pmap->keys[i])
-+ {
-+ void *key = pmap->keys[i];
-+ n = insert_aux (key, new_keys, new_n_slots, new_log_slots);
-+ new_keys[n] = key;
-+ new_values[n] = pmap->values[i];
-+ }
-+
-+ XDELETEVEC (pmap->keys);
-+ XDELETEVEC (pmap->values);
-+ pmap->n_slots = new_n_slots;
-+ pmap->log_slots = new_log_slots;
-+ pmap->keys = new_keys;
-+ pmap->values = new_values;
-+ }
-+
-+ n = insert_aux (p, pmap->keys, pmap->n_slots, pmap->log_slots);
-+ if (!pmap->keys[n])
-+ {
-+ ++pmap->n_elements;
-+ pmap->keys[n] = p;
-+ }
-+
-+ return &pmap->values[n];
++ X x;
++ x = X();
++ return x;
+}
+
-+/* Pass each pointer in PMAP to the function in FN, together with the pointer
-+ to the value and the fixed parameter DATA. If FN returns false, the
-+ iteration stops. */
-+
-+void pointer_map_traverse (struct pointer_map_t *pmap,
-+ bool (*fn) (void *, void **, void *), void *data)
-+{
-+ size_t i;
-+ for (i = 0; i < pmap->n_slots; ++i)
-+ if (pmap->keys[i] && !fn (pmap->keys[i], &pmap->values[i], data))
-+ break;
-+}
-Index: gcc/pointer-set.h
-===================================================================
---- gcc/pointer-set.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/pointer-set.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -22,11 +22,21 @@
- #define POINTER_SET_H
+Index: libstdc++-v3/config/abi/post/sparc-linux-gnu/baseline_symbols.txt
+===================================================================
+--- libstdc++-v3/config/abi/post/sparc-linux-gnu/baseline_symbols.txt (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libstdc++-v3/config/abi/post/sparc-linux-gnu/baseline_symbols.txt (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -43,6 +43,10 @@
+ FUNC:_ZN11__gnu_debug19_Safe_sequence_base18_M_detach_singularEv@@GLIBCXX_3.4
+ FUNC:_ZN11__gnu_debug19_Safe_sequence_base22_M_revalidate_singularEv@@GLIBCXX_3.4
+ FUNC:_ZN11__gnu_debug19_Safe_sequence_base7_M_swapERS0_@@GLIBCXX_3.4
++FUNC:_ZN11__gnu_debug25_Safe_local_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb@@GLIBCXX_3.4.17
++FUNC:_ZN11__gnu_debug25_Safe_local_iterator_base9_M_detachEv@@GLIBCXX_3.4.17
++FUNC:_ZN11__gnu_debug30_Safe_unordered_container_base13_M_detach_allEv@@GLIBCXX_3.4.17
++FUNC:_ZN11__gnu_debug30_Safe_unordered_container_base7_M_swapERS0_@@GLIBCXX_3.4.17
+ FUNC:_ZN14__gnu_parallel9_Settings3getEv@@GLIBCXX_3.4.10
+ FUNC:_ZN14__gnu_parallel9_Settings3setERS0_@@GLIBCXX_3.4.10
+ FUNC:_ZN9__gnu_cxx12__atomic_addEPVii@@GLIBCXX_3.4
+@@ -877,6 +881,7 @@
+ FUNC:_ZNSaIwEC2Ev@@GLIBCXX_3.4
+ FUNC:_ZNSaIwED1Ev@@GLIBCXX_3.4
+ FUNC:_ZNSaIwED2Ev@@GLIBCXX_3.4
++FUNC:_ZNSbIwSt11char_traitsIwESaIwEE10_S_compareEjj@@GLIBCXX_3.4.16
+ FUNC:_ZNSbIwSt11char_traitsIwESaIwEE12_Alloc_hiderC1EPwRKS1_@@GLIBCXX_3.4
+ FUNC:_ZNSbIwSt11char_traitsIwESaIwEE12_Alloc_hiderC2EPwRKS1_@@GLIBCXX_3.4
+ FUNC:_ZNSbIwSt11char_traitsIwESaIwEE12_M_leak_hardEv@@GLIBCXX_3.4
+@@ -961,6 +966,7 @@
+ FUNC:_ZNSbIwSt11char_traitsIwESaIwEE7replaceEjjRKS2_jj@@GLIBCXX_3.4
+ FUNC:_ZNSbIwSt11char_traitsIwESaIwEE7replaceEjjjw@@GLIBCXX_3.4
+ FUNC:_ZNSbIwSt11char_traitsIwESaIwEE7reserveEj@@GLIBCXX_3.4
++FUNC:_ZNSbIwSt11char_traitsIwESaIwEE8pop_backEv@@GLIBCXX_3.4.17
+ FUNC:_ZNSbIwSt11char_traitsIwESaIwEE9_M_assignEPwjw@@GLIBCXX_3.4.5
+ FUNC:_ZNSbIwSt11char_traitsIwESaIwEE9_M_assignEPwjw@GLIBCXX_3.4
+ FUNC:_ZNSbIwSt11char_traitsIwESaIwEE9_M_mutateEjjj@@GLIBCXX_3.4
+@@ -1116,6 +1122,7 @@
+ FUNC:_ZNSolsEt@@GLIBCXX_3.4
+ FUNC:_ZNSolsEx@@GLIBCXX_3.4
+ FUNC:_ZNSolsEy@@GLIBCXX_3.4
++FUNC:_ZNSs10_S_compareEjj@@GLIBCXX_3.4.16
+ FUNC:_ZNSs12_Alloc_hiderC1EPcRKSaIcE@@GLIBCXX_3.4
+ FUNC:_ZNSs12_Alloc_hiderC2EPcRKSaIcE@@GLIBCXX_3.4
+ FUNC:_ZNSs12_M_leak_hardEv@@GLIBCXX_3.4
+@@ -1200,6 +1207,7 @@
+ FUNC:_ZNSs7replaceEjjRKSsjj@@GLIBCXX_3.4
+ FUNC:_ZNSs7replaceEjjjc@@GLIBCXX_3.4
+ FUNC:_ZNSs7reserveEj@@GLIBCXX_3.4
++FUNC:_ZNSs8pop_backEv@@GLIBCXX_3.4.17
+ FUNC:_ZNSs9_M_assignEPcjc@@GLIBCXX_3.4.5
+ FUNC:_ZNSs9_M_assignEPcjc@GLIBCXX_3.4
+ FUNC:_ZNSs9_M_mutateEjjj@@GLIBCXX_3.4
+@@ -1433,6 +1441,9 @@
+ FUNC:_ZNSt13__future_base12_Result_baseD0Ev@@GLIBCXX_3.4.15
+ FUNC:_ZNSt13__future_base12_Result_baseD1Ev@@GLIBCXX_3.4.15
+ FUNC:_ZNSt13__future_base12_Result_baseD2Ev@@GLIBCXX_3.4.15
++FUNC:_ZNSt13__future_base19_Async_state_commonD0Ev@@GLIBCXX_3.4.17
++FUNC:_ZNSt13__future_base19_Async_state_commonD1Ev@@GLIBCXX_3.4.17
++FUNC:_ZNSt13__future_base19_Async_state_commonD2Ev@@GLIBCXX_3.4.17
+ FUNC:_ZNSt13bad_exceptionD0Ev@@GLIBCXX_3.4
+ FUNC:_ZNSt13bad_exceptionD1Ev@@GLIBCXX_3.4
+ FUNC:_ZNSt13bad_exceptionD2Ev@@GLIBCXX_3.4
+@@ -1741,6 +1752,8 @@
+ FUNC:_ZNSt15__exception_ptrneERKNS_13exception_ptrES2_@@CXXABI_1.3.3
+ FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE10pubseekoffExSt12_Ios_SeekdirSt13_Ios_Openmode@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE10pubseekposESt4fposI11__mbstate_tESt13_Ios_Openmode@@GLIBCXX_3.4
++FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE12__safe_gbumpEi@@GLIBCXX_3.4.16
++FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE12__safe_pbumpEi@@GLIBCXX_3.4.16
+ FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE4setgEPcS3_S3_@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE4setpEPcS3_@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEE4syncEv@@GLIBCXX_3.4
+@@ -1780,6 +1793,8 @@
+ FUNC:_ZNSt15basic_streambufIcSt11char_traitsIcEEaSERKS2_@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE10pubseekoffExSt12_Ios_SeekdirSt13_Ios_Openmode@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE10pubseekposESt4fposI11__mbstate_tESt13_Ios_Openmode@@GLIBCXX_3.4
++FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE12__safe_gbumpEi@@GLIBCXX_3.4.16
++FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE12__safe_pbumpEi@@GLIBCXX_3.4.16
+ FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE4setgEPwS3_S3_@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE4setpEPwS3_@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_streambufIwSt11char_traitsIwEE4syncEv@@GLIBCXX_3.4
+@@ -1824,6 +1839,7 @@
+ FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE7_M_syncEPcjj@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE7seekoffExSt12_Ios_SeekdirSt13_Ios_Openmode@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE7seekposESt4fposI11__mbstate_tESt13_Ios_Openmode@@GLIBCXX_3.4
++FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE8_M_pbumpEPcS4_x@@GLIBCXX_3.4.16
+ FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE8overflowEi@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE9pbackfailEi@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEE9showmanycEv@@GLIBCXX_3.4.6
+@@ -1841,6 +1857,7 @@
+ FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE7_M_syncEPwjj@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE7seekoffExSt12_Ios_SeekdirSt13_Ios_Openmode@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE7seekposESt4fposI11__mbstate_tESt13_Ios_Openmode@@GLIBCXX_3.4
++FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE8_M_pbumpEPwS4_x@@GLIBCXX_3.4.16
+ FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE8overflowEj@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE9pbackfailEj@@GLIBCXX_3.4
+ FUNC:_ZNSt15basic_stringbufIwSt11char_traitsIwESaIwEE9showmanycEv@@GLIBCXX_3.4.6
+@@ -2145,6 +2162,7 @@
+ FUNC:_ZNSt6localeD2Ev@@GLIBCXX_3.4
+ FUNC:_ZNSt6localeaSERKS_@@GLIBCXX_3.4
+ FUNC:_ZNSt6thread15_M_start_threadESt10shared_ptrINS_10_Impl_baseEE@@GLIBCXX_3.4.11
++FUNC:_ZNSt6thread20hardware_concurrencyEv@@GLIBCXX_3.4.17
+ FUNC:_ZNSt6thread4joinEv@@GLIBCXX_3.4.11
+ FUNC:_ZNSt6thread6detachEv@@GLIBCXX_3.4.11
+ FUNC:_ZNSt7codecvtIcc11__mbstate_tEC1EP15__locale_structj@@GLIBCXX_3.4
+@@ -2640,14 +2658,17 @@
+ FUNC:_ZnwjRKSt9nothrow_t@@GLIBCXX_3.4
+ FUNC:__atomic_flag_for_address@@GLIBCXX_3.4.11
+ FUNC:__atomic_flag_wait_explicit@@GLIBCXX_3.4.11
++FUNC:__cxa_allocate_dependent_exception@@CXXABI_1.3.6
+ FUNC:__cxa_allocate_exception@@CXXABI_1.3
+ FUNC:__cxa_bad_cast@@CXXABI_1.3
+ FUNC:__cxa_bad_typeid@@CXXABI_1.3
+ FUNC:__cxa_begin_catch@@CXXABI_1.3
+ FUNC:__cxa_call_unexpected@@CXXABI_1.3
+ FUNC:__cxa_current_exception_type@@CXXABI_1.3
++FUNC:__cxa_deleted_virtual@@CXXABI_1.3.6
+ FUNC:__cxa_demangle@@CXXABI_1.3
+ FUNC:__cxa_end_catch@@CXXABI_1.3
++FUNC:__cxa_free_dependent_exception@@CXXABI_1.3.6
+ FUNC:__cxa_free_exception@@CXXABI_1.3
+ FUNC:__cxa_get_exception_ptr@@CXXABI_1.3.1
+ FUNC:__cxa_get_globals@@CXXABI_1.3
+@@ -2658,6 +2679,7 @@
+ FUNC:__cxa_pure_virtual@@CXXABI_1.3
+ FUNC:__cxa_rethrow@@CXXABI_1.3
+ FUNC:__cxa_throw@@CXXABI_1.3
++FUNC:__cxa_tm_cleanup@@CXXABI_TM_1
+ FUNC:__cxa_vec_cctor@@CXXABI_1.3
+ FUNC:__cxa_vec_cleanup@@CXXABI_1.3
+ FUNC:__cxa_vec_ctor@@CXXABI_1.3
+@@ -2701,7 +2723,9 @@
+ OBJECT:0:CXXABI_1.3.3
+ OBJECT:0:CXXABI_1.3.4
+ OBJECT:0:CXXABI_1.3.5
++OBJECT:0:CXXABI_1.3.6
+ OBJECT:0:CXXABI_LDBL_1.3
++OBJECT:0:CXXABI_TM_1
+ OBJECT:0:GLIBCXX_3.4
+ OBJECT:0:GLIBCXX_3.4.1
+ OBJECT:0:GLIBCXX_3.4.10
+@@ -2710,6 +2734,8 @@
+ OBJECT:0:GLIBCXX_3.4.13
+ OBJECT:0:GLIBCXX_3.4.14
+ OBJECT:0:GLIBCXX_3.4.15
++OBJECT:0:GLIBCXX_3.4.16
++OBJECT:0:GLIBCXX_3.4.17
+ OBJECT:0:GLIBCXX_3.4.2
+ OBJECT:0:GLIBCXX_3.4.3
+ OBJECT:0:GLIBCXX_3.4.4
+@@ -2737,6 +2763,7 @@
+ OBJECT:12:_ZTIN9__gnu_cxx13stdio_filebufIwSt11char_traitsIwEEE@@GLIBCXX_3.4
+ OBJECT:12:_ZTIN9__gnu_cxx18stdio_sync_filebufIcSt11char_traitsIcEEE@@GLIBCXX_3.4
+ OBJECT:12:_ZTIN9__gnu_cxx18stdio_sync_filebufIwSt11char_traitsIwEEE@@GLIBCXX_3.4
++OBJECT:12:_ZTINSt13__future_base19_Async_state_commonE@@GLIBCXX_3.4.17
+ OBJECT:12:_ZTINSt17__gnu_cxx_ldbl1287num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEE@@GLIBCXX_LDBL_3.4
+ OBJECT:12:_ZTINSt17__gnu_cxx_ldbl1287num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEE@@GLIBCXX_LDBL_3.4
+ OBJECT:12:_ZTINSt17__gnu_cxx_ldbl1287num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEE@@GLIBCXX_LDBL_3.4
+@@ -3245,6 +3272,7 @@
+ OBJECT:20:_ZTSSt15underflow_error@@GLIBCXX_3.4
+ OBJECT:20:_ZTVNSt13__future_base11_State_baseE@@GLIBCXX_3.4.15
+ OBJECT:20:_ZTVNSt13__future_base12_Result_baseE@@GLIBCXX_3.4.15
++OBJECT:20:_ZTVNSt13__future_base19_Async_state_commonE@@GLIBCXX_3.4.17
+ OBJECT:20:_ZTVNSt8ios_base7failureE@@GLIBCXX_3.4
+ OBJECT:20:_ZTVSt10bad_typeid@@GLIBCXX_3.4
+ OBJECT:20:_ZTVSt10lock_error@@GLIBCXX_3.4.11
+@@ -3437,6 +3465,7 @@
+ OBJECT:40:_ZTVSt19basic_ostringstreamIwSt11char_traitsIwESaIwEE@@GLIBCXX_3.4
+ OBJECT:40:_ZTVSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE@@GLIBCXX_3.4
+ OBJECT:40:_ZTVSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE@@GLIBCXX_3.4
++OBJECT:41:_ZTSNSt13__future_base19_Async_state_commonE@@GLIBCXX_3.4.17
+ OBJECT:41:_ZTSSt15basic_streambufIcSt11char_traitsIcEE@@GLIBCXX_3.4
+ OBJECT:41:_ZTSSt15basic_streambufIwSt11char_traitsIwEE@@GLIBCXX_3.4
+ OBJECT:44:_ZTVN10__cxxabiv117__class_type_infoE@@CXXABI_1.3
+Index: libiberty/ChangeLog
+===================================================================
+--- libiberty/ChangeLog (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libiberty/ChangeLog (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,3 +1,8 @@
++2012-03-22 Jason Merrill <jason@redhat.com>
++
++ * cp-demangle.c (cplus_demangle_operators): Add li.
++ (d_unqualified_name): Handle it specially.
++
+ 2012-03-22 Release Manager
+
+ * GCC 4.7.0 released.
+Index: libiberty/testsuite/demangle-expected
+===================================================================
+--- libiberty/testsuite/demangle-expected (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libiberty/testsuite/demangle-expected (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -4073,6 +4073,8 @@
+ _Z2f1IiEDTnw_T_ilEES0_
+ decltype (new int{}) f1<int>(int)
+ --format=gnu-v3
++_Zli2_wPKc
++operator"" _w(char const*)
+ _Z1fIiEDTnw_Dapifp_EET_
+ decltype (new auto({parm#1})) f<int>(int)
+ --format=gnu-v3
+Index: libiberty/cp-demangle.c
+===================================================================
+--- libiberty/cp-demangle.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libiberty/cp-demangle.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1419,7 +1419,12 @@
+
+ ret = d_operator_name (di);
+ if (ret != NULL && ret->type == DEMANGLE_COMPONENT_OPERATOR)
+- di->expansion += sizeof "operator" + ret->u.s_operator.op->len - 2;
++ {
++ di->expansion += sizeof "operator" + ret->u.s_operator.op->len - 2;
++ if (!strcmp (ret->u.s_operator.op->code, "li"))
++ ret = d_make_comp (di, DEMANGLE_COMPONENT_UNARY, ret,
++ d_source_name (di));
++ }
+ return ret;
+ }
+ else if (peek == 'C' || peek == 'D')
+@@ -1596,6 +1601,7 @@
+ { "ix", NL ("[]"), 2 },
+ { "lS", NL ("<<="), 2 },
+ { "le", NL ("<="), 2 },
++ { "li", NL ("operator\"\" "), 1 },
+ { "ls", NL ("<<"), 2 },
+ { "lt", NL ("<"), 2 },
+ { "mI", NL ("-="), 2 },
+Index: libgcc/ChangeLog
+===================================================================
+--- libgcc/ChangeLog (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libgcc/ChangeLog (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,3 +1,30 @@
++2012-03-22 Georg-Johann Lay <avr@gjlay.de>
++
++ Backport from 2012-03-07 mainline r185033.
++
++ PR target/52507
++ * config/avr/lib1funcs.S (__movmemx_hi): Fix loop label in RAM-part.
++
++ Backport from 2012-03-07 mainline r185031.
++
++ PR target/52505
++ * config/avr/lib1funcs.S (__xload_1): Don't read unintentionally
++ from RAM.
++
++ Backport from 2012-03-07 mainline r185030.
++
++ PR target/52461
++ PR target/52508
++ * config/avr/lib1funcs.S (__do_copy_data): Clear RAMPZ after usage
++ if RAMPZ affects reading from RAM.
++ (__tablejump_elpm__): Ditto.
++ (.xload): Ditto.
++ (__movmemx_hi): Ditto.
++ (__do_global_ctors): Right condition for RAMPZ usage is "have ELPM".
++ (__do_global_dtors): Ditto.
++ (__xload_1, __xload_2, __xload_3, __xload_4): Ditto.
++ (__movmemx_hi): Ditto.
++
+ 2012-03-22 Release Manager
+
+ * GCC 4.7.0 released.
+Index: libgcc/config/avr/lib1funcs.S
+===================================================================
+--- libgcc/config/avr/lib1funcs.S (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libgcc/config/avr/lib1funcs.S (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1893,6 +1893,10 @@
+ cpc r27, r17
+ brne .L__do_copy_data_loop
+ #endif /* !defined(__AVR_HAVE_ELPMX__) && !defined(__AVR_HAVE_ELPM__) */
++#if defined (__AVR_HAVE_ELPM__) && defined (__AVR_HAVE_RAMPD__)
++ ;; Reset RAMPZ to 0 so that EBI devices don't read garbage from RAM
++ out __RAMPZ__, __zero_reg__
++#endif /* ELPM && RAMPD */
+ ENDF __do_copy_data
+ #endif /* L_copy_data */
+
+@@ -1920,7 +1924,7 @@
+ #ifdef L_ctors
+ .section .init6,"ax",@progbits
+ DEFUN __do_global_ctors
+-#if defined(__AVR_HAVE_RAMPZ__)
++#if defined(__AVR_HAVE_ELPM__)
+ ldi r17, hi8(__ctors_start)
+ ldi r28, lo8(__ctors_end)
+ ldi r29, hi8(__ctors_end)
+@@ -1953,14 +1957,14 @@
+ cpi r28, lo8(__ctors_start)
+ cpc r29, r17
+ brne .L__do_global_ctors_loop
+-#endif /* defined(__AVR_HAVE_RAMPZ__) */
++#endif /* defined(__AVR_HAVE_ELPM__) */
+ ENDF __do_global_ctors
+ #endif /* L_ctors */
+
+ #ifdef L_dtors
+ .section .fini6,"ax",@progbits
+ DEFUN __do_global_dtors
+-#if defined(__AVR_HAVE_RAMPZ__)
++#if defined(__AVR_HAVE_ELPM__)
+ ldi r17, hi8(__dtors_end)
+ ldi r28, lo8(__dtors_start)
+ ldi r29, hi8(__dtors_start)
+@@ -1993,7 +1997,7 @@
+ cpi r28, lo8(__dtors_end)
+ cpc r29, r17
+ brne .L__do_global_dtors_loop
+-#endif /* defined(__AVR_HAVE_RAMPZ__) */
++#endif /* defined(__AVR_HAVE_ELPM__) */
+ ENDF __do_global_dtors
+ #endif /* L_dtors */
+
+@@ -2001,18 +2005,21 @@
+
+ #ifdef L_tablejump_elpm
+ DEFUN __tablejump_elpm__
+-#if defined (__AVR_HAVE_ELPM__)
+-#if defined (__AVR_HAVE_LPMX__)
++#if defined (__AVR_HAVE_ELPMX__)
+ elpm __tmp_reg__, Z+
+ elpm r31, Z
+ mov r30, __tmp_reg__
++#if defined (__AVR_HAVE_RAMPD__)
++ ;; Reset RAMPZ to 0 so that EBI devices don't read garbage from RAM
++ out __RAMPZ__, __zero_reg__
++#endif /* RAMPD */
+ #if defined (__AVR_HAVE_EIJMP_EICALL__)
+ eijmp
+ #else
+ ijmp
+ #endif
- struct pointer_set_t;
--
- struct pointer_set_t *pointer_set_create (void);
- void pointer_set_destroy (struct pointer_set_t *pset);
+-#else
++#elif defined (__AVR_HAVE_ELPM__)
+ elpm
+ adiw r30, 1
+ push r0
+@@ -2024,7 +2031,6 @@
+ #endif
+ ret
+ #endif
+-#endif /* defined (__AVR_HAVE_ELPM__) */
+ ENDF __tablejump_elpm__
+ #endif /* defined (L_tablejump_elpm) */
- int pointer_set_contains (struct pointer_set_t *pset, void *p);
- int pointer_set_insert (struct pointer_set_t *pset, void *p);
-+void pointer_set_traverse (struct pointer_set_t *, bool (*) (void *, void *),
-+ void *);
+@@ -2114,11 +2120,18 @@
+ adiw r30, 1
+ .endif
+ #endif
++#if defined (__AVR_HAVE_ELPM__) && defined (__AVR_HAVE_RAMPD__)
++.if \dest == D0+\n-1
++ ;; Reset RAMPZ to 0 so that EBI devices don't read garbage from RAM
++ out __RAMPZ__, __zero_reg__
++.endif
++#endif
+ .endm ; .xload
+
+ #if defined (L_xload_1)
+ DEFUN __xload_1
+-#if defined (__AVR_HAVE_LPMX__) && !defined (__AVR_HAVE_RAMPZ__)
++#if defined (__AVR_HAVE_LPMX__) && !defined (__AVR_HAVE_ELPM__)
++ sbrc HHI8, 7
+ ld D0, Z
+ sbrs HHI8, 7
+ lpm D0, Z
+@@ -2126,14 +2139,14 @@
+ #else
+ sbrc HHI8, 7
+ rjmp 1f
+-#if defined (__AVR_HAVE_RAMPZ__)
++#if defined (__AVR_HAVE_ELPM__)
+ out __RAMPZ__, HHI8
+-#endif /* __AVR_HAVE_RAMPZ__ */
++#endif /* __AVR_HAVE_ELPM__ */
+ .xload D0, 1
+ ret
+ 1: ld D0, Z
+ ret
+-#endif /* LPMx && ! RAMPZ */
++#endif /* LPMx && ! ELPM */
+ ENDF __xload_1
+ #endif /* L_xload_1 */
+
+@@ -2141,9 +2154,9 @@
+ DEFUN __xload_2
+ sbrc HHI8, 7
+ rjmp 1f
+-#if defined (__AVR_HAVE_RAMPZ__)
++#if defined (__AVR_HAVE_ELPM__)
+ out __RAMPZ__, HHI8
+-#endif /* __AVR_HAVE_RAMPZ__ */
++#endif /* __AVR_HAVE_ELPM__ */
+ .xload D0, 2
+ .xload D1, 2
+ ret
+@@ -2157,9 +2170,9 @@
+ DEFUN __xload_3
+ sbrc HHI8, 7
+ rjmp 1f
+-#if defined (__AVR_HAVE_RAMPZ__)
++#if defined (__AVR_HAVE_ELPM__)
+ out __RAMPZ__, HHI8
+-#endif /* __AVR_HAVE_RAMPZ__ */
++#endif /* __AVR_HAVE_ELPM__ */
+ .xload D0, 3
+ .xload D1, 3
+ .xload D2, 3
+@@ -2175,9 +2188,9 @@
+ DEFUN __xload_4
+ sbrc HHI8, 7
+ rjmp 1f
+-#if defined (__AVR_HAVE_RAMPZ__)
++#if defined (__AVR_HAVE_ELPM__)
+ out __RAMPZ__, HHI8
+-#endif /* __AVR_HAVE_RAMPZ__ */
++#endif /* __AVR_HAVE_ELPM__ */
+ .xload D0, 4
+ .xload D1, 4
+ .xload D2, 4
+@@ -2219,7 +2232,7 @@
+
+ ;; Read from Flash
+
+-#if defined (__AVR_HAVE_RAMPZ__)
++#if defined (__AVR_HAVE_ELPM__)
+ out __RAMPZ__, HHI8
+ #endif
-+struct pointer_map_t;
-+struct pointer_map_t *pointer_map_create (void);
-+void pointer_map_destroy (struct pointer_map_t *pmap);
+@@ -2243,6 +2256,10 @@
+ st X+, r0
+ sbiw LOOP, 1
+ brne 0b
++#if defined (__AVR_HAVE_ELPM__) && defined (__AVR_HAVE_RAMPD__)
++ ;; Reset RAMPZ to 0 so that EBI devices don't read garbage from RAM
++ out __RAMPZ__, __zero_reg__
++#endif /* ELPM && RAMPD */
+ ret
+
+ ;; Read from RAM
+@@ -2252,7 +2269,7 @@
+ ;; and store that Byte to RAM Destination
+ st X+, r0
+ sbiw LOOP, 1
+- brne 0b
++ brne 1b
+ ret
+ ENDF __movmemx_hi
+
+Index: gcc/c-family/ChangeLog
+===================================================================
+--- gcc/c-family/ChangeLog (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/c-family/ChangeLog (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,3 +1,8 @@
++2012-03-23 William Bader <williambader@hotmail.com>
+
-+void **pointer_map_contains (struct pointer_map_t *pmap, void *p);
-+void **pointer_map_insert (struct pointer_map_t *pmap, void *p);
-+void pointer_map_traverse (struct pointer_map_t *,
-+ bool (*) (void *, void **, void *), void *);
++ PR c/52682
++ * c-lex.c (c_lex_with_flags): Avoid declarations after stmts.
+
- #endif /* POINTER_SET_H */
-Index: gcc/fold-const.c
-===================================================================
---- gcc/fold-const.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/fold-const.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -4450,13 +4450,24 @@
- {
- low = range_successor (high1);
- high = high0;
-- in_p = (low != 0);
-+ in_p = 1;
-+ if (low == 0)
-+ {
-+ /* We are in the weird situation where high0 > high1 but
-+ high1 has no successor. Punt. */
-+ return 0;
-+ }
- }
- else if (! subset || highequal)
- {
- low = low0;
- high = range_predecessor (low1);
-- in_p = (high != 0);
-+ in_p = 1;
-+ if (high == 0)
-+ {
-+ /* low0 < low1 but low1 has no predecessor. Punt. */
-+ return 0;
-+ }
- }
- else
- return 0;
-@@ -4476,7 +4487,12 @@
- {
- low = range_successor (high0);
- high = high1;
-- in_p = (low != 0);
-+ in_p = 1;
-+ if (low == 0)
-+ {
-+ /* high1 > high0 but high0 has no successor. Punt. */
-+ return 0;
-+ }
- }
- }
+ 2012-03-22 Release Manager
-@@ -12634,9 +12650,14 @@
- /* ... fall through ... */
-
- default:
-- if (truth_value_p (TREE_CODE (t)))
-- /* Truth values evaluate to 0 or 1, which is nonnegative. */
-- return 1;
-+ {
-+ tree type = TREE_TYPE (t);
-+ if ((TYPE_PRECISION (type) != 1 || TYPE_UNSIGNED (type))
-+ && truth_value_p (TREE_CODE (t)))
-+ /* Truth values evaluate to 0 or 1, which is nonnegative unless we
-+ have a signed:1 type (where the value is -1 and 0). */
-+ return true;
-+ }
- }
+ * GCC 4.7.0 released.
+Index: gcc/c-family/c-lex.c
+===================================================================
+--- gcc/c-family/c-lex.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/c-family/c-lex.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -342,6 +342,8 @@
- /* We don't know sign of `t', so be conservative and return false. */
+ if (flags & CPP_N_USERDEF)
+ {
++ char *str;
++ tree literal;
+ tree suffix_id = get_identifier (suffix);
+ int len = tok->val.str.len - strlen (suffix);
+ /* If this is going to be used as a C string to pass to a
+@@ -350,9 +352,9 @@
+ (const char *) tok->val.str.text);
+ TREE_TYPE (num_string) = char_array_type_node;
+ num_string = fix_string_type (num_string);
+- char *str = CONST_CAST (char *, TREE_STRING_POINTER (num_string));
++ str = CONST_CAST (char *, TREE_STRING_POINTER (num_string));
+ str[len] = '\0';
+- tree literal = build_userdef_literal (suffix_id, *value,
++ literal = build_userdef_literal (suffix_id, *value,
+ num_string);
+ *value = literal;
+ }
+Index: gcc/DATESTAMP
+===================================================================
+--- gcc/DATESTAMP (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/DATESTAMP (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1 +1 @@
+-20120322
++20120323
Index: gcc/DEV-PHASE
===================================================================
---- gcc/DEV-PHASE (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/DEV-PHASE (.../branches/gcc-4_2-branch) (wersja 125589)
+--- gcc/DEV-PHASE (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/DEV-PHASE (.../branches/gcc-4_7-branch) (wersja 185750)
@@ -0,0 +1 @@
+prerelease
Index: gcc/ChangeLog
===================================================================
---- gcc/ChangeLog (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/ChangeLog (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,3 +1,201 @@
-+2007-06-08 Kaz Kojima <kkojima@gcc.gnu.org>
-+
-+ PR target/32163
-+ Backport from mainline.
-+ * config/sh/sh.md (symGOT_load): Don't schedule insns when
-+ the symbol is generated with the stack protector.
+--- gcc/ChangeLog (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/ChangeLog (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,3 +1,173 @@
++2012-03-23 Michael Meissner <meissner@linux.vnet.ibm.com>
++
++ Backported from mainline
++ 2012-03-06 Michael Meissner <meissner@linux.vnet.ibm.com>
++
++ PR target/50310
++ * config/rs6000/vector.md (vector_uneq<mode>): Add support for
++ UNEQ, LTGT, ORDERED, and UNORDERED IEEE vector comparisons.
++ (vector_ltgt<mode>): Likewise.
++ (vector_ordered<mode>): Likewise.
++ (vector_unordered<mode>): Likewise.
++ * config/rs6000/rs6000.c (rs6000_emit_vector_compare_inner): Likewise.
++
++2012-03-23 Joern Rennecke <joern.rennecke@embecosm.com>
++
++ * config/epiphany/epiphany.c (epiphany_function_value_regno_p):
++ Make static.
++
++2012-03-22 Kaz Kojima <kkojima@gcc.gnu.org>
++
++ Backported from mainline
++ 2012-03-02 Kaz Kojima <kkojima@gcc.gnu.org>
++
++ PR target/48596
++ PR target/48806
++ * config/sh/sh.c (sh_register_move_cost): Increase cost between
++ GENERAL_REGS and FP_REGS for SImode.
++
++2012-03-22 Jakub Jelinek <jakub@redhat.com>
++
++ PR middle-end/52547
++ * tree-nested.c (convert_tramp_reference_stmt): Call declare_vars
++ on any new_local_var_chain vars declared during recursing on
++ GIMPLE_OMP_PARALLEL or GIMPLE_OMP_TASK body.
++
++2012-03-22 Georg-Johann Lay <avr@gjlay.de>
++
++ Backport from 2012-03-22 mainline r185692.
++
++ PR target/52496
++ * config/avr/avr.md (unspec): Remove UNSPEC_MEMORY_BARRIER.
++ (unspecv): Add UNSPECV_MEMORY_BARRIER.
++ (cli_sei): Use unspec_volatile instead of unspec for memory barrier.
++ (delay_cycles_1, delay_cycles_2): Ditto.
++ (delay_cycles_3, delay_cycles_4): Ditto.
++ (nopv, *nopv): Ditto.
++ (sleep, *sleep): Ditto.
++ (wdr, *wdr): Ditto.
+
-+2007-06-06 Ian Lance Taylor <iant@google.com>
++ Backport from 2012-03-21 mainline r185605.
+
-+ * fold-const.c (merge_ranges): If range_successor or
-+ range_predecessor fail, just return 0.
++ PR rtl-optimization/52543
++ PR target/52461
++ * config/avr/avr-protos.h (avr_load_lpm): New prototype.
++ * config/avr/avr.c (avr_mode_dependent_address_p): New function.
++ (TARGET_MODE_DEPENDENT_ADDRESS_P): New define.
++ (avr_load_libgcc_p): Restrict to __flash loads.
++ (avr_out_lpm): Only handle 1-byte loads from __flash.
++ (avr_load_lpm): New function.
++ (avr_find_unused_d_reg): Remove.
++ (avr_out_lpm_no_lpmx): Remove.
++ (adjust_insn_length): Handle ADJUST_LEN_LOAD_LPM.
++ * config/avr/avr.md (unspec): Add UNSPEC_LPM.
++ (load_<mode>_libgcc): Use UNSPEC_LPM instead of MEM.
++ (load_<mode>, load_<mode>_clobber): New insns.
++ (mov<mode>): For multi-byte move from non-generic
++ 16-bit address spaces: Expand to load_<mode> resp.
++ load_<mode>_clobber.
++ (load<mode>_libgcc): Remove expander.
++ (split-lpmx): Remove split.
+
-+2007-06-05 Ian Lance Taylor <iant@google.com>
++ Backport from 2012-03-13 mainline r185329.
+
-+ * tree-vrp.c (compare_values_warnv): Check TREE_NO_WARNING on a
-+ PLUS_EXPR or MINUS_EXPR node before setting *strict_overflow_p.
-+ (extract_range_from_assert): Set TREE_NO_WARNING when creating an
-+ expression.
-+ (test_for_singularity): Likewise.
++ PR target/52488
++ * config/avr/avr.c (avr_prologue_setup_frame): Cut down stack
++ offset (size) to a value the insns can deal with.
++ (expand_epilogue): Ditto.
+
-+2007-06-04 Ian Lance Taylor <iant@google.com>
++ Backport from 2012-03-12 mainline r185256.
+
-+ * tree-vrp.c (adjust_range_with_scev): When loop is not expected
-+ to overflow, reduce overflow infinity to regular infinity.
-+ (vrp_var_may_overflow): New static function.
-+ (vrp_visit_phi_node): Check vrp_var_may_overflow.
++ PR target/52499
++ * config/avr/avr.c (avr_mode_code_base_reg_class): Change return
++ type from reg_class_t to enum reg_class.
++ * config/avr/avr-protos.h (avr_mode_code_base_reg_class): Ditto.
+
-+2007-05-31 H.J. Lu <hongjiu.lu@intel.com>
++ Backport from 2012-03-12 mainline r185253.
+
-+ Backport from mainline:
-+ 2007-05-25 H.J. Lu <hongjiu.lu@intel.com>
++ PR target/52148
++ * config/avr/avr.c (avr_out_movmem): Fix typo in output template
++ for the case ADDR_SPACE_FLASH and AVR_HAVE_LPMX introduced in
++ r184615 from 2012-02-28.
+
-+ * config/i386/i386.c (__builtin_ia32_vec_ext_v2df): Mark it
-+ with MASK_SSE2.
-+ (__builtin_ia32_vec_ext_v2di): Likewise.
-+ (__builtin_ia32_vec_ext_v4si): Likewise.
-+ (__builtin_ia32_vec_ext_v8hi): Likewise.
-+ (__builtin_ia32_vec_set_v8hi): Likewise.
++ Backport from 2012-03-08 mainline r185105.
+
-+2007-05-31 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
++ * config/avr/avr.md (*addhi3, addhi3_clobber): Add "w" alternative
++ for constants in [-63,63].
+
-+ Backport from mainline:
-+ 2007-05-05 Aurelien Jarno <aurelien@aurel32.net>
++ Backport from 2012-03-08 mainline r185100.
+
-+ * config/pa/pa.md: Split tgd_load, tld_load and tie_load
-+ into pic and non-pic versions. Mark r19 as used for
-+ tgd_load_pic, tld_load_pic and tie_load_pic. Mark r27 as used
-+ for tgd_load, tld_load and tie_load .
-+ * config/pa/pa.c (legitimize_tls_address): Emit pic or non-pic
-+ version of tgd_load, tld_load and tie_load depending on the
-+ value of flag_pic.
++ PR target/52496
++ * config/avr/avr.c (avr_mem_clobber): New static function.
++ (avr_expand_delay_cycles): Add memory clobber operand to
++ delay_cycles_1, delay_cycles_2, delay_cycles_3, delay_cycles_4.
++ * config/avr/avr.md (unspec): Add UNSPEC_MEMORY_BARRIER.
++ (enable_interrupt, disable_interrupt): New expander.
++ (nopv, sleep, wdr): New expanders.
++ (delay_cycles_1): Add memory clobber.
++ (delay_cycles_2): Add memory clobber.
++ (delay_cycles_3): Add memory clobber.
++ (delay_cycles_4): Add memory clobber.
++ (cli_sei): New insn from former "enable_interrupt",
++ "disable_interrupt" with memory clobber.
++ (*wdt): New insn from former "wdt" with memory clobber.
++ (*nopv): Similar, but for "nopv".
++ (*sleep): Similar, but for "sleep".
+
-+2007-05-27 Daniel Berlin <dberlin@dberlin.org>
++ Backport from 2012-03-07 mainline r185043.
+
-+ Fix PR/30052
-+ Backport PTA solver from mainline
++ PR target/52484
++ * config/avr/avr.md (xload<mode>_A): Add R22... to register footprint.
++
++ Backport from 2012-03-07 mainline r185032.
+
-+ * pointer-set.c: Copy from mainline
-+ * pointer-set.h: Ditto.
-+ * tree-ssa-structalias.c: Copy solver portions from mainline.
-+ * Makefile.in (tree-ssa-structalias.o): Update dependencies
++ PR target/52506
++ * gcc/config/avr/avr.c (expand_epilogue): Fix order of restoration
++ to: RAMPZ, RAMPY, RAMPX, RAMPD.
++ (expand_prologue): Only clear RAMPZ if it has effect on RAM-read.
+
-+2007-05-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
++ Backport from 2012-03-07 mainline r185031.
++
++ PR target/52505
++ * config/avr/avr.c (avr_out_xload): Don't read unintentionally
++ from RAM.
++ * config/avr/avr.md (xload_8): Adjust insn length.
+
-+ * tree-vrp.c (compare_names): Initialize sop.
++ Backport from 2012-03-07 mainline r185030.
++
++ PR target/52461
++ * gcc/config/avr/avr.c (avr_out_lpm): Clear RAMPZ after usage
++ if RAMPZ affects reading from RAM.
++
++ Backport from 2012-03-05 mainline r184919.
++
++ * config/avr/avr.md (*umaddqihi4.2): New insn-and-split.
++
++2012-03-22 Georg-Johann Lay <avr@gjlay.de>
+
-+2007-05-30 Jakub Jelinek <jakub@redhat.com>
++ Backport from mainline r185259.
+
-+ PR tree-optimization/31769
-+ * except.c (duplicate_eh_regions): Clear prev_try if
-+ ERT_MUST_NOT_THROW region is inside of ERT_TRY region.
++ PR other/52545
++ * output.h (SECTION_EXCLUDE, SECTION_MACH_DEP): Don't use
++ SECTION_MACH_DEP reserved bits for SECTION_EXCLUDE.
++
++2012-03-22 Jakub Jelinek <jakub@redhat.com>
+
-+2007-05-28 Andrew Pinski <andrew_pinski@playstation.sony.com>
++ Backported from mainline
++ 2012-03-13 Jakub Jelinek <jakub@redhat.com>
++
++ PR c/52577
++ * c-parser.c (c_parser_postfix_expression)
++ <case RID_BUILTIN_SHUFFLE>: Call mark_exp_read on argument values.
+
-+ PR tree-opt/32100
-+ * fold-const.c (tree_expr_nonnegative_warnv_p): Don't
-+ return true when truth_value_p is true and the type
-+ is of signed:1.
++ * config/i386/smmintrin.h: Avoid /* within a comment.
++ * config/i386/nmmintrin.h: Likewise.
+
-+2007-05-27 H.J. Lu <hongjiu.lu@intel.com>
++2012-03-22 Richard Guenther <rguenther@suse.de>
+
-+ Backport from mainline:
-+ 2007-05-25 Uros Bizjak <ubizjak@gmail.com>
-+
-+ * config/i386/sse.md (*vec_extractv2di_1_sse2): Do not calculate
-+ "memory" attribute for "sseishft" type insn without operands[2].
-+
-+ 2007-05-25 H.J. Lu <hongjiu.lu@intel.com>
-+
-+ * config/i386/sse.md (*vec_extractv2di_1_sse2): Correct shift.
-+
-+2007-05-22 Ian Lance Taylor <iant@google.com>
-+
-+ * tree-vrp.c (avoid_overflow_infinity): New static function,
-+ broken out of set_value_range_to_value.
-+ (set_value_range_to_value): Call avoid_overflow_infinity.
-+ (extract_range_from_assert): Likewise.
-+
-+2007-05-23 Chen Liqin <liqin@sunnorth.com.cn>
-+
-+ PR target/30987
-+ * config/score/misc.md (bitclr_c, bitset_c, bittgl_c): remove.
-+ * config/score/predicate.md (const_pow2, const_npow2): remove.
-+ * config/score/score.h (ASM_OUTPUT_EXTERNAL): add ASM_OUTPUT_EXTERNAL undef.
-+ PR target/30474
-+ * config/score/score.c (score_print_operand): makes sure that only lower
-+ bits are used.
-+
-+2007-05-21 Uros Bizjak <ubizjak@gmail.com>
-+
-+ PR target/31167
-+ Backport from mainline.
-+ * config/i386/i386.md (*addti3_1, *addti3_1 splitter): Use
-+ x86_64_general_operand as operand[2] predicate. Remove "iF"
-+ from operand constraints and use "e" constraint instead.
-+ (*subti3_1, *subti3_1 splitter): Ditto.
-+ (*negti2_1, *negti2_1 splitter): Use nonimmediate_operand as
-+ operand[1] predicate.
-+
-+2007-05-21 Uros Bizjak <ubizjak@gmail.com>
-+
-+ PR target/30041
-+ Backport from mainline.
-+ * config/i386/sse.md ("*sse3_movddup"): Use operands[0] and
-+ operands[1] in insn constraint. Correct type attribute to sselog1.
-+
-+2007-05-20 Kaz Kojima <kkojima@gcc.gnu.org>
-+
-+ PR target/31701
-+ Backport from mainline.
-+ * config/sh/sh.c (output_stack_adjust): Avoid using the frame
-+ register itself to hold the offset constant. Tell flow the use
-+ of r4 and r5 when they are used.
-+
-+2007-05-20 Kaz Kojima <kkojima@gcc.gnu.org>
-+
-+ PR target/31480
-+ Backport from mainline.
-+ * config/sh/sh.md (length): Check if prev_nonnote_insn (insn)
-+ is null.
-+
-+2007-05-20 Kaz Kojima <kkojima@gcc.gnu.org>
-+
-+ PR target/31022
-+ Backport from mainline.
-+ * config/sh/sh.c (sh_adjust_cost): Use the result of single_set
-+ instead of PATTERN.
-+
-+2007-05-20 Kaz Kojima <kkojima@gcc.gnu.org>
-+
-+ PR target/27405
-+ Backport from mainline.
-+ * config/sh/sh.md (cmp{eq,gt,gtu}{si,di}_media): Remove.
-+ (cmpsi{eq,gt,gtu}{si,di}_media): Rename to
-+ cmp{eq,gt,gtu}{si,di}_media.
-+ (*cmpne0si_media): Remove.
-+ (*movsicc_umin): Adjust gen_cmp*_media call.
-+ (unordered): Change the mode of unordered and operands[1] to
-+ SImode.
-+ (seq): Adjust gen_cmp*_media calls. Make the mode of
-+ a temporary result of compare SImode if needed. If the mode
-+ of operands[0] is DImode, extend the temporary result to DImode.
-+ (slt, sle, sgt, sge, sgtu, sltu, sleu, sgue, sne): Likewise.
-+ (sunorderd): Change the mode of match_operand and unorderd to
-+ SImode.
-+ (cmpeq{sf,df}_media): Remove.
-+ (cmpsieq{sf,df}_media): Rename to cmpeq{sf,df}_media.
-+ (cmp{gt,ge,un}{sf,df}_media): Change the mode of match_operand
-+ and compare operation to SImode.
-+
-+2007-05-18 Joseph Myers <joseph@codesourcery.com>
-+
-+ * config/soft-fp/double.h, config/soft-fp/extended.h,
-+ config/soft-fp/floatundidf.c, config/soft-fp/floatundisf.c,
-+ config/soft-fp/floatunsidf.c, config/soft-fp/floatunsisf.c,
-+ config/soft-fp/op-2.h, config/soft-fp/op-4.h,
-+ config/soft-fp/op-common.h, config/soft-fp/quad.h: Update from
-+ glibc CVS.
-+
-+2007-05-17 Ian Lance Taylor <iant@google.com>
-+
-+ PR tree-optimization/31953
-+ * tree-vrp.c (set_value_range_to_value): Add equiv parameter.
-+ Change all callers.
-+ (set_value_range_to_null): Call set_value_range_to_value.
-+ (extract_range_from_comparison): Likewise.
-+
-+2007-05-17 Eric Botcazou <ebotcazou@libertysurf.fr>
-+
-+ PR rtl-optimization/31691
-+ * combine.c (simplify_set): Build a new src pattern instead of
-+ substituting its operands in the COMPARE case.
-+
-+2007-05-14 Mark Mitchell <mark@codesourcery.com>
-+
-+ * BASE-VER: Set to 4.2.1.
++ * BASE-VER: Set to 4.7.1.
+ * DEV-PHASE: Set to prerelease.
+
- 2007-05-13 Release Manager
+ 2012-03-22 Release Manager
- * GCC 4.2.0 released.
-@@ -307,7 +505,8 @@
- 2007-04-03 Stuart Hastings <stuart@apple.com>
-
- PR 31281
-- * objc/objc-act.c (next_sjlj_build_catch_list): Delete volatile from rethrow decl.
-+ * objc/objc-act.c (next_sjlj_build_catch_list): Delete volatile
-+ from rethrow decl.
- * cse.c (record_jump_equiv): Bail out on CCmode comparisons.
-
- 2007-04-03 Jakub Jelinek <jakub@redhat.com>
-Index: gcc/testsuite/gcc.c-torture/execute/vrp-7.c
+ * GCC 4.7.0 released.
+Index: gcc/testsuite/gcc.target/avr/torture/addr-space-1-0.c
===================================================================
---- gcc/testsuite/gcc.c-torture/execute/vrp-7.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.c-torture/execute/vrp-7.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,20 @@
+--- gcc/testsuite/gcc.target/avr/torture/addr-space-1-0.c (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gcc.target/avr/torture/addr-space-1-0.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,6 @@
++/* { dg-options "-std=gnu99" } */
++/* { dg-do run } */
+
-+void abort (void);
++#define __as __flash
+
-+struct T
-+{
-+ int b : 1;
-+} t;
++#include "addr-space-1.h"
+Index: gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c
+===================================================================
+--- gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gcc.target/avr/torture/addr-space-1-1.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,6 @@
++/* { dg-options "-std=gnu99 -Tavr51-flash1.x" } */
++/* { dg-do run } */
+
-+void __attribute__((noinline)) foo (int f)
-+{
-+ t.b = (f & 0x10) ? 1 : 0;
-+}
++#define __as __flash1
+
-+int main (void)
-+{
-+ foo (0x10);
-+ if (!t.b)
-+ abort ();
-+ return 0;
-+}
-Index: gcc/testsuite/gcc.c-torture/execute/20070517-1.c
++#include "addr-space-1.h"
+Index: gcc/testsuite/gcc.target/avr/torture/addr-space-2-0.c
===================================================================
---- gcc/testsuite/gcc.c-torture/execute/20070517-1.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.c-torture/execute/20070517-1.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,41 @@
-+/* PR rtl-optimization/31691 */
-+/* Origin: Chi-Hua Chen <stephaniechc-gccbug@yahoo.com> */
+--- gcc/testsuite/gcc.target/avr/torture/addr-space-2-0.c (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gcc.target/avr/torture/addr-space-2-0.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,6 @@
++/* { dg-options "-std=gnu99" } */
++/* { dg-do run } */
+
-+extern void abort (void);
++#define __as __flash
+
-+static int get_kind(int) __attribute__ ((noinline));
++#include "addr-space-2.h"
+Index: gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c
+===================================================================
+--- gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gcc.target/avr/torture/addr-space-2-1.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,6 @@
++/* { dg-options "-std=gnu99 -Tavr51-flash1.x" } */
++/* { dg-do run } */
+
-+static int get_kind(int v)
-+{
-+ volatile int k = v;
-+ return k;
-+}
++#define __as __flash1
++
++#include "addr-space-2.h"
+Index: gcc/testsuite/gcc.target/avr/torture/addr-space-1-x.c
+===================================================================
+--- gcc/testsuite/gcc.target/avr/torture/addr-space-1-x.c (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gcc.target/avr/torture/addr-space-1-x.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,6 @@
++/* { dg-options "-std=gnu99" } */
++/* { dg-do run } */
+
-+static int some_call(void) __attribute__ ((noinline));
++#define __as __memx
+
-+static int some_call(void)
-+{
-+ return 0;
-+}
++#include "addr-space-1.h"
+Index: gcc/testsuite/gcc.target/avr/torture/addr-space-1.h
+===================================================================
+--- gcc/testsuite/gcc.target/avr/torture/addr-space-1.h (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gcc.target/avr/torture/addr-space-1.h (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,83 @@
++#include <stdlib.h>
++#include <string.h>
+
-+static void example (int arg)
++typedef struct
+{
-+ int tmp, kind = get_kind (arg);
++ char i1;
++ short i2;
++ long i4;
++ long long i8;
++ char str[2][10];
++} a_t;
++
++const __as a_t A =
++ {
++ 12, 345, 678910, 1234567891011ll,
++ {
++ "xxx..xxx",
++ "yyy..yyy"
++ }
++ };
+
-+ if (kind == 9 || kind == 10 || kind == 5)
++const __as volatile a_t V =
++ {
++ 12+1, 345+1, 678910+1, 1234567891011ll+1,
+ {
-+ if (some_call() == 0)
-+ {
-+ if (kind == 9 || kind == 10)
-+ tmp = arg;
-+ else
-+ abort();
-+ }
++ "XXX..XXX",
++ "YYY..YYY"
+ }
-+}
++ };
+
-+int main(void)
++a_t A2;
++volatile a_t V2;
++
++int main (void)
+{
-+ example(10);
++ if (A.i1 != 12
++ || A.i1 != V.i1 -1)
++ abort();
++
++ if (A.i2 != 345
++ || A.i2 != V.i2 -1)
++ abort();
++
++ if (A.i4 != 678910
++ || A.i4 != V.i4 -1)
++ abort();
++
++ if (A.i8 != 1234567891011ll
++ || A.i8 != V.i8 -1)
++ abort();
++
++ A2 = A;
++ V2 = V;
++
++ if (A2.i1 != 12
++ || A2.i1 != V2.i1 -1)
++ abort();
++
++ if (A2.i2 != 345
++ || A2.i2 != V2.i2 -1)
++ abort();
++
++ if (A2.i4 != 678910
++ || A2.i4 != V2.i4 -1)
++ abort();
++
++ if (A2.i8 != 1234567891011ll
++ || A2.i8 != V2.i8 -1)
++ abort();
++
++ if (strcmp (A2.str[0], "xxx..xxx"))
++ abort();
++ if (strcmp (A2.str[1], "yyy..yyy"))
++ abort();
++
++ if (strcmp ((const char*) V2.str[0], "XXX..XXX"))
++ abort();
++ if (strcmp ((const char*) V2.str[1], "YYY..YYY"))
++ abort();
++
++ exit (0);
+ return 0;
+}
-Index: gcc/testsuite/gcc.c-torture/compile/pr31953.c
-===================================================================
---- gcc/testsuite/gcc.c-torture/compile/pr31953.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.c-torture/compile/pr31953.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,14 @@
-+struct WView
-+{
-+ int hexedit_mode:1;
-+};
-+toggle_hexedit_mode (struct WView *view)
-+{
-+ if (view->hexedit_mode)
-+ {
-+ }
-+ else
-+ {
-+ view->hexedit_mode = !view->hexedit_mode;
-+ }
-+}
-Index: gcc/testsuite/gcc.target/i386/sse2-vec-3.c
+Index: gcc/testsuite/gcc.target/avr/torture/addr-space-2-x.c
===================================================================
---- gcc/testsuite/gcc.target/i386/sse2-vec-3.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.target/i386/sse2-vec-3.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,37 @@
-+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
-+/* { dg-options "-O2 -msse2" } */
+--- gcc/testsuite/gcc.target/avr/torture/addr-space-2-x.c (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gcc.target/avr/torture/addr-space-2-x.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,9 @@
++/* { dg-options "-std=gnu99 -Wa,--no-warn" } */
++/* { dg-do run } */
+
-+#include "sse2-check.h"
++/* --no-warn because: "assembling 24-bit address needs binutils extension"
++ see binutils PR13503. */
+
-+#include <emmintrin.h>
++#define __as __memx
+
-+static void
-+sse2_test (void)
-+{
-+ union
-+ {
-+ __m128i x;
-+ char c[16];
-+ short s[8];
-+ int i[4];
-+ long long ll[2];
-+ } val1;
-+ int res[4];
-+ int masks[4];
-+ int i;
-+
-+ for (i = 0; i < 16; i++)
-+ val1.c[i] = i;
-+
-+ res[0] = __builtin_ia32_vec_ext_v4si ((__v4si)val1.x, 0);
-+ res[1] = __builtin_ia32_vec_ext_v4si ((__v4si)val1.x, 1);
-+ res[2] = __builtin_ia32_vec_ext_v4si ((__v4si)val1.x, 2);
-+ res[3] = __builtin_ia32_vec_ext_v4si ((__v4si)val1.x, 3);
-+
-+ for (i = 0; i < 4; i++)
-+ masks[i] = i;
-+
-+ for (i = 0; i < 4; i++)
-+ if (res[i] != val1.i [masks[i]])
-+ abort ();
-+}
-Index: gcc/testsuite/gcc.target/i386/pr31167.c
++#include "addr-space-2.h"
+Index: gcc/testsuite/gcc.target/avr/torture/addr-space-2.h
===================================================================
---- gcc/testsuite/gcc.target/i386/pr31167.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.target/i386/pr31167.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,20 @@
-+/* { dg-do compile { target x86_64-*-* } } */
-+/* { dg-options "-O" } */
-+
-+typedef int int32_t;
+--- gcc/testsuite/gcc.target/avr/torture/addr-space-2.h (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gcc.target/avr/torture/addr-space-2.h (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,106 @@
++extern void exit (int);
++extern void abort (void);
+
-+int32_t round32hi (const __int128_t arg)
++typedef struct T
+{
-+ const int SHIFT = 96;
-+ const int mshift = 96;
-+ const __int128_t M = (~(__int128_t) 0) << mshift;
-+ const __int128_t L = (~M) + 1;
-+ const __int128_t L1 = ((__int128_t) L) >> 1;
-+ const __int128_t Mlo = ((__int128_t) (~M)) >> 1;
-+ __int128_t vv = arg & M;
-+
-+ if ((arg & (L1)) && ((arg & Mlo) || (arg & L)))
-+ vv += L;
-+
-+ return (int32_t) (vv >> SHIFT);
-+}
-Index: gcc/testsuite/gcc.target/i386/sse2-vec-4.c
-===================================================================
---- gcc/testsuite/gcc.target/i386/sse2-vec-4.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.target/i386/sse2-vec-4.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,41 @@
-+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
-+/* { dg-options "-O2 -msse2" } */
++ char val;
++ const __as struct T *l, *r;
++} tree;
++
++/*
++ abcd
++ / \
++ ab cd
++ / \ / \
++ a b c d
++*/
+
-+#include "sse2-check.h"
++const __as tree a = { 'a', 0, 0 };
++const __as tree b = { 'b', 0, 0 };
++const __as tree c = { 'c', 0, 0 };
++const __as tree d = { 'd', 0, 0 };
+
-+#include <emmintrin.h>
++const __as tree ab = { 'A', &a, &b };
++const __as tree cd = { 'C', &c, &d };
++
++const __as tree abcd = { '*', &ab, &cd };
+
+static void
-+sse2_test (void)
++test1 (void)
+{
-+ union
-+ {
-+ __m128i x;
-+ char c[16];
-+ short s[8];
-+ int i[4];
-+ long long ll[2];
-+ } val1;
-+ short res[8];
-+ int masks[8];
-+ int i;
-+
-+ for (i = 0; i < 16; i++)
-+ val1.c[i] = i;
-+
-+ res[0] = __builtin_ia32_vec_ext_v8hi ((__v8hi)val1.x, 0);
-+ res[1] = __builtin_ia32_vec_ext_v8hi ((__v8hi)val1.x, 1);
-+ res[2] = __builtin_ia32_vec_ext_v8hi ((__v8hi)val1.x, 2);
-+ res[3] = __builtin_ia32_vec_ext_v8hi ((__v8hi)val1.x, 3);
-+ res[4] = __builtin_ia32_vec_ext_v8hi ((__v8hi)val1.x, 4);
-+ res[5] = __builtin_ia32_vec_ext_v8hi ((__v8hi)val1.x, 5);
-+ res[6] = __builtin_ia32_vec_ext_v8hi ((__v8hi)val1.x, 6);
-+ res[7] = __builtin_ia32_vec_ext_v8hi ((__v8hi)val1.x, 7);
-+
-+ for (i = 0; i < 8; i++)
-+ masks[i] = i;
-+
-+ for (i = 0; i < 8; i++)
-+ if (res[i] != val1.s [masks[i]])
-+ abort ();
++ if (abcd.val != '*')
++ abort();
++
++ if (abcd.l->val != 'A')
++ abort();
++ if (abcd.r->val != 'C')
++ abort();
++
++ if (abcd.l->l->val != 'a')
++ abort();
++ if (abcd.l->r->val != 'b')
++ abort();
++ if (abcd.r->l->val != 'c')
++ abort();
++ if (abcd.r->r->val != 'd')
++ abort();
+}
-Index: gcc/testsuite/gcc.target/i386/sse2-check.h
-===================================================================
---- gcc/testsuite/gcc.target/i386/sse2-check.h (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.target/i386/sse2-check.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,20 @@
-+#include <stdio.h>
-+#include <stdlib.h>
+
-+#include "../../gcc.dg/i386-cpuid.h"
-+
-+static void sse2_test (void);
-+
-+int
-+main ()
++static void
++test2 (const __as tree *t)
+{
-+ unsigned long cpu_facilities;
-+
-+ cpu_facilities = i386_cpuid_edx ();
-+
-+ /* Run SSE2 test only if host has SSE2 support. */
-+ if ((cpu_facilities & bit_SSE2))
-+ sse2_test ();
-+
-+ exit (0);
++ if (t->val != '*')
++ abort();
++
++ if (t->l->val != 'A')
++ abort();
++ if (t->r->val != 'C')
++ abort();
++
++ if (t->l->l->val != 'a')
++ abort();
++ if (t->l->r->val != 'b')
++ abort();
++ if (t->r->l->val != 'c')
++ abort();
++ if (t->r->r->val != 'd')
++ abort();
+}
-Index: gcc/testsuite/gcc.target/i386/sse2-vec-1.c
-===================================================================
---- gcc/testsuite/gcc.target/i386/sse2-vec-1.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.target/i386/sse2-vec-1.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,35 @@
-+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
-+/* { dg-options "-O2 -msse2" } */
-+
-+#include "sse2-check.h"
-+
-+#include <emmintrin.h>
-+
-+#define msk0 0
-+#define msk1 1
+
+static void
-+sse2_test (void)
++test3 (const __as tree *pt)
+{
-+ union
-+ {
-+ __m128d x;
-+ double d[2];
-+ } val1;
-+ double res[2];
-+ int masks[2];
-+ int i;
-+
-+ val1.d[0] = 23.;
-+ val1.d[1] = 45;
-+
-+ res[0] = __builtin_ia32_vec_ext_v2df ((__v2df)val1.x, msk0);
-+ res[1] = __builtin_ia32_vec_ext_v2df ((__v2df)val1.x, msk1);
-+
-+ masks[0] = msk0;
-+ masks[1] = msk1;
-+
-+ for (i = 0; i < 2; i++)
-+ if (res[i] != val1.d [masks[i]])
-+ abort ();
++ tree t = *pt;
++
++ if (t.val != '*')
++ abort();
++
++ if (t.l->val != 'A')
++ abort();
++ if (t.r->val != 'C')
++ abort();
++
++ if (t.l->l->val != 'a')
++ abort();
++ if (t.l->r->val != 'b')
++ abort();
++ if (t.r->l->val != 'c')
++ abort();
++ if (t.r->r->val != 'd')
++ abort();
+}
-Index: gcc/testsuite/gcc.target/i386/sse2-vec-5.c
-===================================================================
---- gcc/testsuite/gcc.target/i386/sse2-vec-5.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.target/i386/sse2-vec-5.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,49 @@
-+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
-+/* { dg-options "-O2 -msse2" } */
+
-+#include "sse2-check.h"
-+
-+#include <emmintrin.h>
-+
-+static void
-+sse2_test (void)
++int main (void)
+{
-+ union
-+ {
-+ __m128i x;
-+ char c[16];
-+ short s[8];
-+ int i[4];
-+ long long ll[2];
-+ } val1;
-+ char res[16];
-+ int masks[16];
-+ int i;
-+
-+ for (i = 0; i < 16; i++)
-+ val1.c[i] = i;
-+
-+ res[0] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 0);
-+ res[1] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 1);
-+ res[2] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 2);
-+ res[3] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 3);
-+ res[4] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 4);
-+ res[5] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 5);
-+ res[6] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 6);
-+ res[7] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 7);
-+ res[8] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 8);
-+ res[9] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 9);
-+ res[10] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 10);
-+ res[11] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 11);
-+ res[12] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 12);
-+ res[13] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 13);
-+ res[14] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 14);
-+ res[15] = __builtin_ia32_vec_ext_v16qi ((__v16qi)val1.x, 15);
-+
-+ for (i = 0; i < 16; i++)
-+ masks[i] = i;
-+
-+ for (i = 0; i < 16; i++)
-+ if (res[i] != val1.c [masks[i]])
-+ abort ();
++ const __as tree *t = &abcd;
++ test1();
++ test2 (&abcd);
++ test3 (&abcd);
++
++ __asm ("" : "+r" (t));
++ test2 (t);
++ test3 (t);
++
++ exit (0);
++ return 0;
+}
-Index: gcc/testsuite/gcc.target/i386/sse2-vec-2.c
+Index: gcc/testsuite/gcc.target/avr/torture/addr-space-1-g.c
+===================================================================
+--- gcc/testsuite/gcc.target/avr/torture/addr-space-1-g.c (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gcc.target/avr/torture/addr-space-1-g.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,6 @@
++/* { dg-options "-std=gnu99" } */
++/* { dg-do run } */
++
++#define __as
++
++#include "addr-space-1.h"
+Index: gcc/testsuite/gcc.target/avr/torture/addr-space-2-g.c
+===================================================================
+--- gcc/testsuite/gcc.target/avr/torture/addr-space-2-g.c (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gcc.target/avr/torture/addr-space-2-g.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,6 @@
++/* { dg-options "-std=gnu99" } */
++/* { dg-do run } */
++
++#define __as
++
++#include "addr-space-2.h"
+Index: gcc/testsuite/gcc.target/avr/progmem.h
+===================================================================
+--- gcc/testsuite/gcc.target/avr/progmem.h (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/testsuite/gcc.target/avr/progmem.h (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -5,6 +5,7 @@
+ static const char __c[] PROGMEM = (s); \
+ &__c[0];}))
+
++#ifdef __AVR_HAVE_LPMX__
+ #define pgm_read_char(addr) \
+ (__extension__({ \
+ unsigned int __addr16 = (unsigned int)(addr); \
+@@ -12,3 +13,13 @@
+ __asm__ ("lpm %0, %a1" \
+ : "=r" (__result) : "z" (__addr16)); \
+ __result; }))
++#else
++#define pgm_read_char(addr) \
++ (__extension__({ \
++ unsigned int __addr16 = (unsigned int)(addr); \
++ char __result; \
++ __asm__ ("lpm" "\n\t" \
++ "mov %0, r0" \
++ : "=r" (__result) : "z" (__addr16)); \
++ __result; }))
++#endif
+Index: gcc/testsuite/gfortran.dg/intrinsic_8.f90
===================================================================
---- gcc/testsuite/gcc.target/i386/sse2-vec-2.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.target/i386/sse2-vec-2.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,35 @@
-+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
-+/* { dg-options "-O2 -msse2" } */
-+
-+#include "sse2-check.h"
+--- gcc/testsuite/gfortran.dg/intrinsic_8.f90 (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gfortran.dg/intrinsic_8.f90 (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,23 @@
++! { dg-do compile }
++!
++! PR fortran/52452
++!
++! Contributed by Roger Ferrer Ibanez
++!
++PROGRAM test_etime
++ IMPLICIT NONE
++ INTRINSIC :: etime
++ REAL(4) :: tarray(1:2)
++ REAL(4) :: result
++
++ CALL etime(tarray, result)
++END PROGRAM test_etime
++
++subroutine test_etime2
++ IMPLICIT NONE
++ INTRINSIC :: etime
++ REAL(4) :: tarray(1:2)
++ REAL(4) :: result
++
++ result = etime(tarray)
++END subroutine test_etime2
+Index: gcc/testsuite/gcc.dg/Wunused-var-3.c
+===================================================================
+--- gcc/testsuite/gcc.dg/Wunused-var-3.c (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/gcc.dg/Wunused-var-3.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,34 @@
++/* PR c/52577 */
++/* { dg-do compile } */
++/* { dg-options "-Wunused" } */
+
-+#include <emmintrin.h>
++typedef int V __attribute__((vector_size (sizeof (int) * 4)));
+
-+static void
-+sse2_test (void)
++void
++f1 (V *p)
+{
-+ union
-+ {
-+ __m128i x;
-+ char c[16];
-+ short s[8];
-+ int i[4];
-+ long long ll[2];
-+ } val1;
-+ long long res[2];
-+ int masks[2];
-+ int i;
-+
-+ for (i = 0; i < 16; i++)
-+ val1.c[i] = i;
-+
-+ res[0] = __builtin_ia32_vec_ext_v2di ((__v2di)val1.x, 0);
-+ res[1] = __builtin_ia32_vec_ext_v2di ((__v2di)val1.x, 1);
-+
-+ for (i = 0; i < 2; i++)
-+ masks[i] = i;
-+
-+ for (i = 0; i < 2; i++)
-+ if (res[i] != val1.ll [masks[i]])
-+ abort ();
++ V mask = { 1, 2, 3, 0 };
++ *p = __builtin_shuffle (*p, mask);
+}
-Index: gcc/testsuite/gcc.target/i386/sse2-vec-6.c
-===================================================================
---- gcc/testsuite/gcc.target/i386/sse2-vec-6.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.target/i386/sse2-vec-6.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,69 @@
-+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
-+/* { dg-options "-O2 -msse2" } */
-+
-+#include "sse2-check.h"
-+
-+#include <emmintrin.h>
-+#include <string.h>
+
-+static void
-+sse2_test (void)
++void
++f2 (V *p, V *q)
+{
-+ union
-+ {
-+ __m128i x;
-+ char c[16];
-+ short s[8];
-+ int i[4];
-+ long long ll[2];
-+ } val1, res[16], tmp;
-+ short ins[8] = { 8, 5, 9, 4, 2, 6, 1, 20 };
-+ int masks[8];
-+ int i;
-+
-+ for (i = 0; i < 16; i++)
-+ val1.c[i] = i;
-+
-+ res[0].x = (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)val1.x,
-+ ins[0], 0);
-+ res[1].x = (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)val1.x,
-+ ins[0], 1);
-+ res[2].x = (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)val1.x,
-+ ins[0], 2);
-+ res[3].x = (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)val1.x,
-+ ins[0], 3);
-+ res[4].x = (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)val1.x,
-+ ins[0], 4);
-+ res[5].x = (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)val1.x,
-+ ins[0], 5);
-+ res[6].x = (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)val1.x,
-+ ins[0], 6);
-+ res[7].x = (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)val1.x,
-+ ins[0], 7);
-+
-+ for (i = 0; i < 8; i++)
-+ masks[i] = i;
-+
-+ for (i = 0; i < 8; i++)
-+ {
-+ tmp.x = val1.x;
-+ tmp.s[masks[i]] = ins[0];
-+ if (memcmp (&tmp, &res[i], sizeof (tmp)))
-+ abort ();
-+ }
-+
-+ for (i = 0; i < 8; i++)
-+ {
-+ res[i].x = (__m128i) __builtin_ia32_vec_set_v8hi ((__v8hi)val1.x,
-+ ins[i], 0);
-+ masks[i] = 0;
-+ }
-+
-+ for (i = 0; i < 8; i++)
-+ {
-+ tmp.x = val1.x;
-+ tmp.s[masks[i]] = ins[i];
-+ if (memcmp (&tmp, &res[i], sizeof (tmp)))
-+ abort ();
-+ }
++ V mask = { 1, 2, 3, 0 };
++ *p = __builtin_shuffle (*p, *q, mask);
+}
-Index: gcc/testsuite/gcc.dg/Wstrict-overflow-18.c
-===================================================================
---- gcc/testsuite/gcc.dg/Wstrict-overflow-18.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.dg/Wstrict-overflow-18.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,22 @@
-+/* { dg-do compile } */
-+/* { dg-options "-fstrict-overflow -O2 -Wstrict-overflow" } */
-+
-+/* Don't warn about an overflow when folding i > 0. The loop analysis
-+ should determine that i does not wrap. */
+
-+struct c { unsigned int a; unsigned int b; };
-+extern void bar (struct c *);
-+int
-+foo (struct c *p)
++void
++f3 (V *p, V *mask)
+{
-+ int i;
-+ int sum = 0;
-+
-+ for (i = 0; i < p->a - p->b; ++i)
-+ {
-+ if (i > 0)
-+ sum += 2;
-+ bar (p);
-+ }
-+ return sum;
++ V a = { 1, 2, 3, 0 };
++ *p = __builtin_shuffle (a, *mask);
+}
-Index: gcc/testsuite/gcc.dg/Wstrict-overflow-19.c
-===================================================================
---- gcc/testsuite/gcc.dg/Wstrict-overflow-19.c (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gcc.dg/Wstrict-overflow-19.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,15 @@
-+/* { dg-do compile } */
-+/* { dg-options "-fstrict-overflow -O2 -Wstrict-overflow" } */
-+
-+/* Don't warn about an overflow when threading jumps. We used to get
-+ a warning from comparing bounds generated by VRP. */
+
-+int
-+bar(int a, int b, int n)
++void
++f4 (V *p, V *mask)
+{
-+ if (b > a)
-+ n = a - b;
-+ if (a >= b)
-+ n = 1;
-+ return n;
++ V a = { 1, 2, 3, 0 };
++ V b = { 2, 3, 4, 1 };
++ *p = __builtin_shuffle (a, b, *mask);
+}
Index: gcc/testsuite/ChangeLog
===================================================================
---- gcc/testsuite/ChangeLog (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/testsuite/ChangeLog (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,3 +1,124 @@
-+2007-06-08 Dirk Mueller <dmueller@suse.de>
-+
-+ PR c++/31809
-+ Backport from mainline:
-+ 2007-05-30 Jakub Jelinek <jakub@redhat.com>
-+
-+ * g++.dg/opt/static5.C: New test.
-+
-+2007-06-06 Ian Lance Taylor <iant@google.com>
-+
-+ * g++.dg/conversion/enum1.C: New test.
-+
-+2007-06-05 Ian Lance Taylor <iant@google.com>
-+
-+ * gcc.dg/Wstrict-overflow-19.c: New test.
-+
-+2007-06-04 Ian Lance Taylor <iant@google.com>
-+
-+ * gcc.dg/Wstrict-overflow-18.c: New test.
-+
-+2007-05-31 H.J. Lu <hongjiu.lu@intel.com>
-+
-+ Backport from mainline:
-+ 2007-05-25 H.J. Lu <hongjiu.lu@intel.com>
-+
-+ * gcc.target/i386/sse2-check.h: New.
-+ * gcc.target/i386/sse2-vec-1.c: Likewise.
-+ * gcc.target/i386/sse2-vec-2.c: Likewise.
-+ * gcc.target/i386/sse2-vec-3.c: Likewise.
-+ * gcc.target/i386/sse2-vec-4.c: Likewise.
-+ * gcc.target/i386/sse2-vec-5.c: Likewise.
-+ * gcc.target/i386/sse2-vec-6.c: Likewise.
+--- gcc/testsuite/ChangeLog (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/testsuite/ChangeLog (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,3 +1,60 @@
++2012-03-22 Paolo Carlini <paolo.carlini@oracle.com>
+
-+2007-05-31 Paul Thomas <pault@gcc.gnu.org>
++ PR c++/52487
++ * g++.dg/cpp0x/lambda/lambda-ice7.C: New.
+
-+ PR fortran/31483
-+ * gfortran.dg/altreturn_5.f90: New test.
++2012-03-22 Tobias Burnus <burnus@net-b.de>
+
-+ PR fortran/31540
-+ * gfortran.dg/char_result_5.f90: New test.
++ PR fortran/52452
++ * gfortran.dg/intrinsic_8.f90: New.
+
-+ PR fortran/31867
-+ * gfortran.dg/char_length_5.f90: New test.
++2012-03-22 Jakub Jelinek <jakub@redhat.com>
+
-+ PR fortran/31994
-+ * gfortran.dg/array_reference_1.f90: New test.
++ PR c++/52671
++ * g++.dg/ext/attrib44.C: New test.
+
-+2007-05-22 Tobias Burnus <burnus@net-b.de>
++2012-03-22 Jason Merrill <jason@redhat.com>
+
-+ PR fortran/31559
-+ Backport from mainline.
-+ * primary.c (match_variable): External functions
-+ are no variables.
++ * g++.dg/torture/pr52582.C: New.
+
-+2007-05-30 Jakub Jelinek <jakub@redhat.com>
++2012-03-22 Georg-Johann Lay <avr@gjlay.de>
+
-+ PR tree-optimization/31769
-+ * g++.dg/gomp/pr31769.C: New test.
++ Backport from 2012-03-20 mainline r185583.
+
-+2007-05-28 Andrew Pinski <andrew_pinski@playstation.sony.com>
++ * gcc.target/avr/progmem.h (pgm_read_char): Define depending on
++ __AVR_HAVE_LPMX__
+
-+ PR tree-opt/32100
-+ * gcc.c-torture/execute/vrp-7.c: New test.
-+
-+2007-05-23 Jerry DeLisle <jvdelisle@gcc.gnu.org>
++ Backport from 2012-03-20 mainline r185570.
+
-+ PR libfortran/31964
-+ * gfortran.fortran-torture/execute/intrinsic_bitops.f90: Update.
++ PR target/49868
++ * gcc.target/avr/torture/addr-space-2.h: New file.
++ * gcc.target/avr/torture/addr-space-2-g.h: New test.
++ * gcc.target/avr/torture/addr-space-2-0.h: New test.
++ * gcc.target/avr/torture/addr-space-2-1.h: New test.
++ * gcc.target/avr/torture/addr-space-2-x.h: New test.
+
-+2007-05-22 Jerry DeLisle <jvdelisle@gcc.gnu.org>
++ Backport from 2012-03-12 mainline r185255.
+
-+ PR libgfortran/31051
-+ * gfortran.dg/fmt_t_3.f90: New.
++ PR target/49868
++ * gcc.target/avr/torture/addr-space-1.h: New file.
++ * gcc.target/avr/torture/addr-space-g.h: New test.
++ * gcc.target/avr/torture/addr-space-0.h: New test.
++ * gcc.target/avr/torture/addr-space-1.h: New test.
++ * gcc.target/avr/torture/addr-space-x.h: New test.
+
-+2007-05-22 Dominique d'Humieres <dominiq@lps.ens.fr>
++2012-03-22 Jakub Jelinek <jakub@redhat.com>
+
-+ * gfortran.dg/unf_io_convert_3.f90: Fix dg directive.
++ Backported from mainline
++ 2012-03-14 Jakub Jelinek <jakub@redhat.com>
+
-+2007-05-22 Tobias Burnus <burnus@net-b.de>
++ PR c++/52521
++ * g++.dg/cpp0x/udlit-args2.C: New test.
+
-+ PR fortran/31559
-+ Backport from mainline.
-+ * func_assign.f90: New test.
++ 2012-03-13 Jakub Jelinek <jakub@redhat.com>
+
-+2007-05-21 Uros Bizjak <ubizjak@gmail.com>
++ PR c/52577
++ * gcc.dg/Wunused-var-3.c: New test.
+
-+ PR target/31167
-+ Backport from mainline.
-+ * gcc.target/i386/pr31167.c: New test.
-+
-+2007-05-20 Jerry DeLisle <jvdelisle@gcc.gnu.org>
-+
-+ PR libgfortran/31395
-+ * gfortran.dg/fmt_colon.f90: New test.
-+
-+2007-05-20 Thomas Koenig <tkoenig@gcc.gnu.org>
-+
-+ PR fortran/31618
-+ Backport from trunk.
-+ * gfortran.dg/backspace_8.f: New test case.
-+
-+2007-05-20 Thomas Koenig <tkoenig@gcc.gnu.org>
-+
-+ PR libfortran/31196
-+ Backport from trunk.
-+ * gfortran.dg/reshape_transpose_1.f90: New test.
-+
-+2007-05-17 Ian Lance Taylor <iant@google.com>
-+
-+ PR tree-optimization/31953
-+ * gcc.c-torture/compile/pr31953.c: New test.
-+
-+2007-05-17 Eric Botcazou <ebotcazou@libertysurf.fr>
-+
-+ * gcc.c-torture/execute/20070517-1.c: New test.
-+
-+2007-05-16 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
-+
-+ PR fortran/31725
-+ * gfortran.dg/substr_4.f: New test.
-+
- 2007-05-13 Release Manager
+ 2012-03-22 Release Manager
- * GCC 4.2.0 released.
-Index: gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_bitops.f90
+ * GCC 4.7.0 released.
+Index: gcc/testsuite/g++.dg/ext/attrib44.C
===================================================================
---- gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_bitops.f90 (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_bitops.f90 (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -8,7 +8,8 @@
- i = 2
- j = 3
- k = 12
--
-+ a = 5
-+
- if (.not. btest (i, o+1)) call abort
- if (btest (i, o+2)) call abort
- if (iand (i, j) .ne. 2) call abort
-@@ -26,4 +27,6 @@
- if (ishftc (k, o-30) .ne. 48) call abort
- if (ishftc (k, o+1, o+3) .ne. 9) call abort
- if (not (i) .ne. -3) call abort
-+ if (ishftc (a, 1, bit_size(a)) .ne. 10) call abort
-+ if (ishftc (1, 1, 32) .ne. 2) call abort
- end program
-Index: gcc/testsuite/g++.dg/conversion/enum1.C
+--- gcc/testsuite/g++.dg/ext/attrib44.C (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/g++.dg/ext/attrib44.C (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,4 @@
++// PR c++/52671
++// { dg-do compile }
++__attribute__ ((deprecated)) enum E { E0 }; // { dg-warning "attribute ignored in declaration of" }
++// { dg-message "must follow the" "" { target *-*-* } 3 }
+Index: gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice7.C
===================================================================
---- gcc/testsuite/g++.dg/conversion/enum1.C (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/g++.dg/conversion/enum1.C (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,10 @@
-+// { dg-do run }
-+// { dg-options "-O2 -finline-functions" }
-+
-+enum E { V = 1 };
-+static const E E_MIN = V;
-+static const E E_MAX = V;
+--- gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice7.C (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice7.C (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,9 @@
++// PR c++/52487
++// { dg-options "-std=c++0x" }
+
-+bool valid(E v) { return v >= E_MIN && v <= E_MAX; }
++struct A; // { dg-error "forward declaration" }
+
-+int main() { return valid(E(2)); }
-Index: gcc/testsuite/g++.dg/gomp/pr31769.C
++void foo(A& a)
++{
++ [=](){a;}; // { dg-error "invalid use of incomplete type" }
++}
+Index: gcc/testsuite/g++.dg/cpp0x/udlit-args2.C
===================================================================
---- gcc/testsuite/g++.dg/gomp/pr31769.C (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/g++.dg/gomp/pr31769.C (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,61 @@
-+// PR tree-optimization/31769
-+// { dg-options "-O2 -fopenmp" }
+--- gcc/testsuite/g++.dg/cpp0x/udlit-args2.C (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/g++.dg/cpp0x/udlit-args2.C (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,15 @@
++// PR c++/52521
+// { dg-do compile }
++// { dg-options -std=c++11 }
+
-+struct B
-+{
-+ B () {}
-+ virtual ~B () {}
-+};
-+struct C
-+{
-+ C (int x, int y) {}
-+};
-+template<typename T, int U>
-+struct D
-+{
-+ D () {}
-+ ~D () {}
-+};
-+struct E
-+{
-+ E () {}
-+ ~E () {}
-+ D<int, 1> e;
-+};
-+struct A
-+{
-+ B *b;
-+ A () { b = __null; }
-+ ~A () { if (b != __null) delete b; }
-+};
-+struct F : public A
-+{
-+ explicit F (int x) { foo (0); }
-+ F (const F &x) {}
-+ F (F &x, C y) {}
-+ F operator () (C x) const
-+ {
-+ return F (const_cast<F &>(*this), x);
-+ }
-+ template <typename U> F & operator+= (const U &);
-+ void foo (int);
-+ E f;
-+};
++#include <cstddef>
+
-+int
-+main ()
++int operator "" _a (const char *);
++int operator "" _a (const char *, std::size_t);
++int a = 123_a;
++int a2 = "abc"_a;
++
++int operator "" _b (const char *, std::size_t);
++int operator "" _b (const char *);
++int b = 123_b;
++int b2 = "abc"_b;
+Index: gcc/testsuite/g++.dg/torture/pr52582.C
+===================================================================
+--- gcc/testsuite/g++.dg/torture/pr52582.C (.../tags/gcc_4_7_0_release) (wersja 0)
++++ gcc/testsuite/g++.dg/torture/pr52582.C (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -0,0 +1,23 @@
++// PR c++/52582
++
++inline void *operator new (__SIZE_TYPE__, void *p) throw ()
+{
-+ try
-+ {
-+ F f (10);
-+ F g (10);
-+ C h (0, 9);
-+#pragma omp parallel for
-+ for (int i = 0; i < 2; ++i)
-+ g += f (h);
-+ }
-+ catch (int &e)
-+ {
-+ }
++ return p;
+}
-Index: gcc/testsuite/g++.dg/opt/static5.C
-===================================================================
---- gcc/testsuite/g++.dg/opt/static5.C (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/g++.dg/opt/static5.C (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,29 @@
-+// PR c++/31809
-+// { dg-do run }
-+// { dg-options "-O2" }
-+
-+struct S
++struct B
+{
-+ unsigned v;
-+ static inline S f (unsigned a);
++ virtual ~B ();
++ B ();
+};
-+
-+inline S
-+S::f (unsigned a)
++struct A : B
+{
-+ static S t = { a };
-+ return t;
-+}
-+
-+const static S s = S::f (26);
-+
-+extern "C" void abort (void);
-+
-+int
-+main ()
++ A () : B () {}
++ virtual void bar ();
++};
++void
++foo ()
+{
-+ S t = s;
-+ if (t.v != 26)
-+ abort ();
-+ return 0;
++ char a[64];
++ B *b = new (&a) A ();
++ b->~B ();
+}
-Index: gcc/testsuite/gfortran.dg/char_length_5.f90
-===================================================================
---- gcc/testsuite/gfortran.dg/char_length_5.f90 (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gfortran.dg/char_length_5.f90 (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,61 @@
-+! { dg-do run }
-+! Tests the fix for PR31867, in which the interface evaluation
-+! of the character length of 'join' (ie. the length available in
-+! the caller) was wrong.
-+!
-+! Contributed by <beliavsky@aol.com>
-+!
-+module util_mod
-+ implicit none
-+contains
-+ function join (words, sep) result(str)
-+ character (len=*), intent(in) :: words(:),sep
-+ character (len = (size (words) - 1) * len_trim (sep) + &
-+ sum (len_trim (words))) :: str
-+ integer :: i,nw
-+ nw = size (words)
-+ str = ""
-+ if (nw < 1) then
-+ return
-+ else
-+ str = words(1)
-+ end if
-+ do i=2,nw
-+ str = trim (str) // trim (sep) // words(i)
-+ end do
-+ end function join
-+end module util_mod
-+!
-+program xjoin
-+ use util_mod, only: join
-+ implicit none
-+ integer yy
-+ character (len=5) :: words(5:8) = (/"two ","three","four ","five "/), sep = "^#^"
-+ character (len=5) :: words2(4) = (/"bat ","ball ","goal ","stump"/), sep2 = "&"
-+
-+ if (join (words, sep) .ne. "two^#^three^#^four^#^five") call abort ()
-+ if (len (join (words, sep)) .ne. 25) call abort ()
-+
-+ if (join (words(5:6), sep) .ne. "two^#^three") call abort ()
-+ if (len (join (words(5:6), sep)) .ne. 11) call abort ()
-+
-+ if (join (words(7:8), sep) .ne. "four^#^five") call abort ()
-+ if (len (join (words(7:8), sep)) .ne. 11) call abort ()
-+
-+ if (join (words(5:7:2), sep) .ne. "two^#^four") call abort ()
-+ if (len (join (words(5:7:2), sep)) .ne. 10) call abort ()
-+
-+ if (join (words(6:8:2), sep) .ne. "three^#^five") call abort ()
-+ if (len (join (words(6:8:2), sep)) .ne. 12) call abort ()
-+
-+ if (join (words2, sep2) .ne. "bat&ball&goal&stump") call abort ()
-+ if (len (join (words2, sep2)) .ne. 19) call abort ()
-+
-+ if (join (words2(1:2), sep2) .ne. "bat&ball") call abort ()
-+ if (len (join (words2(1:2), sep2)) .ne. 8) call abort ()
-+
-+ if (join (words2(2:4:2), sep2) .ne. "ball&stump") call abort ()
-+ if (len (join (words2(2:4:2), sep2)) .ne. 10) call abort ()
-+
-+end program xjoin
-+! { dg-final { cleanup-modules "util_mod" } }
-Index: gcc/testsuite/gfortran.dg/array_reference_1.f90
-===================================================================
---- gcc/testsuite/gfortran.dg/array_reference_1.f90 (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gfortran.dg/array_reference_1.f90 (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,35 @@
-+! { dg-do run }
-+! Tests the fix for PR31994, aka 31867, in which the offset
-+! of 'a' in both subroutines was being evaluated incorrectly.
-+! The testcase for PR31867 is char_length_5.f90
-+!
-+! Contributed by Elizabeth Yip <elizabeth.l.yip@boeing.com>
-+! and Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
-+!
-+program main
-+ call PR31994
-+ call PR31994_comment6
-+contains
-+ subroutine PR31994
-+ implicit none
-+ complex (kind=4), dimension(2,2) :: a, b, c
-+ a(1,1) = (1.,1.)
-+ a(2,1) = (2.,2.)
-+ a(1,2) = (3.,3.)
-+ a(2,2) = (4.,4.)
-+ b=conjg (transpose (a))
-+ c=transpose (a)
-+ c=conjg (c)
-+ if (any (b .ne. c)) call abort ()
-+ end subroutine PR31994
-+ subroutine PR31994_comment6
-+ implicit none
-+ real ,dimension(2,2)::a
-+ integer ,dimension(2,2) :: b, c
-+ a = reshape ((/1.,2.,3.,4./), (/2,2/))
-+ b=int (transpose(a))
-+ c = int (a)
-+ c = transpose (c)
-+ if (any (b .ne. c)) call abort ()
-+ end subroutine PR31994_comment6
-+END program main
-Index: gcc/testsuite/gfortran.dg/reshape_transpose_1.f90
-===================================================================
---- gcc/testsuite/gfortran.dg/reshape_transpose_1.f90 (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gfortran.dg/reshape_transpose_1.f90 (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,18 @@
-+! { dg-do run }
-+! PR 31196 - reshape of transposed derived types generated
-+! wront results.
-+program main
-+ implicit none
-+ TYPE datatype
-+ INTEGER :: I
-+ END TYPE datatype
-+ character (len=20) line1, line2
-+ TYPE(datatype), dimension(2,2) :: data, result
-+ data(1,1)%i = 1
-+ data(2,1)%i = 2
-+ data(1,2)%i = 3
-+ data(2,2)%i = 4
-+ write (unit=line1, fmt="(4I4)") reshape(transpose(data),shape(data))
-+ write (unit=line2, fmt="(4I4)") (/ 1, 3, 2, 4 /)
-+ if (line1 /= line2) call abort
-+END program main
-Index: gcc/testsuite/gfortran.dg/fmt_colon.f90
-===================================================================
---- gcc/testsuite/gfortran.dg/fmt_colon.f90 (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gfortran.dg/fmt_colon.f90 (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,14 @@
-+! { dg-do run }
-+! PR31395 Colon edit descriptor is ignored.
-+! Test case derived from PR. Prepared by Jerry DeLisle
-+! <jvdelisle@gcc.gnu.org>
-+PROGRAM test
-+ INTEGER :: i = 1
-+ character(30) :: astring
-+ WRITE(astring, 10) i
-+ 10 FORMAT('i =',I2:' this should not print')
-+ if (astring.ne."i = 1") call abort
-+ write(astring, 20) i, i
-+ 20 format('i =',I2:' this should print',I2)
-+ if (astring.ne."i = 1 this should print 1") call abort
-+END PROGRAM test
-\ brakuje znaku końca linii na końcu pliku
-Index: gcc/testsuite/gfortran.dg/char_result_13.f90
-===================================================================
---- gcc/testsuite/gfortran.dg/char_result_13.f90 (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gfortran.dg/char_result_13.f90 (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,13 @@
-+! { dg-do compile }
-+! tests the fix for PR31540, in which the character lengths in
-+! parentheses were not resolved.
-+!
-+! Contributed by Tobias Burnus <burnus@gcc.gnu.org>
-+!
-+ subroutine pfb()
-+ implicit none
-+ external pfname1, pfname2
-+ character ((136)) pfname1
-+ character ((129+7)) pfname2
-+ return
-+ end
-Index: gcc/testsuite/gfortran.dg/altreturn_5.f90
-===================================================================
---- gcc/testsuite/gfortran.dg/altreturn_5.f90 (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gfortran.dg/altreturn_5.f90 (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,30 @@
-+! { dg-do run }
-+! Tests the fix for PR31483, in which dummy argument procedures
-+! produced an ICE if they had an alternate return.
-+!
-+! Contributed by Mathias Fröhlich <M.Froehlich@science-computing.de>
-+
-+ SUBROUTINE R (i, *, *)
-+ INTEGER i
-+ RETURN i
-+ END
-+
-+ SUBROUTINE PHLOAD (READER, i, res)
-+ IMPLICIT NONE
-+ EXTERNAL READER
-+ integer i
-+ character(3) res
-+ CALL READER (i, *1, *2)
-+ 1 res = "one"
-+ return
-+ 2 res = "two"
-+ return
-+ END
-+
-+ EXTERNAL R
-+ character(3) res
-+ call PHLOAD (R, 1, res)
-+ if (res .ne. "one") call abort ()
-+ CALL PHLOAD (R, 2, res)
-+ if (res .ne. "two") call abort ()
-+ END
-\ brakuje znaku końca linii na końcu pliku
-Index: gcc/testsuite/gfortran.dg/substr_4.f
-===================================================================
---- gcc/testsuite/gfortran.dg/substr_4.f (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gfortran.dg/substr_4.f (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,69 @@
-+! { dg-do run }
-+ subroutine test_lower
-+ implicit none
-+ character(3), dimension(3) :: zsymel,zsymelr
-+ common /xx/ zsymel, zsymelr
-+ integer :: znsymelr
-+ zsymel = (/ 'X', 'Y', ' ' /)
-+ zsymelr= (/ 'X', 'Y', ' ' /)
-+ znsymelr=2
-+ call check_zsymel(zsymel,zsymelr,znsymelr)
-+
-+ contains
-+
-+ subroutine check_zsymel(zsymel,zsymelr,znsymelr)
-+ implicit none
-+ integer znsymelr, isym
-+ character(*) zsymel(*),zsymelr(*)
-+ character(len=80) buf
-+ zsymel(3)(lenstr(zsymel(3))+1:)='X'
-+ write (buf,10) (trim(zsymelr(isym)),isym=1,znsymelr)
-+10 format(3(a,:,','))
-+ if (trim(buf) /= 'X,Y') call abort
-+ end subroutine check_zsymel
-+
-+ function lenstr(s)
-+ character(len=*),intent(in) :: s
-+ integer :: lenstr
-+ if (len_trim(s) /= 0) call abort
-+ lenstr = len_trim(s)
-+ end function lenstr
-+
-+ end subroutine test_lower
-+
-+ subroutine test_upper
-+ implicit none
-+ character(3), dimension(3) :: zsymel,zsymelr
-+ common /xx/ zsymel, zsymelr
-+ integer :: znsymelr
-+ zsymel = (/ 'X', 'Y', ' ' /)
-+ zsymelr= (/ 'X', 'Y', ' ' /)
-+ znsymelr=2
-+ call check_zsymel(zsymel,zsymelr,znsymelr)
-+
-+ contains
-+
-+ subroutine check_zsymel(zsymel,zsymelr,znsymelr)
-+ implicit none
-+ integer znsymelr, isym
-+ character(*) zsymel(*),zsymelr(*)
-+ character(len=80) buf
-+ zsymel(3)(:lenstr(zsymel(3))+1)='X'
-+ write (buf,20) (trim(zsymelr(isym)),isym=1,znsymelr)
-+20 format(3(a,:,','))
-+ if (trim(buf) /= 'X,Y') call abort
-+ end subroutine check_zsymel
-+
-+ function lenstr(s)
-+ character(len=*),intent(in) :: s
-+ integer :: lenstr
-+ if (len_trim(s) /= 0) call abort
-+ lenstr = len_trim(s)
-+ end function lenstr
-+
-+ end subroutine test_upper
-+
-+ program test
-+ call test_lower
-+ call test_upper
-+ end program test
-Index: gcc/testsuite/gfortran.dg/fmt_t_3.f90
-===================================================================
---- gcc/testsuite/gfortran.dg/fmt_t_3.f90 (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gfortran.dg/fmt_t_3.f90 (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,15 @@
-+! { dg-do run }
-+! PR31051 bug with x and t format descriptors.
-+! Test case prepared by Jerry DeLisle <jvdelisle@gcc.gnu.org> from PR.
-+program t
-+ integer, parameter :: n = 9
-+ character(len=40) :: fmt
-+ character(len=2), dimension(n) :: y
-+ open(unit=10, status="scratch")
-+ y = 'a '
-+ fmt = '(a,1x,(t7, 3a))'
-+ write(10, fmt) 'xxxx', (y(i), i = 1,n)
-+ rewind(10)
-+ read(10, '(a)') fmt
-+ if (fmt.ne."xxxx a a a") call abort()
-+end program t
-Index: gcc/testsuite/gfortran.dg/backspace_8.f
-===================================================================
---- gcc/testsuite/gfortran.dg/backspace_8.f (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gfortran.dg/backspace_8.f (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,18 @@
-+C { dg-do run }
-+C PR libfortran/31618 - backspace after an error didn't work.
-+ program main
-+ character*78 msg
-+ open (21, file="backspace_7.dat", form="unformatted")
-+ write (21) 42, 43
-+ write (21) 4711, 4712
-+ write (21) -1, -4
-+ rewind (21)
-+ read (21) i,j
-+ read (21,err=100,end=100) i,j,k
-+ call abort
-+ 100 continue
-+ backspace 21
-+ read (21) i,j
-+ if (i .ne. 4711 .or. j .ne. 4712) call abort
-+ close (21,status="delete")
-+ end
-Index: gcc/testsuite/gfortran.dg/func_assign.f90
-===================================================================
---- gcc/testsuite/gfortran.dg/func_assign.f90 (.../tags/gcc_4_2_0_release) (wersja 0)
-+++ gcc/testsuite/gfortran.dg/func_assign.f90 (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -0,0 +1,33 @@
-+! { dg-do compile }
-+!
-+! PR fortran/31559
-+! Do not allow assigning to external functions
-+!
-+! Contributed by Steve Kargl <sgk@troutmask.apl.washington.edu>
-+!
-+module mod
-+ implicit none
-+contains
-+ integer function bar()
-+ bar = 4
-+ end function bar
-+
-+ subroutine a()
-+ implicit none
-+ real :: fun
-+ external fun
-+ interface
-+ function funget(a)
-+ integer :: a
-+ end function
-+ subroutine sub()
-+ end subroutine sub
-+ end interface
-+ sub = 'a' ! { dg-error "Expected VARIABLE" }
-+ fun = 4.4 ! { dg-error "Expected VARIABLE" }
-+ funget = 4 ! { dg-error "is not a VALUE" }
-+ bar = 5 ! { dg-error "is not a VALUE" }
-+ end subroutine a
-+end module mod
-+
-+end
-Index: gcc/testsuite/gfortran.dg/unf_io_convert_3.f90
-===================================================================
---- gcc/testsuite/gfortran.dg/unf_io_convert_3.f90 (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/testsuite/gfortran.dg/unf_io_convert_3.f90 (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,4 +1,4 @@
--! { dg-do run}
-+! { dg-do run }
- ! { dg-require-effective-target fortran_large_real }
- program main
- integer,parameter :: k = selected_real_kind (precision (0.0_8) + 1)
+Index: gcc/cp/class.c
+===================================================================
+--- gcc/cp/class.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/cp/class.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -3145,8 +3145,9 @@
+ CLASSTYPE_NON_AGGREGATE (t) = 1;
+
+ /* If at least one non-static data member is non-literal, the whole
+- class becomes non-literal. */
+- if (!literal_type_p (type))
++ class becomes non-literal. Note: if the type is incomplete we
++ will complain later on. */
++ if (COMPLETE_TYPE_P (type) && !literal_type_p (type))
+ CLASSTYPE_LITERAL_P (t) = false;
+
+ /* A standard-layout class is a class that:
Index: gcc/cp/decl.c
===================================================================
---- gcc/cp/decl.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/cp/decl.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -5368,7 +5368,18 @@
- initializer. It is not legal to redeclare a static data
- member, so this issue does not arise in that case. */
- if (var_definition_p && TREE_STATIC (decl))
-- expand_static_init (decl, init);
-+ {
-+ /* If a TREE_READONLY variable needs initialization
-+ at runtime, it is no longer readonly and we need to
-+ avoid MEM_READONLY_P being set on RTL created for it. */
-+ if (init)
-+ {
-+ if (TREE_READONLY (decl))
-+ TREE_READONLY (decl) = 0;
-+ was_readonly = 0;
-+ }
-+ expand_static_init (decl, init);
-+ }
- }
- }
-
+--- gcc/cp/decl.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/cp/decl.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -4219,7 +4219,8 @@
+ if (declspecs->attributes)
+ {
+ location_t loc = input_location;
+- if (!CLASSTYPE_TEMPLATE_INSTANTIATION (declared_type))
++ if (!CLASS_TYPE_P (declared_type)
++ || !CLASSTYPE_TEMPLATE_INSTANTIATION (declared_type))
+ /* For a non-template class, use the name location; for a template
+ class (an explicit instantiation), use the current location. */
+ input_location = location_of (declared_type);
+Index: gcc/cp/method.c
+===================================================================
+--- gcc/cp/method.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/cp/method.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1590,6 +1590,7 @@
+ DECL_DELETED_FN (fn) = deleted_p;
+ DECL_DECLARED_CONSTEXPR_P (fn) = constexpr_p;
+ }
++ DECL_EXTERNAL (fn) = true;
+ DECL_NOT_REALLY_EXTERN (fn) = 1;
+ DECL_DECLARED_INLINE_P (fn) = 1;
+ gcc_assert (!TREE_USED (fn));
Index: gcc/cp/ChangeLog
===================================================================
---- gcc/cp/ChangeLog (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/cp/ChangeLog (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,3 +1,18 @@
-+2007-06-08 Dirk Mueller <dmueller@suse.de>
+--- gcc/cp/ChangeLog (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/cp/ChangeLog (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,3 +1,30 @@
++2012-03-22 Paolo Carlini <paolo.carlini@oracle.com>
+
-+ PR c++/31809
-+ PR c++/31806
-+ Backport from mainline:
-+ 2007-05-31 Jakub Jelinek <jakub@redhat.com>
++ PR c++/52487
++ * class.c (check_field_decls): Call literal_type_p only
++ on complete types.
+
-+ * decl.c (cp_finish_decl): Also clear was_readonly if a static var
-+ needs runtime initialization.
++2012-03-22 Jakub Jelinek <jakub@redhat.com>
+
-+ 2007-05-30 Jakub Jelinek <jakub@redhat.com>
++ PR c++/52671
++ * decl.c (check_tag_decl): Only use CLASSTYPE_TEMPLATE_INSTANTIATION
++ on CLASS_TYPE_P types.
+
-+ * decl.c (cp_finish_decl): Clear TREE_READONLY flag on TREE_STATIC
-+ variables that need runtime initialization.
++2012-03-22 Jason Merrill <jason@redhat.com>
+
- 2007-05-13 Release Manager
-
- * GCC 4.2.0 released.
-Index: gcc/fortran/trans-expr.c
-===================================================================
---- gcc/fortran/trans-expr.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/fortran/trans-expr.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -255,6 +255,10 @@
- gfc_conv_string_parameter (se);
- else
- {
-+ /* Avoid multiple evaluation of substring start. */
-+ if (!CONSTANT_CLASS_P (start.expr) && !DECL_P (start.expr))
-+ start.expr = gfc_evaluate_now (start.expr, &se->pre);
-+
- /* Change the start of the string. */
- if (TYPE_STRING_FLAG (TREE_TYPE (se->expr)))
- tmp = se->expr;
-@@ -273,6 +277,10 @@
- gfc_conv_expr_type (&end, ref->u.ss.end, gfc_charlen_type_node);
- gfc_add_block_to_block (&se->pre, &end.pre);
- }
++ PR c++/52582
++ * method.c (implicitly_declare_fn): Set DECL_EXTERNAL.
+
-+ if (!CONSTANT_CLASS_P (end.expr) && !DECL_P (end.expr))
-+ end.expr = gfc_evaluate_now (end.expr, &se->pre);
++2012-03-22 Jakub Jelinek <jakub@redhat.com>
+
- tmp = fold_build2 (MINUS_EXPR, gfc_charlen_type_node,
- build_int_cst (gfc_charlen_type_node, 1),
- start.expr);
-@@ -2340,17 +2348,23 @@
-
- /* Generate the actual call. */
- gfc_conv_function_val (se, sym);
++ Backported from mainline
++ 2012-03-14 Jakub Jelinek <jakub@redhat.com>
+
- /* If there are alternate return labels, function type should be
- integer. Can't modify the type in place though, since it can be shared
-- with other functions. */
-+ with other functions. For dummy arguments, the typing is done to
-+ to this result, even if it has to be repeated for each call. */
- if (has_alternate_specifier
- && TREE_TYPE (TREE_TYPE (TREE_TYPE (se->expr))) != integer_type_node)
- {
-- gcc_assert (! sym->attr.dummy);
-- TREE_TYPE (sym->backend_decl)
-- = build_function_type (integer_type_node,
-- TYPE_ARG_TYPES (TREE_TYPE (sym->backend_decl)));
-- se->expr = build_fold_addr_expr (sym->backend_decl);
-+ if (!sym->attr.dummy)
-+ {
-+ TREE_TYPE (sym->backend_decl)
-+ = build_function_type (integer_type_node,
-+ TYPE_ARG_TYPES (TREE_TYPE (sym->backend_decl)));
-+ se->expr = build_fold_addr_expr (sym->backend_decl);
-+ }
-+ else
-+ TREE_TYPE (TREE_TYPE (TREE_TYPE (se->expr))) = integer_type_node;
- }
++ PR c++/52521
++ * parser.c (lookup_literal_operator): Return fn only if
++ processed all arguments from args vector and argtypes is
++ void_list_node.
++
+ 2012-03-22 Release Manager
- fntype = TREE_TYPE (TREE_TYPE (se->expr));
-Index: gcc/fortran/trans-array.c
+ * GCC 4.7.0 released.
+Index: gcc/cp/parser.c
===================================================================
---- gcc/fortran/trans-array.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/fortran/trans-array.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -4422,6 +4422,8 @@
-
- if (se->direct_byref)
- base = gfc_index_zero_node;
-+ else if (GFC_ARRAY_TYPE_P (TREE_TYPE (desc)))
-+ base = gfc_evaluate_now (gfc_conv_array_offset (desc), &loop.pre);
- else
- base = NULL_TREE;
-
-@@ -4489,8 +4491,20 @@
- stride, info->stride[dim]);
-
- if (se->direct_byref)
-- base = fold_build2 (MINUS_EXPR, TREE_TYPE (base),
-- base, stride);
-+ {
-+ base = fold_build2 (MINUS_EXPR, TREE_TYPE (base),
-+ base, stride);
-+ }
-+ else if (GFC_ARRAY_TYPE_P (TREE_TYPE (desc)))
-+ {
-+ tmp = gfc_conv_array_lbound (desc, n);
-+ tmp = fold_build2 (MINUS_EXPR, TREE_TYPE (base),
-+ tmp, loop.from[dim]);
-+ tmp = fold_build2 (MULT_EXPR, TREE_TYPE (base),
-+ tmp, gfc_conv_array_stride (desc, n));
-+ base = fold_build2 (PLUS_EXPR, TREE_TYPE (base),
-+ tmp, base);
-+ }
-
- /* Store the new stride. */
- tmp = gfc_conv_descriptor_stride (parm, gfc_rank_cst[dim]);
-@@ -4511,7 +4525,8 @@
- gfc_conv_descriptor_data_set (&loop.pre, parm, offset);
+--- gcc/cp/parser.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/cp/parser.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,6 +1,6 @@
+ /* C++ Parser.
+ Copyright (C) 2000, 2001, 2002, 2003, 2004,
+- 2005, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
++ 2005, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ Written by Mark Mitchell <mark@codesourcery.com>.
+
+ This file is part of GCC.
+@@ -3581,7 +3581,13 @@
+ TREE_TYPE (tparm))))
+ found = false;
+ }
+- if (found)
++ if (found
++ && ix == VEC_length (tree, args)
++ /* May be this should be sufficient_parms_p instead,
++ depending on how exactly should user-defined literals
++ work in presence of default arguments on the literal
++ operator parameters. */
++ && argtypes == void_list_node)
+ return fn;
}
-
-- if (se->direct_byref && !se->data_not_needed)
-+ if ((se->direct_byref || GFC_ARRAY_TYPE_P (TREE_TYPE (desc)))
-+ && !se->data_not_needed)
- {
- /* Set the offset. */
- tmp = gfc_conv_descriptor_offset (parm);
-Index: gcc/fortran/gfortran.texi
-===================================================================
---- gcc/fortran/gfortran.texi (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/fortran/gfortran.texi (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -611,7 +611,7 @@
- to change the representation of data for unformatted files.
- The syntax for the @env{GFORTRAN_CONVERT_UNIT} variable is:
- @smallexample
--GFORTRAN_CONVERT_UNIT: mode | mode ';' exception ;
-+GFORTRAN_CONVERT_UNIT: mode | mode ';' exception | exception ;
- mode: 'native' | 'swap' | 'big_endian' | 'little_endian' ;
- exception: mode ':' unit_list | unit_list ;
- unit_list: unit_spec | unit_list unit_spec ;
-@@ -668,7 +668,12 @@
- setting a default data representation for the whole program. The
- @code{CONVERT} specifier overrides the @option{-fconvert} compile options.
-
-+@emph{Note that the values specified via the GFORTRAN_CONVERT_UNIT
-+environment variable will override the CONVERT specifier in the
-+open statement}. This is to give control over data formats to
-+users who do not have the source code of their program available.
-
-+
- @c =====================================================================
- @c PART II: LANGUAGE REFERENCE
- @c =====================================================================
+ }
Index: gcc/fortran/ChangeLog
===================================================================
---- gcc/fortran/ChangeLog (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/fortran/ChangeLog (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,3 +1,30 @@
-+2007-05-31 Paul Thomas <pault@gcc.gnu.org>
-+
-+ PR fortran/31483
-+ * trans-expr.c (gfc_conv_function_call): Give a dummy
-+ procedure the correct type if it has alternate returns.
-+
-+
-+ PR fortran/31540
-+ * resolve.c (resolve_fl_procedure): Resolve constant character
-+ lengths.
-+
-+ PR fortran/31867
-+ PR fortran/31994
-+ * trans-array.c (gfc_conv_expr_descriptor): Obtain the stored
-+ offset for non-descriptor, source arrays and correct for stride
-+ not equal to one before writing to field of output descriptor.
-+
-+2007-05-17 Tobias Burnus <burnus@net-b.de>
-+
-+ * gfortran.texi (GFORTRAN_CONVERT_UNIT): Improve documentation.
-+
-+2007-05-16 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+--- gcc/fortran/ChangeLog (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/fortran/ChangeLog (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,3 +1,9 @@
++2012-03-22 Tobias Burnus <burnus@net-b.de>
+
-+ PR fortran/31725
-+ * trans-expr.c (gfc_conv_substring): Evaluate substring bounds
-+ only once.
++ PR fortran/52452
++ * resolve.c (resolve_intrinsic): Don't search for a
++ function if we know that it is a subroutine.
+
- 2007-05-13 Release Manager
+ 2012-03-22 Release Manager
- * GCC 4.2.0 released.
+ * GCC 4.7.0 released.
Index: gcc/fortran/resolve.c
===================================================================
---- gcc/fortran/resolve.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/fortran/resolve.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -5742,6 +5742,11 @@
- if (sym->ts.type == BT_CHARACTER)
- {
- gfc_charlen *cl = sym->ts.cl;
-+
-+ if (cl && cl->length && gfc_is_constant_expr (cl->length)
-+ && resolve_charlen (cl) == FAILURE)
-+ return FAILURE;
-+
- if (!cl || !cl->length || cl->length->expr_type != EXPR_CONSTANT)
- {
- if (sym->attr.proc == PROC_ST_FUNCTION)
-Index: gcc/fortran/primary.c
-===================================================================
---- gcc/fortran/primary.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/fortran/primary.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -2415,7 +2415,8 @@
-
- case FL_PROCEDURE:
- /* Check for a nonrecursive function result */
-- if (sym->attr.function && (sym->result == sym || sym->attr.entry))
-+ if (sym->attr.function && (sym->result == sym || sym->attr.entry)
-+ && !sym->attr.external)
- {
- /* If a function result is a derived type, then the derived
- type may still have to be resolved. */
+--- gcc/fortran/resolve.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/fortran/resolve.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1496,7 +1496,7 @@
+
+ if (sym->intmod_sym_id)
+ isym = gfc_intrinsic_function_by_id ((gfc_isym_id) sym->intmod_sym_id);
+- else
++ else if (!sym->attr.subroutine)
+ isym = gfc_find_function (sym->name);
+
+ if (isym)
Index: gcc/BASE-VER
===================================================================
---- gcc/BASE-VER (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/BASE-VER (.../branches/gcc-4_2-branch) (wersja 125589)
+--- gcc/BASE-VER (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/BASE-VER (.../branches/gcc-4_7-branch) (wersja 185750)
@@ -1 +1 @@
--4.2.0
-+4.2.1
-Index: gcc/except.c
-===================================================================
---- gcc/except.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/except.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1005,7 +1005,11 @@
- for (prev_try = VEC_index (eh_region, cfun->eh->region_array, outer_region);
- prev_try && prev_try->type != ERT_TRY;
- prev_try = prev_try->outer)
-- ;
-+ if (prev_try->type == ERT_MUST_NOT_THROW)
-+ {
-+ prev_try = NULL;
-+ break;
-+ }
+-4.7.0
++4.7.1
+Index: gcc/tree-nested.c
+===================================================================
+--- gcc/tree-nested.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/tree-nested.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1954,6 +1954,7 @@
+ convert_tramp_reference_stmt (gimple_stmt_iterator *gsi, bool *handled_ops_p,
+ struct walk_stmt_info *wi)
+ {
++ struct nesting_info *info = (struct nesting_info *) wi->info;
+ gimple stmt = gsi_stmt (*gsi);
+
+ switch (gimple_code (stmt))
+@@ -1966,16 +1967,33 @@
+ for (i = 0; i < nargs; i++)
+ walk_tree (gimple_call_arg_ptr (stmt, i), convert_tramp_reference_op,
+ wi, NULL);
++ break;
++ }
- /* Remap all of the internal catch and cleanup linkages. Since we
- duplicate entire subtrees, all of the referenced regions will have
-Index: gcc/combine.c
-===================================================================
---- gcc/combine.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/combine.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -5341,14 +5341,14 @@
- }
- else if (GET_MODE (op0) == compare_mode && op1 == const0_rtx)
- {
-- SUBST(SET_SRC (x), op0);
-+ SUBST (SET_SRC (x), op0);
- src = SET_SRC (x);
- }
-- else
-+ /* Otherwise, update the COMPARE if needed. */
-+ else if (XEXP (src, 0) != op0 || XEXP (src, 1) != op1)
- {
-- /* Otherwise, update the COMPARE if needed. */
-- SUBST (XEXP (src, 0), op0);
-- SUBST (XEXP (src, 1), op1);
-+ SUBST (SET_SRC (x), gen_rtx_COMPARE (compare_mode, op0, op1));
-+ src = SET_SRC (x);
- }
+- *handled_ops_p = true;
+- return NULL_TREE;
++ case GIMPLE_OMP_PARALLEL:
++ case GIMPLE_OMP_TASK:
++ {
++ tree save_local_var_chain;
++ walk_gimple_op (stmt, convert_tramp_reference_op, wi);
++ save_local_var_chain = info->new_local_var_chain;
++ info->new_local_var_chain = NULL;
++ walk_body (convert_tramp_reference_stmt, convert_tramp_reference_op,
++ info, gimple_omp_body (stmt));
++ if (info->new_local_var_chain)
++ declare_vars (info->new_local_var_chain,
++ gimple_seq_first_stmt (gimple_omp_body (stmt)),
++ false);
++ info->new_local_var_chain = save_local_var_chain;
+ }
++ break;
+
+ default:
++ *handled_ops_p = false;
++ return NULL_TREE;
+ break;
}
- else
-Index: gcc/Makefile.in
-===================================================================
---- gcc/Makefile.in (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/Makefile.in (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1839,7 +1839,7 @@
- tree-ssa-structalias.o: tree-ssa-structalias.c tree-ssa-structalias.h \
- $(SYSTEM_H) $(CONFIG_H) $(GGC_H) $(TREE_H) $(TREE_FLOW_H) \
- $(TM_H) coretypes.h $(CGRAPH_H) tree-pass.h $(TIMEVAR_H) \
-- gt-tree-ssa-structalias.h $(PARAMS_H)
-+ gt-tree-ssa-structalias.h $(PARAMS_H) pointer-set.h
- tree-ssa.o : tree-ssa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
- $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) output.h $(DIAGNOSTIC_H) \
- toplev.h $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h \
-Index: gcc/tree-ssa-structalias.c
-===================================================================
---- gcc/tree-ssa-structalias.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/tree-ssa-structalias.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -51,10 +51,11 @@
- #include "params.h"
- #include "tree-ssa-structalias.h"
- #include "cgraph.h"
-+#include "pointer-set.h"
-
- /* The idea behind this analyzer is to generate set constraints from the
- program, then solve the resulting constraints in order to generate the
-- points-to sets.
-+ points-to sets.
-
- Set constraints are a way of modeling program analysis problems that
- involve sets. They consist of an inclusion constraint language,
-@@ -70,33 +71,33 @@
-
- Also see "Ultra-fast Aliasing Analysis using CLA: A Million Lines
- of C Code in a Second" by ""Nevin Heintze and Olivier Tardieu" at
-- http://citeseer.ist.psu.edu/heintze01ultrafast.html
-+ http://citeseer.ist.psu.edu/heintze01ultrafast.html
-
-- There are three types of constraint expressions, DEREF, ADDRESSOF, and
-- SCALAR. Each constraint expression consists of a constraint type,
-- a variable, and an offset.
--
-+ There are three types of real constraint expressions, DEREF,
-+ ADDRESSOF, and SCALAR. Each constraint expression consists
-+ of a constraint type, a variable, and an offset.
-+
- SCALAR is a constraint expression type used to represent x, whether
- it appears on the LHS or the RHS of a statement.
- DEREF is a constraint expression type used to represent *x, whether
-- it appears on the LHS or the RHS of a statement.
-+ it appears on the LHS or the RHS of a statement.
- ADDRESSOF is a constraint expression used to represent &x, whether
- it appears on the LHS or the RHS of a statement.
--
-+
- Each pointer variable in the program is assigned an integer id, and
- each field of a structure variable is assigned an integer id as well.
--
-+
- Structure variables are linked to their list of fields through a "next
- field" in each variable that points to the next field in offset
-- order.
-- Each variable for a structure field has
-+ order.
-+ Each variable for a structure field has
-
- 1. "size", that tells the size in bits of that field.
- 2. "fullsize, that tells the size in bits of the entire structure.
- 3. "offset", that tells the offset in bits from the beginning of the
- structure to this field.
-
-- Thus,
-+ Thus,
- struct f
- {
- int a;
-@@ -110,50 +111,51 @@
- foo.b -> id 2, size 32, offset 32, fullsize 64, next NULL
- bar -> id 3, size 32, offset 0, fullsize 32, next NULL
-
--
-+
- In order to solve the system of set constraints, the following is
- done:
-
- 1. Each constraint variable x has a solution set associated with it,
- Sol(x).
--
-+
- 2. Constraints are separated into direct, copy, and complex.
- Direct constraints are ADDRESSOF constraints that require no extra
- processing, such as P = &Q
- Copy constraints are those of the form P = Q.
-- Complex constraints are all the constraints involving dereferences.
--
-+ Complex constraints are all the constraints involving dereferences
-+ and offsets (including offsetted copies).
-+
- 3. All direct constraints of the form P = &Q are processed, such
-- that Q is added to Sol(P)
-+ that Q is added to Sol(P)
-
- 4. All complex constraints for a given constraint variable are stored in a
-- linked list attached to that variable's node.
-+ linked list attached to that variable's node.
-
- 5. A directed graph is built out of the copy constraints. Each
-- constraint variable is a node in the graph, and an edge from
-+ constraint variable is a node in the graph, and an edge from
- Q to P is added for each copy constraint of the form P = Q
--
-+
- 6. The graph is then walked, and solution sets are
- propagated along the copy edges, such that an edge from Q to P
- causes Sol(P) <- Sol(P) union Sol(Q).
--
-+
- 7. As we visit each node, all complex constraints associated with
- that node are processed by adding appropriate copy edges to the graph, or the
-- appropriate variables to the solution set.
-+ appropriate variables to the solution set.
-
- 8. The process of walking the graph is iterated until no solution
- sets change.
-
- Prior to walking the graph in steps 6 and 7, We perform static
-- cycle elimination on the constraint graph, as well
-+ cycle elimination on the constraint graph, as well
- as off-line variable substitution.
--
-+
- TODO: Adding offsets to pointer-to-structures can be handled (IE not punted
- on and turned into anything), but isn't. You can just see what offset
- inside the pointed-to struct it's going to access.
--
-+
- TODO: Constant bounded arrays can be handled as if they were structs of the
-- same number of elements.
-+ same number of elements.
-
- TODO: Modeling heap and incoming pointers becomes much better if we
- add fields to them as we discover them, which we could do.
-@@ -161,20 +163,29 @@
- TODO: We could handle unions, but to be honest, it's probably not
- worth the pain or slowdown. */
-
--static GTY ((if_marked ("tree_map_marked_p"), param_is (struct tree_map)))
--htab_t heapvar_for_stmt;
-+static GTY ((if_marked ("tree_map_marked_p"), param_is (struct tree_map))) htab_t heapvar_for_stmt;
-
- /* One variable to represent all non-local accesses. */
- tree nonlocal_all;
-
- static bool use_field_sensitive = true;
- static int in_ipa_mode = 0;
-+
-+/* Used for predecessor bitmaps. */
- static bitmap_obstack predbitmap_obstack;
--static bitmap_obstack ptabitmap_obstack;
-+
-+/* Used for points-to sets. */
-+static bitmap_obstack pta_obstack;
-+
-+/* Used for oldsolution members of variables. */
-+static bitmap_obstack oldpta_obstack;
-+
-+/* Used for per-solver-iteration bitmaps. */
- static bitmap_obstack iteration_obstack;
-
- static unsigned int create_variable_info_for (tree, const char *);
--static void build_constraint_graph (void);
-+typedef struct constraint_graph *constraint_graph_t;
-+static void unify_nodes (constraint_graph_t, unsigned int, unsigned int, bool);
-
- DEF_VEC_P(constraint_t);
- DEF_VEC_ALLOC_P(constraint_t,heap);
-@@ -186,11 +197,13 @@
- static struct constraint_stats
- {
- unsigned int total_vars;
-- unsigned int collapsed_vars;
-+ unsigned int nonpointer_vars;
- unsigned int unified_vars_static;
- unsigned int unified_vars_dynamic;
- unsigned int iterations;
- unsigned int num_edges;
-+ unsigned int num_implicit_edges;
-+ unsigned int points_to_sets_created;
- } stats;
-
- struct variable_info
-@@ -205,7 +218,7 @@
- tree decl;
-
- /* Offset of this variable, in bits, from the base variable */
-- unsigned HOST_WIDE_INT offset;
-+ unsigned HOST_WIDE_INT offset;
-
- /* Size of the variable, in bits. */
- unsigned HOST_WIDE_INT size;
-@@ -216,34 +229,21 @@
- /* A link to the variable for the next field in this structure. */
- struct variable_info *next;
-
-- /* Node in the graph that represents the constraints and points-to
-- solution for the variable. */
-- unsigned int node;
--
-- /* True if the address of this variable is taken. Needed for
-- variable substitution. */
-- unsigned int address_taken:1;
--
-- /* True if this variable is the target of a dereference. Needed for
-- variable substitution. */
-- unsigned int indirect_target:1;
--
- /* True if the variable is directly the target of a dereference.
- This is used to track which variables are *actually* dereferenced
-- so we can prune their points to listed. This is equivalent to the
-- indirect_target flag when no merging of variables happens. */
-+ so we can prune their points to listed. */
- unsigned int directly_dereferenced:1;
-
- /* True if this is a variable created by the constraint analysis, such as
- heap variables and constraints we had to break up. */
- unsigned int is_artificial_var:1;
--
-+
- /* True if this is a special variable whose solution set should not be
- changed. */
- unsigned int is_special_var:1;
-
- /* True for variables whose size is not known or variable. */
-- unsigned int is_unknown_size_var:1;
-+ unsigned int is_unknown_size_var:1;
-
- /* True for variables that have unions somewhere in them. */
- unsigned int has_union:1;
-@@ -254,16 +254,15 @@
- /* Points-to set for this variable. */
- bitmap solution;
-
-+ /* Old points-to set for this variable. */
-+ bitmap oldsolution;
-+
- /* Variable ids represented by this node. */
- bitmap variables;
-
-- /* Vector of complex constraints for this node. Complex
-- constraints are those involving dereferences. */
-- VEC(constraint_t,heap) *complex;
--
-- /* Variable id this was collapsed to due to type unsafety.
-- This should be unused completely after build_constraint_graph, or
-- something is broken. */
-+ /* Variable id this was collapsed to due to type unsafety. This
-+ should be unused completely after build_succ_graph, or something
-+ is broken. */
- struct variable_info *collapsed_to;
- };
- typedef struct variable_info *varinfo_t;
-@@ -277,8 +276,8 @@
-
- DEF_VEC_ALLOC_P(varinfo_t, heap);
-
--/* Table of variable info structures for constraint variables. Indexed directly
-- by variable info id. */
-+/* Table of variable info structures for constraint variables.
-+ Indexed directly by variable info id. */
- static VEC(varinfo_t,heap) *varmap;
-
- /* Return the varmap element N */
-@@ -286,7 +285,7 @@
- static inline varinfo_t
- get_varinfo (unsigned int n)
- {
-- return VEC_index(varinfo_t, varmap, n);
-+ return VEC_index (varinfo_t, varmap, n);
+
+- *handled_ops_p = false;
++ *handled_ops_p = true;
+ return NULL_TREE;
}
- /* Return the varmap element N, following the collapsed_to link. */
-@@ -294,7 +293,7 @@
- static inline varinfo_t
- get_varinfo_fc (unsigned int n)
- {
-- varinfo_t v = VEC_index(varinfo_t, varmap, n);
-+ varinfo_t v = VEC_index (varinfo_t, varmap, n);
-
- if (v->collapsed_to)
- return v->collapsed_to;
-@@ -331,10 +330,9 @@
- /* Variable that represents non-local variables before we expand it to
- one for each type. */
- static unsigned int nonlocal_vars_id;
--
- /* Lookup a heap var for FROM, and return it if we find one. */
+Index: gcc/output.h
+===================================================================
+--- gcc/output.h (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/output.h (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -446,8 +446,8 @@
+ #define SECTION_STYLE_MASK 0x600000 /* bits used for SECTION_STYLE */
+ #define SECTION_COMMON 0x800000 /* contains common data */
+ #define SECTION_RELRO 0x1000000 /* data is readonly after relocation processing */
+-#define SECTION_MACH_DEP 0x2000000 /* subsequent bits reserved for target */
+-#define SECTION_EXCLUDE 0x4000000 /* discarded by the linker */
++#define SECTION_EXCLUDE 0x2000000 /* discarded by the linker */
++#define SECTION_MACH_DEP 0x4000000 /* subsequent bits reserved for target */
+
+ /* This SECTION_STYLE is used for unnamed sections that we can switch
+ to using a special assembler directive. */
+Index: gcc/c-parser.c
+===================================================================
+--- gcc/c-parser.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/c-parser.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,7 +1,7 @@
+ /* Parser for C and Objective-C.
+ Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+- 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
+- Free Software Foundation, Inc.
++ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011,
++ 2012 Free Software Foundation, Inc.
+
+ Parser actions based on the old Bison parser; structure somewhat
+ influenced by and fragments based on the C++ parser.
+@@ -6647,6 +6647,8 @@
+ case RID_BUILTIN_SHUFFLE:
+ {
+ VEC(c_expr_t,gc) *cexpr_list;
++ unsigned int i;
++ c_expr_t *p;
+
+ c_parser_consume_token (parser);
+ if (!c_parser_get_builtin_args (parser,
+@@ -6657,6 +6659,9 @@
+ break;
+ }
+
++ FOR_EACH_VEC_ELT (c_expr_t, cexpr_list, i, p)
++ mark_exp_read (p->value);
++
+ if (VEC_length (c_expr_t, cexpr_list) == 2)
+ expr.value =
+ c_build_vec_perm_expr
+Index: gcc/config/i386/nmmintrin.h
+===================================================================
+--- gcc/config/i386/nmmintrin.h (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/config/i386/nmmintrin.h (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2007, 2009 Free Software Foundation, Inc.
++/* Copyright (C) 2007, 2009, 2012 Free Software Foundation, Inc.
--static tree
-+static tree
- heapvar_lookup (tree from)
- {
- struct tree_map *h, in;
-@@ -367,25 +365,21 @@
- named NAME, and using constraint graph node NODE. */
+ This file is part of GCC.
- static varinfo_t
--new_var_info (tree t, unsigned int id, const char *name, unsigned int node)
-+new_var_info (tree t, unsigned int id, const char *name)
- {
- varinfo_t ret = pool_alloc (variable_info_pool);
-
- ret->id = id;
- ret->name = name;
- ret->decl = t;
-- ret->node = node;
-- ret->address_taken = false;
-- ret->indirect_target = false;
- ret->directly_dereferenced = false;
- ret->is_artificial_var = false;
- ret->is_heap_var = false;
- ret->is_special_var = false;
- ret->is_unknown_size_var = false;
- ret->has_union = false;
-- ret->solution = BITMAP_ALLOC (&ptabitmap_obstack);
-- ret->variables = BITMAP_ALLOC (&ptabitmap_obstack);
-- ret->complex = NULL;
-+ ret->solution = BITMAP_ALLOC (&pta_obstack);
-+ ret->oldsolution = BITMAP_ALLOC (&oldpta_obstack);
- ret->next = NULL;
- ret->collapsed_to = NULL;
- return ret;
-@@ -395,7 +389,7 @@
-
- /* An expression that appears in a constraint. */
-
--struct constraint_expr
-+struct constraint_expr
- {
- /* Constraint type. */
- constraint_expr_type type;
-@@ -418,7 +412,7 @@
- static void do_deref (VEC (ce_s, heap) **);
-
- /* Our set constraints are made up of two constraint expressions, one
-- LHS, and one RHS.
-+ LHS, and one RHS.
-
- As described in the introduction, our set constraints each represent an
- operation between set valued variables.
-@@ -434,63 +428,98 @@
- static VEC(constraint_t,heap) *constraints;
- static alloc_pool constraint_pool;
-
--/* An edge in the weighted constraint graph. The edges are weighted,
-- with a bit set in weights meaning their is an edge with that
-- weight.
-- We don't keep the src in the edge, because we always know what it
-- is. */
-
--struct constraint_edge
-+DEF_VEC_I(int);
-+DEF_VEC_ALLOC_I(int, heap);
-+
-+/* The constraint graph is represented as an array of bitmaps
-+ containing successor nodes. */
-+
-+struct constraint_graph
- {
-- unsigned int dest;
-- bitmap weights;
--};
-+ /* Size of this graph, which may be different than the number of
-+ nodes in the variable map. */
-+ unsigned int size;
-
--typedef struct constraint_edge *constraint_edge_t;
--static alloc_pool constraint_edge_pool;
-+ /* Explicit successors of each node. */
-+ bitmap *succs;
-
--/* Return a new constraint edge from SRC to DEST. */
-+ /* Implicit predecessors of each node (Used for variable
-+ substitution). */
-+ bitmap *implicit_preds;
-
--static constraint_edge_t
--new_constraint_edge (unsigned int dest)
--{
-- constraint_edge_t ret = pool_alloc (constraint_edge_pool);
-- ret->dest = dest;
-- ret->weights = NULL;
-- return ret;
--}
-+ /* Explicit predecessors of each node (Used for variable substitution). */
-+ bitmap *preds;
-
--DEF_VEC_P(constraint_edge_t);
--DEF_VEC_ALLOC_P(constraint_edge_t,heap);
-+ /* Indirect cycle representatives, or -1 if the node has no indirect
-+ cycles. */
-+ int *indirect_cycles;
-
-+ /* Representative node for a node. rep[a] == a unless the node has
-+ been unified. */
-+ unsigned int *rep;
-
--/* The constraint graph is represented internally in two different
-- ways. The overwhelming majority of edges in the constraint graph
-- are zero weigh edges, and thus, using a vector of contrainst_edge_t
-- is a waste of time and memory, since they have no weights. We
-- simply use a bitmap to store the preds and succs for each node.
-- The weighted edges are stored as a set of adjacency vectors, one
-- per variable. succs[x] is the vector of successors for variable x,
-- and preds[x] is the vector of predecessors for variable x. IOW,
-- all edges are "forward" edges, which is not like our CFG. So
-- remember that preds[x]->src == x, and succs[x]->src == x. */
-+ /* Equivalence class representative for a node. This is used for
-+ variable substitution. */
-+ int *eq_rep;
-
--struct constraint_graph
--{
-- bitmap *zero_weight_succs;
-- bitmap *zero_weight_preds;
-- VEC(constraint_edge_t,heap) **succs;
-- VEC(constraint_edge_t,heap) **preds;
-+ /* Label for each node, used during variable substitution. */
-+ unsigned int *label;
-+
-+ /* Bitmap of nodes where the bit is set if the node is a direct
-+ node. Used for variable substitution. */
-+ sbitmap direct_nodes;
-+
-+ /* Vector of complex constraints for each graph node. Complex
-+ constraints are those involving dereferences or offsets that are
-+ not 0. */
-+ VEC(constraint_t,heap) **complex;
- };
-
--typedef struct constraint_graph *constraint_graph_t;
--
- static constraint_graph_t graph;
--static int graph_size;
-
-+/* During variable substitution and the offline version of indirect
-+ cycle finding, we create nodes to represent dereferences and
-+ address taken constraints. These represent where these start and
-+ end. */
-+#define FIRST_REF_NODE (VEC_length (varinfo_t, varmap))
-+#define LAST_REF_NODE (FIRST_REF_NODE + (FIRST_REF_NODE - 1))
-+#define FIRST_ADDR_NODE (LAST_REF_NODE + 1)
-+
-+/* Return the representative node for NODE, if NODE has been unioned
-+ with another NODE.
-+ This function performs path compression along the way to finding
-+ the representative. */
-+
-+static unsigned int
-+find (unsigned int node)
-+{
-+ gcc_assert (node < graph->size);
-+ if (graph->rep[node] != node)
-+ return graph->rep[node] = find (graph->rep[node]);
-+ return node;
-+}
-+
-+/* Union the TO and FROM nodes to the TO nodes.
-+ Note that at some point in the future, we may want to do
-+ union-by-rank, in which case we are going to have to return the
-+ node we unified to. */
-+
-+static bool
-+unite (unsigned int to, unsigned int from)
-+{
-+ gcc_assert (to < graph->size && from < graph->size);
-+ if (to != from && graph->rep[from] != to)
-+ {
-+ graph->rep[from] = to;
-+ return true;
-+ }
-+ return false;
-+}
-+
- /* Create a new constraint consisting of LHS and RHS expressions. */
+@@ -19,7 +19,7 @@
+ You should have received a copy of the GNU General Public License and
+ a copy of the GCC Runtime Library Exception along with this program;
+ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+- <http://www.gnu.org/licenses/>.
++ <http://www.gnu.org/licenses/>. */
--static constraint_t
-+static constraint_t
- new_constraint (const struct constraint_expr lhs,
- const struct constraint_expr rhs)
- {
-@@ -508,7 +537,7 @@
- if (c->lhs.type == ADDRESSOF)
- fprintf (file, "&");
- else if (c->lhs.type == DEREF)
-- fprintf (file, "*");
-+ fprintf (file, "*");
- fprintf (file, "%s", get_varinfo_fc (c->lhs.var)->name);
- if (c->lhs.offset != 0)
- fprintf (file, " + " HOST_WIDE_INT_PRINT_DEC, c->lhs.offset);
-@@ -550,23 +579,24 @@
- dump_constraints (stderr);
- }
+ /* Implemented from the specification included in the Intel C++ Compiler
+ User Guide and Reference, version 10.0. */
+Index: gcc/config/i386/smmintrin.h
+===================================================================
+--- gcc/config/i386/smmintrin.h (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/config/i386/smmintrin.h (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
++/* Copyright (C) 2007, 2008, 2009, 2010, 2012 Free Software Foundation, Inc.
--/* SOLVER FUNCTIONS
-+/* SOLVER FUNCTIONS
+ This file is part of GCC.
- The solver is a simple worklist solver, that works on the following
- algorithm:
--
-- sbitmap changed_nodes = all ones;
-- changed_count = number of nodes;
-- For each node that was already collapsed:
-- changed_count--;
+@@ -19,9 +19,8 @@
+ You should have received a copy of the GNU General Public License and
+ a copy of the GCC Runtime Library Exception along with this program;
+ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+- <http://www.gnu.org/licenses/>.
++ <http://www.gnu.org/licenses/>. */
-+ sbitmap changed_nodes = all zeroes;
-+ changed_count = 0;
-+ For each node that is not already collapsed:
-+ changed_count++;
-+ set bit in changed nodes
-+
- while (changed_count > 0)
- {
- compute topological ordering for constraint graph
--
-+
- find and collapse cycles in the constraint graph (updating
- changed if necessary)
--
-+
- for each node (n) in the graph in topological order:
- changed_count--;
+-
+ /* Implemented from the specification included in the Intel C++ Compiler
+ User Guide and Reference, version 10.0. */
-@@ -619,11 +649,11 @@
- }
+Index: gcc/config/sh/sh.c
+===================================================================
+--- gcc/config/sh/sh.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/config/sh/sh.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,6 +1,6 @@
+ /* Output routines for GCC for Renesas / SuperH SH.
+ Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+- 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
++ 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+ Free Software Foundation, Inc.
+ Contributed by Steve Chamberlain (sac@cygnus.com).
+ Improved by Jim Wilson (wilson@cygnus.com).
+@@ -11497,9 +11497,16 @@
+ && REGCLASS_HAS_GENERAL_REG (srcclass))
+ || (REGCLASS_HAS_GENERAL_REG (dstclass)
+ && REGCLASS_HAS_FP_REG (srcclass)))
+- return ((TARGET_SHMEDIA ? 4 : TARGET_FMOVD ? 8 : 12)
+- * ((GET_MODE_SIZE (mode) + 7) / 8U));
++ {
++ /* Discourage trying to use fp regs for a pointer. This also
++ discourages fp regs with SImode because Pmode is an alias
++ of SImode on this target. See PR target/48596. */
++ int addend = (mode == Pmode) ? 40 : 0;
- /* Return true if two constraints A and B are equal. */
--
++ return (((TARGET_SHMEDIA ? 4 : TARGET_FMOVD ? 8 : 12) + addend)
++ * ((GET_MODE_SIZE (mode) + 7) / 8U));
++ }
+
- static bool
- constraint_equal (struct constraint a, struct constraint b)
- {
-- return constraint_expr_equal (a.lhs, b.lhs)
-+ return constraint_expr_equal (a.lhs, b.lhs)
- && constraint_expr_equal (a.rhs, b.rhs);
- }
-
-@@ -634,7 +664,7 @@
- constraint_vec_find (VEC(constraint_t,heap) *vec,
- struct constraint lookfor)
- {
-- unsigned int place;
-+ unsigned int place;
- constraint_t found;
-
- if (vec == NULL)
-@@ -684,7 +714,7 @@
- /* If this is a properly sized variable, only add offset if it's
- less than end. Otherwise, it is globbed to a single
- variable. */
--
+ if ((dstclass == FPUL_REGS
+ && REGCLASS_HAS_GENERAL_REG (srcclass))
+ || (srcclass == FPUL_REGS
+Index: gcc/config/avr/avr.md
+===================================================================
+--- gcc/config/avr/avr.md (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/config/avr/avr.md (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -63,6 +63,7 @@
+ [UNSPEC_STRLEN
+ UNSPEC_MOVMEM
+ UNSPEC_INDEX_JMP
++ UNSPEC_LPM
+ UNSPEC_FMUL
+ UNSPEC_FMULS
+ UNSPEC_FMULSU
+@@ -77,6 +78,7 @@
+ UNSPECV_WRITE_SP
+ UNSPECV_GOTO_RECEIVER
+ UNSPECV_ENABLE_IRQS
++ UNSPECV_MEMORY_BARRIER
+ UNSPECV_NOP
+ UNSPECV_SLEEP
+ UNSPECV_WDR
+@@ -139,7 +141,7 @@
+ "out_bitop, out_plus, out_plus_noclobber, plus64, addto_sp,
+ tsthi, tstpsi, tstsi, compare, compare64, call,
+ mov8, mov16, mov24, mov32, reload_in16, reload_in24, reload_in32,
+- xload, movmem,
++ xload, movmem, load_lpm,
+ ashlqi, ashrqi, lshrqi,
+ ashlhi, ashrhi, lshrhi,
+ ashlsi, ashrsi, lshrsi,
+@@ -363,36 +365,63 @@
+ ;;========================================================================
+ ;; Move stuff around
+
+-(define_expand "load<mode>_libgcc"
+- [(set (match_dup 3)
+- (match_dup 2))
+- (set (reg:MOVMODE 22)
+- (match_operand:MOVMODE 1 "memory_operand" ""))
+- (set (match_operand:MOVMODE 0 "register_operand" "")
+- (reg:MOVMODE 22))]
+- "avr_load_libgcc_p (operands[1])"
+- {
+- operands[3] = gen_rtx_REG (HImode, REG_Z);
+- operands[2] = force_operand (XEXP (operands[1], 0), NULL_RTX);
+- operands[1] = replace_equiv_address (operands[1], operands[3]);
+- set_mem_addr_space (operands[1], ADDR_SPACE_FLASH);
+- })
+-
++;; Represent a load from __flash that needs libgcc support as UNSPEC.
++;; This is legal because we read from non-changing memory.
++;; For rationale see the FIXME below.
++
++;; "load_psi_libgcc"
++;; "load_si_libgcc"
++;; "load_sf_libgcc"
+ (define_insn "load_<mode>_libgcc"
+ [(set (reg:MOVMODE 22)
+- (match_operand:MOVMODE 0 "memory_operand" "m,m"))]
+- "avr_load_libgcc_p (operands[0])
+- && REG_P (XEXP (operands[0], 0))
+- && REG_Z == REGNO (XEXP (operands[0], 0))"
++ (unspec:MOVMODE [(reg:HI REG_Z)]
++ UNSPEC_LPM))]
++ ""
+ {
+- operands[0] = GEN_INT (GET_MODE_SIZE (<MODE>mode));
+- return "%~call __load_%0";
++ rtx n_bytes = GEN_INT (GET_MODE_SIZE (<MODE>mode));
++ output_asm_insn ("%~call __load_%0", &n_bytes);
++ return "";
+ }
+- [(set_attr "length" "1,2")
+- (set_attr "isa" "rjmp,jmp")
++ [(set_attr "type" "xcall")
+ (set_attr "cc" "clobber")])
+
+
++;; Similar for inline reads from flash. We use UNSPEC instead
++;; of MEM for the same reason as above: PR52543.
++;; $1 contains the memory segment.
++
++(define_insn "load_<mode>"
++ [(set (match_operand:MOVMODE 0 "register_operand" "=r")
++ (unspec:MOVMODE [(reg:HI REG_Z)
++ (match_operand:QI 1 "reg_or_0_operand" "rL")]
++ UNSPEC_LPM))]
++ "(CONST_INT_P (operands[1]) && AVR_HAVE_LPMX)
++ || (REG_P (operands[1]) && AVR_HAVE_ELPMX)"
++ {
++ return avr_load_lpm (insn, operands, NULL);
++ }
++ [(set_attr "adjust_len" "load_lpm")
++ (set_attr "cc" "clobber")])
+
- if ((get_varinfo (i)->offset + offset) < get_varinfo (i)->fullsize)
- {
- unsigned HOST_WIDE_INT fieldoffset = get_varinfo (i)->offset + offset;
-@@ -693,15 +723,15 @@
- continue;
- bitmap_set_bit (result, v->id);
- }
-- else if (get_varinfo (i)->is_artificial_var
-+ else if (get_varinfo (i)->is_artificial_var
- || get_varinfo (i)->has_union
- || get_varinfo (i)->is_unknown_size_var)
- {
- bitmap_set_bit (result, i);
- }
++
++;; Similar to above for the complementary situation when there is no [E]LPMx.
++;; Clobber Z in that case.
++
++(define_insn "load_<mode>_clobber"
++ [(set (match_operand:MOVMODE 0 "register_operand" "=r")
++ (unspec:MOVMODE [(reg:HI REG_Z)
++ (match_operand:QI 1 "reg_or_0_operand" "rL")]
++ UNSPEC_LPM))
++ (clobber (reg:HI REG_Z))]
++ "!((CONST_INT_P (operands[1]) && AVR_HAVE_LPMX)
++ || (REG_P (operands[1]) && AVR_HAVE_ELPMX))"
++ {
++ return avr_load_lpm (insn, operands, NULL);
++ }
++ [(set_attr "adjust_len" "load_lpm")
++ (set_attr "cc" "clobber")])
++
++
+ (define_insn_and_split "xload8_A"
+ [(set (match_operand:QI 0 "register_operand" "=r")
+ (match_operand:QI 1 "memory_operand" "m"))
+@@ -418,9 +447,15 @@
+ DONE;
+ })
+
++;; "xloadqi_A"
++;; "xloadhi_A"
++;; "xloadpsi_A"
++;; "xloadsi_A"
++;; "xloadsf_A"
+ (define_insn_and_split "xload<mode>_A"
+ [(set (match_operand:MOVMODE 0 "register_operand" "=r")
+ (match_operand:MOVMODE 1 "memory_operand" "m"))
++ (clobber (reg:MOVMODE 22))
+ (clobber (reg:QI 21))
+ (clobber (reg:HI REG_Z))]
+ "can_create_pseudo_p()
+@@ -461,7 +496,7 @@
+ {
+ return avr_out_xload (insn, operands, NULL);
+ }
+- [(set_attr "length" "3,4")
++ [(set_attr "length" "4,4")
+ (set_attr "adjust_len" "*,xload")
+ (set_attr "isa" "lpmx,lpm")
+ (set_attr "cc" "none")])
+@@ -532,12 +567,55 @@
+ DONE;
}
--
-- bitmap_copy (set, result);
+
++ /* For old devices without LPMx, prefer __flash loads per libcall. */
+
-+ bitmap_copy (set, result);
- BITMAP_FREE (result);
- }
+ if (avr_load_libgcc_p (src))
+ {
+- /* For the small devices, do loads per libgcc call. */
+- emit_insn (gen_load<mode>_libgcc (dest, src));
++ emit_move_insn (gen_rtx_REG (Pmode, REG_Z),
++ force_reg (Pmode, XEXP (src, 0)));
++
++ emit_insn (gen_load_<mode>_libgcc ());
++ emit_move_insn (dest, gen_rtx_REG (<MODE>mode, 22));
+ DONE;
+ }
++
++ /* ; FIXME: Hack around PR rtl-optimization/52543.
++ ; lower-subreg.c splits loads from the 16-bit address spaces which
++ ; causes code bloat because each load need his setting of RAMPZ.
++ ; Moreover, the split will happen in such a way that the loads don't
++ ; take advantage of POST_INC addressing. Thus, we use UNSPEC to
++ ; represent these loads instead. Notice that this is legitimate
++ ; because the memory content does not change: Loads from the same
++ ; address will yield the same value.
++ ; POST_INC addressing would make the addresses mode_dependent and could
++ ; work around that PR, too. However, notice that it is *not* legitimate
++ ; to expand to POST_INC at expand time: The following passes assert
++ ; that pre-/post-modify addressing is introduced by .auto_inc_dec and
++ ; does not exist before that pass. */
++
++ if (avr_mem_flash_p (src)
++ && (GET_MODE_SIZE (<MODE>mode) > 1
++ || MEM_ADDR_SPACE (src) != ADDR_SPACE_FLASH))
++ {
++ rtx xsegment = GEN_INT (avr_addrspace[MEM_ADDR_SPACE (src)].segment);
++ if (!AVR_HAVE_ELPM)
++ xsegment = const0_rtx;
++ if (xsegment != const0_rtx)
++ xsegment = force_reg (QImode, xsegment);
++
++ emit_move_insn (gen_rtx_REG (Pmode, REG_Z),
++ force_reg (Pmode, XEXP (src, 0)));
++
++ if ((CONST_INT_P (xsegment) && AVR_HAVE_LPMX)
++ || (REG_P (xsegment) && AVR_HAVE_ELPMX))
++ emit_insn (gen_load_<mode> (dest, xsegment));
++ else
++ emit_insn (gen_load_<mode>_clobber (dest, xsegment));
++ DONE;
++ }
++
++ /* ; The only address-space for which we use plain MEM and reload
++ ; machinery are 1-byte loads from __flash. */
+ })
+
+ ;;========================================================================
+@@ -677,40 +755,6 @@
+ operands[5] = gen_rtx_REG (HImode, REGNO (operands[3]));
+ })
+
+-;; For LPM loads from AS1 we split
+-;; R = *Z
+-;; to
+-;; R = *Z++
+-;; Z = Z - sizeof (R)
+-;;
+-;; so that the second instruction can be optimized out.
+-
+-(define_split ; "split-lpmx"
+- [(set (match_operand:HISI 0 "register_operand" "")
+- (match_operand:HISI 1 "memory_operand" ""))]
+- "reload_completed
+- && AVR_HAVE_LPMX"
+- [(set (match_dup 0)
+- (match_dup 2))
+- (set (match_dup 3)
+- (plus:HI (match_dup 3)
+- (match_dup 4)))]
+- {
+- rtx addr = XEXP (operands[1], 0);
+-
+- if (!avr_mem_flash_p (operands[1])
+- || !REG_P (addr)
+- || reg_overlap_mentioned_p (addr, operands[0]))
+- {
+- FAIL;
+- }
+-
+- operands[2] = replace_equiv_address (operands[1],
+- gen_rtx_POST_INC (Pmode, addr));
+- operands[3] = addr;
+- operands[4] = gen_int_mode (-GET_MODE_SIZE (<MODE>mode), HImode);
+- })
+-
+ ;;==========================================================================
+ ;; xpointer move (24 bit)
+
+@@ -1081,15 +1125,16 @@
+ (set_attr "adjust_len" "addto_sp")])
+
+ (define_insn "*addhi3"
+- [(set (match_operand:HI 0 "register_operand" "=r,d,d")
+- (plus:HI (match_operand:HI 1 "register_operand" "%0,0,0")
+- (match_operand:HI 2 "nonmemory_operand" "r,s,n")))]
++ [(set (match_operand:HI 0 "register_operand" "=r,d,!w,d")
++ (plus:HI (match_operand:HI 1 "register_operand" "%0,0,0 ,0")
++ (match_operand:HI 2 "nonmemory_operand" "r,s,IJ,n")))]
+ ""
+ {
+ static const char * const asm_code[] =
+ {
+ "add %A0,%A2\;adc %B0,%B2",
+ "subi %A0,lo8(-(%2))\;sbci %B0,hi8(-(%2))",
++ "",
+ ""
+ };
+
+@@ -1098,9 +1143,9 @@
+
+ return avr_out_plus_noclobber (operands, NULL, NULL);
+ }
+- [(set_attr "length" "2,2,2")
+- (set_attr "adjust_len" "*,*,out_plus_noclobber")
+- (set_attr "cc" "set_n,set_czn,out_plus_noclobber")])
++ [(set_attr "length" "2,2,2,2")
++ (set_attr "adjust_len" "*,*,out_plus_noclobber,out_plus_noclobber")
++ (set_attr "cc" "set_n,set_czn,out_plus_noclobber,out_plus_noclobber")])
+
+ ;; Adding a constant to NO_LD_REGS might have lead to a reload of
+ ;; that constant to LD_REGS. We don't add a scratch to *addhi3
+@@ -1138,10 +1183,10 @@
+ (clobber (match_dup 2))])])
+
+ (define_insn "addhi3_clobber"
+- [(set (match_operand:HI 0 "register_operand" "=d,l")
+- (plus:HI (match_operand:HI 1 "register_operand" "%0,0")
+- (match_operand:HI 2 "const_int_operand" "n,n")))
+- (clobber (match_scratch:QI 3 "=X,&d"))]
++ [(set (match_operand:HI 0 "register_operand" "=!w,d,r")
++ (plus:HI (match_operand:HI 1 "register_operand" "%0,0,0")
++ (match_operand:HI 2 "const_int_operand" "IJ,n,n")))
++ (clobber (match_scratch:QI 3 "=X,X,&d"))]
+ ""
+ {
+ gcc_assert (REGNO (operands[0]) == REGNO (operands[1]));
+@@ -1692,6 +1737,29 @@
+
+ ;; Handle small constants
+
++;; Special case of a += 2*b as frequently seen with accesses to int arrays.
++;; This is shorter, faster than MUL and has lower register pressure.
++
++(define_insn_and_split "*umaddqihi4.2"
++ [(set (match_operand:HI 0 "register_operand" "=r")
++ (plus:HI (mult:HI (zero_extend:HI (match_operand:QI 1 "register_operand" "r"))
++ (const_int 2))
++ (match_operand:HI 2 "register_operand" "r")))]
++ "!reload_completed
++ && !reg_overlap_mentioned_p (operands[0], operands[1])"
++ { gcc_unreachable(); }
++ "&& 1"
++ [(set (match_dup 0)
++ (match_dup 2))
++ ; *addhi3_zero_extend
++ (set (match_dup 0)
++ (plus:HI (zero_extend:HI (match_dup 1))
++ (match_dup 0)))
++ ; *addhi3_zero_extend
++ (set (match_dup 0)
++ (plus:HI (zero_extend:HI (match_dup 1))
++ (match_dup 0)))])
++
+ ;; "umaddqihi4.uconst"
+ ;; "maddqihi4.sconst"
+ (define_insn_and_split "*<extend_u>maddqihi4.<extend_su>const"
+@@ -5198,18 +5266,36 @@
+ (set_attr "length" "1")])
+
+ ;; Enable Interrupts
+-(define_insn "enable_interrupt"
+- [(unspec_volatile [(const_int 1)] UNSPECV_ENABLE_IRQS)]
++(define_expand "enable_interrupt"
++ [(clobber (const_int 0))]
+ ""
+- "sei"
+- [(set_attr "length" "1")
+- (set_attr "cc" "none")])
++ {
++ rtx mem = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (mem) = 1;
++ emit_insn (gen_cli_sei (const1_rtx, mem));
++ DONE;
++ })
+
+ ;; Disable Interrupts
+-(define_insn "disable_interrupt"
+- [(unspec_volatile [(const_int 0)] UNSPECV_ENABLE_IRQS)]
++(define_expand "disable_interrupt"
++ [(clobber (const_int 0))]
+ ""
+- "cli"
++ {
++ rtx mem = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (mem) = 1;
++ emit_insn (gen_cli_sei (const0_rtx, mem));
++ DONE;
++ })
++
++(define_insn "cli_sei"
++ [(unspec_volatile [(match_operand:QI 0 "const_int_operand" "L,P")]
++ UNSPECV_ENABLE_IRQS)
++ (set (match_operand:BLK 1 "" "")
++ (unspec_volatile:BLK [(match_dup 1)] UNSPECV_MEMORY_BARRIER))]
++ ""
++ "@
++ cli
++ sei"
+ [(set_attr "length" "1")
+ (set_attr "cc" "none")])
+
+@@ -5316,10 +5402,12 @@
+ [(unspec_volatile [(match_operand:QI 0 "const_int_operand" "n")
+ (const_int 1)]
+ UNSPECV_DELAY_CYCLES)
+- (clobber (match_scratch:QI 1 "=&d"))]
++ (set (match_operand:BLK 1 "" "")
++ (unspec_volatile:BLK [(match_dup 1)] UNSPECV_MEMORY_BARRIER))
++ (clobber (match_scratch:QI 2 "=&d"))]
+ ""
+- "ldi %1,lo8(%0)
+- 1: dec %1
++ "ldi %2,lo8(%0)
++ 1: dec %2
+ brne 1b"
+ [(set_attr "length" "3")
+ (set_attr "cc" "clobber")])
+@@ -5328,11 +5416,13 @@
+ [(unspec_volatile [(match_operand:HI 0 "const_int_operand" "n")
+ (const_int 2)]
+ UNSPECV_DELAY_CYCLES)
+- (clobber (match_scratch:HI 1 "=&w"))]
++ (set (match_operand:BLK 1 "" "")
++ (unspec_volatile:BLK [(match_dup 1)] UNSPECV_MEMORY_BARRIER))
++ (clobber (match_scratch:HI 2 "=&w"))]
+ ""
+- "ldi %A1,lo8(%0)
+- ldi %B1,hi8(%0)
+- 1: sbiw %A1,1
++ "ldi %A2,lo8(%0)
++ ldi %B2,hi8(%0)
++ 1: sbiw %A2,1
+ brne 1b"
+ [(set_attr "length" "4")
+ (set_attr "cc" "clobber")])
+@@ -5341,16 +5431,18 @@
+ [(unspec_volatile [(match_operand:SI 0 "const_int_operand" "n")
+ (const_int 3)]
+ UNSPECV_DELAY_CYCLES)
+- (clobber (match_scratch:QI 1 "=&d"))
++ (set (match_operand:BLK 1 "" "")
++ (unspec_volatile:BLK [(match_dup 1)] UNSPECV_MEMORY_BARRIER))
+ (clobber (match_scratch:QI 2 "=&d"))
+- (clobber (match_scratch:QI 3 "=&d"))]
++ (clobber (match_scratch:QI 3 "=&d"))
++ (clobber (match_scratch:QI 4 "=&d"))]
+ ""
+- "ldi %1,lo8(%0)
+- ldi %2,hi8(%0)
+- ldi %3,hlo8(%0)
+- 1: subi %1,1
+- sbci %2,0
++ "ldi %2,lo8(%0)
++ ldi %3,hi8(%0)
++ ldi %4,hlo8(%0)
++ 1: subi %2,1
+ sbci %3,0
++ sbci %4,0
+ brne 1b"
+ [(set_attr "length" "7")
+ (set_attr "cc" "clobber")])
+@@ -5359,19 +5451,21 @@
+ [(unspec_volatile [(match_operand:SI 0 "const_int_operand" "n")
+ (const_int 4)]
+ UNSPECV_DELAY_CYCLES)
+- (clobber (match_scratch:QI 1 "=&d"))
++ (set (match_operand:BLK 1 "" "")
++ (unspec_volatile:BLK [(match_dup 1)] UNSPECV_MEMORY_BARRIER))
+ (clobber (match_scratch:QI 2 "=&d"))
+ (clobber (match_scratch:QI 3 "=&d"))
+- (clobber (match_scratch:QI 4 "=&d"))]
++ (clobber (match_scratch:QI 4 "=&d"))
++ (clobber (match_scratch:QI 5 "=&d"))]
+ ""
+- "ldi %1,lo8(%0)
+- ldi %2,hi8(%0)
+- ldi %3,hlo8(%0)
+- ldi %4,hhi8(%0)
+- 1: subi %1,1
+- sbci %2,0
++ "ldi %2,lo8(%0)
++ ldi %3,hi8(%0)
++ ldi %4,hlo8(%0)
++ ldi %5,hhi8(%0)
++ 1: subi %2,1
+ sbci %3,0
+ sbci %4,0
++ sbci %5,0
+ brne 1b"
+ [(set_attr "length" "9")
+ (set_attr "cc" "clobber")])
+@@ -5757,9 +5851,23 @@
+ ;; CPU instructions
+
+ ;; NOP taking 1 or 2 Ticks
+-(define_insn "nopv"
++(define_expand "nopv"
++ [(parallel [(unspec_volatile [(match_operand:SI 0 "const_int_operand" "")]
++ UNSPECV_NOP)
++ (set (match_dup 1)
++ (unspec_volatile:BLK [(match_dup 1)]
++ UNSPECV_MEMORY_BARRIER))])]
++ ""
++ {
++ operands[1] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[1]) = 1;
++ })
++
++(define_insn "*nopv"
+ [(unspec_volatile [(match_operand:SI 0 "const_int_operand" "P,K")]
+- UNSPECV_NOP)]
++ UNSPECV_NOP)
++ (set (match_operand:BLK 1 "" "")
++ (unspec_volatile:BLK [(match_dup 1)] UNSPECV_MEMORY_BARRIER))]
+ ""
+ "@
+ nop
+@@ -5768,17 +5876,43 @@
+ (set_attr "cc" "none")])
+
+ ;; SLEEP
+-(define_insn "sleep"
+- [(unspec_volatile [(const_int 0)] UNSPECV_SLEEP)]
++(define_expand "sleep"
++ [(parallel [(unspec_volatile [(const_int 0)] UNSPECV_SLEEP)
++ (set (match_dup 0)
++ (unspec_volatile:BLK [(match_dup 0)]
++ UNSPECV_MEMORY_BARRIER))])]
+ ""
++ {
++ operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[0]) = 1;
++ })
++
++(define_insn "*sleep"
++ [(unspec_volatile [(const_int 0)] UNSPECV_SLEEP)
++ (set (match_operand:BLK 0 "" "")
++ (unspec_volatile:BLK [(match_dup 0)] UNSPECV_MEMORY_BARRIER))]
++ ""
+ "sleep"
+ [(set_attr "length" "1")
+ (set_attr "cc" "none")])
+
+ ;; WDR
+-(define_insn "wdr"
+- [(unspec_volatile [(const_int 0)] UNSPECV_WDR)]
++(define_expand "wdr"
++ [(parallel [(unspec_volatile [(const_int 0)] UNSPECV_WDR)
++ (set (match_dup 0)
++ (unspec_volatile:BLK [(match_dup 0)]
++ UNSPECV_MEMORY_BARRIER))])]
+ ""
++ {
++ operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (operands[0]) = 1;
++ })
++
++(define_insn "*wdr"
++ [(unspec_volatile [(const_int 0)] UNSPECV_WDR)
++ (set (match_operand:BLK 0 "" "")
++ (unspec_volatile:BLK [(match_dup 0)] UNSPECV_MEMORY_BARRIER))]
++ ""
+ "wdr"
+ [(set_attr "length" "1")
+ (set_attr "cc" "none")])
+Index: gcc/config/avr/avr-protos.h
+===================================================================
+--- gcc/config/avr/avr-protos.h (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/config/avr/avr-protos.h (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -75,6 +75,8 @@
+ extern const char *avr_out_ashrpsi3 (rtx, rtx*, int*);
+ extern const char *avr_out_lshrpsi3 (rtx, rtx*, int*);
+
++extern const char* avr_load_lpm (rtx, rtx*, int*);
++
+ extern bool avr_rotate_bytes (rtx operands[]);
+
+ extern void expand_prologue (void);
+@@ -115,7 +117,7 @@
+ extern RTX_CODE avr_normalize_condition (RTX_CODE condition);
+ extern void out_shift_with_cnt (const char *templ, rtx insn,
+ rtx operands[], int *len, int t_len);
+-extern reg_class_t avr_mode_code_base_reg_class (enum machine_mode, addr_space_t, RTX_CODE, RTX_CODE);
++extern enum reg_class avr_mode_code_base_reg_class (enum machine_mode, addr_space_t, RTX_CODE, RTX_CODE);
+ extern bool avr_regno_mode_code_ok_for_base_p (int, enum machine_mode, addr_space_t, RTX_CODE, RTX_CODE);
+ extern rtx avr_incoming_return_addr_rtx (void);
+ extern rtx avr_legitimize_reload_address (rtx*, enum machine_mode, int, int, int, int, rtx (*)(rtx,int));
+Index: gcc/config/avr/avr.c
+===================================================================
+--- gcc/config/avr/avr.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/config/avr/avr.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -827,7 +827,11 @@
+ bool isr_p = cfun->machine->is_interrupt || cfun->machine->is_signal;
+ int live_seq = sequent_regs_live ();
+
++ HOST_WIDE_INT size_max
++ = (HOST_WIDE_INT) GET_MODE_MASK (AVR_HAVE_8BIT_SP ? QImode : Pmode);
++
+ bool minimize = (TARGET_CALL_PROLOGUES
++ && size < size_max
+ && live_seq
+ && !isr_p
+ && !cfun->machine->is_OS_task
+@@ -933,6 +937,7 @@
+ leaf function and thus X has already been saved. */
+
+ int irq_state = -1;
++ HOST_WIDE_INT size_cfa = size;
+ rtx fp_plus_insns, fp, my_fp;
+
+ gcc_assert (frame_pointer_needed
+@@ -951,6 +956,27 @@
+ my_fp = all_regs_rtx[FRAME_POINTER_REGNUM];
+ }
-@@ -727,397 +757,149 @@
- }
++ /* Cut down size and avoid size = 0 so that we don't run
++ into ICE like PR52488 in the remainder. */
++
++ if (size > size_max)
++ {
++ /* Don't error so that insane code from newlib still compiles
++ and does not break building newlib. As PR51345 is implemented
++ now, there are multilib variants with -mtiny-stack.
++
++ If user wants sanity checks he can use -Wstack-usage=
++ or similar options.
++
++ For CFA we emit the original, non-saturated size so that
++ the generic machinery is aware of the real stack usage and
++ will print the above diagnostic as expected. */
++
++ size = size_max;
++ }
++
++ size = trunc_int_for_mode (size, GET_MODE (my_fp));
++
+ /************ Method 1: Adjust frame pointer ************/
+
+ start_sequence ();
+@@ -975,7 +1001,7 @@
+ RTX_FRAME_RELATED_P (insn) = 1;
+ add_reg_note (insn, REG_CFA_ADJUST_CFA,
+ gen_rtx_SET (VOIDmode, fp,
+- plus_constant (fp, -size)));
++ plus_constant (fp, -size_cfa)));
+ }
+
+ /* Copy to stack pointer. Note that since we've already
+@@ -1003,7 +1029,7 @@
+ add_reg_note (insn, REG_CFA_ADJUST_CFA,
+ gen_rtx_SET (VOIDmode, stack_pointer_rtx,
+ plus_constant (stack_pointer_rtx,
+- -size)));
++ -size_cfa)));
+ }
+
+ fp_plus_insns = get_insns ();
+@@ -1026,7 +1052,7 @@
+ add_reg_note (insn, REG_CFA_ADJUST_CFA,
+ gen_rtx_SET (VOIDmode, stack_pointer_rtx,
+ plus_constant (stack_pointer_rtx,
+- -size)));
++ -size_cfa)));
+ if (frame_pointer_needed)
+ {
+ insn = emit_move_insn (fp, stack_pointer_rtx);
+@@ -1048,7 +1074,7 @@
+ emit_insn (fp_plus_insns);
+ }
+
+- cfun->machine->stack_usage += size;
++ cfun->machine->stack_usage += size_cfa;
+ } /* !minimize && size != 0 */
+ } /* !minimize */
}
+@@ -1123,11 +1149,11 @@
+ emit_push_sfr (rampy_rtx, false /* frame-related */, true /* clr */);
+ }
--/* Insert constraint C into the list of complex constraints for VAR. */
-+/* Insert constraint C into the list of complex constraints for graph
-+ node VAR. */
+- if (AVR_HAVE_RAMPZ
++ if (AVR_HAVE_RAMPZ
+ && TEST_HARD_REG_BIT (set, REG_Z)
+ && TEST_HARD_REG_BIT (set, REG_Z + 1))
+ {
+- emit_push_sfr (rampz_rtx, false /* frame-related */, true /* clr */);
++ emit_push_sfr (rampz_rtx, false /* frame-related */, AVR_HAVE_RAMPD);
+ }
+ } /* is_interrupt is_signal */
+
+@@ -1261,6 +1287,7 @@
+ int irq_state = -1;
+ rtx fp, my_fp;
+ rtx fp_plus_insns;
++ HOST_WIDE_INT size_max;
+
+ gcc_assert (frame_pointer_needed
+ || !isr_p
+@@ -1277,6 +1304,13 @@
+
+ my_fp = all_regs_rtx[FRAME_POINTER_REGNUM];
+ }
++
++ /* For rationale see comment in prologue generation. */
++
++ size_max = (HOST_WIDE_INT) GET_MODE_MASK (GET_MODE (my_fp));
++ if (size > size_max)
++ size = size_max;
++ size = trunc_int_for_mode (size, GET_MODE (my_fp));
+
+ /********** Method 1: Adjust fp register **********/
+
+@@ -1347,12 +1381,12 @@
+ /* Restore RAMPZ/Y/X/D using tmp_reg as scratch.
+ The conditions to restore them must be tha same as in prologue. */
+
+- if (AVR_HAVE_RAMPX
+- && TEST_HARD_REG_BIT (set, REG_X)
+- && TEST_HARD_REG_BIT (set, REG_X + 1))
++ if (AVR_HAVE_RAMPZ
++ && TEST_HARD_REG_BIT (set, REG_Z)
++ && TEST_HARD_REG_BIT (set, REG_Z + 1))
+ {
+ emit_pop_byte (TMP_REGNO);
+- emit_move_insn (rampx_rtx, tmp_reg_rtx);
++ emit_move_insn (rampz_rtx, tmp_reg_rtx);
+ }
- static void
--insert_into_complex (unsigned int var, constraint_t c)
-+insert_into_complex (constraint_graph_t graph,
-+ unsigned int var, constraint_t c)
- {
-- varinfo_t vi = get_varinfo (var);
-- unsigned int place = VEC_lower_bound (constraint_t, vi->complex, c,
-+ VEC (constraint_t, heap) *complex = graph->complex[var];
-+ unsigned int place = VEC_lower_bound (constraint_t, complex, c,
- constraint_less);
-- VEC_safe_insert (constraint_t, heap, vi->complex, place, c);
--}
+ if (AVR_HAVE_RAMPY
+@@ -1364,12 +1398,12 @@
+ emit_move_insn (rampy_rtx, tmp_reg_rtx);
+ }
--
--/* Compare two constraint edges A and B, return true if they are equal. */
--
--static bool
--constraint_edge_equal (struct constraint_edge a, struct constraint_edge b)
--{
-- return a.dest == b.dest;
-+ /* Only insert constraints that do not already exist. */
-+ if (place >= VEC_length (constraint_t, complex)
-+ || !constraint_equal (*c, *VEC_index (constraint_t, complex, place)))
-+ VEC_safe_insert (constraint_t, heap, graph->complex[var], place, c);
- }
+- if (AVR_HAVE_RAMPZ
+- && TEST_HARD_REG_BIT (set, REG_Z)
+- && TEST_HARD_REG_BIT (set, REG_Z + 1))
++ if (AVR_HAVE_RAMPX
++ && TEST_HARD_REG_BIT (set, REG_X)
++ && TEST_HARD_REG_BIT (set, REG_X + 1))
+ {
+ emit_pop_byte (TMP_REGNO);
+- emit_move_insn (rampz_rtx, tmp_reg_rtx);
++ emit_move_insn (rampx_rtx, tmp_reg_rtx);
+ }
--/* Compare two constraint edges, return true if A is less than B */
+ if (AVR_HAVE_RAMPD)
+@@ -1423,6 +1457,22 @@
+ }
--static bool
--constraint_edge_less (const constraint_edge_t a, const constraint_edge_t b)
--{
-- if (a->dest < b->dest)
-- return true;
-- return false;
--}
--
--/* Find the constraint edge that matches LOOKFOR, in VEC.
-- Return the edge, if found, NULL otherwise. */
--
--static constraint_edge_t
--constraint_edge_vec_find (VEC(constraint_edge_t,heap) *vec,
-- struct constraint_edge lookfor)
--{
-- unsigned int place;
-- constraint_edge_t edge = NULL;
--
-- place = VEC_lower_bound (constraint_edge_t, vec, &lookfor,
-- constraint_edge_less);
-- if (place >= VEC_length (constraint_edge_t, vec))
-- return NULL;
-- edge = VEC_index (constraint_edge_t, vec, place);
-- if (!constraint_edge_equal (*edge, lookfor))
-- return NULL;
-- return edge;
--}
--
- /* Condense two variable nodes into a single variable node, by moving
- all associated info from SRC to TO. */
--static void
--condense_varmap_nodes (unsigned int to, unsigned int src)
-+static void
-+merge_node_constraints (constraint_graph_t graph, unsigned int to,
-+ unsigned int from)
- {
-- varinfo_t tovi = get_varinfo (to);
-- varinfo_t srcvi = get_varinfo (src);
- unsigned int i;
- constraint_t c;
-- bitmap_iterator bi;
--
-- /* the src node, and all its variables, are now the to node. */
-- srcvi->node = to;
-- EXECUTE_IF_SET_IN_BITMAP (srcvi->variables, 0, i, bi)
-- get_varinfo (i)->node = to;
--
-- /* Merge the src node variables and the to node variables. */
-- bitmap_set_bit (tovi->variables, src);
-- bitmap_ior_into (tovi->variables, srcvi->variables);
-- bitmap_clear (srcvi->variables);
--
-+
-+ gcc_assert (find (from) == to);
-+
- /* Move all complex constraints from src node into to node */
-- for (i = 0; VEC_iterate (constraint_t, srcvi->complex, i, c); i++)
-+ for (i = 0; VEC_iterate (constraint_t, graph->complex[from], i, c); i++)
- {
- /* In complex constraints for node src, we may have either
-- a = *src, and *src = a. */
--
-+ a = *src, and *src = a, or an offseted constraint which are
-+ always added to the rhs node's constraints. */
++/* Implement `TARGET_MODE_DEPENDENT_ADDRESS_P'. */
+
- if (c->rhs.type == DEREF)
- c->rhs.var = to;
-+ else if (c->lhs.type == DEREF)
-+ c->lhs.var = to;
- else
-- c->lhs.var = to;
-+ c->rhs.var = to;
- }
-- constraint_set_union (&tovi->complex, &srcvi->complex);
-- VEC_free (constraint_t, heap, srcvi->complex);
-- srcvi->complex = NULL;
-+ constraint_set_union (&graph->complex[to], &graph->complex[from]);
-+ VEC_free (constraint_t, heap, graph->complex[from]);
-+ graph->complex[from] = NULL;
++/* FIXME: PSImode addresses are not mode-dependent in themselves.
++ This hook just serves to hack around PR rtl-optimization/52543 by
++ claiming that PSImode addresses (which are used for the 24-bit
++ address space __memx) were mode-dependent so that lower-subreg.s
++ will skip these addresses. See also the similar FIXME comment along
++ with mov<mode> expanders in avr.md. */
++
++static bool
++avr_mode_dependent_address_p (const_rtx addr)
++{
++ return GET_MODE (addr) != Pmode;
++}
++
++
+ /* Helper function for `avr_legitimate_address_p'. */
+
+ static inline bool
+@@ -2435,7 +2485,8 @@
+
+ return (n_bytes > 2
+ && !AVR_HAVE_LPMX
+- && avr_mem_flash_p (op));
++ && MEM_P (op)
++ && MEM_ADDR_SPACE (op) == ADDR_SPACE_FLASH);
}
--/* Erase an edge from SRC to SRC from GRAPH. This routine only
-- handles self-edges (e.g. an edge from a to a). */
+ /* Return true if a value of mode MODE is read by __xload_* function. */
+@@ -2450,155 +2501,6 @@
+ }
--static void
--erase_graph_self_edge (constraint_graph_t graph, unsigned int src)
--{
-- VEC(constraint_edge_t,heap) *predvec = graph->preds[src];
-- VEC(constraint_edge_t,heap) *succvec = graph->succs[src];
-- struct constraint_edge edge;
-- unsigned int place;
--
-- edge.dest = src;
--
-- /* Remove from the successors. */
-- place = VEC_lower_bound (constraint_edge_t, succvec, &edge,
-- constraint_edge_less);
--
-- /* Make sure we found the edge. */
--#ifdef ENABLE_CHECKING
-- {
-- constraint_edge_t tmp = VEC_index (constraint_edge_t, succvec, place);
-- gcc_assert (constraint_edge_equal (*tmp, edge));
-- }
--#endif
-- VEC_ordered_remove (constraint_edge_t, succvec, place);
--
-- /* Remove from the predecessors. */
-- place = VEC_lower_bound (constraint_edge_t, predvec, &edge,
-- constraint_edge_less);
--
-- /* Make sure we found the edge. */
--#ifdef ENABLE_CHECKING
-- {
-- constraint_edge_t tmp = VEC_index (constraint_edge_t, predvec, place);
-- gcc_assert (constraint_edge_equal (*tmp, edge));
-- }
--#endif
-- VEC_ordered_remove (constraint_edge_t, predvec, place);
--}
--
- /* Remove edges involving NODE from GRAPH. */
- static void
- clear_edges_for_node (constraint_graph_t graph, unsigned int node)
- {
-- VEC(constraint_edge_t,heap) *succvec = graph->succs[node];
-- VEC(constraint_edge_t,heap) *predvec = graph->preds[node];
-- bitmap_iterator bi;
-- unsigned int j;
-- constraint_edge_t c = NULL;
-- int i;
--
-- /* Walk the successors, erase the associated preds. */
--
-- EXECUTE_IF_IN_NONNULL_BITMAP (graph->zero_weight_succs[node], 0, j, bi)
-- if (j != node)
-- bitmap_clear_bit (graph->zero_weight_preds[j], node);
--
-- for (i = 0; VEC_iterate (constraint_edge_t, succvec, i, c); i++)
-- if (c->dest != node)
-- {
-- unsigned int place;
-- struct constraint_edge lookfor;
-- constraint_edge_t result;
--
-- lookfor.dest = node;
-- place = VEC_lower_bound (constraint_edge_t, graph->preds[c->dest],
-- &lookfor, constraint_edge_less);
-- result = VEC_ordered_remove (constraint_edge_t,
-- graph->preds[c->dest], place);
-- pool_free (constraint_edge_pool, result);
-- }
--
-- /* Walk the preds, erase the associated succs. */
--
-- EXECUTE_IF_IN_NONNULL_BITMAP (graph->zero_weight_preds[node], 0, j, bi)
-- if (j != node)
-- bitmap_clear_bit (graph->zero_weight_succs[j], node);
--
-- for (i =0; VEC_iterate (constraint_edge_t, predvec, i, c); i++)
-- if (c->dest != node)
-- {
-- unsigned int place;
-- struct constraint_edge lookfor;
-- constraint_edge_t result;
--
-- lookfor.dest = node;
-- place = VEC_lower_bound (constraint_edge_t, graph->succs[c->dest],
-- &lookfor, constraint_edge_less);
-- result = VEC_ordered_remove (constraint_edge_t,
-- graph->succs[c->dest], place);
-- pool_free (constraint_edge_pool, result);
--
-- }
--
-- if (graph->zero_weight_preds[node])
-- {
-- BITMAP_FREE (graph->zero_weight_preds[node]);
-- graph->zero_weight_preds[node] = NULL;
-- }
+-/* Find an unused d-register to be used as scratch in INSN.
+- EXCLUDE is either NULL_RTX or some register. In the case where EXCLUDE
+- is a register, skip all possible return values that overlap EXCLUDE.
+- The policy for the returned register is similar to that of
+- `reg_unused_after', i.e. the returned register may overlap the SET_DEST
+- of INSN.
-
-- if (graph->zero_weight_succs[node])
-- {
-- BITMAP_FREE (graph->zero_weight_succs[node]);
-- graph->zero_weight_succs[node] = NULL;
-- }
--
-- VEC_free (constraint_edge_t, heap, graph->preds[node]);
-- VEC_free (constraint_edge_t, heap, graph->succs[node]);
-- graph->preds[node] = NULL;
-- graph->succs[node] = NULL;
-+ if (graph->succs[node])
-+ BITMAP_FREE (graph->succs[node]);
- }
-
--static bool edge_added = false;
--
--/* Add edge (src, dest) to the graph. */
+- Return a QImode d-register or NULL_RTX if nothing found. */
-
--static bool
--add_graph_edge (constraint_graph_t graph, unsigned int src, unsigned int dest)
+-static rtx
+-avr_find_unused_d_reg (rtx insn, rtx exclude)
-{
-- unsigned int place;
-- VEC(constraint_edge_t,heap) *vec;
-- struct constraint_edge newe;
-- newe.dest = dest;
+- int regno;
+- bool isr_p = (interrupt_function_p (current_function_decl)
+- || signal_function_p (current_function_decl));
-
-- vec = graph->preds[src];
-- place = VEC_lower_bound (constraint_edge_t, vec, &newe,
-- constraint_edge_less);
-- if (place == VEC_length (constraint_edge_t, vec)
-- || VEC_index (constraint_edge_t, vec, place)->dest != dest)
+- for (regno = 16; regno < 32; regno++)
- {
-- constraint_edge_t edge = new_constraint_edge (dest);
--
-- VEC_safe_insert (constraint_edge_t, heap, graph->preds[src],
-- place, edge);
-- edge = new_constraint_edge (src);
--
-- place = VEC_lower_bound (constraint_edge_t, graph->succs[dest],
-- edge, constraint_edge_less);
-- VEC_safe_insert (constraint_edge_t, heap, graph->succs[dest],
-- place, edge);
-- edge_added = true;
-- stats.num_edges++;
-- return true;
+- rtx reg = all_regs_rtx[regno];
+-
+- if ((exclude
+- && reg_overlap_mentioned_p (exclude, reg))
+- || fixed_regs[regno])
+- {
+- continue;
+- }
+-
+- /* Try non-live register */
+-
+- if (!df_regs_ever_live_p (regno)
+- && (TREE_THIS_VOLATILE (current_function_decl)
+- || cfun->machine->is_OS_task
+- || cfun->machine->is_OS_main
+- || (!isr_p && call_used_regs[regno])))
+- {
+- return reg;
+- }
+-
+- /* Any live register can be used if it is unused after.
+- Prologue/epilogue will care for it as needed. */
+-
+- if (df_regs_ever_live_p (regno)
+- && reg_unused_after (insn, reg))
+- {
+- return reg;
+- }
- }
-- else
-- return false;
+-
+- return NULL_RTX;
-}
-
-
--/* Return the bitmap representing the weights of edge (SRC, DEST). */
+-/* Helper function for the next function in the case where only restricted
+- version of LPM instruction is available. */
-
--static bitmap *
--get_graph_weights (constraint_graph_t graph, unsigned int src,
-- unsigned int dest)
+-static const char*
+-avr_out_lpm_no_lpmx (rtx insn, rtx *xop, int *plen)
-{
-- constraint_edge_t edge;
-- VEC(constraint_edge_t,heap) *vec;
-- struct constraint_edge lookfor;
+- rtx dest = xop[0];
+- rtx addr = xop[1];
+- int n_bytes = GET_MODE_SIZE (GET_MODE (dest));
+- int regno_dest;
-
-- lookfor.dest = dest;
+- regno_dest = REGNO (dest);
-
-- vec = graph->preds[src];
-- edge = constraint_edge_vec_find (vec, lookfor);
-- gcc_assert (edge != NULL);
-- return &edge->weights;
--}
+- /* The implicit target register of LPM. */
+- xop[3] = lpm_reg_rtx;
-
--/* Allocate graph weight bitmap for the edges associated with SRC and
-- DEST in GRAPH. Both the pred and the succ edges share a single
-- bitmap, so we need to set both edges to that bitmap. */
+- switch (GET_CODE (addr))
+- {
+- default:
+- gcc_unreachable();
+-
+- case REG:
+-
+- gcc_assert (REG_Z == REGNO (addr));
+-
+- switch (n_bytes)
+- {
+- default:
+- gcc_unreachable();
+-
+- case 1:
+- avr_asm_len ("%4lpm", xop, plen, 1);
+-
+- if (regno_dest != LPM_REGNO)
+- avr_asm_len ("mov %0,%3", xop, plen, 1);
+-
+- return "";
+-
+- case 2:
+- if (REGNO (dest) == REG_Z)
+- return avr_asm_len ("%4lpm" CR_TAB
+- "push %3" CR_TAB
+- "adiw %2,1" CR_TAB
+- "%4lpm" CR_TAB
+- "mov %B0,%3" CR_TAB
+- "pop %A0", xop, plen, 6);
+-
+- avr_asm_len ("%4lpm" CR_TAB
+- "mov %A0,%3" CR_TAB
+- "adiw %2,1" CR_TAB
+- "%4lpm" CR_TAB
+- "mov %B0,%3", xop, plen, 5);
+-
+- if (!reg_unused_after (insn, addr))
+- avr_asm_len ("sbiw %2,1", xop, plen, 1);
+-
+- break; /* 2 */
+- }
+-
+- break; /* REG */
-
--static bitmap
--allocate_graph_weights (constraint_graph_t graph, unsigned int src,
-- unsigned int dest)
--{
-- bitmap result;
-- constraint_edge_t edge;
-- VEC(constraint_edge_t,heap) *vec;
-- struct constraint_edge lookfor;
--
-- result = BITMAP_ALLOC (&ptabitmap_obstack);
+- case POST_INC:
-
-- /* Set the pred weight. */
-- lookfor.dest = dest;
-- vec = graph->preds[src];
-- edge = constraint_edge_vec_find (vec, lookfor);
-- gcc_assert (edge != NULL);
-- edge->weights = result;
+- gcc_assert (REG_Z == REGNO (XEXP (addr, 0))
+- && n_bytes <= 4);
-
-- /* Set the succ weight. */
-- lookfor.dest = src;
-- vec = graph->succs[dest];
-- edge = constraint_edge_vec_find (vec, lookfor);
-- gcc_assert (edge != NULL);
-- edge->weights = result;
--
-- return result;
+- if (regno_dest == LPM_REGNO)
+- avr_asm_len ("%4lpm" CR_TAB
+- "adiw %2,1", xop, plen, 2);
+- else
+- avr_asm_len ("%4lpm" CR_TAB
+- "mov %A0,%3" CR_TAB
+- "adiw %2,1", xop, plen, 3);
+-
+- if (n_bytes >= 2)
+- avr_asm_len ("%4lpm" CR_TAB
+- "mov %B0,%3" CR_TAB
+- "adiw %2,1", xop, plen, 3);
+-
+- if (n_bytes >= 3)
+- avr_asm_len ("%4lpm" CR_TAB
+- "mov %C0,%3" CR_TAB
+- "adiw %2,1", xop, plen, 3);
+-
+- if (n_bytes >= 4)
+- avr_asm_len ("%4lpm" CR_TAB
+- "mov %D0,%3" CR_TAB
+- "adiw %2,1", xop, plen, 3);
+-
+- break; /* POST_INC */
+-
+- } /* switch CODE (addr) */
+-
+- return "";
-}
-
-
- /* Merge GRAPH nodes FROM and TO into node TO. */
+ /* If PLEN == NULL: Ouput instructions to load a value from a memory location
+ OP[1] in AS1 to register OP[0].
+ If PLEN != 0 set *PLEN to the length in words of the instruction sequence.
+@@ -2607,13 +2509,11 @@
+ static const char*
+ avr_out_lpm (rtx insn, rtx *op, int *plen)
+ {
+- rtx xop[6];
++ rtx xop[3];
+ rtx dest = op[0];
+ rtx src = SET_SRC (single_set (insn));
+ rtx addr;
+ int n_bytes = GET_MODE_SIZE (GET_MODE (dest));
+- int regno_dest;
+- int segment;
+ RTX_CODE code;
+ addr_space_t as = MEM_ADDR_SPACE (src);
+
+@@ -2634,135 +2534,126 @@
+ gcc_assert (REG_P (dest));
+ gcc_assert (REG == code || POST_INC == code);
+
++ /* Only 1-byte moves from __flash are representes as open coded
++ mov insns. All other loads from flash are not handled here but
++ by some UNSPEC instead, see respective FIXME in machine description. */
++
++ gcc_assert (as == ADDR_SPACE_FLASH);
++ gcc_assert (n_bytes == 1);
++
+ xop[0] = dest;
+- xop[1] = addr;
+- xop[2] = lpm_addr_reg_rtx;
+- xop[4] = xstring_empty;
+- xop[5] = tmp_reg_rtx;
++ xop[1] = lpm_addr_reg_rtx;
++ xop[2] = lpm_reg_rtx;
- static void
--merge_graph_nodes (constraint_graph_t graph, unsigned int to,
-+merge_graph_nodes (constraint_graph_t graph, unsigned int to,
- unsigned int from)
- {
-- VEC(constraint_edge_t,heap) *succvec = graph->succs[from];
-- VEC(constraint_edge_t,heap) *predvec = graph->preds[from];
-- int i;
-- constraint_edge_t c;
-- unsigned int j;
-- bitmap_iterator bi;
+- regno_dest = REGNO (dest);
+-
+- segment = avr_addrspace[as].segment;
-
-- /* Merge all the zero weighted predecessor edges. */
-- if (graph->zero_weight_preds[from])
-+ if (graph->indirect_cycles[from] != -1)
+- /* Set RAMPZ as needed. */
+-
+- if (segment)
++ switch (code)
{
-- if (!graph->zero_weight_preds[to])
-- graph->zero_weight_preds[to] = BITMAP_ALLOC (&predbitmap_obstack);
+- xop[4] = GEN_INT (segment);
-
-- EXECUTE_IF_SET_IN_BITMAP (graph->zero_weight_preds[from], 0, j, bi)
-+ /* If we have indirect cycles with the from node, and we have
-+ none on the to node, the to node has indirect cycles from the
-+ from node now that they are unified.
-+ If indirect cycles exist on both, unify the nodes that they
-+ are in a cycle with, since we know they are in a cycle with
-+ each other. */
-+ if (graph->indirect_cycles[to] == -1)
- {
-- if (j != to)
-- {
-- bitmap_clear_bit (graph->zero_weight_succs[j], from);
-- bitmap_set_bit (graph->zero_weight_succs[j], to);
-- }
-+ graph->indirect_cycles[to] = graph->indirect_cycles[from];
- }
-- bitmap_ior_into (graph->zero_weight_preds[to],
-- graph->zero_weight_preds[from]);
+- if (xop[3] = avr_find_unused_d_reg (insn, lpm_addr_reg_rtx),
+- xop[3])
+- {
+- avr_asm_len ("ldi %3,%4" CR_TAB
+- "out __RAMPZ__,%3", xop, plen, 2);
+- }
+- else if (segment == 1)
+- {
+- avr_asm_len ("clr %5" CR_TAB
+- "inc %5" CR_TAB
+- "out __RAMPZ__,%5", xop, plen, 3);
+- }
+- else
+- {
+- avr_asm_len ("mov %5,%2" CR_TAB
+- "ldi %2,%4" CR_TAB
+- "out __RAMPZ__,%2" CR_TAB
+- "mov %2,%5", xop, plen, 4);
+- }
+-
+- xop[4] = xstring_e;
+-
+- if (!AVR_HAVE_ELPMX)
+- return avr_out_lpm_no_lpmx (insn, xop, plen);
- }
-+ else
-+ {
-+ unsigned int tonode = find (graph->indirect_cycles[to]);
-+ unsigned int fromnode = find (graph->indirect_cycles[from]);
-
-- /* Merge all the zero weighted successor edges. */
-- if (graph->zero_weight_succs[from])
+- else if (!AVR_HAVE_LPMX)
- {
-- if (!graph->zero_weight_succs[to])
-- graph->zero_weight_succs[to] = BITMAP_ALLOC (&ptabitmap_obstack);
-- EXECUTE_IF_SET_IN_BITMAP (graph->zero_weight_succs[from], 0, j, bi)
-- {
-- bitmap_clear_bit (graph->zero_weight_preds[j], from);
-- bitmap_set_bit (graph->zero_weight_preds[j], to);
-+ if (unite (tonode, fromnode))
-+ unify_nodes (graph, tonode, fromnode, true);
- }
-- bitmap_ior_into (graph->zero_weight_succs[to],
-- graph->zero_weight_succs[from]);
- }
+- return avr_out_lpm_no_lpmx (insn, xop, plen);
+- }
+-
+- /* We have [E]LPMX: Output reading from Flash the comfortable way. */
+-
+- switch (GET_CODE (addr))
+- {
+ default:
+ gcc_unreachable();
-- /* Merge all the nonzero weighted predecessor edges. */
-- for (i = 0; VEC_iterate (constraint_edge_t, predvec, i, c); i++)
-+ /* Merge all the successor edges. */
-+ if (graph->succs[from])
- {
-- unsigned int d = c->dest;
-- bitmap temp;
-- bitmap *weights;
-+ if (!graph->succs[to])
-+ graph->succs[to] = BITMAP_ALLOC (&pta_obstack);
-+ bitmap_ior_into (graph->succs[to],
-+ graph->succs[from]);
+ case REG:
+
+ gcc_assert (REG_Z == REGNO (addr));
++
++ return AVR_HAVE_LPMX
++ ? avr_asm_len ("lpm %0,%a1", xop, plen, 1)
++ : avr_asm_len ("lpm" CR_TAB
++ "mov %0,%2", xop, plen, 2);
++
++ case POST_INC:
++
++ gcc_assert (REG_Z == REGNO (XEXP (addr, 0)));
+
+- switch (n_bytes)
+- {
+- default:
+- gcc_unreachable();
++ return AVR_HAVE_LPMX
++ ? avr_asm_len ("lpm %0,%a1+", xop, plen, 1)
++ : avr_asm_len ("lpm" CR_TAB
++ "adiw %1, 1" CR_TAB
++ "mov %0,%2", xop, plen, 3);
+ }
-- if (c->dest == from)
-- d = to;
-+ clear_edges_for_node (graph, from);
+- case 1:
+- return avr_asm_len ("%4lpm %0,%a2", xop, plen, 1);
++ return "";
+}
-- add_graph_edge (graph, to, d);
-
-- temp = *(get_graph_weights (graph, from, c->dest));
-- if (temp)
-- {
-- weights = get_graph_weights (graph, to, d);
-- if (!*weights)
-- *weights = allocate_graph_weights (graph, to, d);
--
-- bitmap_ior_into (*weights, temp);
-- }
--
-- }
--
-- /* Merge all the nonzero weighted successor edges. */
-- for (i = 0; VEC_iterate (constraint_edge_t, succvec, i, c); i++)
-- {
-- unsigned int d = c->dest;
-- bitmap temp;
-- bitmap *weights;
-+/* Add an indirect graph edge to GRAPH, going from TO to FROM if
-+ it doesn't exist in the graph already. */
-
-- if (c->dest == from)
-- d = to;
-+static void
-+add_implicit_graph_edge (constraint_graph_t graph, unsigned int to,
-+ unsigned int from)
+- case 2:
+- if (REGNO (dest) == REG_Z)
+- return avr_asm_len ("%4lpm %5,%a2+" CR_TAB
+- "%4lpm %B0,%a2" CR_TAB
+- "mov %A0,%5", xop, plen, 3);
+- else
+- {
+- avr_asm_len ("%4lpm %A0,%a2+" CR_TAB
+- "%4lpm %B0,%a2", xop, plen, 2);
+-
+- if (!reg_unused_after (insn, addr))
+- avr_asm_len ("sbiw %2,1", xop, plen, 1);
+- }
+-
+- break; /* 2 */
+
+- case 3:
++/* If PLEN == NULL: Ouput instructions to load $0 with a value from
++ flash address $1:Z. If $1 = 0 we can use LPM to read, otherwise
++ use ELPM.
++ If PLEN != 0 set *PLEN to the length in words of the instruction sequence.
++ Return "". */
+
+- avr_asm_len ("%4lpm %A0,%a2+" CR_TAB
+- "%4lpm %B0,%a2+" CR_TAB
+- "%4lpm %C0,%a2", xop, plen, 3);
+-
+- if (!reg_unused_after (insn, addr))
+- avr_asm_len ("sbiw %2,2", xop, plen, 1);
+-
+- break; /* 3 */
++const char*
++avr_load_lpm (rtx insn, rtx *op, int *plen)
+{
-+ if (to == from)
-+ return;
-
-- add_graph_edge (graph, d, to);
-+ if (!graph->implicit_preds[to])
-+ graph->implicit_preds[to] = BITMAP_ALLOC (&predbitmap_obstack);
-
-- temp = *(get_graph_weights (graph, c->dest, from));
-- if (temp)
-- {
-- weights = get_graph_weights (graph, d, to);
-- if (!*weights)
-- *weights = allocate_graph_weights (graph, d, to);
-- bitmap_ior_into (*weights, temp);
-- }
-+ if (!bitmap_bit_p (graph->implicit_preds[to], from))
++ rtx xop[4];
++ int n, n_bytes = GET_MODE_SIZE (GET_MODE (op[0]));
++ rtx xsegment = op[1];
++ bool clobber_z = PARALLEL == GET_CODE (PATTERN (insn));
++ bool r30_in_tmp = false;
++
++ if (plen)
++ *plen = 0;
++
++ xop[1] = lpm_addr_reg_rtx;
++ xop[2] = lpm_reg_rtx;
++ xop[3] = xstring_empty;
++
++ /* Set RAMPZ as needed. */
++
++ if (REG_P (xsegment))
+ {
-+ stats.num_implicit_edges++;
-+ bitmap_set_bit (graph->implicit_preds[to], from);
- }
-- clear_edges_for_node (graph, from);
++ avr_asm_len ("out __RAMPZ__,%0", &xsegment, plen, 1);
++ xop[3] = xstring_e;
++ }
++
++ /* Load the individual bytes from LSB to MSB. */
++
++ for (n = 0; n < n_bytes; n++)
++ {
++ xop[0] = all_regs_rtx[REGNO (op[0]) + n];
+
+- case 4:
+-
+- avr_asm_len ("%4lpm %A0,%a2+" CR_TAB
+- "%4lpm %B0,%a2+", xop, plen, 2);
+-
+- if (REGNO (dest) == REG_Z - 2)
+- return avr_asm_len ("%4lpm %5,%a2+" CR_TAB
+- "%4lpm %C0,%a2" CR_TAB
+- "mov %D0,%5", xop, plen, 3);
+- else
++ if ((CONST_INT_P (xsegment) && AVR_HAVE_LPMX)
++ || (REG_P (xsegment) && AVR_HAVE_ELPMX))
++ {
++ if (n == n_bytes-1)
++ avr_asm_len ("%3lpm %0,%a1", xop, plen, 1);
++ else if (REGNO (xop[0]) == REG_Z)
+ {
+- avr_asm_len ("%4lpm %C0,%a2+" CR_TAB
+- "%4lpm %D0,%a2", xop, plen, 2);
+-
+- if (!reg_unused_after (insn, addr))
+- avr_asm_len ("sbiw %2,3", xop, plen, 1);
++ avr_asm_len ("%3lpm %2,%a1+", xop, plen, 1);
++ r30_in_tmp = true;
+ }
++ else
++ avr_asm_len ("%3lpm %0,%a1+", xop, plen, 1);
++ }
++ else
++ {
++ gcc_assert (clobber_z);
++
++ avr_asm_len ("%3lpm" CR_TAB
++ "mov %0,%2", xop, plen, 2);
+
+- break; /* 4 */
+- } /* n_bytes */
++ if (n != n_bytes-1)
++ avr_asm_len ("adiw %1,1", xop, plen, 1);
++ }
++ }
++
++ if (r30_in_tmp)
++ avr_asm_len ("mov %1,%2", xop, plen, 1);
++
++ if (!clobber_z
++ && n_bytes > 1
++ && !reg_unused_after (insn, lpm_addr_reg_rtx)
++ && !reg_overlap_mentioned_p (op[0], lpm_addr_reg_rtx))
++ {
++ xop[2] = GEN_INT (n_bytes-1);
++ avr_asm_len ("sbiw %1,%2", xop, plen, 1);
++ }
++
++ if (REG_P (xsegment) && AVR_HAVE_RAMPD)
++ {
++ /* Reset RAMPZ to 0 so that EBI devices don't read garbage from RAM */
+
+- break; /* REG */
++ avr_asm_len ("out __RAMPZ__,__zero_reg__", xop, plen, 1);
++ }
+
+- case POST_INC:
+-
+- gcc_assert (REG_Z == REGNO (XEXP (addr, 0))
+- && n_bytes <= 4);
+-
+- avr_asm_len ("%4lpm %A0,%a2+", xop, plen, 1);
+- if (n_bytes >= 2) avr_asm_len ("%4lpm %B0,%a2+", xop, plen, 1);
+- if (n_bytes >= 3) avr_asm_len ("%4lpm %C0,%a2+", xop, plen, 1);
+- if (n_bytes >= 4) avr_asm_len ("%4lpm %D0,%a2+", xop, plen, 1);
+-
+- break; /* POST_INC */
+-
+- } /* switch CODE (addr) */
+-
+ return "";
}
--/* Add a graph edge to GRAPH, going from TO to FROM, with WEIGHT, if
-+/* Add a predecessor graph edge to GRAPH, going from TO to FROM if
- it doesn't exist in the graph already.
- Return false if the edge already existed, true otherwise. */
+@@ -2782,8 +2673,9 @@
+ if (plen)
+ *plen = 0;
-+static void
-+add_pred_graph_edge (constraint_graph_t graph, unsigned int to,
-+ unsigned int from)
-+{
-+ if (!graph->preds[to])
-+ graph->preds[to] = BITMAP_ALLOC (&predbitmap_obstack);
-+ if (!bitmap_bit_p (graph->preds[to], from))
-+ bitmap_set_bit (graph->preds[to], from);
-+}
-+
-+/* Add a graph edge to GRAPH, going from FROM to TO if
-+ it doesn't exist in the graph already.
-+ Return false if the edge already existed, true otherwise. */
-+
- static bool
--int_add_graph_edge (constraint_graph_t graph, unsigned int to,
-- unsigned int from, unsigned HOST_WIDE_INT weight)
-+add_graph_edge (constraint_graph_t graph, unsigned int to,
-+ unsigned int from)
+- avr_asm_len ("ld %3,%a2" CR_TAB
+- "sbrs %1,7", xop, plen, 2);
++ avr_asm_len ("sbrc %1,7" CR_TAB
++ "ld %3,%a2" CR_TAB
++ "sbrs %1,7", xop, plen, 3);
+
+ avr_asm_len (AVR_HAVE_LPMX ? "lpm %3,%a2" : "lpm", xop, plen, 1);
+
+@@ -2794,13 +2686,11 @@
+ }
+
+
+-const char *
+-output_movqi (rtx insn, rtx operands[], int *l)
++const char*
++output_movqi (rtx insn, rtx operands[], int *real_l)
{
-- if (to == from && weight == 0)
-+ if (to == from)
- {
- return false;
+- int dummy;
+ rtx dest = operands[0];
+ rtx src = operands[1];
+- int *real_l = l;
+
+ if (avr_mem_flash_p (src)
+ || avr_mem_flash_p (dest))
+@@ -2808,10 +2698,8 @@
+ return avr_out_lpm (insn, operands, real_l);
}
-@@ -1125,41 +907,15 @@
- {
- bool r = false;
-
-- if (weight == 0)
-+ if (!graph->succs[from])
-+ graph->succs[from] = BITMAP_ALLOC (&pta_obstack);
-+ if (!bitmap_bit_p (graph->succs[from], to))
- {
-- if (!graph->zero_weight_preds[to])
-- graph->zero_weight_preds[to] = BITMAP_ALLOC (&predbitmap_obstack);
-- if (!graph->zero_weight_succs[from])
-- graph->zero_weight_succs[from] = BITMAP_ALLOC (&ptabitmap_obstack);
-- if (!bitmap_bit_p (graph->zero_weight_succs[from], to))
-- {
-- edge_added = true;
-- r = true;
-- stats.num_edges++;
-- bitmap_set_bit (graph->zero_weight_preds[to], from);
-- bitmap_set_bit (graph->zero_weight_succs[from], to);
-- }
-+ r = true;
-+ if (to < FIRST_REF_NODE && from < FIRST_REF_NODE)
-+ stats.num_edges++;
-+ bitmap_set_bit (graph->succs[from], to);
- }
-- else
-- {
-- bitmap *weights;
--
-- r = add_graph_edge (graph, to, from);
-- weights = get_graph_weights (graph, to, from);
+
+- if (!l)
+- l = &dummy;
-
-- if (!*weights)
-- {
-- r = true;
-- *weights = allocate_graph_weights (graph, to, from);
-- bitmap_set_bit (*weights, weight);
-- }
-- else
-- {
-- r |= !bitmap_bit_p (*weights, weight);
-- bitmap_set_bit (*weights, weight);
-- }
-- }
--
- return r;
+- *l = 1;
++ if (real_l)
++ *real_l = 1;
+
+ if (register_operand (dest, QImode))
+ {
+@@ -2829,10 +2717,10 @@
+ output_reload_in_const (operands, NULL_RTX, real_l, false);
+ return "";
+ }
+- else if (GET_CODE (src) == MEM)
++ else if (MEM_P (src))
+ return out_movqi_r_mr (insn, operands, real_l); /* mov r,m */
}
- }
-@@ -1168,46 +924,51 @@
- /* Return true if {DEST.SRC} is an existing graph edge in GRAPH. */
-
+- else if (GET_CODE (dest) == MEM)
++ else if (MEM_P (dest))
+ {
+ rtx xop[2];
+
+@@ -6533,6 +6421,7 @@
+ case ADJUST_LEN_MOV32: output_movsisf (insn, op, &len); break;
+ case ADJUST_LEN_MOVMEM: avr_out_movmem (insn, op, &len); break;
+ case ADJUST_LEN_XLOAD: avr_out_xload (insn, op, &len); break;
++ case ADJUST_LEN_LOAD_LPM: avr_load_lpm (insn, op, &len); break;
+
+ case ADJUST_LEN_TSTHI: avr_out_tsthi (insn, op, &len); break;
+ case ADJUST_LEN_TSTPSI: avr_out_tstpsi (insn, op, &len); break;
+@@ -8975,7 +8864,7 @@
+
+ /* Implement `MODE_CODE_BASE_REG_CLASS'. */
+
+-reg_class_t
++enum reg_class
+ avr_mode_code_base_reg_class (enum machine_mode mode ATTRIBUTE_UNUSED,
+ addr_space_t as, RTX_CODE outer_code,
+ RTX_CODE index_code ATTRIBUTE_UNUSED)
+@@ -9568,7 +9457,8 @@
static bool
--valid_graph_edge (constraint_graph_t graph, unsigned int src,
-+valid_graph_edge (constraint_graph_t graph, unsigned int src,
- unsigned int dest)
+ avr_reg_ok_for_pgm_addr (rtx reg, bool strict)
{
-- struct constraint_edge lookfor;
-- lookfor.dest = src;
--
-- return (graph->zero_weight_succs[dest]
-- && bitmap_bit_p (graph->zero_weight_succs[dest], src))
-- || constraint_edge_vec_find (graph->succs[dest], lookfor) != NULL;
-+ return (graph->succs[dest]
-+ && bitmap_bit_p (graph->succs[dest], src));
- }
+- gcc_assert (REG_P (reg));
++ if (!REG_P (reg))
++ return false;
--/* Return true if {DEST, SRC} is an existing weighted graph edge (IE has
-- a weight other than 0) in GRAPH. */
--static bool
--valid_weighted_graph_edge (constraint_graph_t graph, unsigned int src,
-- unsigned int dest)
--{
-- struct constraint_edge lookfor;
-- lookfor.dest = src;
--
-- return graph->preds[src]
-- && constraint_edge_vec_find (graph->succs[dest], lookfor) != NULL;
--}
-+/* Build the constraint graph, adding only predecessor edges right now. */
+ if (strict)
+ {
+@@ -9916,7 +9806,7 @@
+ case ADDR_SPACE_FLASH:
--
--/* Build the constraint graph. */
--
+ if (AVR_HAVE_LPMX)
+- avr_asm_len ("lpm %2,%Z+", xop, plen, 1);
++ avr_asm_len ("lpm %2,Z+", xop, plen, 1);
+ else
+ avr_asm_len ("lpm" CR_TAB
+ "adiw r30,1", xop, plen, 2);
+@@ -9965,6 +9855,14 @@
+ \f
+ /* Helper for __builtin_avr_delay_cycles */
+
++static rtx
++avr_mem_clobber (void)
++{
++ rtx mem = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++ MEM_VOLATILE_P (mem) = 1;
++ return mem;
++}
++
static void
--build_constraint_graph (void)
-+build_pred_graph (void)
+ avr_expand_delay_cycles (rtx operands0)
{
-- int i = 0;
-+ int i;
- constraint_t c;
-+ unsigned int j;
-
- graph = XNEW (struct constraint_graph);
-- graph_size = VEC_length (varinfo_t, varmap) + 1;
-- graph->succs = XCNEWVEC (VEC(constraint_edge_t,heap) *, graph_size);
-- graph->preds = XCNEWVEC (VEC(constraint_edge_t,heap) *, graph_size);
-- graph->zero_weight_succs = XCNEWVEC (bitmap, graph_size);
-- graph->zero_weight_preds = XCNEWVEC (bitmap, graph_size);
-+ graph->size = (VEC_length (varinfo_t, varmap)) * 3;
-+ graph->succs = XCNEWVEC (bitmap, graph->size);
-+ graph->implicit_preds = XCNEWVEC (bitmap, graph->size);
-+ graph->preds = XCNEWVEC (bitmap, graph->size);
-+ graph->indirect_cycles = XNEWVEC (int, VEC_length (varinfo_t, varmap));
-+ graph->label = XCNEWVEC (unsigned int, graph->size);
-+ graph->rep = XNEWVEC (unsigned int, graph->size);
-+ graph->eq_rep = XNEWVEC (int, graph->size);
-+ graph->complex = XCNEWVEC (VEC(constraint_t, heap) *,
-+ VEC_length (varinfo_t, varmap));
-+ graph->direct_nodes = sbitmap_alloc (graph->size);
-+ sbitmap_zero (graph->direct_nodes);
-
-+ for (j = 0; j < FIRST_REF_NODE; j++)
-+ {
-+ if (!get_varinfo (j)->is_special_var)
-+ SET_BIT (graph->direct_nodes, j);
-+ }
+@@ -9976,7 +9874,8 @@
+ {
+ loop_count = ((cycles - 9) / 6) + 1;
+ cycles_used = ((loop_count - 1) * 6) + 9;
+- emit_insn (gen_delay_cycles_4 (gen_int_mode (loop_count, SImode)));
++ emit_insn (gen_delay_cycles_4 (gen_int_mode (loop_count, SImode),
++ avr_mem_clobber()));
+ cycles -= cycles_used;
+ }
+
+@@ -9986,7 +9885,8 @@
+ if (loop_count > 0xFFFFFF)
+ loop_count = 0xFFFFFF;
+ cycles_used = ((loop_count - 1) * 5) + 7;
+- emit_insn (gen_delay_cycles_3 (gen_int_mode (loop_count, SImode)));
++ emit_insn (gen_delay_cycles_3 (gen_int_mode (loop_count, SImode),
++ avr_mem_clobber()));
+ cycles -= cycles_used;
+ }
+
+@@ -9996,7 +9896,8 @@
+ if (loop_count > 0xFFFF)
+ loop_count = 0xFFFF;
+ cycles_used = ((loop_count - 1) * 4) + 5;
+- emit_insn (gen_delay_cycles_2 (gen_int_mode (loop_count, HImode)));
++ emit_insn (gen_delay_cycles_2 (gen_int_mode (loop_count, HImode),
++ avr_mem_clobber()));
+ cycles -= cycles_used;
+ }
+
+@@ -10006,7 +9907,8 @@
+ if (loop_count > 255)
+ loop_count = 255;
+ cycles_used = loop_count * 3;
+- emit_insn (gen_delay_cycles_1 (gen_int_mode (loop_count, QImode)));
++ emit_insn (gen_delay_cycles_1 (gen_int_mode (loop_count, QImode),
++ avr_mem_clobber()));
+ cycles -= cycles_used;
+ }
+
+@@ -11007,6 +10909,9 @@
+ #undef TARGET_ADDR_SPACE_LEGITIMIZE_ADDRESS
+ #define TARGET_ADDR_SPACE_LEGITIMIZE_ADDRESS avr_addr_space_legitimize_address
+
++#undef TARGET_MODE_DEPENDENT_ADDRESS_P
++#define TARGET_MODE_DEPENDENT_ADDRESS_P avr_mode_dependent_address_p
++
+ #undef TARGET_PRINT_OPERAND
+ #define TARGET_PRINT_OPERAND avr_print_operand
+ #undef TARGET_PRINT_OPERAND_ADDRESS
+Index: gcc/config/epiphany/epiphany.c
+===================================================================
+--- gcc/config/epiphany/epiphany.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/config/epiphany/epiphany.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1417,7 +1417,7 @@
+ return gen_rtx_REG (mode, 0);
+ }
+
+-bool
++static bool
+ epiphany_function_value_regno_p (const unsigned int regno ATTRIBUTE_UNUSED)
+ {
+ return regno == 0;
+Index: gcc/config/rs6000/vector.md
+===================================================================
+--- gcc/config/rs6000/vector.md (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/config/rs6000/vector.md (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -516,6 +516,94 @@
+ "VECTOR_UNIT_ALTIVEC_P (<MODE>mode)"
+ "")
+
++(define_insn_and_split "*vector_uneq<mode>"
++ [(set (match_operand:VEC_F 0 "vfloat_operand" "")
++ (uneq:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "")
++ (match_operand:VEC_F 2 "vfloat_operand" "")))]
++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)"
++ "#"
++ ""
++ [(set (match_dup 3)
++ (gt:VEC_F (match_dup 1)
++ (match_dup 2)))
++ (set (match_dup 4)
++ (gt:VEC_F (match_dup 2)
++ (match_dup 1)))
++ (set (match_dup 0)
++ (not:VEC_F (ior:VEC_F (match_dup 3)
++ (match_dup 4))))]
++ "
++{
++ operands[3] = gen_reg_rtx (<MODE>mode);
++ operands[4] = gen_reg_rtx (<MODE>mode);
++}")
++
++(define_insn_and_split "*vector_ltgt<mode>"
++ [(set (match_operand:VEC_F 0 "vfloat_operand" "")
++ (ltgt:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "")
++ (match_operand:VEC_F 2 "vfloat_operand" "")))]
++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)"
++ "#"
++ ""
++ [(set (match_dup 3)
++ (gt:VEC_F (match_dup 1)
++ (match_dup 2)))
++ (set (match_dup 4)
++ (gt:VEC_F (match_dup 2)
++ (match_dup 1)))
++ (set (match_dup 0)
++ (ior:VEC_F (match_dup 3)
++ (match_dup 4)))]
++ "
++{
++ operands[3] = gen_reg_rtx (<MODE>mode);
++ operands[4] = gen_reg_rtx (<MODE>mode);
++}")
++
++(define_insn_and_split "*vector_ordered<mode>"
++ [(set (match_operand:VEC_F 0 "vfloat_operand" "")
++ (ordered:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "")
++ (match_operand:VEC_F 2 "vfloat_operand" "")))]
++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)"
++ "#"
++ ""
++ [(set (match_dup 3)
++ (ge:VEC_F (match_dup 1)
++ (match_dup 2)))
++ (set (match_dup 4)
++ (ge:VEC_F (match_dup 2)
++ (match_dup 1)))
++ (set (match_dup 0)
++ (ior:VEC_F (match_dup 3)
++ (match_dup 4)))]
++ "
++{
++ operands[3] = gen_reg_rtx (<MODE>mode);
++ operands[4] = gen_reg_rtx (<MODE>mode);
++}")
++
++(define_insn_and_split "*vector_unordered<mode>"
++ [(set (match_operand:VEC_F 0 "vfloat_operand" "")
++ (unordered:VEC_F (match_operand:VEC_F 1 "vfloat_operand" "")
++ (match_operand:VEC_F 2 "vfloat_operand" "")))]
++ "VECTOR_UNIT_ALTIVEC_OR_VSX_P (<MODE>mode)"
++ "#"
++ ""
++ [(set (match_dup 3)
++ (ge:VEC_F (match_dup 1)
++ (match_dup 2)))
++ (set (match_dup 4)
++ (ge:VEC_F (match_dup 2)
++ (match_dup 1)))
++ (set (match_dup 0)
++ (not:VEC_F (ior:VEC_F (match_dup 3)
++ (match_dup 4))))]
++ "
++{
++ operands[3] = gen_reg_rtx (<MODE>mode);
++ operands[4] = gen_reg_rtx (<MODE>mode);
++}")
++
+ ;; Note the arguments for __builtin_altivec_vsel are op2, op1, mask
+ ;; which is in the reverse order that we want
+ (define_expand "vector_select_<mode>"
+Index: gcc/config/rs6000/rs6000.c
+===================================================================
+--- gcc/config/rs6000/rs6000.c (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ gcc/config/rs6000/rs6000.c (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -16137,6 +16137,10 @@
+ case EQ:
+ case GT:
+ case GTU:
++ case ORDERED:
++ case UNORDERED:
++ case UNEQ:
++ case LTGT:
+ mask = gen_reg_rtx (mode);
+ emit_insn (gen_rtx_SET (VOIDmode,
+ mask,
+Index: libgo/go/syscall/syscall_unix.go
+===================================================================
+--- libgo/go/syscall/syscall_unix.go (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libgo/go/syscall/syscall_unix.go (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -31,6 +31,7 @@
+ // expects a 32-bit one.
+ func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) {
+ Entersyscall()
++ SetErrno(0)
+ var r uintptr
+ if unsafe.Sizeof(r) == 4 {
+ r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3), 0, 0, 0)
+@@ -46,6 +47,7 @@
+
+ func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) {
+ Entersyscall()
++ SetErrno(0)
+ var r uintptr
+ if unsafe.Sizeof(r) == 4 {
+ r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3),
+@@ -63,6 +65,7 @@
+
+ func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) {
+ var r uintptr
++ SetErrno(0)
+ if unsafe.Sizeof(r) == 4 {
+ r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3), 0, 0, 0)
+ r = uintptr(r1)
+@@ -76,6 +79,7 @@
+
+ func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) {
+ var r uintptr
++ SetErrno(0)
+ if unsafe.Sizeof(r) == 4 {
+ r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3),
+ int32(a4), int32(a5), int32(a6))
+Index: libffi/src/powerpc/aix.S
+===================================================================
+--- libffi/src/powerpc/aix.S (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libffi/src/powerpc/aix.S (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,5 +1,5 @@
+ /* -----------------------------------------------------------------------
+- aix.S - Copyright (c) 2002,2009 Free Software Foundation, Inc.
++ aix.S - Copyright (c) 2002, 2009 Free Software Foundation, Inc.
+ based on darwin.S by John Hornkvist
+
+ PowerPC Assembly glue.
+@@ -79,6 +79,8 @@
+ .set f20,20
+ .set f21,21
+
++ .extern .ffi_prep_args
++
+ #define LIBFFI_ASM
+ #include <fficonfig.h>
+ #include <ffi.h>
+@@ -125,6 +127,7 @@
+ /* Call ffi_prep_args. */
+ mr r4, r1
+ bl .ffi_prep_args
++ nop
+
+ /* Now do the call. */
+ ld r0, 0(r29)
+@@ -226,6 +229,7 @@
+ /* Call ffi_prep_args. */
+ mr r4, r1
+ bl .ffi_prep_args
++ nop
+
+ /* Now do the call. */
+ lwz r0, 0(r29)
+Index: libffi/src/powerpc/aix_closure.S
+===================================================================
+--- libffi/src/powerpc/aix_closure.S (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libffi/src/powerpc/aix_closure.S (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -79,6 +79,8 @@
+ .set f20,20
+ .set f21,21
+
++ .extern .ffi_closure_helper_DARWIN
++
+ #define LIBFFI_ASM
+ #define JUMPTARGET(name) name
+ #define L(x) x
+@@ -165,6 +167,7 @@
+
+ /* look up the proper starting point in table */
+ /* by using return type as offset */
++ lhz r3, 10(r3) /* load type from return type */
+ ld r4, LC..60(2) /* get address of jump table */
+ sldi r3, r3, 4 /* now multiply return type by 16 */
+ ld r0, 240+16(r1) /* load return address */
+@@ -337,8 +340,9 @@
+
+ /* look up the proper starting point in table */
+ /* by using return type as offset */
++ lhz r3, 6(r3) /* load type from return type */
+ lwz r4, LC..60(2) /* get address of jump table */
+- slwi r3, r3, 4 /* now multiply return type by 4 */
++ slwi r3, r3, 4 /* now multiply return type by 16 */
+ lwz r0, 176+8(r1) /* load return address */
+ add r3, r3, r4 /* add contents of table to table address */
+ mtctr r3
+Index: libffi/ChangeLog
+===================================================================
+--- libffi/ChangeLog (.../tags/gcc_4_7_0_release) (wersja 185750)
++++ libffi/ChangeLog (.../branches/gcc-4_7-branch) (wersja 185750)
+@@ -1,3 +1,17 @@
++2012-03-22 David Edelsohn <dje.gcc@gmail.com>
+
-+ for (j = 0; j < graph->size; j++)
-+ {
-+ graph->rep[j] = j;
-+ graph->eq_rep[j] = -1;
-+ }
++ Backport from mainline:
++ 2012-03-09 David Edelsohn <dje.gcc@gmail.com>
+
-+ for (j = 0; j < VEC_length (varinfo_t, varmap); j++)
-+ graph->indirect_cycles[j] = -1;
++ * src/powerpc/aix_closure.S (ffi_closure_ASM): Adjust for Darwin64
++ change to return value of ffi_closure_helper_DARWIN and load type
++ from return type.
+
- for (i = 0; VEC_iterate (constraint_t, constraints, i, c); i++)
- {
- struct constraint_expr lhs = c->lhs;
-@@ -1217,31 +978,92 @@
-
- if (lhs.type == DEREF)
- {
-- /* *x = y or *x = &y (complex) */
-- if (rhs.type == ADDRESSOF || rhsvar > anything_id)
-- insert_into_complex (lhsvar, c);
-+ /* *x = y. */
-+ if (rhs.offset == 0 && lhs.offset == 0 && rhs.type == SCALAR)
-+ add_pred_graph_edge (graph, FIRST_REF_NODE + lhsvar, rhsvar);
-+ if (rhs.type == ADDRESSOF)
-+ RESET_BIT (graph->direct_nodes, rhsvar);
- }
- else if (rhs.type == DEREF)
- {
-- /* !special var= *y */
-- if (!(get_varinfo (lhsvar)->is_special_var))
-- insert_into_complex (rhsvar, c);
-+ /* x = *y */
-+ if (rhs.offset == 0 && lhs.offset == 0 && lhs.type == SCALAR)
-+ add_pred_graph_edge (graph, lhsvar, FIRST_REF_NODE + rhsvar);
-+ else
-+ RESET_BIT (graph->direct_nodes, lhsvar);
- }
- else if (rhs.type == ADDRESSOF)
- {
- /* x = &y */
-+ add_pred_graph_edge (graph, lhsvar, FIRST_ADDR_NODE + rhsvar);
-+ /* Implicitly, *x = y */
-+ add_implicit_graph_edge (graph, FIRST_REF_NODE + lhsvar, rhsvar);
-+
-+ RESET_BIT (graph->direct_nodes, rhsvar);
-+ }
-+ else if (lhsvar > anything_id
-+ && lhsvar != rhsvar && lhs.offset == 0 && rhs.offset == 0)
-+ {
-+ /* x = y */
-+ add_pred_graph_edge (graph, lhsvar, rhsvar);
-+ /* Implicitly, *x = *y */
-+ add_implicit_graph_edge (graph, FIRST_REF_NODE + lhsvar,
-+ FIRST_REF_NODE + rhsvar);
-+ }
-+ else if (lhs.offset != 0 || rhs.offset != 0)
-+ {
-+ if (rhs.offset != 0)
-+ RESET_BIT (graph->direct_nodes, lhs.var);
-+ if (lhs.offset != 0)
-+ RESET_BIT (graph->direct_nodes, rhs.var);
-+ }
-+ }
-+}
-+
-+/* Build the constraint graph, adding successor edges. */
-+
-+static void
-+build_succ_graph (void)
-+{
-+ int i;
-+ constraint_t c;
-+
-+ for (i = 0; VEC_iterate (constraint_t, constraints, i, c); i++)
-+ {
-+ struct constraint_expr lhs;
-+ struct constraint_expr rhs;
-+ unsigned int lhsvar;
-+ unsigned int rhsvar;
-+
-+ if (!c)
-+ continue;
-+
-+ lhs = c->lhs;
-+ rhs = c->rhs;
-+ lhsvar = find (get_varinfo_fc (lhs.var)->id);
-+ rhsvar = find (get_varinfo_fc (rhs.var)->id);
-+
-+ if (lhs.type == DEREF)
-+ {
-+ if (rhs.offset == 0 && lhs.offset == 0 && rhs.type == SCALAR)
-+ add_graph_edge (graph, FIRST_REF_NODE + lhsvar, rhsvar);
-+ }
-+ else if (rhs.type == DEREF)
-+ {
-+ if (rhs.offset == 0 && lhs.offset == 0 && lhs.type == SCALAR)
-+ add_graph_edge (graph, lhsvar, FIRST_REF_NODE + rhsvar);
-+ }
-+ else if (rhs.type == ADDRESSOF)
-+ {
-+ /* x = &y */
-+ gcc_assert (find (get_varinfo_fc (rhs.var)->id)
-+ == get_varinfo_fc (rhs.var)->id);
- bitmap_set_bit (get_varinfo (lhsvar)->solution, rhsvar);
- }
-- else if (lhsvar > anything_id)
-+ else if (lhsvar > anything_id
-+ && lhsvar != rhsvar && lhs.offset == 0 && rhs.offset == 0)
- {
-- /* Ignore 0 weighted self edges, as they can't possibly contribute
-- anything */
-- if (lhsvar != rhsvar || rhs.offset != 0 || lhs.offset != 0)
-- {
-- /* x = y (simple) */
-- int_add_graph_edge (graph, lhs.var, rhs.var, rhs.offset);
-- }
--
-+ add_graph_edge (graph, lhsvar, rhsvar);
- }
- }
- }
-@@ -1260,20 +1082,20 @@
- struct scc_info
- {
- sbitmap visited;
-- sbitmap in_component;
-+ sbitmap roots;
-+ unsigned int *dfs;
-+ unsigned int *node_mapping;
- int current_index;
-- unsigned int *visited_index;
- VEC(unsigned,heap) *scc_stack;
-- VEC(unsigned,heap) *unification_queue;
- };
-
-
- /* Recursive routine to find strongly connected components in GRAPH.
- SI is the SCC info to store the information in, and N is the id of current
- graph node we are processing.
--
-+
- This is Tarjan's strongly connected component finding algorithm, as
-- modified by Nuutila to keep only non-root nodes on the stack.
-+ modified by Nuutila to keep only non-root nodes on the stack.
- The algorithm can be found in "On finding the strongly connected
- connected components in a directed graph" by Esko Nuutila and Eljas
- Soisalon-Soininen, in Information Processing Letters volume 49,
-@@ -1284,188 +1106,144 @@
- {
- unsigned int i;
- bitmap_iterator bi;
-+ unsigned int my_dfs;
-
-- gcc_assert (get_varinfo (n)->node == n);
- SET_BIT (si->visited, n);
-- RESET_BIT (si->in_component, n);
-- si->visited_index[n] = si->current_index ++;
--
-+ si->dfs[n] = si->current_index ++;
-+ my_dfs = si->dfs[n];
-+
- /* Visit all the successors. */
-- EXECUTE_IF_IN_NONNULL_BITMAP (graph->zero_weight_succs[n], 0, i, bi)
-+ EXECUTE_IF_IN_NONNULL_BITMAP (graph->succs[n], 0, i, bi)
- {
-- unsigned int w = i;
-+ unsigned int w;
-+
-+ if (i > LAST_REF_NODE)
-+ break;
-+
-+ w = find (i);
-+ if (TEST_BIT (si->roots, w))
-+ continue;
-+
- if (!TEST_BIT (si->visited, w))
- scc_visit (graph, si, w);
-- if (!TEST_BIT (si->in_component, w))
-- {
-- unsigned int t = get_varinfo (w)->node;
-- unsigned int nnode = get_varinfo (n)->node;
-- if (si->visited_index[t] < si->visited_index[nnode])
-- get_varinfo (n)->node = t;
-- }
-+ {
-+ unsigned int t = find (w);
-+ unsigned int nnode = find (n);
-+ gcc_assert (nnode == n);
-+
-+ if (si->dfs[t] < si->dfs[nnode])
-+ si->dfs[n] = si->dfs[t];
-+ }
- }
--
-+
- /* See if any components have been identified. */
-- if (get_varinfo (n)->node == n)
-+ if (si->dfs[n] == my_dfs)
- {
-- unsigned int t = si->visited_index[n];
-- SET_BIT (si->in_component, n);
-- while (VEC_length (unsigned, si->scc_stack) != 0
-- && t < si->visited_index[VEC_last (unsigned, si->scc_stack)])
-+ if (VEC_length (unsigned, si->scc_stack) > 0
-+ && si->dfs[VEC_last (unsigned, si->scc_stack)] >= my_dfs)
- {
-- unsigned int w = VEC_pop (unsigned, si->scc_stack);
-- get_varinfo (w)->node = n;
-- SET_BIT (si->in_component, w);
-- /* Mark this node for collapsing. */
-- VEC_safe_push (unsigned, heap, si->unification_queue, w);
-- }
-- }
-- else
-- VEC_safe_push (unsigned, heap, si->scc_stack, n);
--}
-+ bitmap scc = BITMAP_ALLOC (NULL);
-+ bool have_ref_node = n >= FIRST_REF_NODE;
-+ unsigned int lowest_node;
-+ bitmap_iterator bi;
-
-+ bitmap_set_bit (scc, n);
-
--/* Collapse two variables into one variable. */
-+ while (VEC_length (unsigned, si->scc_stack) != 0
-+ && si->dfs[VEC_last (unsigned, si->scc_stack)] >= my_dfs)
-+ {
-+ unsigned int w = VEC_pop (unsigned, si->scc_stack);
-
--static void
--collapse_nodes (constraint_graph_t graph, unsigned int to, unsigned int from)
--{
-- bitmap tosol, fromsol;
-+ bitmap_set_bit (scc, w);
-+ if (w >= FIRST_REF_NODE)
-+ have_ref_node = true;
-+ }
-
-- condense_varmap_nodes (to, from);
-- tosol = get_varinfo (to)->solution;
-- fromsol = get_varinfo (from)->solution;
-- bitmap_ior_into (tosol, fromsol);
-- merge_graph_nodes (graph, to, from);
--
-- if (valid_graph_edge (graph, to, to))
-- {
-- if (graph->zero_weight_preds[to])
-- {
-- bitmap_clear_bit (graph->zero_weight_preds[to], to);
-- bitmap_clear_bit (graph->zero_weight_succs[to], to);
-+ lowest_node = bitmap_first_set_bit (scc);
-+ gcc_assert (lowest_node < FIRST_REF_NODE);
-+ EXECUTE_IF_SET_IN_BITMAP (scc, 0, i, bi)
-+ {
-+ if (i < FIRST_REF_NODE)
-+ {
-+ /* Mark this node for collapsing. */
-+ if (unite (lowest_node, i))
-+ unify_nodes (graph, lowest_node, i, false);
-+ }
-+ else
-+ {
-+ unite (lowest_node, i);
-+ graph->indirect_cycles[i - FIRST_REF_NODE] = lowest_node;
-+ }
-+ }
- }
-- if (valid_weighted_graph_edge (graph, to, to))
-- {
-- bitmap weights = *(get_graph_weights (graph, to, to));
-- if (!weights || bitmap_empty_p (weights))
-- erase_graph_self_edge (graph, to);
-- }
-+ SET_BIT (si->roots, n);
- }
-- BITMAP_FREE (fromsol);
-- get_varinfo (to)->address_taken |= get_varinfo (from)->address_taken;
-- get_varinfo (to)->indirect_target |= get_varinfo (from)->indirect_target;
-+ else
-+ VEC_safe_push (unsigned, heap, si->scc_stack, n);
- }
-
-+/* Unify node FROM into node TO, updating the changed count if
-+ necessary when UPDATE_CHANGED is true. */
-
--/* Unify nodes in GRAPH that we have found to be part of a cycle.
-- SI is the Strongly Connected Components information structure that tells us
-- what components to unify.
-- UPDATE_CHANGED should be set to true if the changed sbitmap and changed
-- count should be updated to reflect the unification. */
--
- static void
--process_unification_queue (constraint_graph_t graph, struct scc_info *si,
-- bool update_changed)
-+unify_nodes (constraint_graph_t graph, unsigned int to, unsigned int from,
-+ bool update_changed)
- {
-- size_t i = 0;
-- bitmap tmp = BITMAP_ALLOC (update_changed ? &iteration_obstack : NULL);
-- bitmap_clear (tmp);
-
-- /* We proceed as follows:
-+ gcc_assert (to != from && find (to) == to);
-+ if (dump_file && (dump_flags & TDF_DETAILS))
-+ fprintf (dump_file, "Unifying %s to %s\n",
-+ get_varinfo (from)->name,
-+ get_varinfo (to)->name);
-
-- For each component in the queue (components are delineated by
-- when current_queue_element->node != next_queue_element->node):
-+ if (update_changed)
-+ stats.unified_vars_dynamic++;
-+ else
-+ stats.unified_vars_static++;
-
-- rep = representative node for component
-+ merge_graph_nodes (graph, to, from);
-+ merge_node_constraints (graph, to, from);
-
-- For each node (tounify) to be unified in the component,
-- merge the solution for tounify into tmp bitmap
--
-- clear solution for tounify
--
-- merge edges from tounify into rep
--
-- merge complex constraints from tounify into rep
--
-- update changed count to note that tounify will never change
-- again
--
-- Merge tmp into solution for rep, marking rep changed if this
-- changed rep's solution.
--
-- Delete any 0 weighted self-edges we now have for rep. */
-- while (i != VEC_length (unsigned, si->unification_queue))
-+ if (update_changed && TEST_BIT (changed, from))
- {
-- unsigned int tounify = VEC_index (unsigned, si->unification_queue, i);
-- unsigned int n = get_varinfo (tounify)->node;
--
-- if (dump_file && (dump_flags & TDF_DETAILS))
-- fprintf (dump_file, "Unifying %s to %s\n",
-- get_varinfo (tounify)->name,
-- get_varinfo (n)->name);
-- if (update_changed)
-- stats.unified_vars_dynamic++;
-+ RESET_BIT (changed, from);
-+ if (!TEST_BIT (changed, to))
-+ SET_BIT (changed, to);
- else
-- stats.unified_vars_static++;
-- bitmap_ior_into (tmp, get_varinfo (tounify)->solution);
-- merge_graph_nodes (graph, n, tounify);
-- condense_varmap_nodes (n, tounify);
--
-- if (update_changed && TEST_BIT (changed, tounify))
- {
-- RESET_BIT (changed, tounify);
-- if (!TEST_BIT (changed, n))
-- SET_BIT (changed, n);
-- else
-- {
-- gcc_assert (changed_count > 0);
-- changed_count--;
-- }
-+ gcc_assert (changed_count > 0);
-+ changed_count--;
- }
-+ }
-
-- bitmap_clear (get_varinfo (tounify)->solution);
-- ++i;
--
-- /* If we've either finished processing the entire queue, or
-- finished processing all nodes for component n, update the solution for
-- n. */
-- if (i == VEC_length (unsigned, si->unification_queue)
-- || get_varinfo (VEC_index (unsigned, si->unification_queue, i))->node != n)
-+ /* If the solution changes because of the merging, we need to mark
-+ the variable as changed. */
-+ if (bitmap_ior_into (get_varinfo (to)->solution,
-+ get_varinfo (from)->solution))
-+ {
-+ if (update_changed && !TEST_BIT (changed, to))
- {
-- /* If the solution changes because of the merging, we need to mark
-- the variable as changed. */
-- if (bitmap_ior_into (get_varinfo (n)->solution, tmp))
-- {
-- if (update_changed && !TEST_BIT (changed, n))
-- {
-- SET_BIT (changed, n);
-- changed_count++;
-- }
-- }
-- bitmap_clear (tmp);
--
-- if (valid_graph_edge (graph, n, n))
-- {
-- if (graph->zero_weight_succs[n])
-- {
-- if (graph->zero_weight_preds[n])
-- bitmap_clear_bit (graph->zero_weight_preds[n], n);
-- bitmap_clear_bit (graph->zero_weight_succs[n], n);
-- }
-- if (valid_weighted_graph_edge (graph, n, n))
-- {
-- bitmap weights = *(get_graph_weights (graph, n, n));
-- if (!weights || bitmap_empty_p (weights))
-- erase_graph_self_edge (graph, n);
-- }
-- }
-+ SET_BIT (changed, to);
-+ changed_count++;
- }
- }
-- BITMAP_FREE (tmp);
-+
-+ BITMAP_FREE (get_varinfo (from)->solution);
-+ BITMAP_FREE (get_varinfo (from)->oldsolution);
-+
-+ if (stats.iterations > 0)
-+ {
-+ BITMAP_FREE (get_varinfo (to)->oldsolution);
-+ get_varinfo (to)->oldsolution = BITMAP_ALLOC (&oldpta_obstack);
-+ }
-+
-+ if (valid_graph_edge (graph, to, to))
-+ {
-+ if (graph->succs[to])
-+ bitmap_clear_bit (graph->succs[to], to);
-+ }
- }
-
--
- /* Information needed to compute the topological ordering of a graph. */
-
- struct topo_info
-@@ -1509,37 +1287,24 @@
- topo_visit (constraint_graph_t graph, struct topo_info *ti,
- unsigned int n)
- {
-- VEC(constraint_edge_t,heap) *succs = graph->succs[n];
-- bitmap temp;
- bitmap_iterator bi;
-- constraint_edge_t c;
-- int i;
- unsigned int j;
-
- SET_BIT (ti->visited, n);
-- if (VEC_length (constraint_edge_t, succs) != 0)
-- {
-- temp = BITMAP_ALLOC (&iteration_obstack);
-- if (graph->zero_weight_succs[n])
-- bitmap_ior_into (temp, graph->zero_weight_succs[n]);
-- for (i = 0; VEC_iterate (constraint_edge_t, succs, i, c); i++)
-- bitmap_set_bit (temp, c->dest);
-- }
-- else
-- temp = graph->zero_weight_succs[n];
-
-- if (temp)
-- EXECUTE_IF_SET_IN_BITMAP (temp, 0, j, bi)
-+ if (graph->succs[n])
-+ EXECUTE_IF_SET_IN_BITMAP (graph->succs[n], 0, j, bi)
- {
- if (!TEST_BIT (ti->visited, j))
- topo_visit (graph, ti, j);
- }
-+
- VEC_safe_push (unsigned, heap, ti->topo_order, n);
- }
-
- /* Return true if variable N + OFFSET is a legal field of N. */
-
--static bool
-+static bool
- type_safe (unsigned int n, unsigned HOST_WIDE_INT *offset)
- {
- varinfo_t ninfo = get_varinfo (n);
-@@ -1582,10 +1347,10 @@
- v = first_vi_for_offset (get_varinfo (j), fieldoffset);
- if (!v)
- continue;
-- t = v->node;
-+ t = find (v->id);
- sol = get_varinfo (t)->solution;
- if (!bitmap_bit_p (sol, rhs))
-- {
-+ {
- bitmap_set_bit (sol, rhs);
- if (!TEST_BIT (changed, t))
- {
-@@ -1596,7 +1361,7 @@
- }
- else if (0 && dump_file && !(get_varinfo (j)->is_special_var))
- fprintf (dump_file, "Untypesafe usage in do_da_constraint.\n");
--
-+
- }
- }
-
-@@ -1607,7 +1372,7 @@
- do_sd_constraint (constraint_graph_t graph, constraint_t c,
- bitmap delta)
- {
-- unsigned int lhs = get_varinfo (c->lhs.var)->node;
-+ unsigned int lhs = find (c->lhs.var);
- bool flag = false;
- bitmap sol = get_varinfo (lhs)->solution;
- unsigned int j;
-@@ -1620,7 +1385,7 @@
- bitmap_set_bit (sol, anything_id);
- goto done;
- }
-- /* For each variable j in delta (Sol(y)), add
-+ /* For each variable j in delta (Sol(y)), add
- an edge in the graph from j to x, and union Sol(j) into Sol(x). */
- EXECUTE_IF_SET_IN_BITMAP (delta, 0, j, bi)
- {
-@@ -1634,18 +1399,18 @@
- v = first_vi_for_offset (get_varinfo (j), fieldoffset);
- if (!v)
- continue;
-- t = v->node;
-+ t = find (v->id);
-
- /* Adding edges from the special vars is pointless.
- They don't have sets that can change. */
- if (get_varinfo (t) ->is_special_var)
- flag |= bitmap_ior_into (sol, get_varinfo (t)->solution);
-- else if (int_add_graph_edge (graph, lhs, t, 0))
-+ else if (add_graph_edge (graph, lhs, t))
- flag |= bitmap_ior_into (sol, get_varinfo (t)->solution);
- }
- else if (0 && dump_file && !(get_varinfo (j)->is_special_var))
- fprintf (dump_file, "Untypesafe usage in do_sd_constraint\n");
--
-+
- }
-
- done:
-@@ -1658,15 +1423,15 @@
- SET_BIT (changed, lhs);
- changed_count++;
- }
-- }
-+ }
- }
-
- /* Process a constraint C that represents *x = y. */
-
- static void
--do_ds_constraint (constraint_graph_t graph, constraint_t c, bitmap delta)
-+do_ds_constraint (constraint_t c, bitmap delta)
- {
-- unsigned int rhs = get_varinfo (c->rhs.var)->node;
-+ unsigned int rhs = find (c->rhs.var);
- unsigned HOST_WIDE_INT roff = c->rhs.offset;
- bitmap sol = get_varinfo (rhs)->solution;
- unsigned int j;
-@@ -1685,8 +1450,8 @@
- v = first_vi_for_offset (get_varinfo (j), fieldoffset);
- if (!v)
- continue;
-- t = v->node;
--
-+ t = find (v->id);
-+
- if (!bitmap_bit_p (get_varinfo (t)->solution, anything_id))
- {
- bitmap_set_bit (get_varinfo (t)->solution, anything_id);
-@@ -1705,40 +1470,39 @@
- EXECUTE_IF_SET_IN_BITMAP (delta, 0, j, bi)
- {
- unsigned HOST_WIDE_INT loff = c->lhs.offset;
-- if (type_safe (j, &loff) && !(get_varinfo(j)->is_special_var))
-+ if (type_safe (j, &loff) && !(get_varinfo (j)->is_special_var))
- {
- varinfo_t v;
- unsigned int t;
- unsigned HOST_WIDE_INT fieldoffset = get_varinfo (j)->offset + loff;
-+ bitmap tmp;
-
- v = first_vi_for_offset (get_varinfo (j), fieldoffset);
- if (!v)
- continue;
-- t = v->node;
-- if (int_add_graph_edge (graph, t, rhs, roff))
-+ t = find (v->id);
-+ tmp = get_varinfo (t)->solution;
-+
-+ if (set_union_with_increment (tmp, sol, roff))
- {
-- bitmap tmp = get_varinfo (t)->solution;
-- if (set_union_with_increment (tmp, sol, roff))
-+ get_varinfo (t)->solution = tmp;
-+ if (t == rhs)
-+ sol = get_varinfo (rhs)->solution;
-+ if (!TEST_BIT (changed, t))
- {
-- get_varinfo (t)->solution = tmp;
-- if (t == rhs)
-- sol = get_varinfo (rhs)->solution;
-- if (!TEST_BIT (changed, t))
-- {
-- SET_BIT (changed, t);
-- changed_count++;
-- }
-+ SET_BIT (changed, t);
-+ changed_count++;
- }
- }
-- }
-+ }
- else if (0 && dump_file && !(get_varinfo (j)->is_special_var))
- fprintf (dump_file, "Untypesafe usage in do_ds_constraint\n");
- }
- }
-
--/* Handle a non-simple (simple meaning requires no iteration), non-copy
-- constraint (IE *x = &y, x = *y, and *x = y). */
--
-+/* Handle a non-simple (simple meaning requires no iteration),
-+ constraint (IE *x = &y, x = *y, *x = y, and x = y with offsets involved). */
-+
- static void
- do_complex_constraint (constraint_graph_t graph, constraint_t c, bitmap delta)
- {
-@@ -1752,33 +1516,62 @@
- else
- {
- /* *x = y */
-- do_ds_constraint (graph, c, delta);
-+ do_ds_constraint (c, delta);
- }
- }
-- else
-+ else if (c->rhs.type == DEREF)
- {
- /* x = *y */
- if (!(get_varinfo (c->lhs.var)->is_special_var))
- do_sd_constraint (graph, c, delta);
- }
-+ else
-+ {
-+ bitmap tmp;
-+ bitmap solution;
-+ bool flag = false;
-+ unsigned int t;
-+
-+ gcc_assert (c->rhs.type == SCALAR && c->lhs.type == SCALAR);
-+ t = find (c->rhs.var);
-+ solution = get_varinfo (t)->solution;
-+ t = find (c->lhs.var);
-+ tmp = get_varinfo (t)->solution;
-+
-+ flag = set_union_with_increment (tmp, solution, c->rhs.offset);
-+
-+ if (flag)
-+ {
-+ get_varinfo (t)->solution = tmp;
-+ if (!TEST_BIT (changed, t))
-+ {
-+ SET_BIT (changed, t);
-+ changed_count++;
-+ }
-+ }
-+ }
- }
-
- /* Initialize and return a new SCC info structure. */
-
- static struct scc_info *
--init_scc_info (void)
-+init_scc_info (size_t size)
- {
- struct scc_info *si = XNEW (struct scc_info);
-- size_t size = VEC_length (varinfo_t, varmap);
-+ size_t i;
-
- si->current_index = 0;
- si->visited = sbitmap_alloc (size);
- sbitmap_zero (si->visited);
-- si->in_component = sbitmap_alloc (size);
-- sbitmap_ones (si->in_component);
-- si->visited_index = XCNEWVEC (unsigned int, size + 1);
-+ si->roots = sbitmap_alloc (size);
-+ sbitmap_zero (si->roots);
-+ si->node_mapping = XNEWVEC (unsigned int, size);
-+ si->dfs = XCNEWVEC (unsigned int, size);
-+
-+ for (i = 0; i < size; i++)
-+ si->node_mapping[i] = i;
-+
- si->scc_stack = VEC_alloc (unsigned, heap, 1);
-- si->unification_queue = VEC_alloc (unsigned, heap, 1);
- return si;
- }
-
-@@ -1786,209 +1579,430 @@
-
- static void
- free_scc_info (struct scc_info *si)
--{
-+{
- sbitmap_free (si->visited);
-- sbitmap_free (si->in_component);
-- free (si->visited_index);
-+ sbitmap_free (si->roots);
-+ free (si->node_mapping);
-+ free (si->dfs);
- VEC_free (unsigned, heap, si->scc_stack);
-- VEC_free (unsigned, heap, si->unification_queue);
-- free(si);
-+ free (si);
- }
-
-
--/* Find cycles in GRAPH that occur, using strongly connected components, and
-- collapse the cycles into a single representative node. if UPDATE_CHANGED
-- is true, then update the changed sbitmap to note those nodes whose
-- solutions have changed as a result of collapsing. */
-+/* Find indirect cycles in GRAPH that occur, using strongly connected
-+ components, and note them in the indirect cycles map.
-
-+ This technique comes from Ben Hardekopf and Calvin Lin,
-+ "It Pays to be Lazy: Fast and Accurate Pointer Analysis for Millions of
-+ Lines of Code", submitted to PLDI 2007. */
-+
- static void
--find_and_collapse_graph_cycles (constraint_graph_t graph, bool update_changed)
-+find_indirect_cycles (constraint_graph_t graph)
- {
- unsigned int i;
-- unsigned int size = VEC_length (varinfo_t, varmap);
-- struct scc_info *si = init_scc_info ();
-+ unsigned int size = graph->size;
-+ struct scc_info *si = init_scc_info (size);
-
-- for (i = 0; i != size; ++i)
-- if (!TEST_BIT (si->visited, i) && get_varinfo (i)->node == i)
-+ for (i = 0; i < MIN (LAST_REF_NODE, size); i ++ )
-+ if (!TEST_BIT (si->visited, i) && find (i) == i)
- scc_visit (graph, si, i);
--
-- process_unification_queue (graph, si, update_changed);
-+
- free_scc_info (si);
- }
-
- /* Compute a topological ordering for GRAPH, and store the result in the
- topo_info structure TI. */
-
--static void
-+static void
- compute_topo_order (constraint_graph_t graph,
- struct topo_info *ti)
- {
- unsigned int i;
- unsigned int size = VEC_length (varinfo_t, varmap);
--
-+
- for (i = 0; i != size; ++i)
-- if (!TEST_BIT (ti->visited, i) && get_varinfo (i)->node == i)
-+ if (!TEST_BIT (ti->visited, i) && find (i) == i)
- topo_visit (graph, ti, i);
- }
-
--/* Return true if bitmap B is empty, or a bitmap other than bit 0 is set. */
-+/* Perform offline variable substitution.
-
--static bool
--bitmap_other_than_zero_bit_set (bitmap b)
--{
-- unsigned int i;
-- bitmap_iterator bi;
--
-- if (bitmap_empty_p (b))
-- return false;
-- EXECUTE_IF_SET_IN_BITMAP (b, 1, i, bi)
-- return true;
-- return false;
--}
--
--/* Perform offline variable substitution.
--
- This is a linear time way of identifying variables that must have
- equivalent points-to sets, including those caused by static cycles,
- and single entry subgraphs, in the constraint graph.
-
- The technique is described in "Off-line variable substitution for
- scaling points-to analysis" by Atanas Rountev and Satish Chandra,
-- in "ACM SIGPLAN Notices" volume 35, number 5, pages 47-56. */
-+ in "ACM SIGPLAN Notices" volume 35, number 5, pages 47-56.
-
-+ There is an optimal way to do this involving hash based value
-+ numbering, once the technique is published i will implement it
-+ here.
-+
-+ The general method of finding equivalence classes is as follows:
-+ Add fake nodes (REF nodes) and edges for *a = b and a = *b constraints.
-+ Add fake nodes (ADDRESS nodes) and edges for a = &b constraints.
-+ Initialize all non-REF/ADDRESS nodes to be direct nodes
-+ For each SCC in the predecessor graph:
-+ for each member (x) of the SCC
-+ if x is not a direct node:
-+ set rootnode(SCC) to be not a direct node
-+ collapse node x into rootnode(SCC).
-+ if rootnode(SCC) is not a direct node:
-+ label rootnode(SCC) with a new equivalence class
-+ else:
-+ if all labeled predecessors of rootnode(SCC) have the same
-+ label:
-+ label rootnode(SCC) with this label
-+ else:
-+ label rootnode(SCC) with a new equivalence class
-+
-+ All direct nodes with the same equivalence class can be replaced
-+ with a single representative node.
-+ All unlabeled nodes (label == 0) are not pointers and all edges
-+ involving them can be eliminated.
-+ We perform these optimizations during move_complex_constraints.
-+*/
-+
-+static int equivalence_class;
-+
-+/* Recursive routine to find strongly connected components in GRAPH,
-+ and label it's nodes with equivalence classes.
-+ This is used during variable substitution to find cycles involving
-+ the regular or implicit predecessors, and label them as equivalent.
-+ The SCC finding algorithm used is the same as that for scc_visit. */
-+
- static void
--perform_var_substitution (constraint_graph_t graph)
-+label_visit (constraint_graph_t graph, struct scc_info *si, unsigned int n)
- {
-- struct topo_info *ti = init_topo_info ();
--
-- bitmap_obstack_initialize (&iteration_obstack);
-- /* Compute the topological ordering of the graph, then visit each
-- node in topological order. */
-- compute_topo_order (graph, ti);
--
-- while (VEC_length (unsigned, ti->topo_order) != 0)
-+ unsigned int i;
-+ bitmap_iterator bi;
-+ unsigned int my_dfs;
-+
-+ gcc_assert (si->node_mapping[n] == n);
-+ SET_BIT (si->visited, n);
-+ si->dfs[n] = si->current_index ++;
-+ my_dfs = si->dfs[n];
-+
-+ /* Visit all the successors. */
-+ EXECUTE_IF_IN_NONNULL_BITMAP (graph->preds[n], 0, i, bi)
- {
-- unsigned int i = VEC_pop (unsigned, ti->topo_order);
-- unsigned int pred;
-- varinfo_t vi = get_varinfo (i);
-- bool okay_to_elim = false;
-- unsigned int root = VEC_length (varinfo_t, varmap);
-- VEC(constraint_edge_t,heap) *predvec = graph->preds[i];
-- constraint_edge_t ce = NULL;
-- bitmap tmp;
-- unsigned int k;
-- bitmap_iterator bi;
-+ unsigned int w = si->node_mapping[i];
-
-- /* We can't eliminate things whose address is taken, or which is
-- the target of a dereference. */
-- if (vi->address_taken || vi->indirect_target)
-+ if (TEST_BIT (si->roots, w))
- continue;
-
-- /* See if all predecessors of I are ripe for elimination */
-- EXECUTE_IF_IN_NONNULL_BITMAP (graph->zero_weight_preds[i], 0, k, bi)
-- {
-- unsigned int w;
-- w = get_varinfo (k)->node;
-+ if (!TEST_BIT (si->visited, w))
-+ label_visit (graph, si, w);
-+ {
-+ unsigned int t = si->node_mapping[w];
-+ unsigned int nnode = si->node_mapping[n];
-+ gcc_assert (nnode == n);
-
-- /* We can't eliminate the node if one of the predecessors is
-- part of a different strongly connected component. */
-- if (!okay_to_elim)
-- {
-- root = w;
-- okay_to_elim = true;
-- }
-- else if (w != root)
-- {
-- okay_to_elim = false;
-- break;
-- }
-+ if (si->dfs[t] < si->dfs[nnode])
-+ si->dfs[n] = si->dfs[t];
-+ }
-+ }
-
-- /* Theorem 4 in Rountev and Chandra: If i is a direct node,
-- then Solution(i) is a subset of Solution (w), where w is a
-- predecessor in the graph.
-- Corollary: If all predecessors of i have the same
-- points-to set, then i has that same points-to set as
-- those predecessors. */
-- tmp = BITMAP_ALLOC (NULL);
-- bitmap_and_compl (tmp, get_varinfo (i)->solution,
-- get_varinfo (w)->solution);
-- if (!bitmap_empty_p (tmp))
-- {
-- okay_to_elim = false;
-- BITMAP_FREE (tmp);
-- break;
-- }
-- BITMAP_FREE (tmp);
-- }
-+ /* Visit all the implicit predecessors. */
-+ EXECUTE_IF_IN_NONNULL_BITMAP (graph->implicit_preds[n], 0, i, bi)
-+ {
-+ unsigned int w = si->node_mapping[i];
-
-- if (okay_to_elim)
-- for (pred = 0;
-- VEC_iterate (constraint_edge_t, predvec, pred, ce);
-- pred++)
-- {
-- bitmap weight;
-- unsigned int w;
-- weight = *(get_graph_weights (graph, i, ce->dest));
-+ if (TEST_BIT (si->roots, w))
-+ continue;
-
-- /* We can't eliminate variables that have nonzero weighted
-- edges between them. */
-- if (weight && bitmap_other_than_zero_bit_set (weight))
-- {
-- okay_to_elim = false;
-- break;
-- }
-- w = get_varinfo (ce->dest)->node;
-+ if (!TEST_BIT (si->visited, w))
-+ label_visit (graph, si, w);
-+ {
-+ unsigned int t = si->node_mapping[w];
-+ unsigned int nnode = si->node_mapping[n];
-+ gcc_assert (nnode == n);
-
-- /* We can't eliminate the node if one of the predecessors is
-- part of a different strongly connected component. */
-- if (!okay_to_elim)
-- {
-- root = w;
-- okay_to_elim = true;
-- }
-- else if (w != root)
-- {
-- okay_to_elim = false;
-- break;
-- }
-+ if (si->dfs[t] < si->dfs[nnode])
-+ si->dfs[n] = si->dfs[t];
-+ }
-+ }
-
-- /* Theorem 4 in Rountev and Chandra: If i is a direct node,
-- then Solution(i) is a subset of Solution (w), where w is a
-- predecessor in the graph.
-- Corollary: If all predecessors of i have the same
-- points-to set, then i has that same points-to set as
-- those predecessors. */
-- tmp = BITMAP_ALLOC (NULL);
-- bitmap_and_compl (tmp, get_varinfo (i)->solution,
-- get_varinfo (w)->solution);
-- if (!bitmap_empty_p (tmp))
-- {
-- okay_to_elim = false;
-- BITMAP_FREE (tmp);
-- break;
-- }
-- BITMAP_FREE (tmp);
-- }
-+ /* See if any components have been identified. */
-+ if (si->dfs[n] == my_dfs)
-+ {
-+ while (VEC_length (unsigned, si->scc_stack) != 0
-+ && si->dfs[VEC_last (unsigned, si->scc_stack)] >= my_dfs)
-+ {
-+ unsigned int w = VEC_pop (unsigned, si->scc_stack);
-+ si->node_mapping[w] = n;
-
-- /* See if the root is different than the original node.
-- If so, we've found an equivalence. */
-- if (root != get_varinfo (i)->node && okay_to_elim)
-+ if (!TEST_BIT (graph->direct_nodes, w))
-+ RESET_BIT (graph->direct_nodes, n);
-+ }
-+ SET_BIT (si->roots, n);
-+
-+ if (!TEST_BIT (graph->direct_nodes, n))
- {
-- /* Found an equivalence */
-- get_varinfo (i)->node = root;
-- collapse_nodes (graph, root, i);
-+ graph->label[n] = equivalence_class++;
-+ }
-+ else
-+ {
-+ unsigned int size = 0;
-+ unsigned int firstlabel = ~0;
-+
-+ EXECUTE_IF_IN_NONNULL_BITMAP (graph->preds[n], 0, i, bi)
-+ {
-+ unsigned int j = si->node_mapping[i];
-+
-+ if (j == n || graph->label[j] == 0)
-+ continue;
-+
-+ if (firstlabel == (unsigned int)~0)
-+ {
-+ firstlabel = graph->label[j];
-+ size++;
-+ }
-+ else if (graph->label[j] != firstlabel)
-+ size++;
-+ }
-+
-+ if (size == 0)
-+ graph->label[n] = 0;
-+ else if (size == 1)
-+ graph->label[n] = firstlabel;
-+ else
-+ graph->label[n] = equivalence_class++;
-+ }
-+ }
-+ else
-+ VEC_safe_push (unsigned, heap, si->scc_stack, n);
-+}
-+
-+/* Perform offline variable substitution, discovering equivalence
-+ classes, and eliminating non-pointer variables. */
-+
-+static struct scc_info *
-+perform_var_substitution (constraint_graph_t graph)
-+{
-+ unsigned int i;
-+ unsigned int size = graph->size;
-+ struct scc_info *si = init_scc_info (size);
-+
-+ bitmap_obstack_initialize (&iteration_obstack);
-+ equivalence_class = 0;
-+
-+ /* We only need to visit the non-address nodes for labeling
-+ purposes, as the address nodes will never have any predecessors,
-+ because &x never appears on the LHS of a constraint. */
-+ for (i = 0; i < LAST_REF_NODE; i++)
-+ if (!TEST_BIT (si->visited, si->node_mapping[i]))
-+ label_visit (graph, si, si->node_mapping[i]);
-+
-+ if (dump_file && (dump_flags & TDF_DETAILS))
-+ for (i = 0; i < FIRST_REF_NODE; i++)
-+ {
-+ bool direct_node = TEST_BIT (graph->direct_nodes, i);
-+ fprintf (dump_file,
-+ "Equivalence class for %s node id %d:%s is %d\n",
-+ direct_node ? "Direct node" : "Indirect node", i,
-+ get_varinfo (i)->name,
-+ graph->label[si->node_mapping[i]]);
-+ }
-+
-+ /* Quickly eliminate our non-pointer variables. */
-+
-+ for (i = 0; i < FIRST_REF_NODE; i++)
-+ {
-+ unsigned int node = si->node_mapping[i];
-+
-+ if (graph->label[node] == 0 && TEST_BIT (graph->direct_nodes, node))
-+ {
- if (dump_file && (dump_flags & TDF_DETAILS))
-- fprintf (dump_file, "Collapsing %s into %s\n",
-- get_varinfo (i)->name,
-- get_varinfo (root)->name);
-- stats.collapsed_vars++;
-+ fprintf (dump_file,
-+ "%s is a non-pointer variable, eliminating edges.\n",
-+ get_varinfo (node)->name);
-+ stats.nonpointer_vars++;
-+ clear_edges_for_node (graph, node);
- }
- }
-+ return si;
-+}
-
-+/* Free information that was only necessary for variable
-+ substitution. */
-+
-+static void
-+free_var_substitution_info (struct scc_info *si)
-+{
-+ free_scc_info (si);
-+ free (graph->label);
-+ free (graph->eq_rep);
-+ sbitmap_free (graph->direct_nodes);
- bitmap_obstack_release (&iteration_obstack);
-- free_topo_info (ti);
- }
-
-+/* Return an existing node that is equivalent to NODE, which has
-+ equivalence class LABEL, if one exists. Return NODE otherwise. */
-+
-+static unsigned int
-+find_equivalent_node (constraint_graph_t graph,
-+ unsigned int node, unsigned int label)
-+{
-+ /* If the address version of this variable is unused, we can
-+ substitute it for anything else with the same label.
-+ Otherwise, we know the pointers are equivalent, but not the
-+ locations. */
-+
-+ if (graph->label[FIRST_ADDR_NODE + node] == 0)
-+ {
-+ gcc_assert (label < graph->size);
-+
-+ if (graph->eq_rep[label] != -1)
-+ {
-+ /* Unify the two variables since we know they are equivalent. */
-+ if (unite (graph->eq_rep[label], node))
-+ unify_nodes (graph, graph->eq_rep[label], node, false);
-+ return graph->eq_rep[label];
-+ }
-+ else
-+ {
-+ graph->eq_rep[label] = node;
-+ }
-+ }
-+ return node;
-+}
-+
-+/* Move complex constraints to the appropriate nodes, and collapse
-+ variables we've discovered are equivalent during variable
-+ substitution. SI is the SCC_INFO that is the result of
-+ perform_variable_substitution. */
-+
-+static void
-+move_complex_constraints (constraint_graph_t graph,
-+ struct scc_info *si)
-+{
-+ int i;
-+ unsigned int j;
-+ constraint_t c;
-+
-+ for (j = 0; j < graph->size; j++)
-+ gcc_assert (find (j) == j);
-+
-+ for (i = 0; VEC_iterate (constraint_t, constraints, i, c); i++)
-+ {
-+ struct constraint_expr lhs = c->lhs;
-+ struct constraint_expr rhs = c->rhs;
-+ unsigned int lhsvar = find (get_varinfo_fc (lhs.var)->id);
-+ unsigned int rhsvar = find (get_varinfo_fc (rhs.var)->id);
-+ unsigned int lhsnode, rhsnode;
-+ unsigned int lhslabel, rhslabel;
-+
-+ lhsnode = si->node_mapping[lhsvar];
-+ rhsnode = si->node_mapping[rhsvar];
-+ lhslabel = graph->label[lhsnode];
-+ rhslabel = graph->label[rhsnode];
-+
-+ /* See if it is really a non-pointer variable, and if so, ignore
-+ the constraint. */
-+ if (lhslabel == 0)
-+ {
-+ if (!TEST_BIT (graph->direct_nodes, lhsnode))
-+ lhslabel = graph->label[lhsnode] = equivalence_class++;
-+ else
-+ {
-+ if (dump_file && (dump_flags & TDF_DETAILS))
-+ {
-+
-+ fprintf (dump_file, "%s is a non-pointer variable,"
-+ "ignoring constraint:",
-+ get_varinfo (lhs.var)->name);
-+ dump_constraint (dump_file, c);
-+ }
-+ VEC_replace (constraint_t, constraints, i, NULL);
-+ continue;
-+ }
-+ }
-+
-+ if (rhslabel == 0)
-+ {
-+ if (!TEST_BIT (graph->direct_nodes, rhsnode))
-+ rhslabel = graph->label[rhsnode] = equivalence_class++;
-+ else
-+ {
-+ if (dump_file && (dump_flags & TDF_DETAILS))
-+ {
-+
-+ fprintf (dump_file, "%s is a non-pointer variable,"
-+ "ignoring constraint:",
-+ get_varinfo (rhs.var)->name);
-+ dump_constraint (dump_file, c);
-+ }
-+ VEC_replace (constraint_t, constraints, i, NULL);
-+ continue;
-+ }
-+ }
-+
-+ lhsvar = find_equivalent_node (graph, lhsvar, lhslabel);
-+ rhsvar = find_equivalent_node (graph, rhsvar, rhslabel);
-+ c->lhs.var = lhsvar;
-+ c->rhs.var = rhsvar;
-+
-+ if (lhs.type == DEREF)
-+ {
-+ if (rhs.type == ADDRESSOF || rhsvar > anything_id)
-+ insert_into_complex (graph, lhsvar, c);
-+ }
-+ else if (rhs.type == DEREF)
-+ {
-+ if (!(get_varinfo (lhsvar)->is_special_var))
-+ insert_into_complex (graph, rhsvar, c);
-+ }
-+ else if (rhs.type != ADDRESSOF && lhsvar > anything_id
-+ && (lhs.offset != 0 || rhs.offset != 0))
-+ {
-+ insert_into_complex (graph, rhsvar, c);
-+ }
-+
-+ }
-+}
-+
-+/* Eliminate indirect cycles involving NODE. Return true if NODE was
-+ part of an SCC, false otherwise. */
-+
-+static bool
-+eliminate_indirect_cycles (unsigned int node)
-+{
-+ if (graph->indirect_cycles[node] != -1
-+ && !bitmap_empty_p (get_varinfo (node)->solution))
-+ {
-+ unsigned int i;
-+ VEC(unsigned,heap) *queue = NULL;
-+ int queuepos;
-+ unsigned int to = find (graph->indirect_cycles[node]);
-+ bitmap_iterator bi;
-+
-+ /* We can't touch the solution set and call unify_nodes
-+ at the same time, because unify_nodes is going to do
-+ bitmap unions into it. */
-+
-+ EXECUTE_IF_SET_IN_BITMAP (get_varinfo (node)->solution, 0, i, bi)
-+ {
-+ if (find (i) == i && i != to)
-+ {
-+ if (unite (to, i))
-+ VEC_safe_push (unsigned, heap, queue, i);
-+ }
-+ }
-+
-+ for (queuepos = 0;
-+ VEC_iterate (unsigned, queue, queuepos, i);
-+ queuepos++)
-+ {
-+ unify_nodes (graph, to, i, true);
-+ }
-+ VEC_free (unsigned, heap, queue);
-+ return true;
-+ }
-+ return false;
-+}
-+
- /* Solve the constraint graph GRAPH using our worklist solver.
- This is based on the PW* family of solvers from the "Efficient Field
- Sensitive Pointer Analysis for C" paper.
-@@ -2001,17 +2015,28 @@
- {
- unsigned int size = VEC_length (varinfo_t, varmap);
- unsigned int i;
-+ bitmap pts;
-
-- changed_count = size;
-+ changed_count = 0;
- changed = sbitmap_alloc (size);
-- sbitmap_ones (changed);
--
-- /* The already collapsed/unreachable nodes will never change, so we
-- need to account for them in changed_count. */
-+ sbitmap_zero (changed);
-+
-+ /* Mark all initial non-collapsed nodes as changed. */
- for (i = 0; i < size; i++)
-- if (get_varinfo (i)->node != i)
-- changed_count--;
--
-+ {
-+ varinfo_t ivi = get_varinfo (i);
-+ if (find (i) == i && !bitmap_empty_p (ivi->solution)
-+ && ((graph->succs[i] && !bitmap_empty_p (graph->succs[i]))
-+ || VEC_length (constraint_t, graph->complex[i]) > 0))
-+ {
-+ SET_BIT (changed, i);
-+ changed_count++;
-+ }
-+ }
-+
-+ /* Allocate a bitmap to be used to store the changed bits. */
-+ pts = BITMAP_ALLOC (&pta_obstack);
-+
- while (changed_count > 0)
- {
- unsigned int i;
-@@ -2019,41 +2044,45 @@
- stats.iterations++;
-
- bitmap_obstack_initialize (&iteration_obstack);
--
-- if (edge_added)
-- {
-- /* We already did cycle elimination once, when we did
-- variable substitution, so we don't need it again for the
-- first iteration. */
-- if (stats.iterations > 1)
-- find_and_collapse_graph_cycles (graph, true);
-
-- edge_added = false;
-- }
--
- compute_topo_order (graph, ti);
-
- while (VEC_length (unsigned, ti->topo_order) != 0)
- {
-+
- i = VEC_pop (unsigned, ti->topo_order);
-- gcc_assert (get_varinfo (i)->node == i);
-
-+ /* If this variable is not a representative, skip it. */
-+ if (find (i) != i)
-+ continue;
-+
-+ /* In certain indirect cycle cases, we may merge this
-+ variable to another. */
-+ if (eliminate_indirect_cycles (i) && find (i) != i)
-+ continue;
-+
- /* If the node has changed, we need to process the
- complex constraints and outgoing edges again. */
- if (TEST_BIT (changed, i))
- {
- unsigned int j;
- constraint_t c;
-- constraint_edge_t e = NULL;
- bitmap solution;
-- bitmap_iterator bi;
-- VEC(constraint_t,heap) *complex = get_varinfo (i)->complex;
-- VEC(constraint_edge_t,heap) *succs;
-+ VEC(constraint_t,heap) *complex = graph->complex[i];
- bool solution_empty;
-
- RESET_BIT (changed, i);
- changed_count--;
-
-+ /* Compute the changed set of solution bits. */
-+ bitmap_and_compl (pts, get_varinfo (i)->solution,
-+ get_varinfo (i)->oldsolution);
-+
-+ if (bitmap_empty_p (pts))
-+ continue;
-+
-+ bitmap_ior_into (get_varinfo (i)->oldsolution, pts);
-+
- solution = get_varinfo (i)->solution;
- solution_empty = bitmap_empty_p (solution);
-
-@@ -2065,52 +2094,38 @@
- is a constraint where the lhs side is receiving
- some set from elsewhere. */
- if (!solution_empty || c->lhs.type != DEREF)
-- do_complex_constraint (graph, c, solution);
-+ do_complex_constraint (graph, c, pts);
- }
-
- solution_empty = bitmap_empty_p (solution);
-
- if (!solution_empty)
- {
-+ bitmap_iterator bi;
-+
- /* Propagate solution to all successors. */
-- succs = graph->succs[i];
--
-- EXECUTE_IF_IN_NONNULL_BITMAP (graph->zero_weight_succs[i],
-+ EXECUTE_IF_IN_NONNULL_BITMAP (graph->succs[i],
- 0, j, bi)
- {
-- bitmap tmp = get_varinfo (j)->solution;
-- bool flag = false;
--
-- flag = set_union_with_increment (tmp, solution, 0);
--
-- if (flag)
-- {
-- get_varinfo (j)->solution = tmp;
-- if (!TEST_BIT (changed, j))
-- {
-- SET_BIT (changed, j);
-- changed_count++;
-- }
-- }
-- }
-- for (j = 0; VEC_iterate (constraint_edge_t, succs, j, e); j++)
-- {
-- bitmap tmp = get_varinfo (e->dest)->solution;
-- bool flag = false;
-- unsigned int k;
-- bitmap weights = e->weights;
-- bitmap_iterator bi;
-+ bitmap tmp;
-+ bool flag;
-
-- gcc_assert (weights && !bitmap_empty_p (weights));
-- EXECUTE_IF_SET_IN_BITMAP (weights, 0, k, bi)
-- flag |= set_union_with_increment (tmp, solution, k);
-+ unsigned int to = find (j);
-+ tmp = get_varinfo (to)->solution;
-+ flag = false;
-
-+ /* Don't try to propagate to ourselves. */
-+ if (to == i)
-+ continue;
-+
-+ flag = set_union_with_increment (tmp, pts, 0);
-+
- if (flag)
- {
-- get_varinfo (e->dest)->solution = tmp;
-- if (!TEST_BIT (changed, e->dest))
-+ get_varinfo (to)->solution = tmp;
-+ if (!TEST_BIT (changed, to))
- {
-- SET_BIT (changed, e->dest);
-+ SET_BIT (changed, to);
- changed_count++;
- }
- }
-@@ -2122,74 +2137,37 @@
- bitmap_obstack_release (&iteration_obstack);
- }
-
-+ BITMAP_FREE (pts);
- sbitmap_free (changed);
-+ bitmap_obstack_release (&oldpta_obstack);
- }
-
-+/* Map from trees to variable infos. */
-+static struct pointer_map_t *vi_for_tree;
-
--/* CONSTRAINT AND VARIABLE GENERATION FUNCTIONS */
-
--/* Map from trees to variable ids. */
--static htab_t id_for_tree;
-+/* Insert ID as the variable id for tree T in the vi_for_tree map. */
-
--typedef struct tree_id
-+static void
-+insert_vi_for_tree (tree t, varinfo_t vi)
- {
-- tree t;
-- unsigned int id;
--} *tree_id_t;
--
--/* Hash a tree id structure. */
--
--static hashval_t
--tree_id_hash (const void *p)
--{
-- const tree_id_t ta = (tree_id_t) p;
-- return htab_hash_pointer (ta->t);
--}
--
--/* Return true if the tree in P1 and the tree in P2 are the same. */
--
--static int
--tree_id_eq (const void *p1, const void *p2)
--{
-- const tree_id_t ta1 = (tree_id_t) p1;
-- const tree_id_t ta2 = (tree_id_t) p2;
-- return ta1->t == ta2->t;
--}
--
--/* Insert ID as the variable id for tree T in the hashtable. */
--
--static void
--insert_id_for_tree (tree t, int id)
--{
-- void **slot;
-- struct tree_id finder;
-- tree_id_t new_pair;
--
-- finder.t = t;
-- slot = htab_find_slot (id_for_tree, &finder, INSERT);
-+ void **slot = pointer_map_insert (vi_for_tree, t);
-+ gcc_assert (vi);
- gcc_assert (*slot == NULL);
-- new_pair = XNEW (struct tree_id);
-- new_pair->t = t;
-- new_pair->id = id;
-- *slot = (void *)new_pair;
-+ *slot = vi;
- }
-
--/* Find the variable id for tree T in ID_FOR_TREE. If T does not
-- exist in the hash table, return false, otherwise, return true and
-- set *ID to the id we found. */
-+/* Find the variable info for tree T in VI_FOR_TREE. If T does not
-+ exist in the map, return NULL, otherwise, return the varinfo we found. */
-
--static bool
--lookup_id_for_tree (tree t, unsigned int *id)
-+static varinfo_t
-+lookup_vi_for_tree (tree t)
- {
-- tree_id_t pair;
-- struct tree_id finder;
-+ void **slot = pointer_map_contains (vi_for_tree, t);
-+ if (slot == NULL)
-+ return NULL;
-
-- finder.t = t;
-- pair = htab_find (id_for_tree, &finder);
-- if (pair == NULL)
-- return false;
-- *id = pair->id;
-- return true;
-+ return (varinfo_t) *slot;
- }
-
- /* Return a printable name for DECL */
-@@ -2210,7 +2188,7 @@
-
- if (TREE_CODE (decl) == SSA_NAME)
- {
-- num_printed = asprintf (&temp, "%s_%u",
-+ num_printed = asprintf (&temp, "%s_%u",
- alias_get_name (SSA_NAME_VAR (decl)),
- SSA_NAME_VERSION (decl));
- }
-@@ -2226,21 +2204,17 @@
- return res;
- }
-
--/* Find the variable id for tree T in the hashtable.
-- If T doesn't exist in the hash table, create an entry for it. */
-+/* Find the variable id for tree T in the map.
-+ If T doesn't exist in the map, create an entry for it and return it. */
-
--static unsigned int
--get_id_for_tree (tree t)
-+static varinfo_t
-+get_vi_for_tree (tree t)
- {
-- tree_id_t pair;
-- struct tree_id finder;
-+ void **slot = pointer_map_contains (vi_for_tree, t);
-+ if (slot == NULL)
-+ return get_varinfo (create_variable_info_for (t, alias_get_name (t)));
-
-- finder.t = t;
-- pair = htab_find (id_for_tree, &finder);
-- if (pair == NULL)
-- return create_variable_info_for (t, alias_get_name (t));
--
-- return pair->id;
-+ return (varinfo_t) *slot;
- }
-
- /* Get a constraint expression from an SSA_VAR_P node. */
-@@ -2254,14 +2228,14 @@
-
- /* For parameters, get at the points-to set for the actual parm
- decl. */
-- if (TREE_CODE (t) == SSA_NAME
-- && TREE_CODE (SSA_NAME_VAR (t)) == PARM_DECL
-+ if (TREE_CODE (t) == SSA_NAME
-+ && TREE_CODE (SSA_NAME_VAR (t)) == PARM_DECL
- && default_def (SSA_NAME_VAR (t)) == t)
- return get_constraint_exp_from_ssa_var (SSA_NAME_VAR (t));
-
- cexpr.type = SCALAR;
--
-- cexpr.var = get_id_for_tree (t);
-+
-+ cexpr.var = get_vi_for_tree (t)->id;
- /* If we determine the result is "anything", and we know this is readonly,
- say it points to readonly memory instead. */
- if (cexpr.var == anything_id && TREE_READONLY (t))
-@@ -2269,7 +2243,7 @@
- cexpr.type = ADDRESSOF;
- cexpr.var = readonly_id;
- }
--
-+
- cexpr.offset = 0;
- return cexpr;
- }
-@@ -2290,7 +2264,13 @@
- get_varinfo (lhs.var)->directly_dereferenced = true;
- if (rhs.type == DEREF)
- get_varinfo (rhs.var)->directly_dereferenced = true;
--
-+
-+ if (!use_field_sensitive)
-+ {
-+ t->rhs.offset = 0;
-+ t->lhs.offset = 0;
-+ }
-+
- /* ANYTHING == ANYTHING is pointless. */
- if (lhs.var == anything_id && rhs.var == anything_id)
- return;
-@@ -2302,7 +2282,7 @@
- t->lhs = t->rhs;
- t->rhs = rhs;
- process_constraint (t);
-- }
-+ }
- /* This can happen in our IR with things like n->a = *p */
- else if (rhs.type == DEREF && lhs.type == DEREF && rhs.var != anything_id)
- {
-@@ -2312,33 +2292,19 @@
- tree pointedtotype = TREE_TYPE (pointertype);
- tree tmpvar = create_tmp_var_raw (pointedtotype, "doubledereftmp");
- struct constraint_expr tmplhs = get_constraint_exp_from_ssa_var (tmpvar);
--
-+
- /* If this is an aggregate of known size, we should have passed
- this off to do_structure_copy, and it should have broken it
- up. */
-- gcc_assert (!AGGREGATE_TYPE_P (pointedtotype)
-+ gcc_assert (!AGGREGATE_TYPE_P (pointedtotype)
- || get_varinfo (rhs.var)->is_unknown_size_var);
--
-+
- process_constraint (new_constraint (tmplhs, rhs));
- process_constraint (new_constraint (lhs, tmplhs));
- }
-- else if (rhs.type == ADDRESSOF)
-- {
-- varinfo_t vi;
-- gcc_assert (rhs.offset == 0);
--
-- /* No need to mark address taken simply because of escaped vars
-- constraints. */
-- if (lhs.var != escaped_vars_id)
-- for (vi = get_varinfo (rhs.var); vi != NULL; vi = vi->next)
-- vi->address_taken = true;
--
-- VEC_safe_push (constraint_t, heap, constraints, t);
-- }
- else
- {
-- if (lhs.type != DEREF && rhs.type == DEREF)
-- get_varinfo (lhs.var)->indirect_target = true;
-+ gcc_assert (rhs.type != ADDRESSOF || rhs.offset == 0);
- VEC_safe_push (constraint_t, heap, constraints, t);
- }
- }
-@@ -2350,10 +2316,12 @@
- could_have_pointers (tree t)
- {
- tree type = TREE_TYPE (t);
--
-- if (POINTER_TYPE_P (type) || AGGREGATE_TYPE_P (type)
-+
-+ if (POINTER_TYPE_P (type)
-+ || AGGREGATE_TYPE_P (type)
- || TREE_CODE (type) == COMPLEX_TYPE)
- return true;
-+
- return false;
- }
-
-@@ -2367,9 +2335,9 @@
- if (TREE_CODE (DECL_FIELD_OFFSET (fdecl)) != INTEGER_CST
- || TREE_CODE (DECL_FIELD_BIT_OFFSET (fdecl)) != INTEGER_CST)
- return -1;
--
-- return (tree_low_cst (DECL_FIELD_OFFSET (fdecl), 1) * 8)
-- + tree_low_cst (DECL_FIELD_BIT_OFFSET (fdecl), 1);
-+
-+ return (tree_low_cst (DECL_FIELD_OFFSET (fdecl), 1) * 8)
-+ + tree_low_cst (DECL_FIELD_BIT_OFFSET (fdecl), 1);
- }
-
-
-@@ -2388,7 +2356,7 @@
- return true;
- if (accesspos < fieldpos && (accesspos + accesssize > fieldpos))
- return true;
--
-+
- return false;
- }
-
-@@ -2411,20 +2379,20 @@
- while (!SSA_VAR_P (forzero) && !CONSTANT_CLASS_P (forzero))
- forzero = TREE_OPERAND (forzero, 0);
-
-- if (CONSTANT_CLASS_P (forzero) && integer_zerop (forzero))
-+ if (CONSTANT_CLASS_P (forzero) && integer_zerop (forzero))
- {
- struct constraint_expr temp;
--
-+
- temp.offset = 0;
- temp.var = integer_id;
- temp.type = SCALAR;
- VEC_safe_push (ce_s, heap, *results, &temp);
- return;
- }
--
-+
- t = get_ref_base_and_extent (t, &bitpos, &bitsize, &bitmaxsize);
-
-- /* String constants's are readonly, so there is nothing to really do
-+ /* String constants are readonly, so there is nothing to really do
- here. */
- if (TREE_CODE (t) == STRING_CST)
- return;
-@@ -2438,21 +2406,21 @@
- /* This can also happen due to weird offsetof type macros. */
- if (TREE_CODE (t) != ADDR_EXPR && result->type == ADDRESSOF)
- result->type = SCALAR;
--
-+
- if (result->type == SCALAR)
- {
- /* In languages like C, you can access one past the end of an
- array. You aren't allowed to dereference it, so we can
- ignore this constraint. When we handle pointer subtraction,
- we may have to do something cute here. */
--
-+
- if (result->offset < get_varinfo (result->var)->fullsize
- && bitmaxsize != 0)
- {
- /* It's also not true that the constraint will actually start at the
- right offset, it may start in some padding. We only care about
- setting the constraint to the first actual field it touches, so
-- walk to find it. */
-+ walk to find it. */
- varinfo_t curr;
- for (curr = get_varinfo (result->var); curr; curr = curr->next)
- {
-@@ -2495,6 +2463,7 @@
- {
- struct constraint_expr *c;
- unsigned int i = 0;
-+
- for (i = 0; VEC_iterate (ce_s, *constraints, i, c); i++)
- {
- if (c->type == SCALAR)
-@@ -2576,6 +2545,7 @@
- tree pttype = TREE_TYPE (TREE_TYPE (t));
-
- get_constraint_for (exp, results);
-+
- /* Make sure we capture constraints to all elements
- of an array. */
- if ((handled_component_p (exp)
-@@ -2588,7 +2558,7 @@
-
- if (VEC_length (ce_s, *results) == 0)
- return;
--
-+
- gcc_assert (VEC_length (ce_s, *results) == 1);
- origrhs = VEC_last (ce_s, *results);
- tmp = *origrhs;
-@@ -2619,12 +2589,12 @@
- VEC_safe_push (ce_s, heap, *results, &tmp);
- }
- }
--
-+
- for (i = 0; VEC_iterate (ce_s, *results, i, c); i++)
- {
- if (c->type == DEREF)
- c->type = SCALAR;
-- else
-+ else
- c->type = ADDRESSOF;
- }
- return;
-@@ -2638,9 +2608,9 @@
- {
- varinfo_t vi;
- tree heapvar = heapvar_lookup (t);
--
-+
- if (heapvar == NULL)
-- {
-+ {
- heapvar = create_tmp_var_raw (ptr_type_node, "HEAP");
- DECL_EXTERNAL (heapvar) = 1;
- if (referenced_vars)
-@@ -2650,7 +2620,7 @@
-
- temp.var = create_variable_info_for (heapvar,
- alias_get_name (heapvar));
--
-+
- vi = get_varinfo (temp.var);
- vi->is_artificial_var = 1;
- vi->is_heap_var = 1;
-@@ -2712,7 +2682,7 @@
- case NON_LVALUE_EXPR:
- {
- tree op = TREE_OPERAND (t, 0);
--
-+
- /* Cast from non-pointer to pointers are bad news for us.
- Anything else, we see through */
- if (!(POINTER_TYPE_P (TREE_TYPE (t))
-@@ -2738,7 +2708,7 @@
- {
- switch (TREE_CODE (t))
- {
-- case PHI_NODE:
-+ case PHI_NODE:
- {
- get_constraint_for (PHI_RESULT (t), results);
- return;
-@@ -2782,8 +2752,8 @@
-
-
- /* Handle the structure copy case where we have a simple structure copy
-- between LHS and RHS that is of SIZE (in bits)
--
-+ between LHS and RHS that is of SIZE (in bits)
-+
- For each field of the lhs variable (lhsfield)
- For each field of the rhs variable at lhsfield.offset (rhsfield)
- add the constraint lhsfield = rhsfield
-@@ -2808,7 +2778,7 @@
- struct constraint_expr temprhs = rhs;
- unsigned HOST_WIDE_INT fieldoffset;
-
-- templhs.var = p->id;
-+ templhs.var = p->id;
- q = get_varinfo (temprhs.var);
- fieldoffset = p->offset - pstart;
- q = first_vi_for_offset (q, q->offset + fieldoffset);
-@@ -2823,8 +2793,8 @@
-
- /* Handle the structure copy case where we have a structure copy between a
- aggregate on the LHS and a dereference of a pointer on the RHS
-- that is of SIZE (in bits)
--
-+ that is of SIZE (in bits)
-+
- For each field of the lhs variable (lhsfield)
- rhs.offset = lhsfield->offset
- add the constraint lhsfield = rhs
-@@ -2849,12 +2819,12 @@
-
-
- if (templhs.type == SCALAR)
-- templhs.var = p->id;
-+ templhs.var = p->id;
- else
- templhs.offset = p->offset;
--
-+
- q = get_varinfo (temprhs.var);
-- fieldoffset = p->offset - pstart;
-+ fieldoffset = p->offset - pstart;
- temprhs.offset += fieldoffset;
- process_constraint (new_constraint (templhs, temprhs));
- }
-@@ -2862,7 +2832,7 @@
-
- /* Handle the structure copy case where we have a structure copy
- between a aggregate on the RHS and a dereference of a pointer on
-- the LHS that is of SIZE (in bits)
-+ the LHS that is of SIZE (in bits)
-
- For each field of the rhs variable (rhsfield)
- lhs.offset = rhsfield->offset
-@@ -2888,12 +2858,12 @@
-
-
- if (temprhs.type == SCALAR)
-- temprhs.var = p->id;
-+ temprhs.var = p->id;
- else
- temprhs.offset = p->offset;
--
-+
- q = get_varinfo (templhs.var);
-- fieldoffset = p->offset - pstart;
-+ fieldoffset = p->offset - pstart;
- templhs.offset += fieldoffset;
- process_constraint (new_constraint (templhs, temprhs));
- }
-@@ -2901,7 +2871,7 @@
-
- /* Sometimes, frontends like to give us bad type information. This
- function will collapse all the fields from VAR to the end of VAR,
-- into VAR, so that we treat those fields as a single variable.
-+ into VAR, so that we treat those fields as a single variable.
- We return the variable they were collapsed into. */
-
- static unsigned int
-@@ -2913,16 +2883,16 @@
- for (field = currvar->next; field; field = field->next)
- {
- if (dump_file)
-- fprintf (dump_file, "Type safety: Collapsing var %s into %s\n",
-+ fprintf (dump_file, "Type safety: Collapsing var %s into %s\n",
- field->name, currvar->name);
--
-+
- gcc_assert (!field->collapsed_to);
- field->collapsed_to = currvar;
- }
-
- currvar->next = NULL;
- currvar->size = currvar->fullsize - currvar->offset;
--
-+
- return currvar->id;
- }
-
-@@ -2944,7 +2914,7 @@
- gcc_assert (VEC_length (ce_s, rhsc) == 1);
- lhs = *(VEC_last (ce_s, lhsc));
- rhs = *(VEC_last (ce_s, rhsc));
--
-+
- VEC_free (ce_s, heap, lhsc);
- VEC_free (ce_s, heap, rhsc);
-
-@@ -2955,7 +2925,7 @@
- lhs = rhs;
- rhs = tmp;
- }
--
-+
- /* This is fairly conservative for the RHS == ADDRESSOF case, in that it's
- possible it's something we could handle. However, most cases falling
- into this are dealing with transparent unions, which are slightly
-@@ -3021,11 +2991,11 @@
- else
- lhssize = TREE_INT_CST_LOW (lhstypesize);
-
--
-- if (rhs.type == SCALAR && lhs.type == SCALAR)
-+
-+ if (rhs.type == SCALAR && lhs.type == SCALAR)
- {
- if (!do_simple_structure_copy (lhs, rhs, MIN (lhssize, rhssize)))
-- {
-+ {
- lhs.var = collapse_rest_of_var (lhs.var);
- rhs.var = collapse_rest_of_var (rhs.var);
- lhs.offset = 0;
-@@ -3042,7 +3012,7 @@
- else
- {
- tree pointedtotype = lhstype;
-- tree tmpvar;
-+ tree tmpvar;
-
- gcc_assert (rhs.type == DEREF && lhs.type == DEREF);
- tmpvar = create_tmp_var_raw (pointedtotype, "structcopydereftmp");
-@@ -3052,6 +3022,7 @@
- }
- }
-
-+
- /* Update related alias information kept in AI. This is used when
- building name tags, alias sets and deciding grouping heuristics.
- STMT is the statement to process. This function also updates
-@@ -3261,7 +3232,6 @@
- }
- }
-
--
- /* Handle pointer arithmetic EXPR when creating aliasing constraints.
- Expressions of the type PTR + CST can be handled in two ways:
-
-@@ -3307,6 +3277,7 @@
- else
- return false;
-
-+
- for (i = 0; VEC_iterate (ce_s, lhsc, i, c); i++)
- for (j = 0; VEC_iterate (ce_s, temp, j, c2); j++)
- {
-@@ -3360,12 +3331,12 @@
- {
- int i;
- unsigned int j;
--
-+
- /* For a phi node, assign all the arguments to
- the result. */
- get_constraint_for (PHI_RESULT (t), &lhsc);
- for (i = 0; i < PHI_NUM_ARGS (t); i++)
-- {
-+ {
- tree rhstype;
- tree strippedrhs = PHI_ARG_DEF (t, i);
-
-@@ -3401,7 +3372,6 @@
- {
- tree lhsop;
- tree rhsop;
-- unsigned int varid;
- tree arglist;
- varinfo_t fi;
- int i = 1;
-@@ -3423,17 +3393,16 @@
- we should still be able to handle. */
- if (decl)
- {
-- varid = get_id_for_tree (decl);
-+ fi = get_vi_for_tree (decl);
- }
- else
- {
- decl = TREE_OPERAND (rhsop, 0);
-- varid = get_id_for_tree (decl);
-+ fi = get_vi_for_tree (decl);
- }
-
- /* Assign all the passed arguments to the appropriate incoming
- parameters of the function. */
-- fi = get_varinfo (varid);
- arglist = TREE_OPERAND (rhsop, 1);
-
- for (;arglist; arglist = TREE_CHAIN (arglist))
-@@ -3463,13 +3432,14 @@
- }
- i++;
- }
-+
- /* If we are returning a value, assign it to the result. */
- if (lhsop)
- {
- struct constraint_expr rhs;
- struct constraint_expr *lhsp;
- unsigned int j = 0;
--
-+
- get_constraint_for (lhsop, &lhsc);
- if (TREE_CODE (decl) != FUNCTION_DECL)
- {
-@@ -3485,7 +3455,7 @@
- }
- for (j = 0; VEC_iterate (ce_s, lhsc, j, lhsp); j++)
- process_constraint (new_constraint (*lhsp, rhs));
-- }
-+ }
- }
- /* Otherwise, just a regular assignment statement. */
- else if (TREE_CODE (t) == MODIFY_EXPR)
-@@ -3494,7 +3464,7 @@
- tree rhsop = TREE_OPERAND (t, 1);
- int i;
-
-- if ((AGGREGATE_TYPE_P (TREE_TYPE (lhsop))
-+ if ((AGGREGATE_TYPE_P (TREE_TYPE (lhsop))
- || TREE_CODE (TREE_TYPE (lhsop)) == COMPLEX_TYPE)
- && (AGGREGATE_TYPE_P (TREE_TYPE (rhsop))
- || TREE_CODE (TREE_TYPE (lhsop)) == COMPLEX_TYPE))
-@@ -3513,7 +3483,7 @@
- {
- /* RHS that consist of unary operations,
- exceptional types, or bare decls/constants, get
-- handled directly by get_constraint_for. */
-+ handled directly by get_constraint_for. */
- case tcc_reference:
- case tcc_declaration:
- case tcc_constant:
-@@ -3528,7 +3498,7 @@
- {
- struct constraint_expr *c2;
- unsigned int k;
--
-+
- for (k = 0; VEC_iterate (ce_s, rhsc, k, c2); k++)
- process_constraint (new_constraint (*c, *c2));
- }
-@@ -3570,7 +3540,7 @@
- }
- }
- }
-- }
-+ }
- }
- }
- }
-@@ -3578,7 +3548,7 @@
- /* After promoting variables and computing aliasing we will
- need to re-scan most statements. FIXME: Try to minimize the
- number of statements re-scanned. It's not really necessary to
-- re-scan *all* statements. */
-+ re-scan *all* statements. */
- mark_stmt_modified (origt);
- VEC_free (ce_s, heap, rhsc);
- VEC_free (ce_s, heap, lhsc);
-@@ -3591,7 +3561,7 @@
- first field that overlaps with OFFSET.
- Return NULL if we can't find one. */
-
--static varinfo_t
-+static varinfo_t
- first_vi_for_offset (varinfo_t start, unsigned HOST_WIDE_INT offset)
- {
- varinfo_t curr = start;
-@@ -3617,7 +3587,7 @@
- {
- varinfo_t prev = base;
- varinfo_t curr = base->next;
--
-+
- field->next = curr;
- prev->next = field;
- }
-@@ -3630,7 +3600,7 @@
- {
- varinfo_t prev = base;
- varinfo_t curr = base->next;
--
-+
- if (curr == NULL)
- {
- prev->next = field;
-@@ -3652,13 +3622,13 @@
-
- /* qsort comparison function for two fieldoff's PA and PB */
-
--static int
-+static int
- fieldoff_compare (const void *pa, const void *pb)
- {
- const fieldoff_s *foa = (const fieldoff_s *)pa;
- const fieldoff_s *fob = (const fieldoff_s *)pb;
- HOST_WIDE_INT foasize, fobsize;
--
-+
- if (foa->offset != fob->offset)
- return foa->offset - fob->offset;
-
-@@ -3671,8 +3641,8 @@
- void
- sort_fieldstack (VEC(fieldoff_s,heap) *fieldstack)
- {
-- qsort (VEC_address (fieldoff_s, fieldstack),
-- VEC_length (fieldoff_s, fieldstack),
-+ qsort (VEC_address (fieldoff_s, fieldstack),
-+ VEC_length (fieldoff_s, fieldstack),
- sizeof (fieldoff_s),
- fieldoff_compare);
- }
-@@ -3686,12 +3656,12 @@
- TYPE. */
-
- int
--push_fields_onto_fieldstack (tree type, VEC(fieldoff_s,heap) **fieldstack,
-+push_fields_onto_fieldstack (tree type, VEC(fieldoff_s,heap) **fieldstack,
- HOST_WIDE_INT offset, bool *has_union)
- {
- tree field;
- int count = 0;
--
-+
- if (TREE_CODE (type) == COMPLEX_TYPE)
- {
- fieldoff_s *real_part, *img_part;
-@@ -3700,13 +3670,13 @@
- real_part->size = TYPE_SIZE (TREE_TYPE (type));
- real_part->offset = offset;
- real_part->decl = NULL_TREE;
--
-+
- img_part = VEC_safe_push (fieldoff_s, heap, *fieldstack, NULL);
- img_part->type = TREE_TYPE (type);
- img_part->size = TYPE_SIZE (TREE_TYPE (type));
- img_part->offset = offset + TREE_INT_CST_LOW (TYPE_SIZE (TREE_TYPE (type)));
- img_part->decl = NULL_TREE;
--
-+
- return 2;
- }
-
-@@ -3733,12 +3703,12 @@
- {
- bool push = false;
- int pushed = 0;
--
-- if (has_union
-+
-+ if (has_union
- && (TREE_CODE (TREE_TYPE (type)) == QUAL_UNION_TYPE
- || TREE_CODE (TREE_TYPE (type)) == UNION_TYPE))
- *has_union = true;
--
-+
- if (!AGGREGATE_TYPE_P (TREE_TYPE (type))) /* var_can_have_subvars */
- push = true;
- else if (!(pushed = push_fields_onto_fieldstack
-@@ -3772,12 +3742,12 @@
- {
- bool push = false;
- int pushed = 0;
--
-- if (has_union
-+
-+ if (has_union
- && (TREE_CODE (TREE_TYPE (field)) == QUAL_UNION_TYPE
- || TREE_CODE (TREE_TYPE (field)) == UNION_TYPE))
- *has_union = true;
--
-+
- if (!var_can_have_subvars (field))
- push = true;
- else if (!(pushed = push_fields_onto_fieldstack
-@@ -3789,7 +3759,7 @@
- see if we didn't push any subfields and the size is
- nonzero, push the field onto the stack */
- push = true;
--
-+
- if (push)
- {
- fieldoff_s *pair;
-@@ -3848,15 +3818,15 @@
- unsigned int i = 0;
- tree t;
-
-- for (t = TYPE_ARG_TYPES (TREE_TYPE (decl));
-+ for (t = TYPE_ARG_TYPES (TREE_TYPE (decl));
- t;
- t = TREE_CHAIN (t))
-- {
-+ {
- if (TREE_VALUE (t) == void_type_node)
- break;
- i++;
- }
--
-+
- if (!t)
- *is_varargs = true;
- return i;
-@@ -3870,19 +3840,19 @@
- {
- unsigned int index = VEC_length (varinfo_t, varmap);
- varinfo_t vi;
-- tree arg;
-+ tree arg;
- unsigned int i;
- bool is_varargs = false;
-
- /* Create the variable info. */
-
-- vi = new_var_info (decl, index, name, index);
-+ vi = new_var_info (decl, index, name);
- vi->decl = decl;
- vi->offset = 0;
- vi->has_union = 0;
- vi->size = 1;
- vi->fullsize = count_num_arguments (decl, &is_varargs) + 1;
-- insert_id_for_tree (vi->decl, index);
-+ insert_vi_for_tree (vi->decl, vi);
- VEC_safe_push (varinfo_t, heap, varmap, vi);
-
- stats.total_vars++;
-@@ -3898,12 +3868,12 @@
- return index;
- }
-
--
-+
- arg = DECL_ARGUMENTS (decl);
-
- /* Set up variables for each argument. */
- for (i = 1; i < vi->fullsize; i++)
-- {
-+ {
- varinfo_t argvi;
- const char *newname;
- char *tempname;
-@@ -3912,13 +3882,13 @@
-
- if (arg)
- argdecl = arg;
--
-+
- newindex = VEC_length (varinfo_t, varmap);
- asprintf (&tempname, "%s.arg%d", name, i-1);
- newname = ggc_strdup (tempname);
- free (tempname);
-
-- argvi = new_var_info (argdecl, newindex,newname, newindex);
-+ argvi = new_var_info (argdecl, newindex, newname);
- argvi->decl = argdecl;
- VEC_safe_push (varinfo_t, heap, varmap, argvi);
- argvi->offset = i;
-@@ -3929,7 +3899,7 @@
- stats.total_vars ++;
- if (arg)
- {
-- insert_id_for_tree (arg, newindex);
-+ insert_vi_for_tree (arg, argvi);
- arg = TREE_CHAIN (arg);
- }
- }
-@@ -3948,13 +3918,13 @@
-
- if (DECL_RESULT (decl))
- resultdecl = DECL_RESULT (decl);
--
-+
- newindex = VEC_length (varinfo_t, varmap);
- asprintf (&tempname, "%s.result", name);
- newname = ggc_strdup (tempname);
- free (tempname);
-
-- resultvi = new_var_info (resultdecl, newindex, newname, newindex);
-+ resultvi = new_var_info (resultdecl, newindex, newname);
- resultvi->decl = resultdecl;
- VEC_safe_push (varinfo_t, heap, varmap, resultvi);
- resultvi->offset = i;
-@@ -3964,13 +3934,13 @@
- insert_into_field_list_sorted (vi, resultvi);
- stats.total_vars ++;
- if (DECL_RESULT (decl))
-- insert_id_for_tree (DECL_RESULT (decl), newindex);
-+ insert_vi_for_tree (DECL_RESULT (decl), resultvi);
- }
- return index;
--}
-+}
-
-
--/* Return true if FIELDSTACK contains fields that overlap.
-+/* Return true if FIELDSTACK contains fields that overlap.
- FIELDSTACK is assumed to be sorted by offset. */
-
- static bool
-@@ -4057,12 +4027,12 @@
- bool hasunion;
- bool is_global = DECL_P (decl) ? is_global_var (decl) : false;
- VEC (fieldoff_s,heap) *fieldstack = NULL;
--
-+
- if (TREE_CODE (decl) == FUNCTION_DECL && in_ipa_mode)
- return create_function_info_for (decl, name);
-
- hasunion = TREE_CODE (decltype) == UNION_TYPE
-- || TREE_CODE (decltype) == QUAL_UNION_TYPE;
-+ || TREE_CODE (decltype) == QUAL_UNION_TYPE;
- if (var_can_have_subvars (decl) && use_field_sensitive && !hasunion)
- {
- push_fields_onto_fieldstack (decltype, &fieldstack, 0, &hasunion);
-@@ -4072,12 +4042,12 @@
- notokay = true;
- }
- }
--
-
-+
- /* If the variable doesn't have subvars, we may end up needing to
- sort the field list and create fake variables for all the
- fields. */
-- vi = new_var_info (decl, index, name, index);
-+ vi = new_var_info (decl, index, name);
- vi->decl = decl;
- vi->offset = 0;
- vi->has_union = hasunion;
-@@ -4095,8 +4065,8 @@
- vi->fullsize = TREE_INT_CST_LOW (declsize);
- vi->size = vi->fullsize;
- }
--
-- insert_id_for_tree (vi->decl, index);
-+
-+ insert_vi_for_tree (vi->decl, vi);
- VEC_safe_push (varinfo_t, heap, varmap, vi);
- if (is_global && (!flag_whole_program || !in_ipa_mode))
- {
-@@ -4122,9 +4092,9 @@
- }
-
- stats.total_vars++;
-- if (use_field_sensitive
-- && !notokay
-- && !vi->is_unknown_size_var
-+ if (use_field_sensitive
-+ && !notokay
-+ && !vi->is_unknown_size_var
- && var_can_have_subvars (decl)
- && VEC_length (fieldoff_s, fieldstack) <= MAX_FIELDS_FOR_FIELD_SENSITIVE)
- {
-@@ -4148,7 +4118,7 @@
- without creating varinfos for the fields anyway, so sorting them is a
- waste to boot. */
- if (!notokay)
-- {
-+ {
- sort_fieldstack (fieldstack);
- /* Due to some C++ FE issues, like PR 22488, we might end up
- what appear to be overlapping fields even though they,
-@@ -4156,8 +4126,8 @@
- we will simply disable field-sensitivity for these cases. */
- notokay = check_for_overlaps (fieldstack);
- }
--
--
-+
-+
- if (VEC_length (fieldoff_s, fieldstack) != 0)
- fo = VEC_index (fieldoff_s, fieldstack, 0);
-
-@@ -4169,11 +4139,11 @@
- VEC_free (fieldoff_s, heap, fieldstack);
- return index;
- }
--
-+
- vi->size = TREE_INT_CST_LOW (fo->size);
- vi->offset = fo->offset;
-- for (i = VEC_length (fieldoff_s, fieldstack) - 1;
-- i >= 1 && VEC_iterate (fieldoff_s, fieldstack, i, fo);
-+ for (i = VEC_length (fieldoff_s, fieldstack) - 1;
-+ i >= 1 && VEC_iterate (fieldoff_s, fieldstack, i, fo);
- i--)
- {
- varinfo_t newvi;
-@@ -4184,15 +4154,15 @@
- if (dump_file)
- {
- if (fo->decl)
-- asprintf (&tempname, "%s.%s",
-+ asprintf (&tempname, "%s.%s",
- vi->name, alias_get_name (fo->decl));
- else
-- asprintf (&tempname, "%s." HOST_WIDE_INT_PRINT_DEC,
-+ asprintf (&tempname, "%s." HOST_WIDE_INT_PRINT_DEC,
- vi->name, fo->offset);
- newname = ggc_strdup (tempname);
- free (tempname);
- }
-- newvi = new_var_info (decl, newindex, newname, newindex);
-+ newvi = new_var_info (decl, newindex, newname);
- newvi->offset = fo->offset;
- newvi->size = TREE_INT_CST_LOW (fo->size);
- newvi->fullsize = vi->fullsize;
-@@ -4228,14 +4198,22 @@
- {
- varinfo_t vi = get_varinfo (var);
- unsigned int i;
-- bitmap_iterator bi;
--
-- fprintf (file, "%s = { ", vi->name);
-- EXECUTE_IF_SET_IN_BITMAP (get_varinfo (vi->node)->solution, 0, i, bi)
-+ bitmap_iterator bi;
-+
-+ if (find (var) != var)
- {
-- fprintf (file, "%s ", get_varinfo (i)->name);
-+ varinfo_t vipt = get_varinfo (find (var));
-+ fprintf (file, "%s = same as %s\n", vi->name, vipt->name);
- }
-- fprintf (file, "}\n");
-+ else
-+ {
-+ fprintf (file, "%s = { ", vi->name);
-+ EXECUTE_IF_SET_IN_BITMAP (vi->solution, 0, i, bi)
-+ {
-+ fprintf (file, "%s ", get_varinfo (i)->name);
-+ }
-+ fprintf (file, "}\n");
-+ }
- }
-
- /* Print the points-to solution for VAR to stdout. */
-@@ -4266,7 +4244,7 @@
- if (!could_have_pointers (t))
- continue;
-
-- arg_id = get_id_for_tree (t);
-+ arg_id = get_vi_for_tree (t)->id;
-
- /* With flag_argument_noalias greater than two means that the incoming
- argument cannot alias anything except for itself so create a HEAP
-@@ -4276,11 +4254,10 @@
- {
- varinfo_t vi;
- tree heapvar = heapvar_lookup (t);
-- unsigned int id;
-
- lhs.offset = 0;
- lhs.type = SCALAR;
-- lhs.var = get_id_for_tree (t);
-+ lhs.var = get_vi_for_tree (t)->id;
-
- if (heapvar == NULL_TREE)
- {
-@@ -4291,11 +4268,11 @@
- add_referenced_var (heapvar);
- heapvar_insert (t, heapvar);
- }
-- id = get_id_for_tree (heapvar);
-- vi = get_varinfo (id);
-+
-+ vi = get_vi_for_tree (heapvar);
- vi->is_artificial_var = 1;
- vi->is_heap_var = 1;
-- rhs.var = id;
-+ rhs.var = vi->id;
- rhs.type = ADDRESSOF;
- rhs.offset = 0;
- for (p = get_varinfo (lhs.var); p; p = p->next)
-@@ -4409,8 +4386,8 @@
- bool
- find_what_p_points_to (tree p)
- {
-- unsigned int id = 0;
- tree lookup_p = p;
-+ varinfo_t vi;
-
- if (!have_alias_info)
- return false;
-@@ -4422,10 +4399,10 @@
- && default_def (SSA_NAME_VAR (p)) == p)
- lookup_p = SSA_NAME_VAR (p);
-
-- if (lookup_id_for_tree (lookup_p, &id))
-+ vi = lookup_vi_for_tree (lookup_p);
-+ if (vi)
- {
-- varinfo_t vi = get_varinfo (id);
--
-+
- if (vi->is_artificial_var)
- return false;
-
-@@ -4447,7 +4424,7 @@
-
- /* This variable may have been collapsed, let's get the real
- variable. */
-- vi = get_varinfo (vi->node);
-+ vi = get_varinfo (find (vi->id));
-
- /* Translate artificial variables into SSA_NAME_PTR_INFO
- attributes. */
-@@ -4506,13 +4483,16 @@
- {
- fprintf (outfile, "Stats:\n");
- fprintf (outfile, "Total vars: %d\n", stats.total_vars);
-+ fprintf (outfile, "Non-pointer vars: %d\n",
-+ stats.nonpointer_vars);
- fprintf (outfile, "Statically unified vars: %d\n",
- stats.unified_vars_static);
-- fprintf (outfile, "Collapsed vars: %d\n", stats.collapsed_vars);
- fprintf (outfile, "Dynamically unified vars: %d\n",
- stats.unified_vars_dynamic);
- fprintf (outfile, "Iterations: %d\n", stats.iterations);
- fprintf (outfile, "Number of edges: %d\n", stats.num_edges);
-+ fprintf (outfile, "Number of implicit edges: %d\n",
-+ stats.num_implicit_edges);
- }
-
- for (i = 0; i < VEC_length (varinfo_t, varmap); i++)
-@@ -4540,8 +4520,8 @@
- /* Create the NULL variable, used to represent that a variable points
- to NULL. */
- nothing_tree = create_tmp_var_raw (void_type_node, "NULL");
-- var_nothing = new_var_info (nothing_tree, 0, "NULL", 0);
-- insert_id_for_tree (nothing_tree, 0);
-+ var_nothing = new_var_info (nothing_tree, 0, "NULL");
-+ insert_vi_for_tree (nothing_tree, var_nothing);
- var_nothing->is_artificial_var = 1;
- var_nothing->offset = 0;
- var_nothing->size = ~0;
-@@ -4553,8 +4533,8 @@
- /* Create the ANYTHING variable, used to represent that a variable
- points to some unknown piece of memory. */
- anything_tree = create_tmp_var_raw (void_type_node, "ANYTHING");
-- var_anything = new_var_info (anything_tree, 1, "ANYTHING", 1);
-- insert_id_for_tree (anything_tree, 1);
-+ var_anything = new_var_info (anything_tree, 1, "ANYTHING");
-+ insert_vi_for_tree (anything_tree, var_anything);
- var_anything->is_artificial_var = 1;
- var_anything->size = ~0;
- var_anything->offset = 0;
-@@ -4573,7 +4553,6 @@
- rhs.type = ADDRESSOF;
- rhs.var = anything_id;
- rhs.offset = 0;
-- var_anything->address_taken = true;
-
- /* This specifically does not use process_constraint because
- process_constraint ignores all anything = anything constraints, since all
-@@ -4583,14 +4562,14 @@
- /* Create the READONLY variable, used to represent that a variable
- points to readonly memory. */
- readonly_tree = create_tmp_var_raw (void_type_node, "READONLY");
-- var_readonly = new_var_info (readonly_tree, 2, "READONLY", 2);
-+ var_readonly = new_var_info (readonly_tree, 2, "READONLY");
- var_readonly->is_artificial_var = 1;
- var_readonly->offset = 0;
- var_readonly->size = ~0;
- var_readonly->fullsize = ~0;
- var_readonly->next = NULL;
- var_readonly->is_special_var = 1;
-- insert_id_for_tree (readonly_tree, 2);
-+ insert_vi_for_tree (readonly_tree, var_readonly);
- readonly_id = 2;
- VEC_safe_push (varinfo_t, heap, varmap, var_readonly);
-
-@@ -4610,8 +4589,8 @@
- /* Create the INTEGER variable, used to represent that a variable points
- to an INTEGER. */
- integer_tree = create_tmp_var_raw (void_type_node, "INTEGER");
-- var_integer = new_var_info (integer_tree, 3, "INTEGER", 3);
-- insert_id_for_tree (integer_tree, 3);
-+ var_integer = new_var_info (integer_tree, 3, "INTEGER");
-+ insert_vi_for_tree (integer_tree, var_integer);
- var_integer->is_artificial_var = 1;
- var_integer->size = ~0;
- var_integer->fullsize = ~0;
-@@ -4634,8 +4613,8 @@
- /* Create the ESCAPED_VARS variable used to represent variables that
- escape this function. */
- escaped_vars_tree = create_tmp_var_raw (void_type_node, "ESCAPED_VARS");
-- var_escaped_vars = new_var_info (escaped_vars_tree, 4, "ESCAPED_VARS", 4);
-- insert_id_for_tree (escaped_vars_tree, 4);
-+ var_escaped_vars = new_var_info (escaped_vars_tree, 4, "ESCAPED_VARS");
-+ insert_vi_for_tree (escaped_vars_tree, var_escaped_vars);
- var_escaped_vars->is_artificial_var = 1;
- var_escaped_vars->size = ~0;
- var_escaped_vars->fullsize = ~0;
-@@ -4660,21 +4639,19 @@
- static void
- init_alias_vars (void)
- {
-- bitmap_obstack_initialize (&ptabitmap_obstack);
-+ bitmap_obstack_initialize (&pta_obstack);
-+ bitmap_obstack_initialize (&oldpta_obstack);
- bitmap_obstack_initialize (&predbitmap_obstack);
-
-- constraint_pool = create_alloc_pool ("Constraint pool",
-+ constraint_pool = create_alloc_pool ("Constraint pool",
- sizeof (struct constraint), 30);
- variable_info_pool = create_alloc_pool ("Variable info pool",
- sizeof (struct variable_info), 30);
-- constraint_edge_pool = create_alloc_pool ("Constraint edges",
-- sizeof (struct constraint_edge), 30);
--
- constraints = VEC_alloc (constraint_t, heap, 8);
- varmap = VEC_alloc (varinfo_t, heap, 8);
-- id_for_tree = htab_create (10, tree_id_hash, tree_id_eq, free);
-+ vi_for_tree = pointer_map_create ();
-+
- memset (&stats, 0, sizeof (stats));
--
- init_base_vars ();
- }
-
-@@ -4777,6 +4754,43 @@
- VEC_free (ce_s, heap, rhsc);
- }
-
-+
-+/* Remove the REF and ADDRESS edges from GRAPH, as well as all the
-+ predecessor edges. */
-+
-+static void
-+remove_preds_and_fake_succs (constraint_graph_t graph)
-+{
-+ unsigned int i;
-+
-+ /* Clear the implicit ref and address nodes from the successor
-+ lists. */
-+ for (i = 0; i < FIRST_REF_NODE; i++)
-+ {
-+ if (graph->succs[i])
-+ bitmap_clear_range (graph->succs[i], FIRST_REF_NODE,
-+ FIRST_REF_NODE * 2);
-+ }
-+
-+ /* Free the successor list for the non-ref nodes. */
-+ for (i = FIRST_REF_NODE; i < graph->size; i++)
-+ {
-+ if (graph->succs[i])
-+ BITMAP_FREE (graph->succs[i]);
-+ }
-+
-+ /* Now reallocate the size of the successor list as, and blow away
-+ the predecessor bitmaps. */
-+ graph->size = VEC_length (varinfo_t, varmap);
-+ graph->succs = xrealloc (graph->succs, graph->size * sizeof (bitmap));
-+
-+ free (graph->implicit_preds);
-+ graph->implicit_preds = NULL;
-+ free (graph->preds);
-+ graph->preds = NULL;
-+ bitmap_obstack_release (&predbitmap_obstack);
-+}
-+
- /* Create points-to sets for the current function. See the comments
- at the start of the file for an algorithmic overview. */
-
-@@ -4784,11 +4798,13 @@
- compute_points_to_sets (struct alias_info *ai)
- {
- basic_block bb;
-+ struct scc_info *si;
-
- timevar_push (TV_TREE_PTA);
-
- init_alias_vars ();
--
-+ init_alias_heapvars ();
-+
- intra_create_variable_infos ();
-
- /* Now walk all statements and derive aliases. */
-@@ -4824,36 +4840,42 @@
- }
- }
-
-- build_constraint_graph ();
-
- if (dump_file)
- {
- fprintf (dump_file, "Points-to analysis\n\nConstraints:\n\n");
- dump_constraints (dump_file);
- }
--
-+
- if (dump_file)
- fprintf (dump_file,
- "\nCollapsing static cycles and doing variable "
- "substitution:\n");
--
-- find_and_collapse_graph_cycles (graph, false);
-- perform_var_substitution (graph);
--
-+
-+ build_pred_graph ();
-+ si = perform_var_substitution (graph);
-+ move_complex_constraints (graph, si);
-+ free_var_substitution_info (si);
-+
-+ build_succ_graph ();
-+ find_indirect_cycles (graph);
-+
-+ /* Implicit nodes and predecessors are no longer necessary at this
-+ point. */
-+ remove_preds_and_fake_succs (graph);
-+
- if (dump_file)
- fprintf (dump_file, "\nSolving graph:\n");
--
-+
- solve_graph (graph);
--
-+
- if (dump_file)
- dump_sa_points_to_info (dump_file);
--
- have_alias_info = true;
-
- timevar_pop (TV_TREE_PTA);
- }
-
--
- /* Delete created points-to sets. */
-
- void
-@@ -4861,33 +4883,27 @@
- {
- varinfo_t v;
- int i;
--
-- htab_delete (id_for_tree);
-- bitmap_obstack_release (&ptabitmap_obstack);
-- bitmap_obstack_release (&predbitmap_obstack);
-+
-+ if (dump_file && (dump_flags & TDF_STATS))
-+ fprintf (dump_file, "Points to sets created:%d\n",
-+ stats.points_to_sets_created);
-+
-+ pointer_map_destroy (vi_for_tree);
-+ bitmap_obstack_release (&pta_obstack);
- VEC_free (constraint_t, heap, constraints);
--
-+
- for (i = 0; VEC_iterate (varinfo_t, varmap, i, v); i++)
-- {
-- /* Nonlocal vars may add more varinfos. */
-- if (i >= graph_size)
-- break;
-+ VEC_free (constraint_t, heap, graph->complex[i]);
-+ free (graph->complex);
-
-- VEC_free (constraint_edge_t, heap, graph->succs[i]);
-- VEC_free (constraint_edge_t, heap, graph->preds[i]);
-- VEC_free (constraint_t, heap, v->complex);
-- }
-- free (graph->zero_weight_preds);
-- free (graph->zero_weight_succs);
-+ free (graph->rep);
- free (graph->succs);
-- free (graph->preds);
-+ free (graph->indirect_cycles);
- free (graph);
-
- VEC_free (varinfo_t, heap, varmap);
- free_alloc_pool (variable_info_pool);
-- free_alloc_pool (constraint_pool);
-- free_alloc_pool (constraint_edge_pool);
--
-+ free_alloc_pool (constraint_pool);
- have_alias_info = false;
- }
-
-@@ -4905,6 +4921,7 @@
- static unsigned int
- ipa_pta_execute (void)
- {
-+#if 0
- struct cgraph_node *node;
- in_ipa_mode = 1;
- init_alias_heapvars ();
-@@ -4994,6 +5011,7 @@
- in_ipa_mode = 0;
- delete_alias_heapvars ();
- delete_points_to_sets ();
-+#endif
- return 0;
- }
-
-@@ -5018,8 +5036,9 @@
- void
- init_alias_heapvars (void)
- {
-- heapvar_for_stmt = htab_create_ggc (11, tree_map_hash, tree_map_eq,
-- NULL);
-+ if (!heapvar_for_stmt)
-+ heapvar_for_stmt = htab_create_ggc (11, tree_map_hash, tree_map_eq,
-+ NULL);
- nonlocal_all = NULL_TREE;
- }
-
-@@ -5028,7 +5047,7 @@
- {
- nonlocal_all = NULL_TREE;
- htab_delete (heapvar_for_stmt);
-+ heapvar_for_stmt = NULL;
- }
--
-
- #include "gt-tree-ssa-structalias.h"
-Index: gcc/config/i386/i386.md
-===================================================================
---- gcc/config/i386/i386.md (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/i386/i386.md (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -4749,7 +4749,7 @@
- (define_insn "*addti3_1"
- [(set (match_operand:TI 0 "nonimmediate_operand" "=r,o")
- (plus:TI (match_operand:TI 1 "nonimmediate_operand" "%0,0")
-- (match_operand:TI 2 "general_operand" "roiF,riF")))
-+ (match_operand:TI 2 "x86_64_general_operand" "roe,re")))
- (clobber (reg:CC FLAGS_REG))]
- "TARGET_64BIT && ix86_binary_operator_ok (PLUS, TImode, operands)"
- "#")
-@@ -4757,7 +4757,7 @@
- (define_split
- [(set (match_operand:TI 0 "nonimmediate_operand" "")
- (plus:TI (match_operand:TI 1 "nonimmediate_operand" "")
-- (match_operand:TI 2 "general_operand" "")))
-+ (match_operand:TI 2 "x86_64_general_operand" "")))
- (clobber (reg:CC FLAGS_REG))]
- "TARGET_64BIT && reload_completed"
- [(parallel [(set (reg:CC FLAGS_REG) (unspec:CC [(match_dup 1) (match_dup 2)]
-@@ -6483,7 +6483,7 @@
- (define_insn "*subti3_1"
- [(set (match_operand:TI 0 "nonimmediate_operand" "=r,o")
- (minus:TI (match_operand:TI 1 "nonimmediate_operand" "0,0")
-- (match_operand:TI 2 "general_operand" "roiF,riF")))
-+ (match_operand:TI 2 "x86_64_general_operand" "roe,re")))
- (clobber (reg:CC FLAGS_REG))]
- "TARGET_64BIT && ix86_binary_operator_ok (MINUS, TImode, operands)"
- "#")
-@@ -6491,7 +6491,7 @@
- (define_split
- [(set (match_operand:TI 0 "nonimmediate_operand" "")
- (minus:TI (match_operand:TI 1 "nonimmediate_operand" "")
-- (match_operand:TI 2 "general_operand" "")))
-+ (match_operand:TI 2 "x86_64_general_operand" "")))
- (clobber (reg:CC FLAGS_REG))]
- "TARGET_64BIT && reload_completed"
- [(parallel [(set (reg:CC FLAGS_REG) (compare:CC (match_dup 1) (match_dup 2)))
-@@ -9326,7 +9326,7 @@
-
- (define_insn "*negti2_1"
- [(set (match_operand:TI 0 "nonimmediate_operand" "=ro")
-- (neg:TI (match_operand:TI 1 "general_operand" "0")))
-+ (neg:TI (match_operand:TI 1 "nonimmediate_operand" "0")))
- (clobber (reg:CC FLAGS_REG))]
- "TARGET_64BIT
- && ix86_unary_operator_ok (NEG, TImode, operands)"
-@@ -9334,7 +9334,7 @@
-
- (define_split
- [(set (match_operand:TI 0 "nonimmediate_operand" "")
-- (neg:TI (match_operand:TI 1 "general_operand" "")))
-+ (neg:TI (match_operand:TI 1 "nonimmediate_operand" "")))
- (clobber (reg:CC FLAGS_REG))]
- "TARGET_64BIT && reload_completed"
- [(parallel
-Index: gcc/config/i386/sse.md
-===================================================================
---- gcc/config/i386/sse.md (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/i386/sse.md (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -2055,11 +2055,11 @@
- (match_dup 1))
- (parallel [(const_int 0)
- (const_int 2)])))]
-- "TARGET_SSE3 && !(MEM_P (operands[1]) && MEM_P (operands[2]))"
-+ "TARGET_SSE3 && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
- "@
- movddup\t{%1, %0|%0, %1}
- #"
-- [(set_attr "type" "sselog,ssemov")
-+ [(set_attr "type" "sselog1,ssemov")
- (set_attr "mode" "V2DF")])
-
- (define_split
-@@ -3494,9 +3494,10 @@
- "TARGET_SSE2 && !(MEM_P (operands[0]) && MEM_P (operands[1]))"
- "@
- movhps\t{%1, %0|%0, %1}
-- psrldq\t{$4, %0|%0, 4}
-+ psrldq\t{$8, %0|%0, 8}
- movq\t{%H1, %0|%0, %H1}"
- [(set_attr "type" "ssemov,sseishft,ssemov")
-+ (set_attr "memory" "*,none,*")
- (set_attr "mode" "V2SF,TI,TI")])
-
- ;; Not sure this is ever used, but it doesn't hurt to have it. -aoliva
-Index: gcc/config/i386/i386.c
-===================================================================
---- gcc/config/i386/i386.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/i386/i386.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -15539,13 +15539,13 @@
- /* Access to the vec_extract patterns. */
- ftype = build_function_type_list (double_type_node, V2DF_type_node,
- integer_type_node, NULL_TREE);
-- def_builtin (MASK_SSE, "__builtin_ia32_vec_ext_v2df",
-+ def_builtin (MASK_SSE2, "__builtin_ia32_vec_ext_v2df",
- ftype, IX86_BUILTIN_VEC_EXT_V2DF);
-
- ftype = build_function_type_list (long_long_integer_type_node,
- V2DI_type_node, integer_type_node,
- NULL_TREE);
-- def_builtin (MASK_SSE, "__builtin_ia32_vec_ext_v2di",
-+ def_builtin (MASK_SSE2, "__builtin_ia32_vec_ext_v2di",
- ftype, IX86_BUILTIN_VEC_EXT_V2DI);
-
- ftype = build_function_type_list (float_type_node, V4SF_type_node,
-@@ -15555,12 +15555,12 @@
-
- ftype = build_function_type_list (intSI_type_node, V4SI_type_node,
- integer_type_node, NULL_TREE);
-- def_builtin (MASK_SSE, "__builtin_ia32_vec_ext_v4si",
-+ def_builtin (MASK_SSE2, "__builtin_ia32_vec_ext_v4si",
- ftype, IX86_BUILTIN_VEC_EXT_V4SI);
-
- ftype = build_function_type_list (intHI_type_node, V8HI_type_node,
- integer_type_node, NULL_TREE);
-- def_builtin (MASK_SSE, "__builtin_ia32_vec_ext_v8hi",
-+ def_builtin (MASK_SSE2, "__builtin_ia32_vec_ext_v8hi",
- ftype, IX86_BUILTIN_VEC_EXT_V8HI);
-
- ftype = build_function_type_list (intHI_type_node, V4HI_type_node,
-@@ -15577,7 +15577,7 @@
- ftype = build_function_type_list (V8HI_type_node, V8HI_type_node,
- intHI_type_node,
- integer_type_node, NULL_TREE);
-- def_builtin (MASK_SSE, "__builtin_ia32_vec_set_v8hi",
-+ def_builtin (MASK_SSE2, "__builtin_ia32_vec_set_v8hi",
- ftype, IX86_BUILTIN_VEC_SET_V8HI);
-
- ftype = build_function_type_list (V4HI_type_node, V4HI_type_node,
-Index: gcc/config/sh/sh.c
-===================================================================
---- gcc/config/sh/sh.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/sh/sh.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -5295,7 +5295,13 @@
- temp = scavenge_reg (&temps);
- }
- if (temp < 0 && live_regs_mask)
-- temp = scavenge_reg (live_regs_mask);
-+ {
-+ HARD_REG_SET temps;
-+
-+ COPY_HARD_REG_SET (temps, *live_regs_mask);
-+ CLEAR_HARD_REG_BIT (temps, REGNO (reg));
-+ temp = scavenge_reg (&temps);
-+ }
- if (temp < 0)
- {
- rtx adj_reg, tmp_reg, mem;
-@@ -5344,6 +5350,9 @@
- emit_move_insn (adj_reg, mem);
- mem = gen_tmp_stack_mem (Pmode, gen_rtx_POST_INC (Pmode, reg));
- emit_move_insn (tmp_reg, mem);
-+ /* Tell flow the insns that pop r4/r5 aren't dead. */
-+ emit_insn (gen_rtx_USE (VOIDmode, tmp_reg));
-+ emit_insn (gen_rtx_USE (VOIDmode, adj_reg));
- return;
- }
- const_reg = gen_rtx_REG (GET_MODE (reg), temp);
-@@ -8618,7 +8627,7 @@
- else if (TARGET_SH4
- && get_attr_type (insn) == TYPE_DYN_SHIFT
- && get_attr_any_int_load (dep_insn) == ANY_INT_LOAD_YES
-- && reg_overlap_mentioned_p (SET_DEST (PATTERN (dep_insn)),
-+ && reg_overlap_mentioned_p (SET_DEST (single_set (dep_insn)),
- XEXP (SET_SRC (single_set (insn)),
- 1)))
- cost++;
-Index: gcc/config/sh/sh.md
-===================================================================
---- gcc/config/sh/sh.md (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/sh/sh.md (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -413,10 +413,12 @@
- (eq_attr "type" "jump")
- (cond [(eq_attr "med_branch_p" "yes")
- (const_int 2)
-- (and (eq (symbol_ref "GET_CODE (prev_nonnote_insn (insn))")
-- (symbol_ref "INSN"))
-- (eq (symbol_ref "INSN_CODE (prev_nonnote_insn (insn))")
-- (symbol_ref "code_for_indirect_jump_scratch")))
-+ (and (ne (symbol_ref "prev_nonnote_insn (insn)")
-+ (const_int 0))
-+ (and (eq (symbol_ref "GET_CODE (prev_nonnote_insn (insn))")
-+ (symbol_ref "INSN"))
-+ (eq (symbol_ref "INSN_CODE (prev_nonnote_insn (insn))")
-+ (symbol_ref "code_for_indirect_jump_scratch"))))
- (cond [(eq_attr "braf_branch_p" "yes")
- (const_int 6)
- (eq (symbol_ref "flag_pic") (const_int 0))
-@@ -750,54 +752,6 @@
- (set_attr "type" "arith3")])
-
- (define_insn "cmpeqsi_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (eq:DI (match_operand:SI 1 "logical_operand" "%r")
-- (match_operand:SI 2 "cmp_operand" "Nr")))]
-- "TARGET_SHMEDIA"
-- "cmpeq %1, %N2, %0"
-- [(set_attr "type" "cmp_media")])
--
--(define_insn "cmpeqdi_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (eq:DI (match_operand:DI 1 "register_operand" "%r")
-- (match_operand:DI 2 "cmp_operand" "Nr")))]
-- "TARGET_SHMEDIA"
-- "cmpeq %1, %N2, %0"
-- [(set_attr "type" "cmp_media")])
--
--(define_insn "cmpgtsi_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (gt:DI (match_operand:SI 1 "cmp_operand" "Nr")
-- (match_operand:SI 2 "cmp_operand" "rN")))]
-- "TARGET_SHMEDIA"
-- "cmpgt %N1, %N2, %0"
-- [(set_attr "type" "cmp_media")])
--
--(define_insn "cmpgtdi_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (gt:DI (match_operand:DI 1 "arith_reg_or_0_operand" "Nr")
-- (match_operand:DI 2 "arith_reg_or_0_operand" "rN")))]
-- "TARGET_SHMEDIA"
-- "cmpgt %N1, %N2, %0"
-- [(set_attr "type" "cmp_media")])
--
--(define_insn "cmpgtusi_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (gtu:DI (match_operand:SI 1 "cmp_operand" "Nr")
-- (match_operand:SI 2 "cmp_operand" "rN")))]
-- "TARGET_SHMEDIA"
-- "cmpgtu %N1, %N2, %0"
-- [(set_attr "type" "cmp_media")])
--
--(define_insn "cmpgtudi_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (gtu:DI (match_operand:DI 1 "arith_reg_or_0_operand" "Nr")
-- (match_operand:DI 2 "arith_reg_or_0_operand" "rN")))]
-- "TARGET_SHMEDIA"
-- "cmpgtu %N1, %N2, %0"
-- [(set_attr "type" "cmp_media")])
--
--(define_insn "cmpsieqsi_media"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (eq:SI (match_operand:SI 1 "logical_operand" "%r")
- (match_operand:SI 2 "cmp_operand" "Nr")))]
-@@ -805,7 +759,7 @@
- "cmpeq %1, %N2, %0"
- [(set_attr "type" "cmp_media")])
-
--(define_insn "cmpsieqdi_media"
-+(define_insn "cmpeqdi_media"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (eq:SI (match_operand:DI 1 "register_operand" "%r")
- (match_operand:DI 2 "cmp_operand" "Nr")))]
-@@ -813,7 +767,7 @@
- "cmpeq %1, %N2, %0"
- [(set_attr "type" "cmp_media")])
-
--(define_insn "cmpsigtsi_media"
-+(define_insn "cmpgtsi_media"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (gt:SI (match_operand:SI 1 "cmp_operand" "Nr")
- (match_operand:SI 2 "cmp_operand" "rN")))]
-@@ -821,7 +775,7 @@
- "cmpgt %N1, %N2, %0"
- [(set_attr "type" "cmp_media")])
-
--(define_insn "cmpsigtdi_media"
-+(define_insn "cmpgtdi_media"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (gt:SI (match_operand:DI 1 "arith_reg_or_0_operand" "Nr")
- (match_operand:DI 2 "arith_reg_or_0_operand" "rN")))]
-@@ -829,7 +783,7 @@
- "cmpgt %N1, %N2, %0"
- [(set_attr "type" "cmp_media")])
-
--(define_insn "cmpsigtusi_media"
-+(define_insn "cmpgtusi_media"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (gtu:SI (match_operand:SI 1 "cmp_operand" "Nr")
- (match_operand:SI 2 "cmp_operand" "rN")))]
-@@ -837,7 +791,7 @@
- "cmpgtu %N1, %N2, %0"
- [(set_attr "type" "cmp_media")])
-
--(define_insn "cmpsigtudi_media"
-+(define_insn "cmpgtudi_media"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (gtu:SI (match_operand:DI 1 "arith_reg_or_0_operand" "Nr")
- (match_operand:DI 2 "arith_reg_or_0_operand" "rN")))]
-@@ -846,13 +800,6 @@
- [(set_attr "type" "cmp_media")])
-
- ; These two patterns are for combine.
--(define_insn "*cmpne0si_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (ne:DI (match_operand:SI 1 "arith_reg_operand" "r") (const_int 0)))]
-- "TARGET_SHMEDIA"
-- "cmpgtu %1,r63,%0"
-- [(set_attr "type" "cmp_media")])
--
- (define_insn "*cmpne0sisi_media"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (ne:SI (match_operand:SI 1 "arith_reg_operand" "r") (const_int 0)))]
-@@ -1177,7 +1124,7 @@
- {
- emit_insn (gen_movsicc_false (operands[0], operands[1], operands[2],
- operands[3]));
-- emit_insn (gen_cmpsigtusi_media (operands[5], operands[4], operands[0]));
-+ emit_insn (gen_cmpgtusi_media (operands[5], operands[4], operands[0]));
- emit_insn (gen_movsicc_false (operands[0], operands[5], operands[4],
- operands[0]));
- DONE;
-@@ -7200,7 +7147,7 @@
- }")
-
- (define_expand "bunordered"
-- [(set (match_dup 1) (unordered:DI (match_dup 2) (match_dup 3)))
-+ [(set (match_dup 1) (unordered:SI (match_dup 2) (match_dup 3)))
- (set (pc)
- (if_then_else (ne (match_dup 1) (const_int 0))
- (match_operand 0 "" "")
-@@ -7209,7 +7156,7 @@
- "
- {
- operands[0] = gen_rtx_LABEL_REF (Pmode, operands[0]);
-- operands[1] = gen_reg_rtx (DImode);
-+ operands[1] = gen_reg_rtx (SImode);
- operands[2] = force_reg (GET_MODE (sh_compare_op0), sh_compare_op0);
- operands[3] = force_reg (GET_MODE (sh_compare_op1), sh_compare_op1);
- }")
-@@ -8397,6 +8344,20 @@
- operands[2],
- gen_rtx_REG (Pmode, PIC_REG)));
-
-+ /* When stack protector inserts codes after the result is set to
-+ R0, @(rX, r12) will cause a spill failure for R0. Don't schedule
-+ insns to avoid combining (set A (plus rX r12)) and (set op0 (mem A))
-+ when rX is a GOT address for the guard symbol. Ugly but doesn't
-+ matter because this is a rare situation. */
-+ if (!TARGET_SHMEDIA
-+ && flag_stack_protect
-+ && GET_CODE (operands[1]) == CONST
-+ && GET_CODE (XEXP (operands[1], 0)) == UNSPEC
-+ && GET_CODE (XVECEXP (XEXP (operands[1], 0), 0, 0)) == SYMBOL_REF
-+ && strcmp (XSTR (XVECEXP (XEXP (operands[1], 0), 0, 0), 0),
-+ \"__stack_chk_guard\") == 0)
-+ emit_insn (gen_blockage ());
-+
- /* N.B. This is not constant for a GOTPLT relocation. */
- mem = gen_rtx_MEM (Pmode, operands[3]);
- MEM_NOTRAP_P (mem) = 1;
-@@ -9112,6 +9073,8 @@
- {
- if (TARGET_SHMEDIA)
- {
-+ rtx reg;
-+
- sh_compare_op0 = force_reg (GET_MODE (sh_compare_op0), sh_compare_op0);
- if (sh_compare_op1 != const0_rtx)
- sh_compare_op1 = force_reg (GET_MODE (sh_compare_op1) == VOIDmode
-@@ -9126,26 +9089,26 @@
- switch (GET_MODE (sh_compare_op0))
- {
- case SImode:
-- emit_insn (gen_cmpsieqsi_media (operands[0],
-+ emit_insn (gen_cmpeqsi_media (operands[0],
- sh_compare_op0, sh_compare_op1));
- break;
-
- case DImode:
-- emit_insn (gen_cmpsieqdi_media (operands[0],
-+ emit_insn (gen_cmpeqdi_media (operands[0],
- sh_compare_op0, sh_compare_op1));
- break;
-
- case SFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpsieqsf_media (operands[0],
-+ emit_insn (gen_cmpeqsf_media (operands[0],
- sh_compare_op0, sh_compare_op1));
- break;
-
- case DFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpsieqdf_media (operands[0],
-+ emit_insn (gen_cmpeqdf_media (operands[0],
- sh_compare_op0, sh_compare_op1));
- break;
-
-@@ -9155,38 +9118,44 @@
- DONE;
- }
-
-- if (GET_MODE (operands[0]) != DImode)
-- operands[0] = gen_rtx_SUBREG (DImode, operands[0], 0);
-+ reg = operands[0];
-+ if (GET_MODE (operands[0]) != SImode)
-+ reg = no_new_pseudos ? gen_rtx_SUBREG (SImode, operands[0], 0)
-+ : gen_reg_rtx (SImode);
-
- switch (GET_MODE (sh_compare_op0))
- {
- case SImode:
-- emit_insn (gen_cmpeqsi_media (operands[0],
-+ emit_insn (gen_cmpeqsi_media (reg,
- sh_compare_op0, sh_compare_op1));
- break;
-
- case DImode:
-- emit_insn (gen_cmpeqdi_media (operands[0],
-+ emit_insn (gen_cmpeqdi_media (reg,
- sh_compare_op0, sh_compare_op1));
- break;
-
- case SFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpeqsf_media (operands[0],
-+ emit_insn (gen_cmpeqsf_media (reg,
- sh_compare_op0, sh_compare_op1));
- break;
-
- case DFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpeqdf_media (operands[0],
-+ emit_insn (gen_cmpeqdf_media (reg,
- sh_compare_op0, sh_compare_op1));
- break;
-
- default:
- FAIL;
- }
-+
-+ if (GET_MODE (operands[0]) == DImode)
-+ emit_insn (gen_extendsidi2 (operands[0], reg));
-+
- DONE;
- }
- if (sh_expand_t_scc (EQ, operands[0]))
-@@ -9204,8 +9173,8 @@
- {
- if (TARGET_SHMEDIA)
- {
-- if (GET_MODE (operands[0]) != DImode)
-- operands[0] = gen_rtx_SUBREG (DImode, operands[0], 0);
-+ rtx reg;
-+
- sh_compare_op0 = force_reg (GET_MODE (sh_compare_op0), sh_compare_op0);
- if (sh_compare_op1 != const0_rtx)
- sh_compare_op1 = force_reg (GET_MODE (sh_compare_op1) == VOIDmode
-@@ -9213,35 +9182,44 @@
- : GET_MODE (sh_compare_op1),
- sh_compare_op1);
-
-+ reg = operands[0];
-+ if (GET_MODE (operands[0]) != SImode)
-+ reg = no_new_pseudos ? gen_rtx_SUBREG (SImode, operands[0], 0)
-+ : gen_reg_rtx (SImode);
-+
- switch (GET_MODE (sh_compare_op0))
- {
- case SImode:
-- emit_insn (gen_cmpgtsi_media (operands[0],
-+ emit_insn (gen_cmpgtsi_media (reg,
- sh_compare_op1, sh_compare_op0));
- break;
-
- case DImode:
-- emit_insn (gen_cmpgtdi_media (operands[0],
-+ emit_insn (gen_cmpgtdi_media (reg,
- sh_compare_op1, sh_compare_op0));
- break;
-
- case SFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpgtsf_media (operands[0],
-+ emit_insn (gen_cmpgtsf_media (reg,
- sh_compare_op1, sh_compare_op0));
- break;
-
- case DFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpgtdf_media (operands[0],
-+ emit_insn (gen_cmpgtdf_media (reg,
- sh_compare_op1, sh_compare_op0));
- break;
-
- default:
- FAIL;
- }
-+
-+ if (GET_MODE (operands[0]) == DImode)
-+ emit_insn (gen_extendsidi2 (operands[0], reg));
-+
- DONE;
- }
- if (! currently_expanding_to_rtl)
-@@ -9258,8 +9236,8 @@
-
- if (TARGET_SHMEDIA)
- {
-- if (GET_MODE (operands[0]) != DImode)
-- operands[0] = gen_rtx_SUBREG (DImode, operands[0], 0);
-+ rtx reg;
-+
- sh_compare_op0 = force_reg (GET_MODE (sh_compare_op0), sh_compare_op0);
- if (sh_compare_op1 != const0_rtx)
- sh_compare_op1 = force_reg (GET_MODE (sh_compare_op1) == VOIDmode
-@@ -9267,45 +9245,54 @@
- : GET_MODE (sh_compare_op1),
- sh_compare_op1);
-
-+ reg = operands[0];
-+ if (GET_MODE (operands[0]) != SImode)
-+ reg = no_new_pseudos ? gen_rtx_SUBREG (SImode, operands[0], 0)
-+ : gen_reg_rtx (SImode);
-+
- switch (GET_MODE (sh_compare_op0))
- {
- case SImode:
- {
-- tmp = no_new_pseudos ? operands[0] : gen_reg_rtx (DImode);
-+ tmp = no_new_pseudos ? reg : gen_reg_rtx (SImode);
-
- emit_insn (gen_cmpgtsi_media (tmp,
- sh_compare_op0, sh_compare_op1));
-- emit_insn (gen_cmpeqdi_media (operands[0], tmp, const0_rtx));
-+ emit_insn (gen_cmpeqdi_media (reg, tmp, const0_rtx));
- break;
- }
-
- case DImode:
- {
-- tmp = no_new_pseudos ? operands[0] : gen_reg_rtx (DImode);
-+ tmp = no_new_pseudos ? reg : gen_reg_rtx (SImode);
-
- emit_insn (gen_cmpgtdi_media (tmp,
- sh_compare_op0, sh_compare_op1));
-- emit_insn (gen_cmpeqdi_media (operands[0], tmp, const0_rtx));
-+ emit_insn (gen_cmpeqdi_media (reg, tmp, const0_rtx));
- break;
- }
-
- case SFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpgesf_media (operands[0],
-+ emit_insn (gen_cmpgesf_media (reg,
- sh_compare_op1, sh_compare_op0));
- break;
-
- case DFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpgedf_media (operands[0],
-+ emit_insn (gen_cmpgedf_media (reg,
- sh_compare_op1, sh_compare_op0));
- break;
-
- default:
- FAIL;
- }
-+
-+ if (GET_MODE (operands[0]) == DImode)
-+ emit_insn (gen_extendsidi2 (operands[0], reg));
-+
- DONE;
- }
-
-@@ -9323,8 +9310,12 @@
- {
- if (TARGET_SHMEDIA)
- {
-- if (GET_MODE (operands[0]) != DImode)
-- operands[0] = gen_rtx_SUBREG (DImode, operands[0], 0);
-+ rtx reg;
-+
-+ reg = operands[0];
-+ if (GET_MODE (operands[0]) != SImode)
-+ reg = no_new_pseudos ? gen_rtx_SUBREG (SImode, operands[0], 0)
-+ : gen_reg_rtx (SImode);
- sh_compare_op0 = force_reg (GET_MODE (sh_compare_op0), sh_compare_op0);
- if (sh_compare_op1 != const0_rtx)
- sh_compare_op1 = force_reg (GET_MODE (sh_compare_op1) == VOIDmode
-@@ -9335,32 +9326,36 @@
- switch (GET_MODE (sh_compare_op0))
- {
- case SImode:
-- emit_insn (gen_cmpgtsi_media (operands[0],
-+ emit_insn (gen_cmpgtsi_media (reg,
- sh_compare_op0, sh_compare_op1));
- break;
-
- case DImode:
-- emit_insn (gen_cmpgtdi_media (operands[0],
-+ emit_insn (gen_cmpgtdi_media (reg,
- sh_compare_op0, sh_compare_op1));
- break;
-
- case SFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpgtsf_media (operands[0],
-+ emit_insn (gen_cmpgtsf_media (reg,
- sh_compare_op0, sh_compare_op1));
- break;
-
- case DFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpgtdf_media (operands[0],
-+ emit_insn (gen_cmpgtdf_media (reg,
- sh_compare_op0, sh_compare_op1));
- break;
-
- default:
- FAIL;
- }
-+
-+ if (GET_MODE (operands[0]) == DImode)
-+ emit_insn (gen_extendsidi2 (operands[0], reg));
-+
- DONE;
- }
- if (! currently_expanding_to_rtl)
-@@ -9376,12 +9371,15 @@
- {
- if (TARGET_SHMEDIA)
- {
-+ rtx reg;
- enum machine_mode mode = GET_MODE (sh_compare_op0);
-
- if ((mode) == VOIDmode)
- mode = GET_MODE (sh_compare_op1);
-- if (GET_MODE (operands[0]) != DImode)
-- operands[0] = gen_rtx_SUBREG (DImode, operands[0], 0);
-+ reg = operands[0];
-+ if (GET_MODE (operands[0]) != SImode)
-+ reg = no_new_pseudos ? gen_rtx_SUBREG (SImode, operands[0], 0)
-+ : gen_reg_rtx (SImode);
- sh_compare_op0 = force_reg (mode, sh_compare_op0);
- if (sh_compare_op1 != const0_rtx)
- sh_compare_op1 = force_reg (mode, sh_compare_op1);
-@@ -9390,41 +9388,45 @@
- {
- case SImode:
- {
-- rtx tmp = no_new_pseudos ? operands[0] : gen_reg_rtx (DImode);
-+ rtx tmp = no_new_pseudos ? reg : gen_reg_rtx (SImode);
-
- emit_insn (gen_cmpgtsi_media (tmp,
- sh_compare_op1, sh_compare_op0));
-- emit_insn (gen_cmpeqdi_media (operands[0], tmp, const0_rtx));
-+ emit_insn (gen_cmpeqdi_media (reg, tmp, const0_rtx));
- break;
- }
-
- case DImode:
- {
-- rtx tmp = no_new_pseudos ? operands[0] : gen_reg_rtx (DImode);
-+ rtx tmp = no_new_pseudos ? reg : gen_reg_rtx (SImode);
-
- emit_insn (gen_cmpgtdi_media (tmp,
- sh_compare_op1, sh_compare_op0));
-- emit_insn (gen_cmpeqdi_media (operands[0], tmp, const0_rtx));
-+ emit_insn (gen_cmpeqdi_media (reg, tmp, const0_rtx));
- break;
- }
-
- case SFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpgesf_media (operands[0],
-+ emit_insn (gen_cmpgesf_media (reg,
- sh_compare_op0, sh_compare_op1));
- break;
-
- case DFmode:
- if (! TARGET_SHMEDIA_FPU)
- FAIL;
-- emit_insn (gen_cmpgedf_media (operands[0],
-+ emit_insn (gen_cmpgedf_media (reg,
- sh_compare_op0, sh_compare_op1));
- break;
-
- default:
- FAIL;
- }
-+
-+ if (GET_MODE (operands[0]) == DImode)
-+ emit_insn (gen_extendsidi2 (operands[0], reg));
-+
- DONE;
- }
-
-@@ -9456,8 +9458,12 @@
- {
- if (TARGET_SHMEDIA)
- {
-- if (GET_MODE (operands[0]) != DImode)
-- operands[0] = gen_rtx_SUBREG (DImode, operands[0], 0);
-+ rtx reg;
-+
-+ reg = operands[0];
-+ if (GET_MODE (operands[0]) == DImode)
-+ reg = no_new_pseudos ? gen_rtx_SUBREG (SImode, operands[0], 0)
-+ : gen_reg_rtx (SImode);
- sh_compare_op0 = force_reg (GET_MODE (sh_compare_op0), sh_compare_op0);
- if (sh_compare_op1 != const0_rtx)
- sh_compare_op1 = force_reg (GET_MODE (sh_compare_op1) == VOIDmode
-@@ -9465,8 +9471,11 @@
- : GET_MODE (sh_compare_op1),
- sh_compare_op1);
-
-- emit_insn (gen_cmpgtudi_media (operands[0],
-+ emit_insn (gen_cmpgtudi_media (reg,
- sh_compare_op0, sh_compare_op1));
-+ if (GET_MODE (operands[0]) == DImode)
-+ emit_insn (gen_extendsidi2 (operands[0], reg));
-+
- DONE;
- }
- if (! currently_expanding_to_rtl)
-@@ -9482,8 +9491,12 @@
- {
- if (TARGET_SHMEDIA)
- {
-- if (GET_MODE (operands[0]) != DImode)
-- operands[0] = gen_rtx_SUBREG (DImode, operands[0], 0);
-+ rtx reg;
-+
-+ reg = operands[0];
-+ if (GET_MODE (operands[0]) == DImode)
-+ reg = no_new_pseudos ? gen_rtx_SUBREG (SImode, operands[0], 0)
-+ : gen_reg_rtx (SImode);
- sh_compare_op0 = force_reg (GET_MODE (sh_compare_op0), sh_compare_op0);
- if (sh_compare_op1 != const0_rtx)
- sh_compare_op1 = force_reg (GET_MODE (sh_compare_op1) == VOIDmode
-@@ -9491,8 +9504,11 @@
- : GET_MODE (sh_compare_op1),
- sh_compare_op1);
-
-- emit_insn (gen_cmpgtudi_media (operands[0],
-+ emit_insn (gen_cmpgtudi_media (reg,
- sh_compare_op1, sh_compare_op0));
-+ if (GET_MODE (operands[0]) == DImode)
-+ emit_insn (gen_extendsidi2 (operands[0], reg));
-+
- DONE;
- }
- if (! currently_expanding_to_rtl)
-@@ -9508,10 +9524,12 @@
- {
- if (TARGET_SHMEDIA)
- {
-- rtx tmp;
-+ rtx tmp, reg;
-
-- if (GET_MODE (operands[0]) != DImode)
-- operands[0] = gen_rtx_SUBREG (DImode, operands[0], 0);
-+ reg = operands[0];
-+ if (GET_MODE (operands[0]) != SImode)
-+ reg = no_new_pseudos ? gen_rtx_SUBREG (SImode, operands[0], 0)
-+ : gen_reg_rtx (SImode);
- sh_compare_op0 = force_reg (GET_MODE (sh_compare_op0), sh_compare_op0);
- if (sh_compare_op1 != const0_rtx)
- sh_compare_op1 = force_reg (GET_MODE (sh_compare_op1) == VOIDmode
-@@ -9519,10 +9537,12 @@
- : GET_MODE (sh_compare_op1),
- sh_compare_op1);
-
-- tmp = no_new_pseudos ? operands[0] : gen_reg_rtx (DImode);
-+ tmp = no_new_pseudos ? reg : gen_reg_rtx (SImode);
-
- emit_insn (gen_cmpgtudi_media (tmp, sh_compare_op0, sh_compare_op1));
-- emit_insn (gen_cmpeqdi_media (operands[0], tmp, const0_rtx));
-+ emit_insn (gen_cmpeqdi_media (reg, tmp, const0_rtx));
-+ if (GET_MODE (operands[0]) == DImode)
-+ emit_insn (gen_extendsidi2 (operands[0], reg));
-
- DONE;
- }
-@@ -9539,10 +9559,12 @@
- {
- if (TARGET_SHMEDIA)
- {
-- rtx tmp;
-+ rtx tmp, reg;
-
-- if (GET_MODE (operands[0]) != DImode)
-- operands[0] = gen_rtx_SUBREG (DImode, operands[0], 0);
-+ reg = operands[0];
-+ if (GET_MODE (operands[0]) != SImode)
-+ reg = no_new_pseudos ? gen_rtx_SUBREG (SImode, operands[0], 0)
-+ : gen_reg_rtx (SImode);
- sh_compare_op0 = force_reg (GET_MODE (sh_compare_op0), sh_compare_op0);
- if (sh_compare_op1 != const0_rtx)
- sh_compare_op1 = force_reg (GET_MODE (sh_compare_op1) == VOIDmode
-@@ -9550,10 +9572,12 @@
- : GET_MODE (sh_compare_op1),
- sh_compare_op1);
-
-- tmp = no_new_pseudos ? operands[0] : gen_reg_rtx (DImode);
-+ tmp = no_new_pseudos ? operands[0] : gen_reg_rtx (SImode);
-
- emit_insn (gen_cmpgtudi_media (tmp, sh_compare_op1, sh_compare_op0));
-- emit_insn (gen_cmpeqdi_media (operands[0], tmp, const0_rtx));
-+ emit_insn (gen_cmpeqdi_media (reg, tmp, const0_rtx));
-+ if (GET_MODE (operands[0]) == DImode)
-+ emit_insn (gen_extendsidi2 (operands[0], reg));
-
- DONE;
- }
-@@ -9584,11 +9608,12 @@
- {
- if (TARGET_SHMEDIA)
- {
-- rtx tmp;
-+ rtx tmp, reg;
-
-- if (GET_MODE (operands[0]) != DImode)
-- operands[0] = gen_rtx_SUBREG (DImode, operands[0], 0);
--
-+ reg = operands[0];
-+ if (GET_MODE (operands[0]) != SImode)
-+ reg = no_new_pseudos ? gen_rtx_SUBREG (SImode, operands[0], 0)
-+ : gen_reg_rtx (SImode);
- if (! TARGET_SHMEDIA_FPU
- && GET_MODE (sh_compare_op0) != DImode
- && GET_MODE (sh_compare_op0) != SImode)
-@@ -9601,10 +9626,12 @@
- : GET_MODE (sh_compare_op1),
- sh_compare_op1);
-
-- tmp = no_new_pseudos ? operands[0] : gen_reg_rtx (DImode);
-+ tmp = no_new_pseudos ? reg : gen_reg_rtx (SImode);
-
- emit_insn (gen_seq (tmp));
-- emit_insn (gen_cmpeqdi_media (operands[0], tmp, const0_rtx));
-+ emit_insn (gen_cmpeqdi_media (reg, tmp, const0_rtx));
-+ if (GET_MODE (operands[0]) == DImode)
-+ emit_insn (gen_extendsidi2 (operands[0], reg));
-
- DONE;
- }
-@@ -9618,8 +9645,8 @@
- }")
-
- (define_expand "sunordered"
-- [(set (match_operand:DI 0 "arith_reg_operand" "")
-- (unordered:DI (match_dup 1) (match_dup 2)))]
-+ [(set (match_operand:SI 0 "arith_reg_operand" "")
-+ (unordered:SI (match_dup 1) (match_dup 2)))]
- "TARGET_SHMEDIA_FPU"
- "
- {
-@@ -10378,14 +10405,6 @@
- (set_attr "fp_mode" "single")])
-
- (define_insn "cmpeqsf_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (eq:DI (match_operand:SF 1 "fp_arith_reg_operand" "f")
-- (match_operand:SF 2 "fp_arith_reg_operand" "f")))]
-- "TARGET_SHMEDIA_FPU"
-- "fcmpeq.s %1, %2, %0"
-- [(set_attr "type" "fcmp_media")])
--
--(define_insn "cmpsieqsf_media"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (eq:SI (match_operand:SF 1 "fp_arith_reg_operand" "f")
- (match_operand:SF 2 "fp_arith_reg_operand" "f")))]
-@@ -10394,24 +10413,24 @@
- [(set_attr "type" "fcmp_media")])
-
- (define_insn "cmpgtsf_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (gt:DI (match_operand:SF 1 "fp_arith_reg_operand" "f")
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (gt:SI (match_operand:SF 1 "fp_arith_reg_operand" "f")
- (match_operand:SF 2 "fp_arith_reg_operand" "f")))]
- "TARGET_SHMEDIA_FPU"
- "fcmpgt.s %1, %2, %0"
- [(set_attr "type" "fcmp_media")])
-
- (define_insn "cmpgesf_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (ge:DI (match_operand:SF 1 "fp_arith_reg_operand" "f")
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (ge:SI (match_operand:SF 1 "fp_arith_reg_operand" "f")
- (match_operand:SF 2 "fp_arith_reg_operand" "f")))]
- "TARGET_SHMEDIA_FPU"
- "fcmpge.s %1, %2, %0"
- [(set_attr "type" "fcmp_media")])
-
- (define_insn "cmpunsf_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (unordered:DI (match_operand:SF 1 "fp_arith_reg_operand" "f")
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unordered:SI (match_operand:SF 1 "fp_arith_reg_operand" "f")
- (match_operand:SF 2 "fp_arith_reg_operand" "f")))]
- "TARGET_SHMEDIA_FPU"
- "fcmpun.s %1, %2, %0"
-@@ -10884,14 +10903,6 @@
- (set_attr "fp_mode" "double")])
-
- (define_insn "cmpeqdf_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (eq:DI (match_operand:DF 1 "fp_arith_reg_operand" "f")
-- (match_operand:DF 2 "fp_arith_reg_operand" "f")))]
-- "TARGET_SHMEDIA_FPU"
-- "fcmpeq.d %1,%2,%0"
-- [(set_attr "type" "fcmp_media")])
--
--(define_insn "cmpsieqdf_media"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (eq:SI (match_operand:DF 1 "fp_arith_reg_operand" "f")
- (match_operand:DF 2 "fp_arith_reg_operand" "f")))]
-@@ -10900,24 +10911,24 @@
- [(set_attr "type" "fcmp_media")])
-
- (define_insn "cmpgtdf_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (gt:DI (match_operand:DF 1 "fp_arith_reg_operand" "f")
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (gt:SI (match_operand:DF 1 "fp_arith_reg_operand" "f")
- (match_operand:DF 2 "fp_arith_reg_operand" "f")))]
- "TARGET_SHMEDIA_FPU"
- "fcmpgt.d %1,%2,%0"
- [(set_attr "type" "fcmp_media")])
-
- (define_insn "cmpgedf_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (ge:DI (match_operand:DF 1 "fp_arith_reg_operand" "f")
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (ge:SI (match_operand:DF 1 "fp_arith_reg_operand" "f")
- (match_operand:DF 2 "fp_arith_reg_operand" "f")))]
- "TARGET_SHMEDIA_FPU"
- "fcmpge.d %1,%2,%0"
- [(set_attr "type" "fcmp_media")])
-
- (define_insn "cmpundf_media"
-- [(set (match_operand:DI 0 "register_operand" "=r")
-- (unordered:DI (match_operand:DF 1 "fp_arith_reg_operand" "f")
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unordered:SI (match_operand:DF 1 "fp_arith_reg_operand" "f")
- (match_operand:DF 2 "fp_arith_reg_operand" "f")))]
- "TARGET_SHMEDIA_FPU"
- "fcmpun.d %1,%2,%0"
-Index: gcc/config/score/predicates.md
-===================================================================
---- gcc/config/score/predicates.md (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/score/predicates.md (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -75,14 +75,3 @@
- return IMM_IN_RANGE (INTVAL (op), 15, 1);
- })
-
--(define_predicate "const_pow2"
-- (match_code "const_int")
--{
-- return IMM_IS_POW_OF_2 ((unsigned HOST_WIDE_INT) INTVAL (op), 0, 31);
--})
--
--(define_predicate "const_npow2"
-- (match_code "const_int")
--{
-- return IMM_IS_POW_OF_2 (~(unsigned HOST_WIDE_INT) INTVAL (op), 0, 31);
--})
-Index: gcc/config/score/misc.md
-===================================================================
---- gcc/config/score/misc.md (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/score/misc.md (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -380,38 +380,3 @@
- [(set_attr "type" "arith")
- (set_attr "mode" "SI")])
-
--(define_insn "bitclr_c"
-- [(set (match_operand:SI 0 "register_operand" "=e,d")
-- (and:SI (match_operand:SI 1 "register_operand" "0,d")
-- (match_operand:SI 2 "const_npow2")))
-- (clobber (reg:CC CC_REGNUM))]
-- ""
-- "@
-- bitclr! %0, %F2
-- bitclr.c %0, %1, %F2"
-- [(set_attr "type" "arith")
-- (set_attr "mode" "SI")])
--
--(define_insn "bitset_c"
-- [(set (match_operand:SI 0 "register_operand" "=e,d")
-- (ior:SI (match_operand:SI 1 "register_operand" "0,d")
-- (match_operand:SI 2 "const_pow2")))
-- (clobber (reg:CC CC_REGNUM))]
-- ""
-- "@
-- bitset! %0, %E2
-- bitset.c %0, %1, %E2"
-- [(set_attr "type" "arith")
-- (set_attr "mode" "SI")])
--
--(define_insn "bittgl_c"
-- [(set (match_operand:SI 0 "register_operand" "=e,d")
-- (xor:SI (match_operand:SI 1 "register_operand" "0,d")
-- (match_operand:SI 2 "const_pow2")))
-- (clobber (reg:CC CC_REGNUM))]
-- ""
-- "@
-- bittgl! %0, %E2
-- bittgl.c %0, %1, %E2"
-- [(set_attr "type" "arith")
-- (set_attr "mode" "SI")])
-Index: gcc/config/score/score.c
-===================================================================
---- gcc/config/score/score.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/score/score.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1168,7 +1168,7 @@
- {
- gcc_assert (code == CONST_INT);
- fprintf (file, HOST_WIDE_INT_PRINT_HEX,
-- (unsigned HOST_WIDE_INT) INTVAL (op) >> 16);
-+ (INTVAL (op) >> 16) & 0xffff);
- }
- else if (c == 'D')
- {
-@@ -1176,7 +1176,7 @@
- {
- rtx temp = gen_lowpart (SImode, op);
- gcc_assert (GET_MODE (op) == SFmode);
-- fprintf (file, HOST_WIDE_INT_PRINT_HEX, INTVAL (temp));
-+ fprintf (file, HOST_WIDE_INT_PRINT_HEX, INTVAL (temp) & 0xffffffff);
- }
- else
- output_addr_const (file, op);
-Index: gcc/config/score/score.h
-===================================================================
---- gcc/config/score/score.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/score/score.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -785,6 +785,7 @@
- output anything and let undefined symbol become external. However
- the assembler uses length information on externals to allocate in
- data/sdata bss/sbss, thereby saving exec time. */
-+#undef ASM_OUTPUT_EXTERNAL
- #define ASM_OUTPUT_EXTERNAL(STREAM, DECL, NAME) \
- score_output_external (STREAM, DECL, NAME)
-
-Index: gcc/config/pa/pa.md
-===================================================================
---- gcc/config/pa/pa.md (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/pa/pa.md (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -39,6 +39,9 @@
- (UNSPEC_TLSLDBASE 7)
- (UNSPEC_TLSIE 8)
- (UNSPEC_TLSLE 9)
-+ (UNSPEC_TLSGD_PIC 10)
-+ (UNSPEC_TLSLDM_PIC 11)
-+ (UNSPEC_TLSIE_PIC 12)
- ])
-
- ;; UNSPEC_VOLATILE:
-@@ -9890,33 +9893,55 @@
- (define_insn "tgd_load"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (unspec:SI [(match_operand 1 "tgd_symbolic_operand" "")] UNSPEC_TLSGD))
-- (clobber (reg:SI 1))]
-+ (clobber (reg:SI 1))
-+ (use (reg:SI 27))]
- ""
- "*
- {
-- if (flag_pic)
-- return \"addil LT'%1-$tls_gdidx$,%%r19\;ldo RT'%1-$tls_gdidx$(%%r1),%0\";
-- else
-- return \"addil LR'%1-$tls_gdidx$,%%r27\;ldo RR'%1-$tls_gdidx$(%%r1),%0\";
-+ return \"addil LR'%1-$tls_gdidx$,%%r27\;ldo RR'%1-$tls_gdidx$(%%r1),%0\";
- }"
- [(set_attr "type" "multi")
- (set_attr "length" "8")])
-
-+(define_insn "tgd_load_pic"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec:SI [(match_operand 1 "tgd_symbolic_operand" "")] UNSPEC_TLSGD_PIC))
-+ (clobber (reg:SI 1))
-+ (use (reg:SI 19))]
-+ ""
-+ "*
-+{
-+ return \"addil LT'%1-$tls_gdidx$,%%r19\;ldo RT'%1-$tls_gdidx$(%%r1),%0\";
-+}"
-+ [(set_attr "type" "multi")
-+ (set_attr "length" "8")])
-+
- (define_insn "tld_load"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (unspec:SI [(match_operand 1 "tld_symbolic_operand" "")] UNSPEC_TLSLDM))
-- (clobber (reg:SI 1))]
-+ (clobber (reg:SI 1))
-+ (use (reg:SI 27))]
- ""
- "*
- {
-- if (flag_pic)
-- return \"addil LT'%1-$tls_ldidx$,%%r19\;ldo RT'%1-$tls_ldidx$(%%r1),%0\";
-- else
-- return \"addil LR'%1-$tls_ldidx$,%%r27\;ldo RR'%1-$tls_ldidx$(%%r1),%0\";
-+ return \"addil LR'%1-$tls_ldidx$,%%r27\;ldo RR'%1-$tls_ldidx$(%%r1),%0\";
- }"
- [(set_attr "type" "multi")
- (set_attr "length" "8")])
-
-+(define_insn "tld_load_pic"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec:SI [(match_operand 1 "tld_symbolic_operand" "")] UNSPEC_TLSLDM_PIC))
-+ (clobber (reg:SI 1))
-+ (use (reg:SI 19))]
-+ ""
-+ "*
-+{
-+ return \"addil LT'%1-$tls_ldidx$,%%r19\;ldo RT'%1-$tls_ldidx$(%%r1),%0\";
-+}"
-+ [(set_attr "type" "multi")
-+ (set_attr "length" "8")])
-+
- (define_insn "tld_offset_load"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (plus:SI (unspec:SI [(match_operand 1 "tld_symbolic_operand" "")]
-@@ -9942,18 +9967,29 @@
- (define_insn "tie_load"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (unspec:SI [(match_operand 1 "tie_symbolic_operand" "")] UNSPEC_TLSIE))
-- (clobber (reg:SI 1))]
-+ (clobber (reg:SI 1))
-+ (use (reg:SI 27))]
- ""
- "*
- {
-- if (flag_pic)
-- return \"addil LT'%1-$tls_ieoff$,%%r19\;ldw RT'%1-$tls_ieoff$(%%r1),%0\";
-- else
-- return \"addil LR'%1-$tls_ieoff$,%%r27\;ldw RR'%1-$tls_ieoff$(%%r1),%0\";
-+ return \"addil LR'%1-$tls_ieoff$,%%r27\;ldw RR'%1-$tls_ieoff$(%%r1),%0\";
- }"
- [(set_attr "type" "multi")
- (set_attr "length" "8")])
-
-+(define_insn "tie_load_pic"
-+ [(set (match_operand:SI 0 "register_operand" "=r")
-+ (unspec:SI [(match_operand 1 "tie_symbolic_operand" "")] UNSPEC_TLSIE_PIC))
-+ (clobber (reg:SI 1))
-+ (use (reg:SI 19))]
-+ ""
-+ "*
-+{
-+ return \"addil LT'%1-$tls_ieoff$,%%r19\;ldw RT'%1-$tls_ieoff$(%%r1),%0\";
-+}"
-+ [(set_attr "type" "multi")
-+ (set_attr "length" "8")])
-+
- (define_insn "tle_load"
- [(set (match_operand:SI 0 "register_operand" "=r")
- (plus:SI (unspec:SI [(match_operand 1 "tle_symbolic_operand" "")]
-Index: gcc/config/pa/pa.c
-===================================================================
---- gcc/config/pa/pa.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/pa/pa.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -726,7 +726,10 @@
- {
- case TLS_MODEL_GLOBAL_DYNAMIC:
- tmp = gen_reg_rtx (Pmode);
-- emit_insn (gen_tgd_load (tmp, addr));
-+ if (flag_pic)
-+ emit_insn (gen_tgd_load_pic (tmp, addr));
-+ else
-+ emit_insn (gen_tgd_load (tmp, addr));
- ret = hppa_tls_call (tmp);
- break;
-
-@@ -734,7 +737,10 @@
- ret = gen_reg_rtx (Pmode);
- tmp = gen_reg_rtx (Pmode);
- start_sequence ();
-- emit_insn (gen_tld_load (tmp, addr));
-+ if (flag_pic)
-+ emit_insn (gen_tld_load_pic (tmp, addr));
-+ else
-+ emit_insn (gen_tld_load (tmp, addr));
- t1 = hppa_tls_call (tmp);
- insn = get_insns ();
- end_sequence ();
-@@ -750,7 +756,10 @@
- tmp = gen_reg_rtx (Pmode);
- ret = gen_reg_rtx (Pmode);
- emit_insn (gen_tp_load (tp));
-- emit_insn (gen_tie_load (tmp, addr));
-+ if (flag_pic)
-+ emit_insn (gen_tie_load_pic (tmp, addr));
-+ else
-+ emit_insn (gen_tie_load (tmp, addr));
- emit_move_insn (ret, gen_rtx_PLUS (Pmode, tp, tmp));
- break;
-
-Index: gcc/config/soft-fp/quad.h
-===================================================================
---- gcc/config/soft-fp/quad.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/soft-fp/quad.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,6 +1,6 @@
- /* Software floating-point emulation.
- Definitions for IEEE Quad Precision.
-- Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
-+ Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Richard Henderson (rth@cygnus.com),
- Jakub Jelinek (jj@ultra.linux.cz),
-@@ -176,15 +176,15 @@
- } longs;
- struct {
- #if __BYTE_ORDER == __BIG_ENDIAN
-- unsigned sign : 1;
-- unsigned exp : _FP_EXPBITS_Q;
-- unsigned long frac1 : _FP_FRACBITS_Q-(_FP_IMPLBIT_Q != 0)-_FP_W_TYPE_SIZE;
-- unsigned long frac0 : _FP_W_TYPE_SIZE;
-+ unsigned sign : 1;
-+ unsigned exp : _FP_EXPBITS_Q;
-+ _FP_W_TYPE frac1 : _FP_FRACBITS_Q - (_FP_IMPLBIT_Q != 0) - _FP_W_TYPE_SIZE;
-+ _FP_W_TYPE frac0 : _FP_W_TYPE_SIZE;
- #else
-- unsigned long frac0 : _FP_W_TYPE_SIZE;
-- unsigned long frac1 : _FP_FRACBITS_Q-(_FP_IMPLBIT_Q != 0)-_FP_W_TYPE_SIZE;
-- unsigned exp : _FP_EXPBITS_Q;
-- unsigned sign : 1;
-+ _FP_W_TYPE frac0 : _FP_W_TYPE_SIZE;
-+ _FP_W_TYPE frac1 : _FP_FRACBITS_Q - (_FP_IMPLBIT_Q != 0) - _FP_W_TYPE_SIZE;
-+ unsigned exp : _FP_EXPBITS_Q;
-+ unsigned sign : 1;
- #endif
- } bits;
- };
-Index: gcc/config/soft-fp/floatunsidf.c
-===================================================================
---- gcc/config/soft-fp/floatunsidf.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/soft-fp/floatunsidf.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,6 +1,6 @@
- /* Software floating-point emulation.
- Convert a 32bit unsigned integer to IEEE double
-- Copyright (C) 1997,1999, 2006 Free Software Foundation, Inc.
-+ Copyright (C) 1997, 1999, 2006, 2007 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Richard Henderson (rth@cygnus.com) and
- Jakub Jelinek (jj@ultra.linux.cz).
-@@ -32,8 +32,7 @@
- #include "soft-fp.h"
- #include "double.h"
-
--double
--__floatunsidf(USItype i)
-+DFtype __floatunsidf(USItype i)
- {
- FP_DECL_EX;
- FP_DECL_D(A);
-Index: gcc/config/soft-fp/floatundidf.c
-===================================================================
---- gcc/config/soft-fp/floatundidf.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/soft-fp/floatundidf.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,6 +1,6 @@
- /* Software floating-point emulation.
- Convert a 64bit unsigned integer to IEEE double
-- Copyright (C) 1997,1999, 2006 Free Software Foundation, Inc.
-+ Copyright (C) 1997, 1999, 2006, 2007 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Richard Henderson (rth@cygnus.com) and
- Jakub Jelinek (jj@ultra.linux.cz).
-@@ -32,8 +32,7 @@
- #include "soft-fp.h"
- #include "double.h"
-
--double
--__floatundidf(UDItype i)
-+DFtype __floatundidf(UDItype i)
- {
- FP_DECL_EX;
- FP_DECL_D(A);
-Index: gcc/config/soft-fp/extended.h
-===================================================================
---- gcc/config/soft-fp/extended.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/soft-fp/extended.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,6 +1,6 @@
- /* Software floating-point emulation.
- Definitions for IEEE Extended Precision.
-- Copyright (C) 1999,2006 Free Software Foundation, Inc.
-+ Copyright (C) 1999,2006,2007 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Jakub Jelinek (jj@ultra.linux.cz).
-
-@@ -94,12 +94,6 @@
- X##_f[1] = _flo.bits.frac1; \
- X##_e = _flo.bits.exp; \
- X##_s = _flo.bits.sign; \
-- if (!X##_e && (X##_f[1] || X##_f[0]) \
-- && !(X##_f[1] & _FP_IMPLBIT_E)) \
-- { \
-- X##_e++; \
-- FP_SET_EXCEPTION(FP_EX_DENORM); \
-- } \
- } while (0)
-
- #define FP_UNPACK_RAW_EP(X, val) \
-@@ -112,12 +106,6 @@
- X##_f[1] = _flo->bits.frac1; \
- X##_e = _flo->bits.exp; \
- X##_s = _flo->bits.sign; \
-- if (!X##_e && (X##_f[1] || X##_f[0]) \
-- && !(X##_f[1] & _FP_IMPLBIT_E)) \
-- { \
-- X##_e++; \
-- FP_SET_EXCEPTION(FP_EX_DENORM); \
-- } \
- } while (0)
-
- #define FP_PACK_RAW_E(val, X) \
-@@ -164,13 +152,13 @@
-
- #define FP_UNPACK_SEMIRAW_E(X,val) \
- do { \
-- _FP_UNPACK_RAW_E(X,val); \
-+ FP_UNPACK_RAW_E(X,val); \
- _FP_UNPACK_SEMIRAW(E,4,X); \
- } while (0)
-
- #define FP_UNPACK_SEMIRAW_EP(X,val) \
- do { \
-- _FP_UNPACK_RAW_EP(X,val); \
-+ FP_UNPACK_RAW_EP(X,val); \
- _FP_UNPACK_SEMIRAW(E,4,X); \
- } while (0)
-
-@@ -189,13 +177,13 @@
- #define FP_PACK_SEMIRAW_E(val,X) \
- do { \
- _FP_PACK_SEMIRAW(E,4,X); \
-- _FP_PACK_RAW_E(val,X); \
-+ FP_PACK_RAW_E(val,X); \
- } while (0)
-
- #define FP_PACK_SEMIRAW_EP(val,X) \
- do { \
- _FP_PACK_SEMIRAW(E,4,X); \
-- _FP_PACK_RAW_EP(val,X); \
-+ FP_PACK_RAW_EP(val,X); \
- } while (0)
-
- #define FP_ISSIGNAN_E(X) _FP_ISSIGNAN(E,4,X)
-@@ -277,14 +265,14 @@
- XFtype flt;
- struct {
- #if __BYTE_ORDER == __BIG_ENDIAN
-- unsigned long pad : (_FP_W_TYPE_SIZE - 1 - _FP_EXPBITS_E);
-- unsigned sign : 1;
-- unsigned exp : _FP_EXPBITS_E;
-- unsigned long frac : _FP_W_TYPE_SIZE;
-+ _FP_W_TYPE pad : (_FP_W_TYPE_SIZE - 1 - _FP_EXPBITS_E);
-+ unsigned sign : 1;
-+ unsigned exp : _FP_EXPBITS_E;
-+ _FP_W_TYPE frac : _FP_W_TYPE_SIZE;
- #else
-- unsigned long frac : _FP_W_TYPE_SIZE;
-- unsigned exp : _FP_EXPBITS_E;
-- unsigned sign : 1;
-+ _FP_W_TYPE frac : _FP_W_TYPE_SIZE;
-+ unsigned exp : _FP_EXPBITS_E;
-+ unsigned sign : 1;
- #endif
- } bits;
- };
-@@ -299,11 +287,6 @@
- X##_f1 = 0; \
- X##_e = _flo.bits.exp; \
- X##_s = _flo.bits.sign; \
-- if (!X##_e && X##_f0 && !(X##_f0 & _FP_IMPLBIT_E)) \
-- { \
-- X##_e++; \
-- FP_SET_EXCEPTION(FP_EX_DENORM); \
-- } \
- } while (0)
-
- #define FP_UNPACK_RAW_EP(X, val) \
-@@ -315,11 +298,6 @@
- X##_f1 = 0; \
- X##_e = _flo->bits.exp; \
- X##_s = _flo->bits.sign; \
-- if (!X##_e && X##_f0 && !(X##_f0 & _FP_IMPLBIT_E)) \
-- { \
-- X##_e++; \
-- FP_SET_EXCEPTION(FP_EX_DENORM); \
-- } \
- } while (0)
-
- #define FP_PACK_RAW_E(val, X) \
-@@ -365,13 +343,13 @@
-
- #define FP_UNPACK_SEMIRAW_E(X,val) \
- do { \
-- _FP_UNPACK_RAW_E(X,val); \
-+ FP_UNPACK_RAW_E(X,val); \
- _FP_UNPACK_SEMIRAW(E,2,X); \
- } while (0)
-
- #define FP_UNPACK_SEMIRAW_EP(X,val) \
- do { \
-- _FP_UNPACK_RAW_EP(X,val); \
-+ FP_UNPACK_RAW_EP(X,val); \
- _FP_UNPACK_SEMIRAW(E,2,X); \
- } while (0)
-
-@@ -390,13 +368,13 @@
- #define FP_PACK_SEMIRAW_E(val,X) \
- do { \
- _FP_PACK_SEMIRAW(E,2,X); \
-- _FP_PACK_RAW_E(val,X); \
-+ FP_PACK_RAW_E(val,X); \
- } while (0)
-
- #define FP_PACK_SEMIRAW_EP(val,X) \
- do { \
- _FP_PACK_SEMIRAW(E,2,X); \
-- _FP_PACK_RAW_EP(val,X); \
-+ FP_PACK_RAW_EP(val,X); \
- } while (0)
-
- #define FP_ISSIGNAN_E(X) _FP_ISSIGNAN(E,2,X)
-Index: gcc/config/soft-fp/floatunsisf.c
-===================================================================
---- gcc/config/soft-fp/floatunsisf.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/soft-fp/floatunsisf.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,6 +1,6 @@
- /* Software floating-point emulation.
- Convert a 32bit unsigned integer to IEEE single
-- Copyright (C) 1997,1999, 2006 Free Software Foundation, Inc.
-+ Copyright (C) 1997, 1999, 2006, 2007 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Richard Henderson (rth@cygnus.com) and
- Jakub Jelinek (jj@ultra.linux.cz).
-@@ -32,8 +32,7 @@
- #include "soft-fp.h"
- #include "single.h"
-
--float
--__floatunsisf(USItype i)
-+SFtype __floatunsisf(USItype i)
- {
- FP_DECL_EX;
- FP_DECL_S(A);
-Index: gcc/config/soft-fp/op-common.h
-===================================================================
---- gcc/config/soft-fp/op-common.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/soft-fp/op-common.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1153,7 +1153,8 @@
- if (_FP_FRACBITS_##dfs < _FP_FRACBITS_##sfs \
- || (_FP_EXPMAX_##dfs - _FP_EXPBIAS_##dfs \
- < _FP_EXPMAX_##sfs - _FP_EXPBIAS_##sfs) \
-- || _FP_EXPBIAS_##dfs < _FP_EXPBIAS_##sfs + _FP_FRACBITS_##sfs - 1) \
-+ || (_FP_EXPBIAS_##dfs < _FP_EXPBIAS_##sfs + _FP_FRACBITS_##sfs - 1 \
-+ && _FP_EXPBIAS_##dfs != _FP_EXPBIAS_##sfs)) \
- abort(); \
- D##_s = S##_s; \
- _FP_FRAC_COPY_##dwc##_##swc(D, S); \
-@@ -1168,6 +1169,14 @@
- { \
- if (_FP_FRAC_ZEROP_##swc(S)) \
- D##_e = 0; \
-+ else if (_FP_EXPBIAS_##dfs \
-+ < _FP_EXPBIAS_##sfs + _FP_FRACBITS_##sfs - 1) \
-+ { \
-+ FP_SET_EXCEPTION(FP_EX_DENORM); \
-+ _FP_FRAC_SLL_##dwc(D, (_FP_FRACBITS_##dfs \
-+ - _FP_FRACBITS_##sfs)); \
-+ D##_e = 0; \
-+ } \
- else \
- { \
- int _lz; \
-@@ -1199,7 +1208,8 @@
- #define FP_TRUNC(dfs,sfs,dwc,swc,D,S) \
- do { \
- if (_FP_FRACBITS_##sfs < _FP_FRACBITS_##dfs \
-- || _FP_EXPBIAS_##sfs < _FP_EXPBIAS_##dfs + _FP_FRACBITS_##dfs - 1) \
-+ || (_FP_EXPBIAS_##sfs < _FP_EXPBIAS_##dfs + _FP_FRACBITS_##dfs - 1 \
-+ && _FP_EXPBIAS_##sfs != _FP_EXPBIAS_##dfs)) \
- abort(); \
- D##_s = S##_s; \
- if (_FP_EXP_NORMAL(sfs, swc, S)) \
-@@ -1211,8 +1221,11 @@
- { \
- if (D##_e <= 0) \
- { \
-- if (D##_e <= 1 - _FP_FRACBITS_##dfs) \
-- _FP_FRAC_SET_##swc(S, _FP_ZEROFRAC_##swc); \
-+ if (D##_e < 1 - _FP_FRACBITS_##dfs) \
-+ { \
-+ _FP_FRAC_SET_##swc(S, _FP_ZEROFRAC_##swc); \
-+ _FP_FRAC_LOW_##swc(S) |= 1; \
-+ } \
- else \
- { \
- _FP_FRAC_HIGH_##sfs(S) |= _FP_IMPLBIT_SH_##sfs; \
-@@ -1234,11 +1247,24 @@
- if (S##_e == 0) \
- { \
- D##_e = 0; \
-- _FP_FRAC_SET_##dwc(D, _FP_ZEROFRAC_##dwc); \
-- if (!_FP_FRAC_ZEROP_##swc(S)) \
-+ if (_FP_FRAC_ZEROP_##swc(S)) \
-+ _FP_FRAC_SET_##dwc(D, _FP_ZEROFRAC_##dwc); \
-+ else \
- { \
- FP_SET_EXCEPTION(FP_EX_DENORM); \
-- FP_SET_EXCEPTION(FP_EX_INEXACT); \
-+ if (_FP_EXPBIAS_##sfs \
-+ < _FP_EXPBIAS_##dfs + _FP_FRACBITS_##dfs - 1) \
-+ { \
-+ _FP_FRAC_SRS_##swc(S, (_FP_WFRACBITS_##sfs \
-+ - _FP_WFRACBITS_##dfs), \
-+ _FP_WFRACBITS_##sfs); \
-+ _FP_FRAC_COPY_##dwc##_##swc(D, S); \
-+ } \
-+ else \
-+ { \
-+ _FP_FRAC_SET_##dwc(D, _FP_ZEROFRAC_##dwc); \
-+ _FP_FRAC_LOW_##dwc(D) |= 1; \
-+ } \
- } \
- } \
- else \
-Index: gcc/config/soft-fp/floatundisf.c
-===================================================================
---- gcc/config/soft-fp/floatundisf.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/soft-fp/floatundisf.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,6 +1,6 @@
- /* Software floating-point emulation.
- Convert a 64bit unsigned integer to IEEE single
-- Copyright (C) 1997,1999, 2006 Free Software Foundation, Inc.
-+ Copyright (C) 1997, 1999, 2006, 2007 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Richard Henderson (rth@cygnus.com) and
- Jakub Jelinek (jj@ultra.linux.cz).
-@@ -32,8 +32,7 @@
- #include "soft-fp.h"
- #include "single.h"
-
--float
--__floatundisf(UDItype i)
-+SFtype __floatundisf(UDItype i)
- {
- FP_DECL_EX;
- FP_DECL_S(A);
-Index: gcc/config/soft-fp/op-2.h
-===================================================================
---- gcc/config/soft-fp/op-2.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/soft-fp/op-2.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,6 +1,6 @@
- /* Software floating-point emulation.
- Basic two-word fraction declaration and manipulation.
-- Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
-+ Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Richard Henderson (rth@cygnus.com),
- Jakub Jelinek (jj@ultra.linux.cz),
-@@ -613,3 +613,5 @@
- #define _FP_FRAC_COPY_1_2(D, S) (D##_f = S##_f0)
-
- #define _FP_FRAC_COPY_2_1(D, S) ((D##_f0 = S##_f), (D##_f1 = 0))
-+
-+#define _FP_FRAC_COPY_2_2(D,S) _FP_FRAC_COPY_2(D,S)
-Index: gcc/config/soft-fp/op-4.h
-===================================================================
---- gcc/config/soft-fp/op-4.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/soft-fp/op-4.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,6 +1,6 @@
- /* Software floating-point emulation.
- Basic four-word fraction declaration and manipulation.
-- Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
-+ Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Richard Henderson (rth@cygnus.com),
- Jakub Jelinek (jj@ultra.linux.cz),
-@@ -684,3 +684,5 @@
- D##_f[1] = S##_f1; \
- D##_f[2] = D##_f[3] = 0; \
- } while (0)
-+
-+#define _FP_FRAC_COPY_4_4(D,S) _FP_FRAC_COPY_4(D,S)
-Index: gcc/config/soft-fp/double.h
-===================================================================
---- gcc/config/soft-fp/double.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ gcc/config/soft-fp/double.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,6 +1,6 @@
- /* Software floating-point emulation.
- Definitions for IEEE Double Precision
-- Copyright (C) 1997,1998,1999,2006 Free Software Foundation, Inc.
-+ Copyright (C) 1997,1998,1999,2006,2007 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Richard Henderson (rth@cygnus.com),
- Jakub Jelinek (jj@ultra.linux.cz),
-@@ -168,13 +168,13 @@
- DFtype flt;
- struct {
- #if __BYTE_ORDER == __BIG_ENDIAN
-- unsigned sign : 1;
-- unsigned exp : _FP_EXPBITS_D;
-- unsigned long frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);
-+ unsigned sign : 1;
-+ unsigned exp : _FP_EXPBITS_D;
-+ _FP_W_TYPE frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);
- #else
-- unsigned long frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);
-- unsigned exp : _FP_EXPBITS_D;
-- unsigned sign : 1;
-+ _FP_W_TYPE frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);
-+ unsigned exp : _FP_EXPBITS_D;
-+ unsigned sign : 1;
- #endif
- } bits __attribute__((packed));
- };
-Index: libstdc++-v3/configure
-===================================================================
---- libstdc++-v3/configure (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libstdc++-v3/configure (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -5764,8 +5764,6 @@
-
-
-
-- echo "$as_me:$LINENO: checking for C locale to use" >&5
--echo $ECHO_N "checking for C locale to use... $ECHO_C" >&6
- # Check whether --enable-clocale or --disable-clocale was given.
- if test "${enable_clocale+set}" = set; then
- enableval="$enable_clocale"
-@@ -5782,32 +5780,53 @@
- fi;
-
-
-- # If they didn't use this option switch, or if they specified --enable
-- # with no specific model, we'll have to look for one. If they
-- # specified --disable (???), do likewise.
-+ # Deal with gettext issues. Default to not using it (=no) until we detect
-+ # support for it later. Let the user turn it off via --e/d, but let that
-+ # default to on for easier handling.
-+ USE_NLS=no
-+ # Check whether --enable-nls or --disable-nls was given.
-+if test "${enable_nls+set}" = set; then
-+ enableval="$enable_nls"
-+
-+else
-+ enable_nls=yes
-+fi;
-+
-+ # Either a known packaage, or "auto"
- if test $enable_clocale = no || test $enable_clocale = yes; then
- enable_clocale=auto
- fi
--
-- # Either a known package, or "auto"
- enable_clocale_flag=$enable_clocale
-
-- # Probe for locale support if no specific model is specified.
-+ # Probe for locale model to use if none specified.
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
-- cat >conftest.$ac_ext <<_ACEOF
-+ enable_clocale_flag=gnu
-+ ;;
-+ darwin* | freebsd*)
-+ enable_clocale_flag=darwin
-+ ;;
-+ *)
-+ enable_clocale_flag=generic
-+ ;;
-+ esac
-+ fi
-+
-+ # Sanity check model, and test for special functionality.
-+ if test $enable_clocale_flag = gnu; then
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-- #include <features.h>
-- #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
-- _GLIBCXX_ok
-- #endif
-+ #include <features.h>
-+ #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
-+ _GLIBCXX_ok
-+ #endif
-
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-@@ -5819,9 +5838,8 @@
- rm -f conftest*
-
-
-- # Test for bugs early in glibc-2.2.x series
-- if test $enable_clocale_flag = gnu; then
-- if test "$cross_compiling" = yes; then
-+ # Test for bugs early in glibc-2.2.x series
-+ if test "$cross_compiling" = yes; then
- enable_clocale_flag=generic
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5831,28 +5849,28 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-- #define _GNU_SOURCE 1
-- #include <locale.h>
-- #include <string.h>
-- #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
-- extern __typeof(newlocale) __newlocale;
-- extern __typeof(duplocale) __duplocale;
-- extern __typeof(strcoll_l) __strcoll_l;
-- #endif
-- int main()
-- {
-- const char __one[] = "Äuglein Augmen";
-- const char __two[] = "Äuglein";
-- int i;
-- int j;
-- __locale_t loc;
-- __locale_t loc_dup;
-- loc = __newlocale(1 << LC_ALL, "de_DE", 0);
-- loc_dup = __duplocale(loc);
-- i = __strcoll_l(__one, __two, loc);
-- j = __strcoll_l(__one, __two, loc_dup);
-- return 0;
-- }
-+ #define _GNU_SOURCE 1
-+ #include <locale.h>
-+ #include <string.h>
-+ #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
-+ extern __typeof(newlocale) __newlocale;
-+ extern __typeof(duplocale) __duplocale;
-+ extern __typeof(strcoll_l) __strcoll_l;
-+ #endif
-+ int main()
-+ {
-+ const char __one[] = "Äuglein Augmen";
-+ const char __two[] = "Äuglein";
-+ int i;
-+ int j;
-+ __locale_t loc;
-+ __locale_t loc_dup;
-+ loc = __newlocale(1 << LC_ALL, "de_DE", 0);
-+ loc_dup = __duplocale(loc);
-+ i = __strcoll_l(__one, __two, loc);
-+ j = __strcoll_l(__one, __two, loc_dup);
-+ return 0;
-+ }
-
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -5877,32 +5895,176 @@
- fi
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-- fi
-
-- # ... at some point put __strxfrm_l tests in as well.
-- ;;
-- darwin* | freebsd*)
-- enable_clocale_flag=darwin
-- ;;
-- *)
-- enable_clocale_flag=generic
-- ;;
-- esac
-+ # Set it to scream when it hurts.
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS="-Wimplicit-function-declaration -Werror"
-+
-+ # Use strxfrm_l if available.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#define _GNU_SOURCE 1
-+ #include <string.h>
-+ #include <locale.h>
-+int
-+main ()
-+{
-+char s[128]; __locale_t loc; strxfrm_l(s, "C", 5, loc);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRXFRM_L 1
-+_ACEOF
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+ # Use strerror_l if available.
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#define _GNU_SOURCE 1
-+ #include <string.h>
-+ #include <locale.h>
-+int
-+main ()
-+{
-+__locale_t loc; strerror_l(5, loc);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRERROR_L 1
-+_ACEOF
-+
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+ CFLAGS="$ac_save_CFLAGS"
- fi
-
-- # Deal with gettext issues. Default to not using it (=no) until we detect
-- # support for it later. Let the user turn it off via --e/d, but let that
-- # default to on for easier handling.
-- USE_NLS=no
-- # Check whether --enable-nls or --disable-nls was given.
--if test "${enable_nls+set}" = set; then
-- enableval="$enable_nls"
-+ # Perhaps use strerror_r if available, and strerror_l isn't.
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS="-Wimplicit-function-declaration -Werror"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#define _GNU_SOURCE 1
-+ #include <string.h>
-+ #include <locale.h>
-+int
-+main ()
-+{
-+char s[128]; strerror_r(5, s, 128);
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STRERROR_R 1
-+_ACEOF
-+
- else
-- enable_nls=yes
--fi;
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+ CFLAGS="$ac_save_CFLAGS"
-+
- # Set configure bits for specified locale package
-+ echo "$as_me:$LINENO: checking for C locale to use" >&5
-+echo $ECHO_N "checking for C locale to use... $ECHO_C" >&6
- case ${enable_clocale_flag} in
- generic)
- echo "$as_me:$LINENO: result: generic" >&5
-@@ -8015,7 +8177,7 @@
-
- # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
- cat > conftest.$ac_ext << EOF
--#line 8018 "configure"
-+#line 8180 "configure"
- int main()
- {
- // NB: _Atomic_word not necessarily int.
-@@ -8395,11 +8557,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- echo "$as_me:$LINENO: checking for ld that supports -Wl,--gc-sections" >&5
-@@ -54307,11 +54467,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- echo "$as_me:$LINENO: checking for ld that supports -Wl,--gc-sections" >&5
-@@ -75669,11 +75827,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- echo "$as_me:$LINENO: checking for ld that supports -Wl,--gc-sections" >&5
-@@ -77194,11 +77350,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- echo "$as_me:$LINENO: checking for ld that supports -Wl,--gc-sections" >&5
-@@ -78687,11 +78841,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- echo "$as_me:$LINENO: checking for ld that supports -Wl,--gc-sections" >&5
-@@ -100579,11 +100731,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- echo "$as_me:$LINENO: checking for ld that supports -Wl,--gc-sections" >&5
-@@ -101426,11 +101576,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- echo "$as_me:$LINENO: checking for ld that supports -Wl,--gc-sections" >&5
-@@ -102829,11 +102977,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- echo "$as_me:$LINENO: checking for ld that supports -Wl,--gc-sections" >&5
-@@ -104624,11 +104770,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- echo "$as_me:$LINENO: checking for ld that supports -Wl,--gc-sections" >&5
-@@ -105869,11 +106013,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- echo "$as_me:$LINENO: checking for ld that supports -Wl,--gc-sections" >&5
-@@ -106898,11 +107040,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- echo "$as_me:$LINENO: checking for ld that supports -Wl,--gc-sections" >&5
-Index: libstdc++-v3/include/bits/ostream.tcc
-===================================================================
---- libstdc++-v3/include/bits/ostream.tcc (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libstdc++-v3/include/bits/ostream.tcc (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -334,7 +334,6 @@
- extern template ostream& operator<<(ostream&, const char*);
- extern template ostream& operator<<(ostream&, const unsigned char*);
- extern template ostream& operator<<(ostream&, const signed char*);
-- extern template ostream& __ostream_insert(ostream&, const char*, streamsize);
-
- extern template ostream& ostream::_M_insert(long);
- extern template ostream& ostream::_M_insert(unsigned long);
-@@ -356,8 +355,6 @@
- extern template wostream& operator<<(wostream&, char);
- extern template wostream& operator<<(wostream&, const wchar_t*);
- extern template wostream& operator<<(wostream&, const char*);
-- extern template wostream& __ostream_insert(wostream&, const wchar_t*,
-- streamsize);
-
- extern template wostream& wostream::_M_insert(long);
- extern template wostream& wostream::_M_insert(unsigned long);
-Index: libstdc++-v3/include/bits/ostream_insert.h
-===================================================================
---- libstdc++-v3/include/bits/ostream_insert.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libstdc++-v3/include/bits/ostream_insert.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -109,6 +109,18 @@
- return __out;
- }
-
-+ // Inhibit implicit instantiations for required instantiations,
-+ // which are defined via explicit instantiations elsewhere.
-+ // NB: This syntax is a GNU extension.
-+#if _GLIBCXX_EXTERN_TEMPLATE
-+ extern template ostream& __ostream_insert(ostream&, const char*, streamsize);
-+
-+#ifdef _GLIBCXX_USE_WCHAR_T
-+ extern template wostream& __ostream_insert(wostream&, const wchar_t*,
-+ streamsize);
-+#endif
-+#endif
-+
- _GLIBCXX_END_NAMESPACE
-
- #endif /* _OSTREAM_INSERT_H */
-Index: libstdc++-v3/include/std/std_fstream.h
-===================================================================
---- libstdc++-v3/include/std/std_fstream.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libstdc++-v3/include/std/std_fstream.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,6 +1,7 @@
- // File based streams -*- C++ -*-
-
--// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-+// 2006, 2007
- // Free Software Foundation, Inc.
- //
- // This file is part of the GNU ISO C++ Library. This library is free
-@@ -257,9 +258,30 @@
- * Otherwise it tries to open the file named @a s using the flags
- * given in @a mode.
- *
-- * [Table 92 gives the relation between openmode combinations and the
-- * equivalent fopen() flags, but the table has not been copied yet.]
-- */
-+ * Table 92, adapted here, gives the relation between openmode
-+ * combinations and the equivalent fopen() flags.
-+ * (NB: lines in|out|app and binary|in|out|app per DR 596)
-+ * +---------------------------------------------------------+
-+ * | ios_base Flag combination stdio equivalent |
-+ * |binary in out trunc app |
-+ * +---------------------------------------------------------+
-+ * | + "w" |
-+ * | + + "a" |
-+ * | + + "w" |
-+ * | + "r" |
-+ * | + + "r+" |
-+ * | + + + "w+" |
-+ * | + + + "a+" |
-+ * +---------------------------------------------------------+
-+ * | + + "wb" |
-+ * | + + + "ab" |
-+ * | + + + "wb" |
-+ * | + + "rb" |
-+ * | + + + "r+b" |
-+ * | + + + + "w+b" |
-+ * | + + + + "a+b" |
-+ * +---------------------------------------------------------+
-+ */
- __filebuf_type*
- open(const char* __s, ios_base::openmode __mode);
-
-Index: libstdc++-v3/ChangeLog
-===================================================================
---- libstdc++-v3/ChangeLog (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libstdc++-v3/ChangeLog (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,3 +1,39 @@
-+2007-06-08 Paolo Carlini <pcarlini@suse.de>
-+
-+ * docs/html/install.html: Adjust consistently with libstdc++/31717.
-+
-+2007-06-08 Francesco Palagi <palagi@arcetri.astro.it>
-+
-+ * include/std/std_fstream.h: Add Table 92 in comment.
-+
-+2007-06-06 Benjamin Kosnik <bkoz@redhat.com>
-+ Frank Mori Hess <frank.hess@nist.gov>
-+
-+ * docs/html/debug.html: Correct link.
-+
-+2007-05-28 Benjamin Kosnik <bkoz@redhat.com>
-+
-+ PR libstdc++/31717
-+ * acinclude.m4 (GLIBCXX_ENABLE_CLOCALE): Re-organize. Sanity check
-+ gnu locale model requests to make sure it will work for the requested
-+ target. Add checks for strxfrm_l, strerror_l when in gnu locale,
-+ and strerror_r everywhere.
-+ * aclocal.m4: Regenerated.
-+ * configure: Regenerated.
-+ * config.h.in: Regenerated.
-+
-+2007-05-24 Paolo Carlini <pcarlini@suse.de>
-+
-+ * include/bits/ostream.tcc: Do not inhibit implicit instantiation
-+ of __ostream_insert here...
-+ * include/bits/ostream_insert.h: ... do it here.
-+
-+2007-05-21 Paolo Carlini <pcarlini@suse.de>
-+
-+ PR libstdc++/31621
-+ * acinclude.m4 ([GLIBCXX_CHECK_LINKER_FEATURES]): Use the C compiler.
-+ * configure: Regenerate.
-+
- 2007-05-13 Release Manager
-
- * GCC 4.2.0 released.
-Index: libstdc++-v3/docs/html/debug.html
-===================================================================
---- libstdc++-v3/docs/html/debug.html (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libstdc++-v3/docs/html/debug.html (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -420,7 +420,7 @@
-
-
- <h3 class="left"><a name="verbterm">Tracking uncaught exceptions</a></h3>
--<p>The <a href="19_diagnostics/howto.html#4">verbose termination handler</a>
-+<p>The <a href="18_support/howto.html#4">verbose termination handler</a>
- gives information about uncaught exceptions which are killing the
- program. It is described in the linked-to page.
- </p>
-Index: libstdc++-v3/docs/html/install.html
-===================================================================
---- libstdc++-v3/docs/html/install.html (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libstdc++-v3/docs/html/install.html (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -80,8 +80,9 @@
- information must be installed.
-
- <p>
-- The configure option --enable-clocale can be used force a
-- particular behavior.
-+ Note that those sanity checks are also perfomed when an explicit
-+ --enable-clocale=gnu configure option is used: this behavior is
-+ new in gcc 4.2.1 and defends against misconfigurations.
- </p>
-
- <p>
-Index: libstdc++-v3/config.h.in
-===================================================================
---- libstdc++-v3/config.h.in (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libstdc++-v3/config.h.in (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -298,6 +298,12 @@
- /* Define to 1 if you have the <stdlib.h> header file. */
- #undef HAVE_STDLIB_H
-
-+/* Define if strerror_l is available in <string.h>. */
-+#undef HAVE_STRERROR_L
-+
-+/* Define if strerror_r is available in <string.h>. */
-+#undef HAVE_STRERROR_R
-+
- /* Define to 1 if you have the <strings.h> header file. */
- #undef HAVE_STRINGS_H
-
-@@ -310,6 +316,9 @@
- /* Define to 1 if you have the `strtold' function. */
- #undef HAVE_STRTOLD
-
-+/* Define if strxfrm_l is available in <string.h>. */
-+#undef HAVE_STRXFRM_L
-+
- /* Define to 1 if you have the <sys/filio.h> header file. */
- #undef HAVE_SYS_FILIO_H
-
-Index: libstdc++-v3/acinclude.m4
-===================================================================
---- libstdc++-v3/acinclude.m4 (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libstdc++-v3/acinclude.m4 (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -251,11 +251,9 @@
- # NB: This flag only works reliably after 2.16.1. Configure tests
- # for this are difficult, so hard wire a value that should work.
-
-- # All these tests are for C++, but run with the "C" compiler driver.
-- # Need to do this so that g++ won't try to link in libstdc++/libsupc++.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS='-x c++ -Wl,--gc-sections'
-+ CFLAGS='-Wl,--gc-sections'
-
- # Check for -Wl,--gc-sections
- AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections])
-@@ -1334,64 +1332,31 @@
- dnl Default is generic.
- dnl
- AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
-- AC_MSG_CHECKING([for C locale to use])
- GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
- [use MODEL for target locale package],
- [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
-+
-+ # Deal with gettext issues. Default to not using it (=no) until we detect
-+ # support for it later. Let the user turn it off via --e/d, but let that
-+ # default to on for easier handling.
-+ USE_NLS=no
-+ AC_ARG_ENABLE(nls,
-+ AC_HELP_STRING([--enable-nls],[use Native Language Support (default)]),
-+ [],
-+ [enable_nls=yes])
-
-- # If they didn't use this option switch, or if they specified --enable
-- # with no specific model, we'll have to look for one. If they
-- # specified --disable (???), do likewise.
-+ # Either a known packaage, or "auto"
- if test $enable_clocale = no || test $enable_clocale = yes; then
- enable_clocale=auto
- fi
--
-- # Either a known package, or "auto"
- enable_clocale_flag=$enable_clocale
-
-- # Probe for locale support if no specific model is specified.
-+ # Probe for locale model to use if none specified.
- # Default to "generic".
- if test $enable_clocale_flag = auto; then
- case ${target_os} in
- linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
-- AC_EGREP_CPP([_GLIBCXX_ok], [
-- #include <features.h>
-- #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
-- _GLIBCXX_ok
-- #endif
-- ], enable_clocale_flag=gnu, enable_clocale_flag=generic)
--
-- # Test for bugs early in glibc-2.2.x series
-- if test $enable_clocale_flag = gnu; then
-- AC_TRY_RUN([
-- #define _GNU_SOURCE 1
-- #include <locale.h>
-- #include <string.h>
-- #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
-- extern __typeof(newlocale) __newlocale;
-- extern __typeof(duplocale) __duplocale;
-- extern __typeof(strcoll_l) __strcoll_l;
-- #endif
-- int main()
-- {
-- const char __one[] = "Äuglein Augmen";
-- const char __two[] = "Äuglein";
-- int i;
-- int j;
-- __locale_t loc;
-- __locale_t loc_dup;
-- loc = __newlocale(1 << LC_ALL, "de_DE", 0);
-- loc_dup = __duplocale(loc);
-- i = __strcoll_l(__one, __two, loc);
-- j = __strcoll_l(__one, __two, loc_dup);
-- return 0;
-- }
-- ],
-- [enable_clocale_flag=gnu],[enable_clocale_flag=generic],
-- [enable_clocale_flag=generic])
-- fi
--
-- # ... at some point put __strxfrm_l tests in as well.
-+ enable_clocale_flag=gnu
- ;;
- darwin* | freebsd*)
- enable_clocale_flag=darwin
-@@ -1402,16 +1367,79 @@
- esac
- fi
-
-- # Deal with gettext issues. Default to not using it (=no) until we detect
-- # support for it later. Let the user turn it off via --e/d, but let that
-- # default to on for easier handling.
-- USE_NLS=no
-- AC_ARG_ENABLE(nls,
-- AC_HELP_STRING([--enable-nls],[use Native Language Support (default)]),
-- [],
-- [enable_nls=yes])
-+ # Sanity check model, and test for special functionality.
-+ if test $enable_clocale_flag = gnu; then
-+ AC_EGREP_CPP([_GLIBCXX_ok], [
-+ #include <features.h>
-+ #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
-+ _GLIBCXX_ok
-+ #endif
-+ ], enable_clocale_flag=gnu, enable_clocale_flag=generic)
-
-+ # Test for bugs early in glibc-2.2.x series
-+ AC_TRY_RUN([
-+ #define _GNU_SOURCE 1
-+ #include <locale.h>
-+ #include <string.h>
-+ #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
-+ extern __typeof(newlocale) __newlocale;
-+ extern __typeof(duplocale) __duplocale;
-+ extern __typeof(strcoll_l) __strcoll_l;
-+ #endif
-+ int main()
-+ {
-+ const char __one[] = "Äuglein Augmen";
-+ const char __two[] = "Äuglein";
-+ int i;
-+ int j;
-+ __locale_t loc;
-+ __locale_t loc_dup;
-+ loc = __newlocale(1 << LC_ALL, "de_DE", 0);
-+ loc_dup = __duplocale(loc);
-+ i = __strcoll_l(__one, __two, loc);
-+ j = __strcoll_l(__one, __two, loc_dup);
-+ return 0;
-+ }
-+ ],
-+ [enable_clocale_flag=gnu],[enable_clocale_flag=generic],
-+ [enable_clocale_flag=generic])
-+
-+ # Set it to scream when it hurts.
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS="-Wimplicit-function-declaration -Werror"
-+
-+ # Use strxfrm_l if available.
-+ AC_TRY_COMPILE([#define _GNU_SOURCE 1
-+ #include <string.h>
-+ #include <locale.h>],
-+ [char s[128]; __locale_t loc; strxfrm_l(s, "C", 5, loc);],
-+ AC_DEFINE(HAVE_STRXFRM_L, 1,
-+ [Define if strxfrm_l is available in <string.h>.]),)
-+
-+ # Use strerror_l if available.
-+ AC_TRY_COMPILE([#define _GNU_SOURCE 1
-+ #include <string.h>
-+ #include <locale.h>],
-+ [__locale_t loc; strerror_l(5, loc);],
-+ AC_DEFINE(HAVE_STRERROR_L, 1,
-+ [Define if strerror_l is available in <string.h>.]),)
-+
-+ CFLAGS="$ac_save_CFLAGS"
-+ fi
-+
-+ # Perhaps use strerror_r if available, and strerror_l isn't.
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS="-Wimplicit-function-declaration -Werror"
-+ AC_TRY_COMPILE([#define _GNU_SOURCE 1
-+ #include <string.h>
-+ #include <locale.h>],
-+ [char s[128]; strerror_r(5, s, 128);],
-+ AC_DEFINE(HAVE_STRERROR_R, 1,
-+ [Define if strerror_r is available in <string.h>.]),)
-+ CFLAGS="$ac_save_CFLAGS"
-+
- # Set configure bits for specified locale package
-+ AC_MSG_CHECKING([for C locale to use])
- case ${enable_clocale_flag} in
- generic)
- AC_MSG_RESULT(generic)
-Index: libgfortran/runtime/environ.c
-===================================================================
---- libgfortran/runtime/environ.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libgfortran/runtime/environ.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -861,14 +861,13 @@
- static int
- do_parse (void)
- {
-- int tok, def;
-+ int tok;
- int unit1;
- int continue_ulist;
- char *start;
-
- unit_count = 0;
-
-- def = 0;
- start = p;
-
- /* Parse the string. First, let's look for a default. */
-@@ -923,6 +922,7 @@
- break;
-
- case END:
-+ def = endian;
- goto end;
- break;
-
-@@ -939,6 +939,18 @@
- tok = next_token ();
- switch (tok)
- {
-+ case NATIVE:
-+ if (next_token () != ':')
-+ goto error;
-+ endian = CONVERT_NATIVE;
-+ break;
-+
-+ case SWAP:
-+ if (next_token () != ':')
-+ goto error;
-+ endian = CONVERT_SWAP;
-+ break;
-+
- case LITTLE:
- if (next_token () != ':')
- goto error;
-Index: libgfortran/intrinsics/reshape_generic.c
-===================================================================
---- libgfortran/intrinsics/reshape_generic.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libgfortran/intrinsics/reshape_generic.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -266,7 +266,7 @@
- else
- {
- scount[n]++;
-- sptr += sstride[n] * size;
-+ src += sstride[n] * size;
- }
- }
- }
-Index: libgfortran/intrinsics/ishftc.c
-===================================================================
---- libgfortran/intrinsics/ishftc.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libgfortran/intrinsics/ishftc.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -36,8 +36,7 @@
- GFC_INTEGER_4
- ishftc4 (GFC_INTEGER_4 i, GFC_INTEGER_4 shift, GFC_INTEGER_4 size)
- {
-- GFC_INTEGER_4 mask;
-- GFC_UINTEGER_4 bits;
-+ GFC_UINTEGER_4 mask, bits;
-
- if (shift < 0)
- shift = shift + size;
-@@ -45,9 +44,14 @@
- if (shift == 0 || shift == size)
- return i;
-
-- mask = (~(GFC_INTEGER_4)0) << size;
-- bits = i & ~mask;
-- return (i & mask) | (bits >> (size - shift)) | ((i << shift) & ~mask);
-+ /* In C, the result of the shift operator is undefined if the right operand
-+ is greater than or equal to the number of bits in the left operand. So we
-+ have to special case it for fortran. */
-+ mask = ~((size == 32) ? 0 : (~0 << size));
-+
-+ bits = i & mask;
-+
-+ return (i & ~mask) | ((bits << shift) & mask) | (bits >> (size - shift));
- }
-
- extern GFC_INTEGER_8 ishftc8 (GFC_INTEGER_8, GFC_INTEGER_4, GFC_INTEGER_4);
-@@ -56,8 +60,7 @@
- GFC_INTEGER_8
- ishftc8 (GFC_INTEGER_8 i, GFC_INTEGER_4 shift, GFC_INTEGER_4 size)
- {
-- GFC_INTEGER_8 mask;
-- GFC_UINTEGER_8 bits;
-+ GFC_UINTEGER_8 mask, bits;
-
- if (shift < 0)
- shift = shift + size;
-@@ -65,9 +68,14 @@
- if (shift == 0 || shift == size)
- return i;
-
-- mask = (~(GFC_INTEGER_8)0) << size;
-- bits = i & ~mask;
-- return (i & mask) | (bits >> (size - shift)) | ((i << shift) & ~mask);
-+ /* In C, the result of the shift operator is undefined if the right operand
-+ is greater than or equal to the number of bits in the left operand. So we
-+ have to special case it for fortran. */
-+ mask = ~((size == 64) ? 0 : (~0 << size));
-+
-+ bits = i & mask;
-+
-+ return (i & ~mask) | ((bits << shift) & mask) | (bits >> (size - shift));
- }
-
- #ifdef HAVE_GFC_INTEGER_16
-@@ -77,8 +85,7 @@
- GFC_INTEGER_16
- ishftc16 (GFC_INTEGER_16 i, GFC_INTEGER_4 shift, GFC_INTEGER_4 size)
- {
-- GFC_INTEGER_16 mask;
-- GFC_UINTEGER_16 bits;
-+ GFC_UINTEGER_16 mask, bits;
-
- if (shift < 0)
- shift = shift + size;
-@@ -86,8 +93,13 @@
- if (shift == 0 || shift == size)
- return i;
-
-- mask = (~(GFC_INTEGER_16)0) << size;
-- bits = i & ~mask;
-- return (i & mask) | (bits >> (size - shift)) | ((i << shift) & ~mask);
-+ /* In C, the result of the shift operator is undefined if the right operand
-+ is greater than or equal to the number of bits in the left operand. So we
-+ have to special case it for fortran. */
-+ mask = ~((size == 128) ? 0 : (~0 << size));
-+
-+ bits = i & mask;
-+
-+ return (i & ~mask) | ((bits << shift) & mask) | (bits >> (size - shift));
- }
- #endif
-Index: libgfortran/ChangeLog
-===================================================================
---- libgfortran/ChangeLog (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libgfortran/ChangeLog (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,3 +1,53 @@
-+2007-05-23 Jerry DeLisle <jvdelisle@gcc.gnu.org>
-+
-+ PR libfortran/31964
-+ Backport from trunk.
-+ * intrinsics/ishftc.c (ishftc4, ishftc8, ishftc16): Fix mask to handle
-+ shift of bit-size number of bits.
-+
-+2007-05-23 Tobias Burnus <burnus@net-b.de>
-+
-+ PR fortran/31917
-+ Backport from trunk.
-+ * runtime/environ.c (mark_range): Fix setting default convert unit.
-+
-+2007-05-22 Jerry DeLisle <jvdelisle@gcc.gnu.org>
-+
-+ PR libfortran/31051
-+ Backport from trunk.
-+ * io/transfer.c (formatted_transfer_scalar): Adjust position for pending
-+ spaces when in writing mode. Clean up some formatting.
-+
-+2007-05-22 Tobias Burnus <burnus@net-b.de>
-+
-+ PR libfortran/31915
-+ Backport from trunk.
-+ * io/transfer.c (unformatted_read): Use proper size for real(10).
-+ (unformatted_write): Ditto.
-+
-+2007-05-20 Jerry DeLisle <jvdelisle@gcc.gnu.org>
-+
-+ PR libfortran/31395
-+ Backport from 4.3.
-+ * io/format.c (parse_format_list): Fix parsing. Regression against g77.
-+
-+2007-05-20 Thomas Koenig <tkoenig@gcc.gnu.org>
-+
-+ PR fortran/31618
-+ Backport from trunk.
-+ * io/transfer.c (read_block_direct): Instead of calling us_read,
-+ set dtp->u.p.current_unit->current_record = 0 so that pre_position
-+ will read the record marker.
-+ (data_transfer_init): For different error conditions, call
-+ generate_error, then return.
-+
-+2007-05-20 Thomas Koenig <tkoenig@gcc.gnu.org>
-+
-+ PR libfortran/31196
-+ Backport from trunk.
-+ * intrinsics/reshape_generic.c (reshape_internal): Increment
-+ correct variable.
-+
- 2007-05-13 Release Manager
-
- * GCC 4.2.0 released.
-Index: libgfortran/io/transfer.c
-===================================================================
---- libgfortran/io/transfer.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libgfortran/io/transfer.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -493,11 +493,11 @@
- }
- else
- {
-- /* Let's make sure the file position is correctly set for the
-- next read statement. */
-+ /* Let's make sure the file position is correctly pre-positioned
-+ for the next read statement. */
-
-+ dtp->u.p.current_unit->current_record = 0;
- next_record_r_unf (dtp, 0);
-- us_read (dtp, 0);
- generate_error (&dtp->common, ERROR_SHORT_RECORD, NULL);
- return;
- }
-@@ -722,7 +722,11 @@
- of the padding. If we hit a short record, then sz is
- adjusted accordingly, making later reads no-ops. */
-
-- sz = kind;
-+ if (type == BT_REAL || type == BT_COMPLEX)
-+ sz = size_from_real_kind (kind);
-+ else
-+ sz = kind;
-+
- for (i=0; i<nelems; i++)
- {
- read_block_direct (dtp, buffer, &sz);
-@@ -767,7 +771,11 @@
- read kind bytes. We don't care about the contents
- of the padding. */
-
-- sz = kind;
-+ if (type == BT_REAL || type == BT_COMPLEX)
-+ sz = size_from_real_kind (kind);
-+ else
-+ sz = kind;
-+
- for (i=0; i<nelems; i++)
- {
- reverse_memcpy(buffer, p, size);
-@@ -1144,7 +1152,7 @@
- /* Format codes that don't transfer data. */
- case FMT_X:
- case FMT_TR:
-- consume_data_flag = 0 ;
-+ consume_data_flag = 0;
-
- pos = bytes_used + f->u.n + dtp->u.p.skips;
- dtp->u.p.skips = f->u.n + dtp->u.p.skips;
-@@ -1160,6 +1168,7 @@
- write_x (dtp, dtp->u.p.skips, dtp->u.p.pending_spaces);
- dtp->u.p.skips = dtp->u.p.pending_spaces = 0;
- }
-+
- if (dtp->u.p.mode == READING)
- read_x (dtp, f->u.n);
-
-@@ -1167,6 +1176,8 @@
-
- case FMT_TL:
- case FMT_T:
-+ consume_data_flag = 0;
-+
- if (f->format == FMT_TL)
- {
-
-@@ -1185,8 +1196,10 @@
- }
- else /* FMT_T */
- {
-- consume_data_flag = 0;
-- pos = f->u.n - 1;
-+ if (dtp->u.p.mode == READING)
-+ pos = f->u.n - 1;
-+ else
-+ pos = f->u.n - dtp->u.p.pending_spaces - 1;
- }
-
- /* Standard 10.6.1.1: excessive left tabbing is reset to the
-@@ -1753,16 +1766,19 @@
- /* Check the action. */
-
- if (read_flag && dtp->u.p.current_unit->flags.action == ACTION_WRITE)
-- generate_error (&dtp->common, ERROR_BAD_ACTION,
-- "Cannot read from file opened for WRITE");
-+ {
-+ generate_error (&dtp->common, ERROR_BAD_ACTION,
-+ "Cannot read from file opened for WRITE");
-+ return;
-+ }
-
- if (!read_flag && dtp->u.p.current_unit->flags.action == ACTION_READ)
-- generate_error (&dtp->common, ERROR_BAD_ACTION,
-- "Cannot write to file opened for READ");
-+ {
-+ generate_error (&dtp->common, ERROR_BAD_ACTION,
-+ "Cannot write to file opened for READ");
-+ return;
-+ }
-
-- if ((dtp->common.flags & IOPARM_LIBRETURN_MASK) != IOPARM_LIBRETURN_OK)
-- return;
--
- dtp->u.p.first_item = 1;
-
- /* Check the format. */
-@@ -1770,14 +1786,14 @@
- if ((cf & IOPARM_DT_HAS_FORMAT) != 0)
- parse_format (dtp);
-
-- if ((dtp->common.flags & IOPARM_LIBRETURN_MASK) != IOPARM_LIBRETURN_OK)
-- return;
--
- if (dtp->u.p.current_unit->flags.form == FORM_UNFORMATTED
- && (cf & (IOPARM_DT_HAS_FORMAT | IOPARM_DT_LIST_FORMAT))
- != 0)
-- generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-- "Format present for UNFORMATTED data transfer");
-+ {
-+ generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-+ "Format present for UNFORMATTED data transfer");
-+ return;
-+ }
-
- if ((cf & IOPARM_DT_HAS_NAMELIST_NAME) != 0 && dtp->u.p.ionml != NULL)
- {
-@@ -1787,13 +1803,19 @@
- }
- else if (dtp->u.p.current_unit->flags.form == FORM_FORMATTED &&
- !(cf & (IOPARM_DT_HAS_FORMAT | IOPARM_DT_LIST_FORMAT)))
-- generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-- "Missing format for FORMATTED data transfer");
-+ {
-+ generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-+ "Missing format for FORMATTED data transfer");
-+ }
-
- if (is_internal_unit (dtp)
- && dtp->u.p.current_unit->flags.form == FORM_UNFORMATTED)
-- generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-- "Internal file cannot be accessed by UNFORMATTED data transfer");
-+ {
-+ generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-+ "Internal file cannot be accessed by UNFORMATTED "
-+ "data transfer");
-+ return;
-+ }
-
- /* Check the record or position number. */
-
-@@ -1823,49 +1845,71 @@
- if (dtp->u.p.advance_status != ADVANCE_UNSPECIFIED)
- {
- if (dtp->u.p.current_unit->flags.access == ACCESS_DIRECT)
-- generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-- "ADVANCE specification conflicts with sequential access");
-+ {
-+ generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-+ "ADVANCE specification conflicts with sequential access");
-+ return;
-+ }
-
- if (is_internal_unit (dtp))
-- generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-- "ADVANCE specification conflicts with internal file");
-+ {
-+ generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-+ "ADVANCE specification conflicts with internal file");
-+ return;
-+ }
-
- if ((cf & (IOPARM_DT_HAS_FORMAT | IOPARM_DT_LIST_FORMAT))
- != IOPARM_DT_HAS_FORMAT)
-- generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-- "ADVANCE specification requires an explicit format");
-+ {
-+ generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-+ "ADVANCE specification requires an explicit format");
-+ return;
-+ }
- }
-
- if (read_flag)
- {
- if ((cf & IOPARM_EOR) != 0 && dtp->u.p.advance_status != ADVANCE_NO)
-- generate_error (&dtp->common, ERROR_MISSING_OPTION,
-- "EOR specification requires an ADVANCE specification of NO");
-+ {
-+ generate_error (&dtp->common, ERROR_MISSING_OPTION,
-+ "EOR specification requires an ADVANCE specification "
-+ "of NO");
-+ return;
-+ }
-
- if ((cf & IOPARM_DT_HAS_SIZE) != 0 && dtp->u.p.advance_status != ADVANCE_NO)
-- generate_error (&dtp->common, ERROR_MISSING_OPTION,
-- "SIZE specification requires an ADVANCE specification of NO");
--
-+ {
-+ generate_error (&dtp->common, ERROR_MISSING_OPTION,
-+ "SIZE specification requires an ADVANCE specification of NO");
-+ return;
-+ }
- }
- else
- { /* Write constraints. */
- if ((cf & IOPARM_END) != 0)
-- generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-- "END specification cannot appear in a write statement");
-+ {
-+ generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-+ "END specification cannot appear in a write statement");
-+ return;
-+ }
-
- if ((cf & IOPARM_EOR) != 0)
-- generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-- "EOR specification cannot appear in a write statement");
-+ {
-+ generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-+ "EOR specification cannot appear in a write statement");
-+ return;
-+ }
-
- if ((cf & IOPARM_DT_HAS_SIZE) != 0)
-- generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-- "SIZE specification cannot appear in a write statement");
-+ {
-+ generate_error (&dtp->common, ERROR_OPTION_CONFLICT,
-+ "SIZE specification cannot appear in a write statement");
-+ return;
-+ }
- }
-
- if (dtp->u.p.advance_status == ADVANCE_UNSPECIFIED)
- dtp->u.p.advance_status = ADVANCE_YES;
-- if ((dtp->common.flags & IOPARM_LIBRETURN_MASK) != IOPARM_LIBRETURN_OK)
-- return;
-
- /* Sanity checks on the record number. */
- if ((cf & IOPARM_DT_HAS_REC) != 0)
-Index: libgfortran/io/format.c
-===================================================================
---- libgfortran/io/format.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libgfortran/io/format.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -860,10 +860,11 @@
- case FMT_SLASH:
- get_fnode (fmt, &head, &tail, FMT_SLASH);
- tail->repeat = 1;
-+ goto optional_comma;
-
-- /* Fall Through */
--
- case FMT_COLON:
-+ get_fnode (fmt, &head, &tail, FMT_COLON);
-+ tail->repeat = 1;
- goto optional_comma;
-
- case FMT_END:
-Index: boehm-gc/darwin_stop_world.c
-===================================================================
---- boehm-gc/darwin_stop_world.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/darwin_stop_world.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -10,7 +10,7 @@
- be allocated, is called the red zone. This area as shown in Figure 3-2 may
- be used for any purpose as long as a new stack frame does not need to be
- added to the stack."
--
-+
- Page 50: "If a leaf procedure's red zone usage would exceed 224 bytes, then
- it must set up a stack frame just like routines that call other routines."
- */
-@@ -20,48 +20,6 @@
- # define PPC_RED_ZONE_SIZE 320
- #endif
-
--/* Try to work out the right way to access thread state structure members.
-- The structure has changed its definition in different Darwin versions. */
--#if defined(__ppc__)
--# define THREAD_STATE ppc_thread_state_t
--# if defined (HAS_PPC_THREAD_STATE_R0)
--# define THREAD_FLD(x) x
--# elif defined (HAS_PPC_THREAD_STATE___R0)
--# define THREAD_FLD(x) __ ## x
--# else
--# error can not work out how to access fields of ppc_thread_state_t
--# endif
--#elif defined(__ppc64__)
--# define THREAD_STATE ppc_thread_state64_t
--# if defined (HAS_PPC_THREAD_STATE64_R0)
--# define THREAD_FLD(x) x
--# elif defined (HAS_PPC_THREAD_STATE64___R0)
--# define THREAD_FLD(x) __ ## x
--# else
--# error can not work out how to access fields of ppc_thread_state64_t
--# endif
--#elif defined(__i386__)
--# define THREAD_STATE i386_thread_state_t
--# if defined (HAS_I386_THREAD_STATE_EAX)
--# define THREAD_FLD(x) x
--# elif defined (HAS_I386_THREAD_STATE___EAX)
--# define THREAD_FLD(x) __ ## x
--# else
--# error can not work out how to access fields of i386_thread_state_t
--# endif
--#elif defined(__x86_64__)
--# define THREAD_STATE i386_thread_state_t
--# if defined (HAS_I386_THREAD_STATE_EAX)
--# define THREAD_FLD(x) x
--# elif defined (HAS_I386_THREAD_STATE___EAX)
--# define THREAD_FLD(x) __ ## x
--# else
--# error can not work out how to access fields of i386_thread_state_t
--# endif
--#else
--# error unknown architecture
--#endif
--
- typedef struct StackFrame {
- unsigned long savedSP;
- unsigned long savedCR;
-@@ -115,8 +73,8 @@
- GC_thread p;
- pthread_t me;
- ptr_t lo, hi;
-- THREAD_STATE state;
-- mach_msg_type_number_t thread_state_count = MACHINE_THREAD_STATE_COUNT;
-+ GC_THREAD_STATE_T state;
-+ mach_msg_type_number_t thread_state_count = GC_MACH_THREAD_STATE_COUNT;
-
- me = pthread_self();
- if (!GC_thr_initialized) GC_thr_init();
-@@ -128,11 +86,8 @@
- lo = GC_approx_sp();
- } else {
- /* Get the thread state (registers, etc) */
-- r = thread_get_state(
-- p->stop_info.mach_thread,
-- MACHINE_THREAD_STATE,
-- (natural_t*)&state,
-- &thread_state_count);
-+ r = thread_get_state(p->stop_info.mach_thread, GC_MACH_THREAD_STATE,
-+ (natural_t*)&state, &thread_state_count);
- if(r != KERN_SUCCESS) ABORT("thread_get_state failed");
-
- #if defined(I386)
-@@ -144,7 +99,33 @@
- GC_push_one(state . THREAD_FLD (edx));
- GC_push_one(state . THREAD_FLD (edi));
- GC_push_one(state . THREAD_FLD (esi));
-- GC_push_one(state . THREAD_FLD (ebp));
-+ GC_push_one(state . THREAD_FLD (ebp));
-+
-+#elif defined(X86_64)
-+ lo = (void*)state . THREAD_FLD (rsp);
-+
-+ GC_push_one(state . THREAD_FLD (rax));
-+ GC_push_one(state . THREAD_FLD (rbx));
-+ GC_push_one(state . THREAD_FLD (rcx));
-+ GC_push_one(state . THREAD_FLD (rdx));
-+ GC_push_one(state . THREAD_FLD (rdi));
-+ GC_push_one(state . THREAD_FLD (rsi));
-+ GC_push_one(state . THREAD_FLD (rbp));
-+ GC_push_one(state . THREAD_FLD (rsp));
-+ GC_push_one(state . THREAD_FLD (r8));
-+ GC_push_one(state . THREAD_FLD (r9));
-+ GC_push_one(state . THREAD_FLD (r10));
-+ GC_push_one(state . THREAD_FLD (r11));
-+ GC_push_one(state . THREAD_FLD (r12));
-+ GC_push_one(state . THREAD_FLD (r13));
-+ GC_push_one(state . THREAD_FLD (r14));
-+ GC_push_one(state . THREAD_FLD (r15));
-+ GC_push_one(state . THREAD_FLD (rip));
-+ GC_push_one(state . THREAD_FLD (rflags));
-+ GC_push_one(state . THREAD_FLD (cs));
-+ GC_push_one(state . THREAD_FLD (fs));
-+ GC_push_one(state . THREAD_FLD (gs));
-+
- #elif defined(POWERPC)
- lo = (void*)(state . THREAD_FLD (r1) - PPC_RED_ZONE_SIZE);
-
-@@ -221,9 +202,9 @@
- hi = (ptr_t)FindTopOfStack(0);
- } else {
- # if defined(__ppc__) || defined(__ppc64__)
-- THREAD_STATE info;
-+ GC_THREAD_STATE_T info;
- mach_msg_type_number_t outCount = THREAD_STATE_MAX;
-- r = thread_get_state(thread, MACHINE_THREAD_STATE,
-+ r = thread_get_state(thread, GC_MACH_THREAD_STATE,
- (natural_t *)&info, &outCount);
- if(r != KERN_SUCCESS) ABORT("task_get_state failed");
-
-@@ -264,10 +245,10 @@
- # else
- /* FIXME: Remove after testing: */
- WARN("This is completely untested and likely will not work\n", 0);
-- THREAD_STATE info;
-+ GC_THREAD_STATE_T info;
- mach_msg_type_number_t outCount = THREAD_STATE_MAX;
-- r = thread_get_state(thread, MACHINE_THREAD_STATE,
-- (natural_t *)&info, &outCount);
-+ r = thread_get_state(thread, GC_MACH_THREAD_STATE, (natural_t *)&info,
-+ &outCount);
- if(r != KERN_SUCCESS) ABORT("task_get_state failed");
-
- lo = (void*)info . THREAD_FLD (esp);
-Index: boehm-gc/Makefile.in
-===================================================================
---- boehm-gc/Makefile.in (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/Makefile.in (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -224,6 +224,7 @@
- build_vendor = @build_vendor@
- datadir = @datadir@
- exec_prefix = @exec_prefix@
-+extra_ldflags_libgc = @extra_ldflags_libgc@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-@@ -280,7 +281,7 @@
- # linuxthread semaphore functions get linked:
- libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS)
- libgcjgc_la_DEPENDENCIES = @addobjs@
--libgcjgc_la_LDFLAGS = -version-info 1:2:0 -rpath $(toolexeclibdir)
-+libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir)
- libgcjgc_convenience_la_LIBADD = @addobjs@
- libgcjgc_convenience_la_DEPENDENCIES = @addobjs@
- AM_CXXFLAGS = @GC_CFLAGS@
-Index: boehm-gc/configure.ac
-===================================================================
---- boehm-gc/configure.ac (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/configure.ac (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -248,33 +248,46 @@
- case "$host" in
- powerpc*-*-darwin*)
- AC_CHECK_MEMBER(ppc_thread_state_t.r0,
-- AC_DEFINE(HAS_PPC_THREAD_STATE_R0,,[ppc_thread_state_t has field r0]),,
-+ AC_DEFINE(HAS_PPC_THREAD_STATE_R0,1,
-+ [ppc_thread_state_t has field r0]),,
- [#include <mach/thread_status.h>])
- AC_CHECK_MEMBER(ppc_thread_state_t.__r0,
-- AC_DEFINE(HAS_PPC_THREAD_STATE___R0,,dnl
-- [ppc_thread_state_t has field __r0]),,
-+ AC_DEFINE(HAS_PPC_THREAD_STATE___R0,1,dnl
-+ [ppc_thread_state_t has field __r0]),,
- [#include <mach/thread_status.h>])
- AC_CHECK_MEMBER(ppc_thread_state64_t.r0,
-- AC_DEFINE(HAS_PPC_THREAD_STATE64_R0,,dnl
-- [ppc_thread_state64_t has field r0]),,
-+ AC_DEFINE(HAS_PPC_THREAD_STATE64_R0,1,dnl
-+ [ppc_thread_state64_t has field r0]),,
- [#include <mach/thread_status.h>])
- AC_CHECK_MEMBER(ppc_thread_state64_t.__r0,
-- AC_DEFINE(HAS_PPC_THREAD_STATE64___R0,,dnl
-- [ppc_thread_state64_t has field __r0]),,
-+ AC_DEFINE(HAS_PPC_THREAD_STATE64___R0,1,dnl
-+ [ppc_thread_state64_t has field __r0]),,
- [#include <mach/thread_status.h>])
- ;;
- i?86*-*-darwin*)
-- AC_CHECK_MEMBER(i386_thread_state_t.eax,
-- AC_DEFINE(HAS_I386_THREAD_STATE_EAX,,dnl
-- [i386_thread_state_t has field eax]),,
-+ AC_CHECK_MEMBER(x86_thread_state32_t.eax,
-+ AC_DEFINE(HAS_X86_THREAD_STATE32_EAX,1,dnl
-+ [x86_thread_state32_t has field eax]),,
- [#include <sys/cdefs.h>
--#include <mach/thread_status.h>])
-- AC_CHECK_MEMBER(i386_thread_state_t.__eax,
-- AC_DEFINE(HAS_I386_THREAD_STATE___EAX,,dnl
-- [i386_thread_state_t has field __eax]),,
-+ #include <mach/thread_status.h>])
-+ AC_CHECK_MEMBER(x86_thread_state32_t.__eax,
-+ AC_DEFINE(HAS_X86_THREAD_STATE32___EAX,1,dnl
-+ [x86_thread_state32_t has field __eax]),,
- [#include <sys/cdefs.h>
--#include <mach/thread_status.h>])
-+ #include <mach/thread_status.h>])
- ;;
-+ x86_64-*-darwin*)
-+ AC_CHECK_MEMBER(x86_thread_state64_t.rax,
-+ AC_DEFINE(HAS_X86_THREAD_STATE64_RAX,1,dnl
-+ [x86_thread_state64_t has field rax]),,
-+ [#include <sys/cdefs.h>
-+ #include <mach/thread_status.h>])
-+ AC_CHECK_MEMBER(x86_thread_state64_t.__rax,
-+ AC_DEFINE(HAS_X86_THREAD_STATE64___RAX,1,dnl
-+ [x86_thread_state64_t has field __rax]),,
-+ [#include <sys/cdefs.h>
-+ #include <mach/thread_status.h>])
-+ ;;
- *) ;;
- esac
-
-@@ -287,6 +300,14 @@
- ;;
- esac
-
-+# extra LD Flags which are required for targets
-+case "${host}" in
-+ *-*-darwin*)
-+ extra_ldflags_libgc=-Wl,-single_module
-+ ;;
-+esac
-+AC_SUBST(extra_ldflags_libgc)
-+
- AC_SUBST(EXTRA_TEST_LIBS)
-
- target_all=libgcjgc.la
-Index: boehm-gc/include/Makefile.in
-===================================================================
---- boehm-gc/include/Makefile.in (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/include/Makefile.in (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -149,6 +149,7 @@
- build_vendor = @build_vendor@
- datadir = @datadir@
- exec_prefix = @exec_prefix@
-+extra_ldflags_libgc = @extra_ldflags_libgc@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
-Index: boehm-gc/include/gc_config.h.in
-===================================================================
---- boehm-gc/include/gc_config.h.in (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/include/gc_config.h.in (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -54,12 +54,6 @@
- /* support for win32 threads */
- #undef GC_WIN32_THREADS
-
--/* i386_thread_state_t has field eax */
--#undef HAS_I386_THREAD_STATE_EAX
--
--/* i386_thread_state_t has field __eax */
--#undef HAS_I386_THREAD_STATE___EAX
--
- /* ppc_thread_state64_t has field r0 */
- #undef HAS_PPC_THREAD_STATE64_R0
-
-@@ -72,6 +66,18 @@
- /* ppc_thread_state_t has field __r0 */
- #undef HAS_PPC_THREAD_STATE___R0
-
-+/* x86_thread_state32_t has field eax */
-+#undef HAS_X86_THREAD_STATE32_EAX
-+
-+/* x86_thread_state32_t has field __eax */
-+#undef HAS_X86_THREAD_STATE32___EAX
-+
-+/* x86_thread_state64_t has field rax */
-+#undef HAS_X86_THREAD_STATE64_RAX
-+
-+/* x86_thread_state64_t has field __rax */
-+#undef HAS_X86_THREAD_STATE64___RAX
-+
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
-
-Index: boehm-gc/include/private/gc_priv.h
-===================================================================
---- boehm-gc/include/private/gc_priv.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/include/private/gc_priv.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -286,6 +286,53 @@
- #endif
-
-
-+#if defined(DARWIN)
-+# if defined(POWERPC)
-+# if CPP_WORDSZ == 32
-+# define GC_THREAD_STATE_T ppc_thread_state_t
-+# define GC_MACH_THREAD_STATE PPC_THREAD_STATE
-+# define GC_MACH_THREAD_STATE_COUNT PPC_THREAD_STATE_COUNT
-+# define GC_MACH_HEADER mach_header
-+# define GC_MACH_SECTION section
-+# else
-+# define GC_THREAD_STATE_T ppc_thread_state64_t
-+# define GC_MACH_THREAD_STATE PPC_THREAD_STATE64
-+# define GC_MACH_THREAD_STATE_COUNT PPC_THREAD_STATE64_COUNT
-+# define GC_MACH_HEADER mach_header_64
-+# define GC_MACH_SECTION section_64
-+# endif
-+# elif defined(I386) || defined(X86_64)
-+# if CPP_WORDSZ == 32
-+# define GC_THREAD_STATE_T x86_thread_state32_t
-+# define GC_MACH_THREAD_STATE x86_THREAD_STATE32
-+# define GC_MACH_THREAD_STATE_COUNT x86_THREAD_STATE32_COUNT
-+# define GC_MACH_HEADER mach_header
-+# define GC_MACH_SECTION section
-+# else
-+# define GC_THREAD_STATE_T x86_thread_state64_t
-+# define GC_MACH_THREAD_STATE x86_THREAD_STATE64
-+# define GC_MACH_THREAD_STATE_COUNT x86_THREAD_STATE64_COUNT
-+# define GC_MACH_HEADER mach_header_64
-+# define GC_MACH_SECTION section_64
-+# endif
-+# else
-+# error define GC_THREAD_STATE_T
-+# define GC_MACH_THREAD_STATE MACHINE_THREAD_STATE
-+# define GC_MACH_THREAD_STATE_COUNT MACHINE_THREAD_STATE_COUNT
-+# endif
-+/* Try to work out the right way to access thread state structure members.
-+ The structure has changed its definition in different Darwin versions.
-+ This now defaults to the (older) names without __, thus hopefully,
-+ not breaking any existing Makefile.direct builds. */
-+# if defined (HAS_PPC_THREAD_STATE___R0) \
-+ || defined (HAS_PPC_THREAD_STATE64___R0) \
-+ || defined (HAS_X86_THREAD_STATE32___EAX) \
-+ || defined (HAS_X86_THREAD_STATE64___RAX)
-+# define THREAD_FLD(x) __ ## x
-+# else
-+# define THREAD_FLD(x) x
-+# endif
-+#endif
- /*********************************/
- /* */
- /* OS interface routines */
-@@ -468,6 +515,53 @@
- # define GETENV(name) 0
- #endif
-
-+#if defined(DARWIN)
-+# if defined(POWERPC)
-+# if CPP_WORDSZ == 32
-+# define GC_THREAD_STATE_T ppc_thread_state_t
-+# define GC_MACH_THREAD_STATE PPC_THREAD_STATE
-+# define GC_MACH_THREAD_STATE_COUNT PPC_THREAD_STATE_COUNT
-+# define GC_MACH_HEADER mach_header
-+# define GC_MACH_SECTION section
-+# else
-+# define GC_THREAD_STATE_T ppc_thread_state64_t
-+# define GC_MACH_THREAD_STATE PPC_THREAD_STATE64
-+# define GC_MACH_THREAD_STATE_COUNT PPC_THREAD_STATE64_COUNT
-+# define GC_MACH_HEADER mach_header_64
-+# define GC_MACH_SECTION section_64
-+# endif
-+# elif defined(I386) || defined(X86_64)
-+# if CPP_WORDSZ == 32
-+# define GC_THREAD_STATE_T x86_thread_state32_t
-+# define GC_MACH_THREAD_STATE x86_THREAD_STATE32
-+# define GC_MACH_THREAD_STATE_COUNT x86_THREAD_STATE32_COUNT
-+# define GC_MACH_HEADER mach_header
-+# define GC_MACH_SECTION section
-+# else
-+# define GC_THREAD_STATE_T x86_thread_state64_t
-+# define GC_MACH_THREAD_STATE x86_THREAD_STATE64
-+# define GC_MACH_THREAD_STATE_COUNT x86_THREAD_STATE64_COUNT
-+# define GC_MACH_HEADER mach_header_64
-+# define GC_MACH_SECTION section_64
-+# endif
-+# else
-+# error define GC_THREAD_STATE_T
-+# define GC_MACH_THREAD_STATE MACHINE_THREAD_STATE
-+# define GC_MACH_THREAD_STATE_COUNT MACHINE_THREAD_STATE_COUNT
-+# endif
-+/* Try to work out the right way to access thread state structure members.
-+ The structure has changed its definition in different Darwin versions.
-+ This now defaults to the (older) names without __, thus hopefully,
-+ not breaking any existing Makefile.direct builds. */
-+# if defined (HAS_PPC_THREAD_STATE___R0) \
-+ || defined (HAS_PPC_THREAD_STATE64___R0) \
-+ || defined (HAS_X86_THREAD_STATE32___EAX) \
-+ || defined (HAS_X86_THREAD_STATE64___RAX)
-+# define THREAD_FLD(x) __ ## x
-+# else
-+# define THREAD_FLD(x) x
-+# endif
-+#endif
- /*********************************/
- /* */
- /* Word-size-dependent defines */
-Index: boehm-gc/include/private/gcconfig.h
-===================================================================
---- boehm-gc/include/private/gcconfig.h (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/include/private/gcconfig.h (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -302,7 +302,10 @@
- # if defined(__ppc__) || defined(__ppc64__)
- # define POWERPC
- # define mach_type_known
--# elif defined(__i386__) || defined(__x86_64)
-+# elif defined(__x86_64__)
-+# define X86_64
-+# define mach_type_known
-+# elif defined(__i386__)
- # define I386
- # define mach_type_known
- # endif
-@@ -791,26 +794,29 @@
- # define DATAEND (_end)
- # endif
- # ifdef DARWIN
--# if defined(__ppc64__) || defined(__x86_64)
-+# define OS_TYPE "DARWIN"
-+# define DYNAMIC_LOADING
-+# if defined(__ppc64__)
- # define ALIGNMENT 8
- # define CPP_WORDSZ 64
-+# define STACKBOTTOM ((ptr_t) 0x7fff5fc00000)
-+# define CACHE_LINE_SIZE 64
-+# ifndef HBLKSIZE
-+# define HBLKSIZE 4096
-+# endif
- # else
- # define ALIGNMENT 4
-+# define STACKBOTTOM ((ptr_t) 0xc0000000)
- # endif
--# define OS_TYPE "DARWIN"
--# define DYNAMIC_LOADING
- /* XXX: see get_end(3), get_etext() and get_end() should not be used.
-- These aren't used when dyld support is enabled (it is by default) */
-+ These aren't used when dyld support is enabled (it is by default) */
- # define DATASTART ((ptr_t) get_etext())
- # define DATAEND ((ptr_t) get_end())
--# define STACKBOTTOM ((ptr_t) 0xc0000000)
- # define USE_MMAP
- # define USE_MMAP_ANON
- # define USE_ASM_PUSH_REGS
-- /* This is potentially buggy. It needs more testing. See the comments in
-- os_dep.c. It relies on threads to track writes. */
- # ifdef GC_DARWIN_THREADS
--/* # define MPROTECT_VDB -- diabled for now. May work for some apps. */
-+# define MPROTECT_VDB
- # endif
- # include <unistd.h>
- # define GETPAGESIZE() getpagesize()
-@@ -822,7 +828,7 @@
- __asm__ __volatile__ ("dcbtst 0,%0" : : "r" ((const void *) (x)))
- # endif
- /* There seems to be some issues with trylock hanging on darwin. This
-- should be looked into some more */
-+ should be looked into some more */
- # define NO_PTHREAD_TRYLOCK
- # endif
- # ifdef FREEBSD
-@@ -1317,23 +1323,21 @@
- # define DARWIN_DONT_PARSE_STACK
- # define DYNAMIC_LOADING
- /* XXX: see get_end(3), get_etext() and get_end() should not be used.
-- These aren't used when dyld support is enabled (it is by default) */
-+ These aren't used when dyld support is enabled (it is by default) */
- # define DATASTART ((ptr_t) get_etext())
- # define DATAEND ((ptr_t) get_end())
- # define STACKBOTTOM ((ptr_t) 0xc0000000)
- # define USE_MMAP
- # define USE_MMAP_ANON
- # define USE_ASM_PUSH_REGS
-- /* This is potentially buggy. It needs more testing. See the comments in
-- os_dep.c. It relies on threads to track writes. */
- # ifdef GC_DARWIN_THREADS
--/* # define MPROTECT_VDB -- disabled for now. May work for some apps. */
-+# define MPROTECT_VDB
- # endif
- # include <unistd.h>
- # define GETPAGESIZE() getpagesize()
- /* There seems to be some issues with trylock hanging on darwin. This
-- should be looked into some more */
--# define NO_PTHREAD_TRYLOCK
-+ should be looked into some more */
-+# define NO_PTHREAD_TRYLOCK
- # endif /* DARWIN */
- # endif
-
-@@ -1986,6 +1990,26 @@
- # define PREFETCH_FOR_WRITE(x) __builtin_prefetch((x), 1)
- # endif
- # endif
-+# ifdef DARWIN
-+# define OS_TYPE "DARWIN"
-+# define DARWIN_DONT_PARSE_STACK
-+# define DYNAMIC_LOADING
-+ /* XXX: see get_end(3), get_etext() and get_end() should not be used.
-+ These aren't used when dyld support is enabled (it is by default) */
-+# define DATASTART ((ptr_t) get_etext())
-+# define DATAEND ((ptr_t) get_end())
-+# define STACKBOTTOM ((ptr_t) 0x7fff5fc00000)
-+# define USE_MMAP
-+# define USE_MMAP_ANON
-+# ifdef GC_DARWIN_THREADS
-+# define MPROTECT_VDB
-+# endif
-+# include <unistd.h>
-+# define GETPAGESIZE() getpagesize()
-+ /* There seems to be some issues with trylock hanging on darwin. This
-+ should be looked into some more */
-+# define NO_PTHREAD_TRYLOCK
-+# endif
- # ifdef FREEBSD
- # define OS_TYPE "FREEBSD"
- # ifndef GC_FREEBSD_THREADS
-Index: boehm-gc/ChangeLog
-===================================================================
---- boehm-gc/ChangeLog (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/ChangeLog (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,3 +1,67 @@
-+2007-05-22 Andreas Tobler <a.tobler@schweiz.org>
-+
-+ * Backport r124870 from main.
-+
-+ 2007-05-20 Andreas Tobler <a.tobler@schweiz.org>
-+
-+ * configure.ac: Introduce extra_ldflags_libgc. Use it for Darwin.
-+ * configure: Regenerate.
-+ * Makefile.am (libgc_la_LDFLAGS): Use extra_ldflags_libgc.
-+ * Makefile.in: Regenerate.
-+ * include/Makefile.in: Regenerate.
-+ * include/private/gcconfig.h: Enable MPROTECT_VDB for all Darwin
-+ targets. Remove comments. Prepare ppc64 support for Darwin.
-+
-+2007-05-19 Andreas Tobler <a.tobler@schweiz.org>
-+
-+ * Backport r120684, 120801, 120853, 120874 and 120977 from main.
-+
-+ 2007-01-19 Andreas Tobler <a.tobler@schweiz.org>
-+
-+ * os_dep.c (defined(MPROTECT_VDB) && defined(DARWIN)): Moved recently
-+ added defines to include/private/gc_priv.h
-+ * darwin_stop_world.c: Removed the above defines.
-+ (catch_exception_raise): Added THREAD_FLD in exc_state for POWERPC too.
-+ * include/private/gc_priv.h: Moved definitions from darwin_stop_world.c
-+ and os_dep.c to here. Fixed THREAD definition fixes for ppc64.
-+
-+ 2007-01-17 Mike Stump <mrs@apple.com>
-+
-+ * os_dep.c: Fix i686-apple-darwin9 builds.
-+
-+ 2007-01-17 Andreas Tobler <a.tobler@schweiz.org>
-+
-+ * include/gc_config.h.in: Regenerate.
-+
-+ 2007-01-15 Andreas Tobler <a.tobler@schweiz.org>
++ From Tom Honermann <tom.honermann@oracle.com>:
++ * src/powerpc/aix.S: Declare .ffi_prep_args. Insert nops after
++ branch instructions.
++ * src/powerpc/aix_closure.S: Declare .ffi_closure_helper_DARWIN.
+
-+ * os_dep.c (defined(MPROTECT_VDB) && defined(DARWIN)): Adjust mail
-+ reference.
-+ (catch_exception_raise): Fix typo in the I386 exc_state.
-+
-+ 2007-01-11 Andreas Tobler <a.tobler@schweiz.org>
-+
-+ * configure.ac: Replaced HAS_I386_THREAD_STATE_* with
-+ HAS_X86_THREAD_STATE32_* and HAS_X86_THREAD_STATE64_* respectively.
-+ * configure: Regenerated.
-+ * include/private/gcconfig.h (DARWIN): Added X86_64 define for Darwin.
-+ Added base definitions for the X86_64 Darwin port.
-+ * include/private/gc_priv.h: Added definitions for Darwin MACH thread
-+ operations. Moved existing THREAD_STATE info from darwin_stop_world.c.
-+ * darwin_stop_world.c: Removed THREAD_STATE info. Added
-+ HAS_X86_THREAD_STATE64___RAX. And replaced HAS_I386_THREAD_STATE___EAX
-+ with HAS_X86_THREAD_STATE32___EAX.
-+ (GC_push_all_stacks): Use GC_MACH_THREAD_STATE_COUNT. Add code for
-+ X86_64 Darwin.
-+ * dyn_load.c (GC_dyld_name_for_hdr): Use GC_MACH_HEADER.
-+ (GC_dyld_image_add): Use GC_MACH_HEADER and GC_MACH_SECTION.
-+ Distinguish between getsectbynamefromheader_64 and
-+ getsectbynamefromheader.
-+ (GC_dyld_image_remove): Likewise.
-+ * os_dep.c (GC_dirty_init): Use GC_MACH_THREAD_STATE.
-+ (catch_exception_raise): Introduce exception information for I386 and
-+ X86_64 Darwin. Add X86_64 for exc_state.faultvaddr.
-+
- 2007-05-13 Release Manager
-
- * GCC 4.2.0 released.
-Index: boehm-gc/configure
-===================================================================
---- boehm-gc/configure (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/configure (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -309,7 +309,7 @@
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS multi_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical mkinstalldirs INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CFLAGS CXXFLAGS CCAS CCASFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GC_CFLAGS LN_S LIBTOOL CXXCPP CPPFLAGS THREADLIBS POWERPC_DARWIN_TRUE POWERPC_DARWIN_FALSE EXTRA_TEST_LIBS target_all CPLUSPLUS_TRUE CPLUSPLUS_FALSE AM_CPPFLAGS addobjs addincludes addlibs addtests CPP EGREP MY_CFLAGS toolexecdir toolexeclibdir LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS multi_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical mkinstalldirs INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CFLAGS CXXFLAGS CCAS CCASFLAGS AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GC_CFLAGS LN_S LIBTOOL CXXCPP CPPFLAGS THREADLIBS POWERPC_DARWIN_TRUE POWERPC_DARWIN_FALSE extra_ldflags_libgc EXTRA_TEST_LIBS target_all CPLUSPLUS_TRUE CPLUSPLUS_FALSE AM_CPPFLAGS addobjs addincludes addlibs addtests CPP EGREP MY_CFLAGS toolexecdir toolexeclibdir LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -5741,7 +5741,7 @@
- if test $ac_cv_member_ppc_thread_state_t_r0 = yes; then
-
- cat >>confdefs.h <<\_ACEOF
--#define HAS_PPC_THREAD_STATE_R0
-+#define HAS_PPC_THREAD_STATE_R0 1
- _ACEOF
-
- fi
-@@ -5852,7 +5852,7 @@
- if test $ac_cv_member_ppc_thread_state_t___r0 = yes; then
-
- cat >>confdefs.h <<\_ACEOF
--#define HAS_PPC_THREAD_STATE___R0
-+#define HAS_PPC_THREAD_STATE___R0 1
- _ACEOF
-
- fi
-@@ -5963,7 +5963,7 @@
- if test $ac_cv_member_ppc_thread_state64_t_r0 = yes; then
-
- cat >>confdefs.h <<\_ACEOF
--#define HAS_PPC_THREAD_STATE64_R0
-+#define HAS_PPC_THREAD_STATE64_R0 1
- _ACEOF
-
- fi
-@@ -6074,16 +6074,16 @@
- if test $ac_cv_member_ppc_thread_state64_t___r0 = yes; then
-
- cat >>confdefs.h <<\_ACEOF
--#define HAS_PPC_THREAD_STATE64___R0
-+#define HAS_PPC_THREAD_STATE64___R0 1
- _ACEOF
-
- fi
-
- ;;
- i?86*-*-darwin*)
-- echo "$as_me:$LINENO: checking for i386_thread_state_t.eax" >&5
--echo $ECHO_N "checking for i386_thread_state_t.eax... $ECHO_C" >&6
--if test "${ac_cv_member_i386_thread_state_t_eax+set}" = set; then
-+ echo "$as_me:$LINENO: checking for x86_thread_state32_t.eax" >&5
-+echo $ECHO_N "checking for x86_thread_state32_t.eax... $ECHO_C" >&6
-+if test "${ac_cv_member_x86_thread_state32_t_eax+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6093,12 +6093,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/cdefs.h>
--#include <mach/thread_status.h>
-+ #include <mach/thread_status.h>
-
- int
- main ()
- {
--static i386_thread_state_t ac_aggr;
-+static x86_thread_state32_t ac_aggr;
- if (ac_aggr.eax)
- return 0;
- ;
-@@ -6127,7 +6127,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_member_i386_thread_state_t_eax=yes
-+ ac_cv_member_x86_thread_state32_t_eax=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -6139,12 +6139,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/cdefs.h>
--#include <mach/thread_status.h>
-+ #include <mach/thread_status.h>
-
- int
- main ()
- {
--static i386_thread_state_t ac_aggr;
-+static x86_thread_state32_t ac_aggr;
- if (sizeof ac_aggr.eax)
- return 0;
- ;
-@@ -6173,30 +6173,30 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_member_i386_thread_state_t_eax=yes
-+ ac_cv_member_x86_thread_state32_t_eax=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_member_i386_thread_state_t_eax=no
-+ac_cv_member_x86_thread_state32_t_eax=no
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_member_i386_thread_state_t_eax" >&5
--echo "${ECHO_T}$ac_cv_member_i386_thread_state_t_eax" >&6
--if test $ac_cv_member_i386_thread_state_t_eax = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_member_x86_thread_state32_t_eax" >&5
-+echo "${ECHO_T}$ac_cv_member_x86_thread_state32_t_eax" >&6
-+if test $ac_cv_member_x86_thread_state32_t_eax = yes; then
-
- cat >>confdefs.h <<\_ACEOF
--#define HAS_I386_THREAD_STATE_EAX
-+#define HAS_X86_THREAD_STATE32_EAX 1
- _ACEOF
-
- fi
-
-- echo "$as_me:$LINENO: checking for i386_thread_state_t.__eax" >&5
--echo $ECHO_N "checking for i386_thread_state_t.__eax... $ECHO_C" >&6
--if test "${ac_cv_member_i386_thread_state_t___eax+set}" = set; then
-+ echo "$as_me:$LINENO: checking for x86_thread_state32_t.__eax" >&5
-+echo $ECHO_N "checking for x86_thread_state32_t.__eax... $ECHO_C" >&6
-+if test "${ac_cv_member_x86_thread_state32_t___eax+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6206,12 +6206,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/cdefs.h>
--#include <mach/thread_status.h>
-+ #include <mach/thread_status.h>
-
- int
- main ()
- {
--static i386_thread_state_t ac_aggr;
-+static x86_thread_state32_t ac_aggr;
- if (ac_aggr.__eax)
- return 0;
- ;
-@@ -6240,7 +6240,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_member_i386_thread_state_t___eax=yes
-+ ac_cv_member_x86_thread_state32_t___eax=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -6252,12 +6252,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <sys/cdefs.h>
--#include <mach/thread_status.h>
-+ #include <mach/thread_status.h>
-
- int
- main ()
- {
--static i386_thread_state_t ac_aggr;
-+static x86_thread_state32_t ac_aggr;
- if (sizeof ac_aggr.__eax)
- return 0;
- ;
-@@ -6286,28 +6286,256 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_member_i386_thread_state_t___eax=yes
-+ ac_cv_member_x86_thread_state32_t___eax=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_member_i386_thread_state_t___eax=no
-+ac_cv_member_x86_thread_state32_t___eax=no
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_member_i386_thread_state_t___eax" >&5
--echo "${ECHO_T}$ac_cv_member_i386_thread_state_t___eax" >&6
--if test $ac_cv_member_i386_thread_state_t___eax = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_member_x86_thread_state32_t___eax" >&5
-+echo "${ECHO_T}$ac_cv_member_x86_thread_state32_t___eax" >&6
-+if test $ac_cv_member_x86_thread_state32_t___eax = yes; then
-
- cat >>confdefs.h <<\_ACEOF
--#define HAS_I386_THREAD_STATE___EAX
-+#define HAS_X86_THREAD_STATE32___EAX 1
- _ACEOF
-
- fi
-
- ;;
-+ x86_64-*-darwin*)
-+ echo "$as_me:$LINENO: checking for x86_thread_state64_t.rax" >&5
-+echo $ECHO_N "checking for x86_thread_state64_t.rax... $ECHO_C" >&6
-+if test "${ac_cv_member_x86_thread_state64_t_rax+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/cdefs.h>
-+ #include <mach/thread_status.h>
-+
-+int
-+main ()
-+{
-+static x86_thread_state64_t ac_aggr;
-+if (ac_aggr.rax)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_member_x86_thread_state64_t_rax=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/cdefs.h>
-+ #include <mach/thread_status.h>
-+
-+int
-+main ()
-+{
-+static x86_thread_state64_t ac_aggr;
-+if (sizeof ac_aggr.rax)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_member_x86_thread_state64_t_rax=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_member_x86_thread_state64_t_rax=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_member_x86_thread_state64_t_rax" >&5
-+echo "${ECHO_T}$ac_cv_member_x86_thread_state64_t_rax" >&6
-+if test $ac_cv_member_x86_thread_state64_t_rax = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAS_X86_THREAD_STATE64_RAX 1
-+_ACEOF
-+
-+fi
-+
-+ echo "$as_me:$LINENO: checking for x86_thread_state64_t.__rax" >&5
-+echo $ECHO_N "checking for x86_thread_state64_t.__rax... $ECHO_C" >&6
-+if test "${ac_cv_member_x86_thread_state64_t___rax+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/cdefs.h>
-+ #include <mach/thread_status.h>
-+
-+int
-+main ()
-+{
-+static x86_thread_state64_t ac_aggr;
-+if (ac_aggr.__rax)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_member_x86_thread_state64_t___rax=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <sys/cdefs.h>
-+ #include <mach/thread_status.h>
-+
-+int
-+main ()
-+{
-+static x86_thread_state64_t ac_aggr;
-+if (sizeof ac_aggr.__rax)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_member_x86_thread_state64_t___rax=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_member_x86_thread_state64_t___rax=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_member_x86_thread_state64_t___rax" >&5
-+echo "${ECHO_T}$ac_cv_member_x86_thread_state64_t___rax" >&6
-+if test $ac_cv_member_x86_thread_state64_t___rax = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAS_X86_THREAD_STATE64___RAX 1
-+_ACEOF
-+
-+fi
-+
-+ ;;
- *) ;;
- esac
-
-@@ -6392,8 +6620,16 @@
- ;;
- esac
-
-+# extra LD Flags which are required for targets
-+case "${host}" in
-+ *-*-darwin*)
-+ extra_ldflags_libgc=-Wl,-single_module
-+ ;;
-+esac
-
-
-+
-+
- target_all=libgcjgc.la
-
-
-@@ -8246,6 +8482,7 @@
- s,@THREADLIBS@,$THREADLIBS,;t t
- s,@POWERPC_DARWIN_TRUE@,$POWERPC_DARWIN_TRUE,;t t
- s,@POWERPC_DARWIN_FALSE@,$POWERPC_DARWIN_FALSE,;t t
-+s,@extra_ldflags_libgc@,$extra_ldflags_libgc,;t t
- s,@EXTRA_TEST_LIBS@,$EXTRA_TEST_LIBS,;t t
- s,@target_all@,$target_all,;t t
- s,@CPLUSPLUS_TRUE@,$CPLUSPLUS_TRUE,;t t
-Index: boehm-gc/os_dep.c
-===================================================================
---- boehm-gc/os_dep.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/os_dep.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -3371,7 +3371,7 @@
- 1. Apple's mach/xnu documentation
- 2. Timothy J. Wood's "Mach Exception Handlers 101" post to the
- omnigroup's macosx-dev list.
-- www.omnigroup.com/mailman/archive/macosx-dev/2000-June/002030.html
-+ www.omnigroup.com/mailman/archive/macosx-dev/2000-June/014178.html
- 3. macosx-nat.c from Apple's GDB source code.
- */
-
-@@ -3683,7 +3683,7 @@
- mask,
- GC_ports.exception,
- EXCEPTION_DEFAULT,
-- MACHINE_THREAD_STATE
-+ GC_MACH_THREAD_STATE
- );
- if(r != KERN_SUCCESS) ABORT("task_set_exception_ports failed");
-
-@@ -3802,10 +3802,16 @@
- mach_msg_type_number_t exc_state_count = PPC_EXCEPTION_STATE64_COUNT;
- ppc_exception_state64_t exc_state;
- # endif
--# elif defined(I386)
-- thread_state_flavor_t flavor = i386_EXCEPTION_STATE;
-- mach_msg_type_number_t exc_state_count = i386_EXCEPTION_STATE_COUNT;
-- i386_exception_state_t exc_state;
-+# elif defined(I386) || defined(X86_64)
-+# if CPP_WORDSZ == 32
-+ thread_state_flavor_t flavor = x86_EXCEPTION_STATE32;
-+ mach_msg_type_number_t exc_state_count = x86_EXCEPTION_STATE32_COUNT;
-+ x86_exception_state32_t exc_state;
-+# else
-+ thread_state_flavor_t flavor = x86_EXCEPTION_STATE64;
-+ mach_msg_type_number_t exc_state_count = x86_EXCEPTION_STATE64_COUNT;
-+ x86_exception_state64_t exc_state;
-+# endif
- # else
- # error FIXME for non-ppc darwin
- # endif
-@@ -3838,9 +3844,9 @@
-
- /* This is the address that caused the fault */
- #if defined(POWERPC)
-- addr = (char*) exc_state.dar;
--#elif defined (I386)
-- addr = (char*) exc_state.faultvaddr;
-+ addr = (char*) exc_state. THREAD_FLD(dar);
-+#elif defined (I386) || defined (X86_64)
-+ addr = (char*) exc_state. THREAD_FLD(faultvaddr);
- #else
- # error FIXME for non POWERPC/I386
- #endif
-Index: boehm-gc/Makefile.am
-===================================================================
---- boehm-gc/Makefile.am (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/Makefile.am (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -33,11 +33,13 @@
- rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
- sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
-
-+extra_ldflags_libgc = @extra_ldflags_libgc@
-+
- # Include THREADLIBS here to ensure that the correct versions of
- # linuxthread semaphore functions get linked:
- libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS)
- libgcjgc_la_DEPENDENCIES = @addobjs@
--libgcjgc_la_LDFLAGS = -version-info 1:2:0 -rpath $(toolexeclibdir)
-+libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir)
-
- libgcjgc_convenience_la_LIBADD = @addobjs@
- libgcjgc_convenience_la_DEPENDENCIES = @addobjs@
-Index: boehm-gc/dyn_load.c
-===================================================================
---- boehm-gc/dyn_load.c (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ boehm-gc/dyn_load.c (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1152,7 +1152,7 @@
- };
-
- #ifdef DARWIN_DEBUG
--static const char *GC_dyld_name_for_hdr(struct mach_header *hdr) {
-+static const char *GC_dyld_name_for_hdr(const struct GC_MACH_HEADER *hdr) {
- unsigned long i,c;
- c = _dyld_image_count();
- for(i=0;i<c;i++) if(_dyld_get_image_header(i) == hdr)
-@@ -1162,12 +1162,17 @@
- #endif
-
- /* This should never be called by a thread holding the lock */
--static void GC_dyld_image_add(struct mach_header* hdr, unsigned long slide) {
-+static void GC_dyld_image_add(const struct GC_MACH_HEADER *hdr, intptr_t slide)
-+{
- unsigned long start,end,i;
-- const struct section *sec;
-+ const struct GC_MACH_SECTION *sec;
- if (GC_no_dls) return;
- for(i=0;i<sizeof(GC_dyld_sections)/sizeof(GC_dyld_sections[0]);i++) {
-- sec = getsectbynamefromheader(
-+# if defined (__LP64__)
-+ sec = getsectbynamefromheader_64(
-+# else
-+ sec = getsectbynamefromheader(
-+# endif
- hdr,GC_dyld_sections[i].seg,GC_dyld_sections[i].sect);
- if(sec == NULL || sec->size == 0) continue;
- start = slide + sec->addr;
-@@ -1184,11 +1189,16 @@
- }
-
- /* This should never be called by a thread holding the lock */
--static void GC_dyld_image_remove(struct mach_header* hdr, unsigned long slide) {
-+static void GC_dyld_image_remove(const struct GC_MACH_HEADER *hdr,
-+ intptr_t slide) {
- unsigned long start,end,i;
-- const struct section *sec;
-+ const struct GC_MACH_SECTION *sec;
- for(i=0;i<sizeof(GC_dyld_sections)/sizeof(GC_dyld_sections[0]);i++) {
-- sec = getsectbynamefromheader(
-+# if defined (__LP64__)
-+ sec = getsectbynamefromheader_64(
-+# else
-+ sec = getsectbynamefromheader(
-+# endif
- hdr,GC_dyld_sections[i].seg,GC_dyld_sections[i].sect);
- if(sec == NULL || sec->size == 0) continue;
- start = slide + sec->addr;
-Index: configure.in
-===================================================================
---- configure.in (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ configure.in (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -2419,7 +2419,13 @@
- # Pass -fkeep-inline-functions for stage 1 if the GCC version supports it.
- CFLAGS="$CFLAGS -fkeep-inline-functions"
- AC_MSG_CHECKING([whether -fkeep-inline-functions is supported])
-- AC_TRY_COMPILE(,,
-+ AC_TRY_COMPILE([
-+#if (__GNUC__ < 3) \
-+ || (__GNUC__ == 3 && (__GNUC_MINOR__ < 3 \
-+ || (__GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ < 1)))
-+#error http://gcc.gnu.org/PR29382
-+#endif
-+ ],,
- [AC_MSG_RESULT([yes]); stage1_cflags="$stage1_cflags -fkeep-inline-functions"],
- [AC_MSG_RESULT([no])])
-
-Index: ChangeLog
-===================================================================
---- ChangeLog (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ ChangeLog (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,3 +1,9 @@
-+2007-05-30 Jakub Jelinek <jakub@redhat.com>
-+
-+ PR bootstrap/29382
-+ * configure.in: Don't use -fkeep-inline-functions for GCC < 3.3.1.
-+ * configure: Rebuilt.
-+
- 2007-05-13 Release Manager
-
- * GCC 4.2.0 released.
-Index: libjava/java/lang/natClassLoader.cc
-===================================================================
---- libjava/java/lang/natClassLoader.cc (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libjava/java/lang/natClassLoader.cc (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -235,6 +235,15 @@
-
- new_class->engine = &_Jv_soleIndirectCompiledEngine;
-
-+ /* FIXME: Way back before the dawn of time, we overloaded the
-+ SYNTHETIC class access modifier to mean INTERPRETED. This was a
-+ Bad Thing, but it didn't matter then because classes were never
-+ marked synthetic. However, it is possible to redeem the
-+ situation: _Jv_NewClassFromInitializer is only called from
-+ compiled classes, so we clear the INTERPRETED flag. This is a
-+ kludge! */
-+ new_class->accflags &= ~java::lang::reflect::Modifier::INTERPRETED;
-+
- if (_Jv_CheckABIVersion ((unsigned long) new_class->next_or_version))
- (*_Jv_RegisterClassHook) (new_class);
-
-Index: libjava/ChangeLog
-===================================================================
---- libjava/ChangeLog (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ libjava/ChangeLog (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,3 +1,8 @@
-+2007-05-31 Andrew Haley <aph@redhat.com>
-+
-+ * java/lang/natClassLoader.cc (_Jv_NewClassFromInitializer): Clear
-+ INTERPRETED access modifier.
-+
- 2007-05-13 Release Manager
-
- * GCC 4.2.0 released.
-Index: maintainer-scripts/ChangeLog
-===================================================================
---- maintainer-scripts/ChangeLog (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ maintainer-scripts/ChangeLog (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -1,3 +1,7 @@
-+2007-05-28 Mark Mitchell <mark@codesourcery.com>
-+
-+ * gcc_release: Adjust placement of release candidates.
-+
- 2007-05-13 Release Manager
+ 2012-03-22 Release Manager
- * GCC 4.2.0 released.
-Index: maintainer-scripts/gcc_release
-===================================================================
---- maintainer-scripts/gcc_release (.../tags/gcc_4_2_0_release) (wersja 125589)
-+++ maintainer-scripts/gcc_release (.../branches/gcc-4_2-branch) (wersja 125589)
-@@ -699,10 +699,10 @@
- # and minor release numbers.
- SVNBRANCH="branches/gcc-${RELEASE_MAJOR}_${RELEASE_MINOR}-branch"
-
-- # If this is not a final release, set various parameters acordingly.
-+ # If this is not a final release, set various parameters accordingly.
- if [ ${FINAL} -ne 1 ]; then
-- RELEASE="${RELEASE}-${DATE}"
-- FTP_PATH="${FTP_PATH}/prerelease-${RELEASE}/"
-+ RELEASE="${RELEASE}-RC-${DATE}"
-+ FTP_PATH="${SNAPSHOTS_DIR}/${RELEASE}"
- else
- FTP_PATH="${FTP_PATH}/releases/gcc-${RELEASE}/"
- fi
+ * GCC 4.7.0 released.
projects / packages / gcc.git / blobdiff