[packages/gdb.git] / gdb-6.3-bz231832-obstack-2gb.patch

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=231832


Index: gdb-6.8/gdb/symmisc.c
===================================================================
--- gdb-6.8.orig/gdb/symmisc.c	2008-03-17 16:06:24.000000000 +0100
+++ gdb-6.8/gdb/symmisc.c	2008-07-14 10:27:50.000000000 +0200
@@ -230,8 +230,8 @@ print_objfile_statistics (void)
     if (OBJSTAT (objfile, sz_strtab) > 0)
       printf_filtered (_("  Space used by a.out string tables: %d\n"),
 		       OBJSTAT (objfile, sz_strtab));
-    printf_filtered (_("  Total memory used for objfile obstack: %d\n"),
-		     obstack_memory_used (&objfile->objfile_obstack));
+    printf_filtered (_("  Total memory used for objfile obstack: %ld\n"),
+		     (long) obstack_memory_used (&objfile->objfile_obstack));
     printf_filtered (_("  Total memory used for psymbol cache: %d\n"),
 		     bcache_memory_used (objfile->psymbol_cache));
     printf_filtered (_("  Total memory used for macro cache: %d\n"),
Index: gdb-6.8/include/obstack.h
===================================================================
--- gdb-6.8.orig/include/obstack.h	2005-05-10 12:21:08.000000000 +0200
+++ gdb-6.8/include/obstack.h	2008-07-14 10:27:50.000000000 +0200
@@ -188,31 +188,31 @@ struct obstack		/* control current objec
 
 /* Declare the external functions we use; they are in obstack.c.  */
 
-extern void _obstack_newchunk (struct obstack *, int);
+extern void _obstack_newchunk (struct obstack *, PTR_INT_TYPE);
 extern void _obstack_free (struct obstack *, void *);
-extern int _obstack_begin (struct obstack *, int, int,
+extern int _obstack_begin (struct obstack *, PTR_INT_TYPE, int,
 			    void *(*) (long), void (*) (void *));
-extern int _obstack_begin_1 (struct obstack *, int, int,
+extern int _obstack_begin_1 (struct obstack *, PTR_INT_TYPE, int,
 			     void *(*) (void *, long),
 			     void (*) (void *, void *), void *);
-extern int _obstack_memory_used (struct obstack *);
+extern PTR_INT_TYPE _obstack_memory_used (struct obstack *);
 \f
 /* Do the function-declarations after the structs
    but before defining the macros.  */
 
 void obstack_init (struct obstack *obstack);
 
-void * obstack_alloc (struct obstack *obstack, int size);
+void * obstack_alloc (struct obstack *obstack, PTR_INT_TYPE size);
 
-void * obstack_copy (struct obstack *obstack, void *address, int size);
-void * obstack_copy0 (struct obstack *obstack, void *address, int size);
+void * obstack_copy (struct obstack *obstack, void *address, PTR_INT_TYPE size);
+void * obstack_copy0 (struct obstack *obstack, void *address, PTR_INT_TYPE size);
 
 void obstack_free (struct obstack *obstack, void *block);
 
-void obstack_blank (struct obstack *obstack, int size);
+void obstack_blank (struct obstack *obstack, PTR_INT_TYPE size);
 
-void obstack_grow (struct obstack *obstack, void *data, int size);
-void obstack_grow0 (struct obstack *obstack, void *data, int size);
+void obstack_grow (struct obstack *obstack, void *data, PTR_INT_TYPE size);
+void obstack_grow0 (struct obstack *obstack, void *data, PTR_INT_TYPE size);
 
 void obstack_1grow (struct obstack *obstack, int data_char);
 void obstack_ptr_grow (struct obstack *obstack, void *data);
@@ -220,20 +220,20 @@ void obstack_int_grow (struct obstack *o
 
 void * obstack_finish (struct obstack *obstack);
 
-int obstack_object_size (struct obstack *obstack);
+PTR_INT_TYPE obstack_object_size (struct obstack *obstack);
 
-int obstack_room (struct obstack *obstack);
-void obstack_make_room (struct obstack *obstack, int size);
+PTR_INT_TYPE obstack_room (struct obstack *obstack);
+void obstack_make_room (struct obstack *obstack, PTR_INT_TYPE size);
 void obstack_1grow_fast (struct obstack *obstack, int data_char);
 void obstack_ptr_grow_fast (struct obstack *obstack, void *data);
 void obstack_int_grow_fast (struct obstack *obstack, int data);
-void obstack_blank_fast (struct obstack *obstack, int size);
+void obstack_blank_fast (struct obstack *obstack, PTR_INT_TYPE size);
 
 void * obstack_base (struct obstack *obstack);
 void * obstack_next_free (struct obstack *obstack);
 int obstack_alignment_mask (struct obstack *obstack);
-int obstack_chunk_size (struct obstack *obstack);
-int obstack_memory_used (struct obstack *obstack);
+size_t obstack_chunk_size (struct obstack *obstack);
+size_t obstack_memory_used (struct obstack *obstack);
 
 /* Error handler called when `obstack_chunk_alloc' failed to allocate
    more memory.  This can be set to a user defined function.  The
@@ -318,7 +318,7 @@ extern int obstack_exit_failure;
 # define obstack_make_room(OBSTACK,length)				\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
-   int __len = (length);						\
+   PTR_INT_TYPE __len = (length);					\
    if (__o->chunk_limit - __o->next_free < __len)			\
      _obstack_newchunk (__o, __len);					\
    (void) 0; })
@@ -331,7 +331,7 @@ __extension__								\
 # define obstack_grow(OBSTACK,where,length)				\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
-   int __len = (length);						\
+   PTR_INT_TYPE __len = (length);					\
    if (__o->next_free + __len > __o->chunk_limit)			\
      _obstack_newchunk (__o, __len);					\
    _obstack_memcpy (__o->next_free, (where), __len);			\
@@ -341,7 +341,7 @@ __extension__								\
 # define obstack_grow0(OBSTACK,where,length)				\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
-   int __len = (length);						\
+   PTR_INT_TYPE __len = (length);					\
    if (__o->next_free + __len + 1 > __o->chunk_limit)			\
      _obstack_newchunk (__o, __len + 1);				\
    _obstack_memcpy (__o->next_free, (where), __len);			\
@@ -392,7 +392,7 @@ __extension__								\
 # define obstack_blank(OBSTACK,length)					\
 __extension__								\
 ({ struct obstack *__o = (OBSTACK);					\
-   int __len = (length);						\
+   PTR_INT_TYPE __len = (length);					\
    if (__o->chunk_limit - __o->next_free < __len)			\
      _obstack_newchunk (__o, __len);					\
    obstack_blank_fast (__o, __len);					\
@@ -532,7 +532,7 @@ __extension__								\
 # define obstack_free(h,obj)						\
 ( (h)->temp = (char *) (obj) - (char *) (h)->chunk,			\
   (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
-   ? (int) ((h)->next_free = (h)->object_base				\
+   ? (PTR_INT_TYPE) ((h)->next_free = (h)->object_base			\
 	    = (h)->temp + (char *) (h)->chunk)				\
    : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0)))
 
Index: gdb-6.8/libiberty/obstack.c
===================================================================
--- gdb-6.8.orig/libiberty/obstack.c	2005-05-10 17:33:33.000000000 +0200
+++ gdb-6.8/libiberty/obstack.c	2008-07-14 10:27:50.000000000 +0200
@@ -44,9 +44,11 @@
 #if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
 #include <gnu-versions.h>
 #if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
+#if 0 /* 64-bit obstack is not compatible with any glibc implementation.  */
 #define ELIDE_CODE
 #endif
 #endif
+#endif
 
 
 #ifndef ELIDE_CODE
@@ -139,7 +141,7 @@ struct obstack *_obstack;
    free up some memory, then call this again.  */
 
 int
-_obstack_begin (struct obstack *h, int size, int alignment,
+_obstack_begin (struct obstack *h, PTR_INT_TYPE size, int alignment,
                 POINTER (*chunkfun) (long), void (*freefun) (void *))
 {
   register struct _obstack_chunk *chunk; /* points to new chunk */
@@ -183,7 +185,7 @@ _obstack_begin (struct obstack *h, int s
 }
 
 int
-_obstack_begin_1 (struct obstack *h, int size, int alignment,
+_obstack_begin_1 (struct obstack *h, PTR_INT_TYPE size, int alignment,
                   POINTER (*chunkfun) (POINTER, long),
                   void (*freefun) (POINTER, POINTER), POINTER arg)
 {
@@ -235,7 +237,7 @@ _obstack_begin_1 (struct obstack *h, int
    to the beginning of the new one.  */
 
 void
-_obstack_newchunk (struct obstack *h, int length)
+_obstack_newchunk (struct obstack *h, PTR_INT_TYPE length)
 {
   register struct _obstack_chunk *old_chunk = h->chunk;
   register struct _obstack_chunk *new_chunk;
@@ -388,11 +390,11 @@ obstack_free (struct obstack *h, POINTER
     abort ();
 }
 \f
-int
+PTR_INT_TYPE
 _obstack_memory_used (struct obstack *h)
 {
   register struct _obstack_chunk* lp;
-  register int nbytes = 0;
+  register PTR_INT_TYPE nbytes = 0;
 
   for (lp = h->chunk; lp != 0; lp = lp->prev)
     {
@@ -421,6 +423,7 @@ print_and_abort (void)
 }
 \f
 #if 0
+/* These functions are now broken for 64-bit obstack!  */
 /* These are now turned off because the applications do not use it
    and it uses bcopy via obstack_grow, which causes trouble on sysV.  */
Commit	Line	Data
3a58abaf AM	1	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=231832
	2
	3
	4	Index: gdb-6.8/gdb/symmisc.c
	5	===================================================================
	6	--- gdb-6.8.orig/gdb/symmisc.c 2008-03-17 16:06:24.000000000 +0100
	7	+++ gdb-6.8/gdb/symmisc.c 2008-07-14 10:27:50.000000000 +0200
	8	@@ -230,8 +230,8 @@ print_objfile_statistics (void)
	9	if (OBJSTAT (objfile, sz_strtab) > 0)
	10	printf_filtered (_(" Space used by a.out string tables: %d\n"),
	11	OBJSTAT (objfile, sz_strtab));
	12	- printf_filtered (_(" Total memory used for objfile obstack: %d\n"),
	13	- obstack_memory_used (&objfile->objfile_obstack));
	14	+ printf_filtered (_(" Total memory used for objfile obstack: %ld\n"),
	15	+ (long) obstack_memory_used (&objfile->objfile_obstack));
	16	printf_filtered (_(" Total memory used for psymbol cache: %d\n"),
	17	bcache_memory_used (objfile->psymbol_cache));
	18	printf_filtered (_(" Total memory used for macro cache: %d\n"),
	19	Index: gdb-6.8/include/obstack.h
	20	===================================================================
	21	--- gdb-6.8.orig/include/obstack.h 2005-05-10 12:21:08.000000000 +0200
	22	+++ gdb-6.8/include/obstack.h 2008-07-14 10:27:50.000000000 +0200
	23	@@ -188,31 +188,31 @@ struct obstack /* control current objec
	24
	25	/* Declare the external functions we use; they are in obstack.c. */
	26
	27	-extern void _obstack_newchunk (struct obstack *, int);
	28	+extern void _obstack_newchunk (struct obstack *, PTR_INT_TYPE);
	29	extern void _obstack_free (struct obstack , void );
	30	-extern int _obstack_begin (struct obstack *, int, int,
	31	+extern int _obstack_begin (struct obstack *, PTR_INT_TYPE, int,
	32	void () (long), void () (void ));
	33	-extern int _obstack_begin_1 (struct obstack *, int, int,
	34	+extern int _obstack_begin_1 (struct obstack *, PTR_INT_TYPE, int,
	35	void () (void *, long),
	36	void () (void , void ), void );
	37	-extern int _obstack_memory_used (struct obstack *);
	38	+extern PTR_INT_TYPE _obstack_memory_used (struct obstack *);
	39	\f
	40	/* Do the function-declarations after the structs
	41	but before defining the macros. */
	42
	43	void obstack_init (struct obstack *obstack);
	44
	45	-void * obstack_alloc (struct obstack *obstack, int size);
	46	+void * obstack_alloc (struct obstack *obstack, PTR_INT_TYPE size);
	47
	48	-void * obstack_copy (struct obstack obstack, void address, int size);
	49	-void * obstack_copy0 (struct obstack obstack, void address, int size);
	50	+void * obstack_copy (struct obstack obstack, void address, PTR_INT_TYPE size);
	51	+void * obstack_copy0 (struct obstack obstack, void address, PTR_INT_TYPE size);
	52
	53	void obstack_free (struct obstack obstack, void block);
	54
	55	-void obstack_blank (struct obstack *obstack, int size);
	56	+void obstack_blank (struct obstack *obstack, PTR_INT_TYPE size);
	57
	58	-void obstack_grow (struct obstack obstack, void data, int size);
	59	-void obstack_grow0 (struct obstack obstack, void data, int size);
	60	+void obstack_grow (struct obstack obstack, void data, PTR_INT_TYPE size);
	61	+void obstack_grow0 (struct obstack obstack, void data, PTR_INT_TYPE size);
	62
	63	void obstack_1grow (struct obstack *obstack, int data_char);
	64	void obstack_ptr_grow (struct obstack obstack, void data);
65	@@ -220,20 +220,20 @@ void obstack_int_grow (struct obstack *o
66
67	void * obstack_finish (struct obstack *obstack);
68
69	-int obstack_object_size (struct obstack *obstack);
70	+PTR_INT_TYPE obstack_object_size (struct obstack *obstack);
71
72	-int obstack_room (struct obstack *obstack);
73	-void obstack_make_room (struct obstack *obstack, int size);
74	+PTR_INT_TYPE obstack_room (struct obstack *obstack);
75	+void obstack_make_room (struct obstack *obstack, PTR_INT_TYPE size);
76	void obstack_1grow_fast (struct obstack *obstack, int data_char);
77	void obstack_ptr_grow_fast (struct obstack obstack, void data);
78	void obstack_int_grow_fast (struct obstack *obstack, int data);
79	-void obstack_blank_fast (struct obstack *obstack, int size);
80	+void obstack_blank_fast (struct obstack *obstack, PTR_INT_TYPE size);
81
82	void * obstack_base (struct obstack *obstack);
83	void * obstack_next_free (struct obstack *obstack);
84	int obstack_alignment_mask (struct obstack *obstack);
85	-int obstack_chunk_size (struct obstack *obstack);
86	-int obstack_memory_used (struct obstack *obstack);
87	+size_t obstack_chunk_size (struct obstack *obstack);
88	+size_t obstack_memory_used (struct obstack *obstack);
89
90	/* Error handler called when `obstack_chunk_alloc' failed to allocate
91	more memory. This can be set to a user defined function. The
92	@@ -318,7 +318,7 @@ extern int obstack_exit_failure;
93	# define obstack_make_room(OBSTACK,length) \
94	__extension__ \
95	({ struct obstack *__o = (OBSTACK); \
96	- int __len = (length); \
97	+ PTR_INT_TYPE __len = (length); \
98	if (__o->chunk_limit - __o->next_free < __len) \
99	_obstack_newchunk (__o, __len); \
100	(void) 0; })
101	@@ -331,7 +331,7 @@ __extension__ \
102	# define obstack_grow(OBSTACK,where,length) \
103	__extension__ \
104	({ struct obstack *__o = (OBSTACK); \
105	- int __len = (length); \
106	+ PTR_INT_TYPE __len = (length); \
107	if (__o->next_free + __len > __o->chunk_limit) \
108	_obstack_newchunk (__o, __len); \
109	_obstack_memcpy (__o->next_free, (where), __len); \
110	@@ -341,7 +341,7 @@ __extension__ \
111	# define obstack_grow0(OBSTACK,where,length) \
112	__extension__ \
113	({ struct obstack *__o = (OBSTACK); \
114	- int __len = (length); \
115	+ PTR_INT_TYPE __len = (length); \
116	if (__o->next_free + __len + 1 > __o->chunk_limit) \
117	_obstack_newchunk (__o, __len + 1); \
118	_obstack_memcpy (__o->next_free, (where), __len); \
119	@@ -392,7 +392,7 @@ __extension__ \
120	# define obstack_blank(OBSTACK,length) \
121	__extension__ \
122	({ struct obstack *__o = (OBSTACK); \
123	- int __len = (length); \
124	+ PTR_INT_TYPE __len = (length); \
125	if (__o->chunk_limit - __o->next_free < __len) \
126	_obstack_newchunk (__o, __len); \
127	obstack_blank_fast (__o, __len); \
128	@@ -532,7 +532,7 @@ __extension__ \
129	# define obstack_free(h,obj) \
130	( (h)->temp = (char ) (obj) - (char ) (h)->chunk, \
131	(((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
132	- ? (int) ((h)->next_free = (h)->object_base \
133	+ ? (PTR_INT_TYPE) ((h)->next_free = (h)->object_base \
134	= (h)->temp + (char *) (h)->chunk) \
135	: (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0)))
136
137	Index: gdb-6.8/libiberty/obstack.c
138	===================================================================
139	--- gdb-6.8.orig/libiberty/obstack.c 2005-05-10 17:33:33.000000000 +0200
140	+++ gdb-6.8/libiberty/obstack.c 2008-07-14 10:27:50.000000000 +0200
141	@@ -44,9 +44,11 @@
142	#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
143	#include <gnu-versions.h>
144	#if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
145	+#if 0 /* 64-bit obstack is not compatible with any glibc implementation. */
146	#define ELIDE_CODE
147	#endif
148	#endif
149	+#endif
150
151
152	#ifndef ELIDE_CODE
153	@@ -139,7 +141,7 @@ struct obstack *_obstack;
154	free up some memory, then call this again. */
155
156	int
157	-_obstack_begin (struct obstack *h, int size, int alignment,
158	+_obstack_begin (struct obstack *h, PTR_INT_TYPE size, int alignment,
159	POINTER (chunkfun) (long), void (freefun) (void *))
160	{
161	register struct _obstack_chunk chunk; / points to new chunk */
162	@@ -183,7 +185,7 @@ _obstack_begin (struct obstack *h, int s
163	}
164
165	int
166	-_obstack_begin_1 (struct obstack *h, int size, int alignment,
167	+_obstack_begin_1 (struct obstack *h, PTR_INT_TYPE size, int alignment,
168	POINTER (*chunkfun) (POINTER, long),
169	void (*freefun) (POINTER, POINTER), POINTER arg)
170	{
171	@@ -235,7 +237,7 @@ _obstack_begin_1 (struct obstack *h, int
172	to the beginning of the new one. */
173
174	void
175	-_obstack_newchunk (struct obstack *h, int length)
176	+_obstack_newchunk (struct obstack *h, PTR_INT_TYPE length)
177	{
178	register struct _obstack_chunk *old_chunk = h->chunk;
179	register struct _obstack_chunk *new_chunk;
180	@@ -388,11 +390,11 @@ obstack_free (struct obstack *h, POINTER
181	abort ();
182	}
183	\f
184	-int
185	+PTR_INT_TYPE
186	_obstack_memory_used (struct obstack *h)
187	{
188	register struct _obstack_chunk* lp;
189	- register int nbytes = 0;
190	+ register PTR_INT_TYPE nbytes = 0;
191
192	for (lp = h->chunk; lp != 0; lp = lp->prev)
193	{
194	@@ -421,6 +423,7 @@ print_and_abort (void)
195	}
196	\f
197	#if 0
198	+/* These functions are now broken for 64-bit obstack! */
199	/* These are now turned off because the applications do not use it
200	and it uses bcopy via obstack_grow, which causes trouble on sysV. */
201