summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2006-10-09 10:59:12 +0000
committerdinoex <dinoex@FreeBSD.org>2006-10-09 10:59:12 +0000
commit49f9655dd335fa82462b5e6a8bd6119a62efea19 (patch)
treee6c34f00c11e016634d058978810525cdf1d903f
parentbf6d485436963ef56a4bd93a63fe110edb26551c (diff)
downloadFreeBSD-ports-49f9655dd335fa82462b5e6a8bd6119a62efea19.zip
FreeBSD-ports-49f9655dd335fa82462b5e6a8bd6119a62efea19.tar.gz
- fix build with gcc41
Obtained from: upstream
-rw-r--r--lang/gcc32/files/patch-obstack.h99
1 files changed, 99 insertions, 0 deletions
diff --git a/lang/gcc32/files/patch-obstack.h b/lang/gcc32/files/patch-obstack.h
new file mode 100644
index 0000000..6cf1c57
--- /dev/null
+++ b/lang/gcc32/files/patch-obstack.h
@@ -0,0 +1,99 @@
+--- llvm-gcc/include/obstack.h:1.1.1.1 Thu Jan 8 15:59:16 2004
++++ include/obstack.h Fri Jun 18 12:52:45 2004
+@@ -343,7 +343,7 @@
+
+ #endif
+
+-#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = achar)
++#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = (achar))
+
+ #define obstack_blank_fast(h,n) ((h)->next_free += (n))
+
+@@ -411,7 +411,7 @@
+ ({ struct obstack *__o = (OBSTACK); \
+ if (__o->next_free + 1 > __o->chunk_limit) \
+ _obstack_newchunk (__o, 1); \
+- *(__o->next_free)++ = (datum); \
++ obstack_1grow_fast (__o, datum); \
+ (void) 0; })
+
+ /* These assume that the obstack alignment is good enough for pointers or ints,
+@@ -423,19 +423,28 @@
+ ({ struct obstack *__o = (OBSTACK); \
+ if (__o->next_free + sizeof (void *) > __o->chunk_limit) \
+ _obstack_newchunk (__o, sizeof (void *)); \
+- *((void **)__o->next_free)++ = ((void *)datum); \
+- (void) 0; })
++ obstack_ptr_grow_fast (__o, datum); })
+
+ # define obstack_int_grow(OBSTACK,datum) \
+ __extension__ \
+ ({ struct obstack *__o = (OBSTACK); \
+ if (__o->next_free + sizeof (int) > __o->chunk_limit) \
+ _obstack_newchunk (__o, sizeof (int)); \
+- *((int *)__o->next_free)++ = ((int)datum); \
++ obstack_int_grow_fast (__o, datum); })
++
++# define obstack_ptr_grow_fast(OBSTACK,aptr) \
++__extension__ \
++({ struct obstack *__o1 = (OBSTACK); \
++ *(const void **) __o1->next_free = (aptr); \
++ __o1->next_free += sizeof (const void *); \
+ (void) 0; })
+
+-# define obstack_ptr_grow_fast(h,aptr) (*((void **) (h)->next_free)++ = (void *)aptr)
+-# define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint)
++# define obstack_int_grow_fast(OBSTACK,aint) \
++__extension__ \
++({ struct obstack *__o1 = (OBSTACK); \
++ *(int *) __o1->next_free = (aint); \
++ __o1->next_free += sizeof (int); \
++ (void) 0; })
+
+ # define obstack_blank(OBSTACK,length) \
+ __extension__ \
+@@ -443,7 +452,7 @@
+ int __len = (length); \
+ if (__o->chunk_limit - __o->next_free < __len) \
+ _obstack_newchunk (__o, __len); \
+- __o->next_free += __len; \
++ obstack_blank_fast (__o, __len); \
+ (void) 0; })
+
+ # define obstack_alloc(OBSTACK,length) \
+@@ -530,26 +539,29 @@
+ # define obstack_1grow(h,datum) \
+ ( (((h)->next_free + 1 > (h)->chunk_limit) \
+ ? (_obstack_newchunk ((h), 1), 0) : 0), \
+- (*((h)->next_free)++ = (datum)))
++ obstack_1grow_fast (h, datum))
+
+ # define obstack_ptr_grow(h,datum) \
+ ( (((h)->next_free + sizeof (char *) > (h)->chunk_limit) \
+ ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0), \
+- (*((char **) (((h)->next_free+=sizeof(char *))-sizeof(char *))) = ((char *) datum)))
++ obstack_ptr_grow_fast (h, datum))
+
+ # define obstack_int_grow(h,datum) \
+ ( (((h)->next_free + sizeof (int) > (h)->chunk_limit) \
+ ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0), \
+- (*((int *) (((h)->next_free+=sizeof(int))-sizeof(int))) = ((int) datum)))
++ obstack_int_grow_fast (h, datum))
++
++# define obstack_ptr_grow_fast(h,aptr) \
++ (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr))
+
+-# define obstack_ptr_grow_fast(h,aptr) (*((char **) (h)->next_free)++ = (char *) aptr)
+-# define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint)
++# define obstack_int_grow_fast(h,aint) \
++ (((int *) ((h)->next_free += sizeof (int)))[-1] = (aptr))
+
+ # define obstack_blank(h,length) \
+ ( (h)->temp = (length), \
+ (((h)->chunk_limit - (h)->next_free < (h)->temp) \
+ ? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \
+- ((h)->next_free += (h)->temp))
++ obstack_blank_fast (h, (h)->temp))
+
+ # define obstack_alloc(h,length) \
+ (obstack_blank ((h), (length)), obstack_finish ((h)))
OpenPOWER on IntegriCloud