CVS: packaging/patches insight-6.7.1-64bit.patch, NONE, 1.1

Chris Liechti <[email protected]> Thu, 22 May 2008 12:32:42 -0700
Newsgroups gmane.comp.hardware.texas-instruments.msp430.gcc.cvs
Message-ID <[email protected]>
Update of /cvsroot/mspgcc/packaging/patches
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3635/patches

Added Files:
	insight-6.7.1-64bit.patch 
Log Message:
Masayuki Hatta's patch to build on 64 bit systems


--- NEW FILE: insight-6.7.1-64bit.patch ---
diff -urNad insight-6.7.1.dfsg.1~/gdb/gdbtk/generic/gdbtk-register.c
insight-6.7.1.dfsg.1/gdb/gdbtk/generic/gdbtk-register.c
--- insight-6.7.1.dfsg.1~/gdb/gdbtk/generic/gdbtk-register.c	2007-06-28
12:54:31.000000000 +0900
+++ insight-6.7.1.dfsg.1/gdb/gdbtk/generic/gdbtk-register.c	2007-12-11
19:41:27.000000000 +0900
@@ -153,7 +153,7 @@
 	char *s = Tcl_GetStringFromObj (objv[0], &len);
 	if (objc != 0 && strncmp (s, "-numbers", len) == 0)
 	  {
-	    argp = (void *) 1;
+	    argp = (intptr_t *) 1;
 	    objc--;
 	    objv++;
 	  }
@@ -345,7 +345,7 @@
 get_register_name (int regnum, void *argp)
 {
   /* Non-zero if the caller wants the register numbers, too.  */
-  int numbers = (int) argp;
+  intptr_t numbers = (intptr_t) argp;
   Tcl_Obj *name
     = Tcl_NewStringObj (gdbarch_register_name (current_gdbarch, regnum), -1);
   Tcl_Obj *elt;
diff -urNad insight-6.7.1.dfsg.1~/gdb/gdbtk/generic/gdbtk-stack.c
insight-6.7.1.dfsg.1/gdb/gdbtk/generic/gdbtk-stack.c
--- insight-6.7.1.dfsg.1~/gdb/gdbtk/generic/gdbtk-stack.c	2007-07-03
03:33:22.000000000 +0900
+++ insight-6.7.1.dfsg.1/gdb/gdbtk/generic/gdbtk-stack.c	2007-12-11
19:41:27.000000000 +0900
@@ -286,7 +286,7 @@
   struct block *block;
   char **canonical, *args;
   struct dict_iterator iter;
-  int i, arguments;
+  intptr_t i, arguments;

   if (objc > 2)
     {
@@ -295,7 +295,7 @@
       return TCL_ERROR;
     }

-  arguments = (int) clientData;
+  arguments = (intptr_t) clientData;

   /* Initialize the result pointer to an empty list. */

diff -urNad insight-6.7.1.dfsg.1~/gdb/gdbtk/generic/gdbtk-varobj.c
insight-6.7.1.dfsg.1/gdb/gdbtk/generic/gdbtk-varobj.c
--- insight-6.7.1.dfsg.1~/gdb/gdbtk/generic/gdbtk-varobj.c	2007-04-28
00:39:50.000000000 +0900
+++ insight-6.7.1.dfsg.1/gdb/gdbtk/generic/gdbtk-varobj.c	2007-12-11
19:41:27.000000000 +0900
@@ -445,7 +445,7 @@
   Tcl_Obj *changed;
   struct varobj **changelist;
   struct varobj **vc;
-  int result;
+  intptr_t result;

   /* varobj_update() throws an error for a non-root variable
      and otherwise it returns a value < 0 if the variable is
diff -urNad insight-6.7.1.dfsg.1~/gdb/gdbtk/generic/gdbtk-wrapper.c
insight-6.7.1.dfsg.1/gdb/gdbtk/generic/gdbtk-wrapper.c
--- insight-6.7.1.dfsg.1~/gdb/gdbtk/generic/gdbtk-wrapper.c	2007-04-28
00:39:50.000000000 +0900
+++ insight-6.7.1.dfsg.1/gdb/gdbtk/generic/gdbtk-wrapper.c	2007-12-11
19:42:06.000000000 +0900
@@ -34,16 +34,16 @@

 gdb_result GDB_evaluate_expression (struct expression *, value_ptr *);

-gdb_result GDB_type_print (value_ptr, char *, struct ui_file *, int);
+gdb_result GDB_type_print (value_ptr, char *, struct ui_file *, intptr_t);

 gdb_result GDB_val_print (struct type *type, char *valaddr,
 			  CORE_ADDR address, struct ui_file *stream,
-			  int format, int deref_ref, int recurse,
+			  intptr_t format, intptr_t deref_ref, intptr_t recurse,
 			  enum val_prettyprint pretty);

-gdb_result GDB_value_equal (value_ptr, value_ptr, int *);
+gdb_result GDB_value_equal (value_ptr, value_ptr, intptr_t *);

-gdb_result GDB_parse_exp_1 (char **stringptr, struct block *block, int comma,
+gdb_result GDB_parse_exp_1 (char **stringptr, struct block *block, intptr_t comma,
 			    struct expression **result);

 gdb_result GDB_evaluate_type (struct expression *exp, value_ptr * result);
@@ -83,8 +83,8 @@
 gdb_result GDB_get_current_frame (struct frame_info **result);

 gdb_result GDB_varobj_update (struct varobj **varp,
-			      struct varobj ***changelist, int explicit,
-			      int *result);
+			      struct varobj ***changelist, intptr_t explicit,
+			      intptr_t *result);

 /*
  * Private functions for this file
@@ -148,7 +148,7 @@

 gdb_result
 GDB_type_print (value_ptr val, char *varstring,
-		struct ui_file *stream, int show)
+		struct ui_file *stream, intptr_t show)
 {
   struct gdb_wrapper_arguments args;

@@ -166,7 +166,7 @@
   value_ptr val = (value_ptr) (*args)->args[0];
   char *varstring = (*args)->args[1];
   struct ui_file *stream = (struct ui_file *) (*args)->args[2];
-  int show = (int) (*args)->args[3];
+  intptr_t show = (intptr_t) (*args)->args[3];
   type_print (value_type (val), varstring, stream, show);
   return 1;
 }
@@ -176,9 +176,9 @@
 	       char *valaddr,
 	       CORE_ADDR address,
 	       struct ui_file *stream,
-	       int format,
-	       int deref_ref,
-	       int recurse,
+	       intptr_t format,
+	       intptr_t deref_ref,
+	       intptr_t recurse,
 	       enum val_prettyprint pretty)
 {
   struct gdb_wrapper_arguments args;
@@ -203,18 +203,18 @@
   const gdb_byte *valaddr;
   CORE_ADDR address;
   struct ui_file *stream;
-  int format;
-  int deref_ref;
-  int recurse;
+  intptr_t format;
+  intptr_t deref_ref;
+  intptr_t recurse;
   enum val_prettyprint pretty;

   type = (struct type *) (*args)->args[0];
   valaddr = (gdb_byte *) (*args)->args[1];
   address = *(CORE_ADDR *) (*args)->args[2];
   stream = (struct ui_file *) (*args)->args[3];
-  format = (int) (*args)->args[4];
-  deref_ref = (int) (*args)->args[5];
-  recurse = (int) (*args)->args[6];
+  format = (intptr_t) (*args)->args[4];
+  deref_ref = (intptr_t) (*args)->args[5];
+  recurse = (intptr_t) (*args)->args[6];
   pretty = (enum val_prettyprint) (*args)->args[7];

   val_print (type, valaddr, 0, address, stream, format, deref_ref,
@@ -269,7 +269,7 @@
 GDB_value_equal (val1, val2, result)
      value_ptr val1;
      value_ptr val2;
-     int *result;
+     intptr_t *result;
 {
   struct gdb_wrapper_arguments args;
   gdb_result r;
@@ -281,7 +281,7 @@
   if (r != GDB_OK)
     return r;

-  *result = (int) args.result;
+  *result = (intptr_t) args.result;
   return GDB_OK;
 }

@@ -294,13 +294,13 @@
   val1 = (value_ptr) (*args)->args[0];
   val2 = (value_ptr) (*args)->args[1];

-  (*args)->result = (char *) value_equal (val1, val2);
+  (*args)->result = (char *) (intptr_t) value_equal (val1, val2);
   return 1;
 }

 gdb_result
 GDB_parse_exp_1 (char **stringptr, struct block *block,
-		 int comma, struct expression **result)
+		 intptr_t comma, struct expression **result)
 {
   struct gdb_wrapper_arguments args;
   gdb_result r;
@@ -323,11 +323,11 @@
   struct gdb_wrapper_arguments **args = (struct gdb_wrapper_arguments **) opaque_arg;
   struct block *block;
   char **stringptr;
-  int comma;
+  intptr_t comma;

   stringptr = (char **) (*args)->args[0];
   block = (struct block *) (*args)->args[1];
-  comma = (int) (*args)->args[2];
+  comma = (intptr_t) (*args)->args[2];

   (*args)->result = (char *) parse_exp_1 (stringptr, block, comma);
   return 1;
@@ -730,7 +730,7 @@

 gdb_result
 GDB_varobj_update (struct varobj **varp, struct varobj ***changelist,
-		   int explicit, int *result)
+		   intptr_t explicit, intptr_t *result)
 {
   struct gdb_wrapper_arguments args;
   gdb_result r;
@@ -743,7 +743,7 @@
   if (r != GDB_OK)
     return r;

-  *result = (int) args.result;
+  *result = (intptr_t) args.result;
   return GDB_OK;
 }

@@ -753,8 +753,8 @@
     = (struct gdb_wrapper_arguments **) opaque_arg;
   struct varobj **varp = (struct varobj **) (*args)->args[0];
   struct varobj ***changelist = (struct varobj ***) (*args)->args[1];
-  int explicit = (int) (*args)->args[2];
+  intptr_t explicit = (intptr_t) (*args)->args[2];

-  (*args)->result = (char *) varobj_update (varp, changelist, explicit);
+  (*args)->result = (char *) (intptr_t) varobj_update (varp, changelist, explicit);
   return 1;
 }
diff -urNad insight-6.7.1.dfsg.1~/gdb/gdbtk/generic/gdbtk-wrapper.h
insight-6.7.1.dfsg.1/gdb/gdbtk/generic/gdbtk-wrapper.h
--- insight-6.7.1.dfsg.1~/gdb/gdbtk/generic/gdbtk-wrapper.h	2007-04-28
00:39:50.000000000 +0900
+++ insight-6.7.1.dfsg.1/gdb/gdbtk/generic/gdbtk-wrapper.h	2007-12-11
19:41:27.000000000 +0900
@@ -46,16 +46,16 @@
 extern gdb_result GDB_evaluate_expression (struct expression *expr,
 					   value_ptr * val);
 extern gdb_result GDB_type_print (value_ptr val, char *varstring,
-				  struct ui_file *stream, int show);
+				  struct ui_file *stream, intptr_t show);
 extern gdb_result GDB_val_print (struct type *type, char *valaddr,
 				 CORE_ADDR address, struct ui_file *stream,
-				 int format, int deref_ref, int recurse,
+				 intptr_t format, intptr_t deref_ref, intptr_t recurse,
 				 enum val_prettyprint pretty);
 extern gdb_result GDB_value_fetch_lazy (value_ptr value);
 extern gdb_result GDB_value_equal (value_ptr val1, value_ptr val2,
-				   int *result);
+				   intptr_t *result);
 extern gdb_result GDB_parse_exp_1 (char **stringptr, struct block *block,
-				   int comma, struct expression **result);
+				   intptr_t comma, struct expression **result);
 extern gdb_result GDB_evaluate_type (struct expression *exp,
 				     value_ptr * result);
 extern gdb_result GDB_block_for_pc (CORE_ADDR pc, struct block **result);
@@ -81,7 +81,7 @@
 					   struct frame_info **result);
 extern gdb_result GDB_get_current_frame (struct frame_info **result);
 extern gdb_result GDB_varobj_update (struct varobj **varp,
-				     struct varobj ***changelist, int explicit,
-				     int *result);
+				     struct varobj ***changelist, intptr_t explicit,
+				     intptr_t *result);
 #endif /* GDBTK_WRAPPER_H */


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/