alias.c (set_reg_known_value, [...]): Prototype.

	* alias.c (set_reg_known_value, set_reg_known_equiv_p):
	Prototype.
	(get_reg_known_value, set_reg_known_value,
	get_reg_known_equiv_p, set_reg_known_equiv_p): Use traditional
	style function definitions.
	(set_reg_known_equiv_p): Change parameter from bool to int.

	Backport:

	2003-06-13  Matt Kraai  <kraai@alumni.cmu.edu>

	* unwind-c.c: Define NO_SIZE_OF_ENCODED_VALUE.
	* unwind-pe.h (size_of_encoded_value): Do not define if
	NO_SIZE_OF_ENCODED_VALUE is defined.

	2003-10-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* unwind-dw2.c (NO_SIZE_OF_ENCODED_VALUE): Define when
	appropriate.

	2003-05-07  Richard Henderson  <rth@redhat.com>

	* unwind-dw2.c (_Unwind_GetCFA): Cast pointer to _Unwind_Ptr,
	not _Unwind_Word.

cp:
	* Make-lang.in (cp/init.o): Depend on diagnostic.h.
	* except.c (do_free_exception): Prototype.
	* init.c: Include "diagnostic.h".

f:
	Backport:

	2004-02-24  Michael Matz  <matz@suse.de>

	* sta.c (ffesta_save_): Don't break aliasing rules.

From-SVN: r81649

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e6d22fce6dc19383c644a57e2c7dc5ba92df73dc..efef8d2c6fef65628590d0f41824306acc4cf1d3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,30 @@
+2004-05-08  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * alias.c (set_reg_known_value, set_reg_known_equiv_p):
+       Prototype.
+       (get_reg_known_value, set_reg_known_value,
+       get_reg_known_equiv_p, set_reg_known_equiv_p): Use traditional
+       style function definitions.
+       (set_reg_known_equiv_p): Change parameter from bool to int.
+       
+       Backport:
+       
+       2003-06-13  Matt Kraai  <kraai@alumni.cmu.edu>
+
+       * unwind-c.c: Define NO_SIZE_OF_ENCODED_VALUE.
+       * unwind-pe.h (size_of_encoded_value): Do not define if
+       NO_SIZE_OF_ENCODED_VALUE is defined.
+
+       2003-10-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+       
+       * unwind-dw2.c (NO_SIZE_OF_ENCODED_VALUE): Define when
+       appropriate.
+
+       2003-05-07  Richard Henderson  <rth@redhat.com>
+       
+       * unwind-dw2.c (_Unwind_GetCFA): Cast pointer to _Unwind_Ptr,
+       not _Unwind_Word.
+
 2004-05-08  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        * doc/install.texi (sparc-sun-solaris2*): Document bootstrap

diff --git a/gcc/alias.c b/gcc/alias.c
index 3213f33ed906cbb7de25a5698ab97f27f4e98e18..e320a6f0efc6b1737233093e6f7fed97050aa9cb 100644 (file)
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -110,6 +110,8 @@ static tree decl_for_component_ref  PARAMS ((tree));
 static rtx adjust_offset_for_component_ref PARAMS ((tree, rtx));
 static int nonoverlapping_memrefs_p    PARAMS ((rtx, rtx));
 static int write_dependence_p           PARAMS ((rtx, rtx, int));
+static void set_reg_known_value                PARAMS ((unsigned int, rtx));
+static void set_reg_known_equiv_p      PARAMS ((unsigned int, int));
 
 static int nonlocal_mentioned_p_1       PARAMS ((rtx *, void *));
 static int nonlocal_mentioned_p         PARAMS ((rtx));
@@ -1068,7 +1070,8 @@ clear_reg_alias_info (reg)
 /* If a value is known for REGNO, return it.  */
 
 rtx 
-get_reg_known_value (unsigned int regno)
+get_reg_known_value (regno)
+     unsigned int regno;
 {
   if (regno >= FIRST_PSEUDO_REGISTER)
     {
@@ -1082,7 +1085,9 @@ get_reg_known_value (unsigned int regno)
 /* Set it.  */
 
 static void
-set_reg_known_value (unsigned int regno, rtx val)
+set_reg_known_value (regno, val)
+     unsigned int regno;
+     rtx val;
 {
   if (regno >= FIRST_PSEUDO_REGISTER)
     {
@@ -1095,7 +1100,8 @@ set_reg_known_value (unsigned int regno, rtx val)
 /* Similarly for reg_known_equiv_p.  */
 
 bool
-get_reg_known_equiv_p (unsigned int regno)
+get_reg_known_equiv_p (regno)
+     unsigned int regno;
 {
   if (regno >= FIRST_PSEUDO_REGISTER)
     {
@@ -1107,7 +1113,9 @@ get_reg_known_equiv_p (unsigned int regno)
 }
 
 static void
-set_reg_known_equiv_p (unsigned int regno, bool val)
+set_reg_known_equiv_p (regno, val)
+     unsigned int regno;
+     int val;
 {
   if (regno >= FIRST_PSEUDO_REGISTER)
     {

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 86f60c9ac28bb1df3b4a8e14eb0f45b94ad39713..85adf271e05039c34ed8d9a027ab0eaf6c71ede0 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-08  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * Make-lang.in (cp/init.o): Depend on diagnostic.h.
+       * except.c (do_free_exception): Prototype.
+       * init.c: Include "diagnostic.h".
+
 2004-05-04  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
        Backport:

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index afeb7aba4f806d91e2aa5319b0476b2b2881340b..e6640554ea88d3cad7671bf3a17fda1265e5f9d3 100644 (file)
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -250,7 +250,7 @@ cp/call.o: cp/call.c $(CXX_TREE_H) flags.h toplev.h $(RTL_H) $(EXPR_H) \
      $(GGC_H) diagnostic.h gt-cp-call.h
 cp/friend.o: cp/friend.c $(CXX_TREE_H) flags.h $(RTL_H) toplev.h $(EXPR_H)
 cp/init.o: cp/init.c $(CXX_TREE_H) flags.h $(RTL_H) $(EXPR_H) toplev.h \
-  $(GGC_H) except.h
+  diagnostic.h $(GGC_H) except.h
 cp/method.o: cp/method.c $(CXX_TREE_H) toplev.h $(GGC_H) $(RTL_H) $(EXPR_H) \
   $(TM_P_H) $(TARGET_H)
 cp/cvt.o: cp/cvt.c $(CXX_TREE_H) cp/decl.h flags.h toplev.h convert.h

diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 6b32a5bd08dd89c8d2f6e89b918e4576111cadb1..52b89705e4e40d6d19326e4b2734271286afac35 100644 (file)
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -53,6 +53,7 @@ static bool is_admissible_throw_operand PARAMS ((tree));
 static int can_convert_eh PARAMS ((tree, tree));
 static void check_handlers_1 PARAMS ((tree, tree));
 static tree cp_protect_cleanup_actions PARAMS ((void));
+static tree do_free_exception PARAMS ((tree));
 
 /* Sets up all the global eh stuff that needs to be initialized at the
    start of compilation.  */

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index f3fa9aa93f792f41a1321206d6f6cf297f064270..5a408030d7d96b38bebf0bb684eed5c7f26c12d3 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "except.h"
 #include "toplev.h"
+#include "diagnostic.h"
 #include "ggc.h"
 
 static void construct_virtual_base (tree, tree);

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 18528b2c0a1acca4ecea14deb09d306ec4f2e5c0..d10ee8c993b61a88ab31ced45cbeeeea150ebdec 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,11 @@
+Sat May  8 17:50:43 2004  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       Backport:
+       
+       2004-02-24  Michael Matz  <matz@suse.de>
+       
+       * sta.c (ffesta_save_): Don't break aliasing rules.
+
 2004-04-18  Gerald Pfeifer  <gerald@pfeifer.com>
 
        * g77.texi (Floating-point Errors): Avoid referencing 

diff --git a/gcc/f/sta.c b/gcc/f/sta.c
index 0b4c11aa9efd4384692023807ca437ca76b713bf..37c8b6798427dd0b90fc1511e89802ccd4674e02 100644 (file)
--- a/gcc/f/sta.c
+++ b/gcc/f/sta.c
@@ -337,7 +337,7 @@ ffesta_save_ (ffelexToken t)
     {                          /* No handler in this list, try exec list if
                                   not tried yet. */
       if (ffesta_current_possible_
-         == (ffestaPossible_) &ffesta_possible_nonexecs_)
+         == (ffestaPossible_) &ffesta_possible_nonexecs_.first)
        {
          ffesta_current_possible_ = ffesta_possible_execs_.first;
          ffesta_current_handler_ = ffesta_current_possible_->handler;
@@ -381,7 +381,7 @@ ffesta_save_ (ffelexToken t)
                {
                  if (possible->handler == NULL)
                    {
-                     if (possible == (ffestaPossible_) &ffesta_possible_nonexecs_)
+                     if (possible == (ffestaPossible_) &ffesta_possible_nonexecs_.first)
                        {
                          possible = first_exec = ffesta_possible_execs_.first;
                          continue;

diff --git a/gcc/unwind-c.c b/gcc/unwind-c.c
index 2730536d5df3bb6d3c573a70fd4c18c9a95ee20a..fb2f720907be0b06ab595d3328330463f49243da 100644 (file)
--- a/gcc/unwind-c.c
+++ b/gcc/unwind-c.c
@@ -23,6 +23,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "tconfig.h"
 #include "tsystem.h"
 #include "unwind.h"
+#define NO_SIZE_OF_ENCODED_VALUE
 #include "unwind-pe.h"
 
 typedef struct

diff --git a/gcc/unwind-dw2.c b/gcc/unwind-dw2.c
index 0e59c7b2ba261e74173363f065606cb60c900813..e0c8ed568c643a3abf62ab30b51bdd9b16c140a5 100644 (file)
--- a/gcc/unwind-dw2.c
+++ b/gcc/unwind-dw2.c
@@ -23,6 +23,9 @@
 #include "tsystem.h"
 #include "dwarf2.h"
 #include "unwind.h"
+#ifdef __USING_SJLJ_EXCEPTIONS__
+# define NO_SIZE_OF_ENCODED_VALUE
+#endif
 #include "unwind-pe.h"
 #include "unwind-dw2-fde.h"
 #include "gthr.h"
@@ -171,7 +174,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
 _Unwind_Word
 _Unwind_GetCFA (struct _Unwind_Context *context)
 {
-  return (_Unwind_Word) context->cfa;
+  return (_Unwind_Ptr) context->cfa;
 }
 
 /* Overwrite the saved value for register REG in CONTEXT with VAL.  */

diff --git a/gcc/unwind-pe.h b/gcc/unwind-pe.h
index d32e506667d6544df7033c24b9eec345c00a6802..bfa455c4f32d0eec44a824fc33b423fc92f02b5b 100644 (file)
--- a/gcc/unwind-pe.h
+++ b/gcc/unwind-pe.h
@@ -52,6 +52,8 @@
 #define DW_EH_PE_indirect      0x80
 \f
 
+#ifndef NO_SIZE_OF_ENCODED_VALUE
+
 /* Given an encoding, return the number of bytes the format occupies.
    This is only defined for fixed-size encodings, and so does not
    include leb128.  */
@@ -76,6 +78,8 @@ size_of_encoded_value (unsigned char encoding)
   __gxx_abort ();
 }
 
+#endif
+
 #ifndef NO_BASE_OF_ENCODED_VALUE
 
 /* Given an encoding and an _Unwind_Context, return the base to which