| 1 |
vapier 08/04/20 01:59:18 |
| 2 |
|
| 3 |
Added: gdb-armulator-5.0-objstack.patch gtk-config |
| 4 |
Log: |
| 5 |
Fix building with newer versions of gcc #211463 by Ihar Hrachyshka and trick the system to build with gtk-2 #211461 by Ihar Hrachyshka. |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-emulation/gdb-armulator/files/gdb-armulator-5.0-objstack.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/gdb-armulator/files/gdb-armulator-5.0-objstack.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/gdb-armulator/files/gdb-armulator-5.0-objstack.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gdb-armulator-5.0-objstack.patch |
| 15 |
=================================================================== |
| 16 |
--- gdb-5.0/include/obstack.h |
| 17 |
+++ gdb-5.0/include/obstack.h |
| 18 |
@@ -343,7 +343,7 @@ |
| 19 |
|
| 20 |
#endif |
| 21 |
|
| 22 |
-#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = achar) |
| 23 |
+#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = (achar)) |
| 24 |
|
| 25 |
#define obstack_blank_fast(h,n) ((h)->next_free += (n)) |
| 26 |
|
| 27 |
@@ -411,7 +411,7 @@ |
| 28 |
({ struct obstack *__o = (OBSTACK); \ |
| 29 |
if (__o->next_free + 1 > __o->chunk_limit) \ |
| 30 |
_obstack_newchunk (__o, 1); \ |
| 31 |
- *(__o->next_free)++ = (datum); \ |
| 32 |
+ obstack_1grow_fast (__o, datum); \ |
| 33 |
(void) 0; }) |
| 34 |
|
| 35 |
/* These assume that the obstack alignment is good enough for pointers or ints, |
| 36 |
@@ -423,19 +423,28 @@ |
| 37 |
({ struct obstack *__o = (OBSTACK); \ |
| 38 |
if (__o->next_free + sizeof (void *) > __o->chunk_limit) \ |
| 39 |
_obstack_newchunk (__o, sizeof (void *)); \ |
| 40 |
- *((void **)__o->next_free)++ = ((void *)datum); \ |
| 41 |
- (void) 0; }) |
| 42 |
+ obstack_ptr_grow_fast (__o, datum); }) |
| 43 |
|
| 44 |
# define obstack_int_grow(OBSTACK,datum) \ |
| 45 |
__extension__ \ |
| 46 |
({ struct obstack *__o = (OBSTACK); \ |
| 47 |
if (__o->next_free + sizeof (int) > __o->chunk_limit) \ |
| 48 |
_obstack_newchunk (__o, sizeof (int)); \ |
| 49 |
- *((int *)__o->next_free)++ = ((int)datum); \ |
| 50 |
+ obstack_int_grow_fast (__o, datum); }) |
| 51 |
+ |
| 52 |
+# define obstack_ptr_grow_fast(OBSTACK,aptr) \ |
| 53 |
+__extension__ \ |
| 54 |
+({ struct obstack *__o1 = (OBSTACK); \ |
| 55 |
+ *(const void **) __o1->next_free = (aptr); \ |
| 56 |
+ __o1->next_free += sizeof (const void *); \ |
| 57 |
(void) 0; }) |
| 58 |
|
| 59 |
-# define obstack_ptr_grow_fast(h,aptr) (*((void **) (h)->next_free)++ = (void *)aptr) |
| 60 |
-# define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint) |
| 61 |
+# define obstack_int_grow_fast(OBSTACK,aint) \ |
| 62 |
+__extension__ \ |
| 63 |
+({ struct obstack *__o1 = (OBSTACK); \ |
| 64 |
+ *(int *) __o1->next_free = (aint); \ |
| 65 |
+ __o1->next_free += sizeof (int); \ |
| 66 |
+ (void) 0; }) |
| 67 |
|
| 68 |
# define obstack_blank(OBSTACK,length) \ |
| 69 |
__extension__ \ |
| 70 |
@@ -443,7 +452,7 @@ |
| 71 |
int __len = (length); \ |
| 72 |
if (__o->chunk_limit - __o->next_free < __len) \ |
| 73 |
_obstack_newchunk (__o, __len); \ |
| 74 |
- __o->next_free += __len; \ |
| 75 |
+ obstack_blank_fast (__o, __len); \ |
| 76 |
(void) 0; }) |
| 77 |
|
| 78 |
# define obstack_alloc(OBSTACK,length) \ |
| 79 |
@@ -530,26 +539,29 @@ |
| 80 |
# define obstack_1grow(h,datum) \ |
| 81 |
( (((h)->next_free + 1 > (h)->chunk_limit) \ |
| 82 |
? (_obstack_newchunk ((h), 1), 0) : 0), \ |
| 83 |
- (*((h)->next_free)++ = (datum))) |
| 84 |
+ obstack_1grow_fast (h, datum)) |
| 85 |
|
| 86 |
# define obstack_ptr_grow(h,datum) \ |
| 87 |
( (((h)->next_free + sizeof (char *) > (h)->chunk_limit) \ |
| 88 |
? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0), \ |
| 89 |
- (*((char **) (((h)->next_free+=sizeof(char *))-sizeof(char *))) = ((char *) datum))) |
| 90 |
+ obstack_ptr_grow_fast (h, datum)) |
| 91 |
|
| 92 |
# define obstack_int_grow(h,datum) \ |
| 93 |
( (((h)->next_free + sizeof (int) > (h)->chunk_limit) \ |
| 94 |
? (_obstack_newchunk ((h), sizeof (int)), 0) : 0), \ |
| 95 |
- (*((int *) (((h)->next_free+=sizeof(int))-sizeof(int))) = ((int) datum))) |
| 96 |
+ obstack_int_grow_fast (h, datum)) |
| 97 |
+ |
| 98 |
+# define obstack_ptr_grow_fast(h,aptr) \ |
| 99 |
+ (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr)) |
| 100 |
|
| 101 |
-# define obstack_ptr_grow_fast(h,aptr) (*((char **) (h)->next_free)++ = (char *) aptr) |
| 102 |
-# define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint) |
| 103 |
+# define obstack_int_grow_fast(h,aint) \ |
| 104 |
+ (((int *) ((h)->next_free += sizeof (int)))[-1] = (aptr)) |
| 105 |
|
| 106 |
# define obstack_blank(h,length) \ |
| 107 |
( (h)->temp = (length), \ |
| 108 |
(((h)->chunk_limit - (h)->next_free < (h)->temp) \ |
| 109 |
? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \ |
| 110 |
- ((h)->next_free += (h)->temp)) |
| 111 |
+ obstack_blank_fast (h, (h)->temp)) |
| 112 |
|
| 113 |
# define obstack_alloc(h,length) \ |
| 114 |
(obstack_blank ((h), (length)), obstack_finish ((h))) |
| 115 |
|
| 116 |
|
| 117 |
|
| 118 |
1.1 app-emulation/gdb-armulator/files/gtk-config |
| 119 |
|
| 120 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/gdb-armulator/files/gtk-config?rev=1.1&view=markup |
| 121 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/gdb-armulator/files/gtk-config?rev=1.1&content-type=text/plain |
| 122 |
|
| 123 |
Index: gtk-config |
| 124 |
=================================================================== |
| 125 |
#!/bin/sh |
| 126 |
exec pkg-config gtk+-2.0 $(printf "%s" "$*" | sed s:--version:--modversion:) |
| 127 |
|
| 128 |
|
| 129 |
|
| 130 |
-- |
| 131 |
gentoo-commits@l.g.o mailing list |
Archives