From beb2725a0e8530c725841a8648fccbbda06071ee Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Sat, 17 Jun 2006 22:32:15 +0000 Subject: [PATCH] Fix #134659. Package-Manager: portage-2.1.1_pre1 --- dev-lang/prc-tools/ChangeLog | 6 +- dev-lang/prc-tools/Manifest | 41 +- dev-lang/prc-tools/files/digest-prc-tools-2.3 | 16 +- .../prc-tools/files/digest-prc-tools-2.3-r1 | 20 +- .../prc-tools/files/prc-tools-2.3-gcc4.patch | 354 ++++++++++++++++++ dev-lang/prc-tools/prc-tools-2.3-r1.ebuild | 18 +- 6 files changed, 438 insertions(+), 17 deletions(-) create mode 100644 dev-lang/prc-tools/files/prc-tools-2.3-gcc4.patch diff --git a/dev-lang/prc-tools/ChangeLog b/dev-lang/prc-tools/ChangeLog index 9013bc1b3eb9..f789e512b17e 100644 --- a/dev-lang/prc-tools/ChangeLog +++ b/dev-lang/prc-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/prc-tools # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/ChangeLog,v 1.11 2006/01/02 17:16:15 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/ChangeLog,v 1.12 2006/06/17 22:32:15 plasmaroo Exp $ + + 17 Jun 2006; prc-tools-2.3-r1.ebuild, + +files/prc-tools-2.3-gcc4.patch: + Fix #134659. 02 Jan 2006; files/prc-tools-2.3-compilefix.patch: Add configure fix for userpriv; #117307. diff --git a/dev-lang/prc-tools/Manifest b/dev-lang/prc-tools/Manifest index 573400a4a00a..40ade8cd5476 100644 --- a/dev-lang/prc-tools/Manifest +++ b/dev-lang/prc-tools/Manifest @@ -1,7 +1,36 @@ -MD5 d238bb6511d5c7d43ff9cdece33b027a ChangeLog 1384 -MD5 2aee4ac4975556a9558eeda9483f6928 prc-tools-2.3-r1.ebuild 3661 -MD5 a5c50833bcc05f696a75e5dc8bb9eb4d metadata.xml 225 -MD5 5fdc4c03698ce46609cf3e6ef57ea52a prc-tools-2.3.ebuild 3354 -MD5 caff630bb5a63f4cd8b4165d5016eca1 files/digest-prc-tools-2.3-r1 393 -MD5 a7ab0a38eef025abb11ecefaa270c68b files/digest-prc-tools-2.3 323 +AUX prc-tools-2.3-compilefix.patch 10402 RMD160 4dc143e5fbb34609eed50bb4f75bd84c74e59916 SHA1 eeebb466706e330523f6cbf92d7fc321930345d9 SHA256 940181fc986b9922568836db4663cf4cb7d2a3783d0947cc3da71057ca434dd5 MD5 f89f5bdc838e1898795108506f39d585 files/prc-tools-2.3-compilefix.patch 10402 +RMD160 4dc143e5fbb34609eed50bb4f75bd84c74e59916 files/prc-tools-2.3-compilefix.patch 10402 +SHA256 940181fc986b9922568836db4663cf4cb7d2a3783d0947cc3da71057ca434dd5 files/prc-tools-2.3-compilefix.patch 10402 +AUX prc-tools-2.3-gcc4.patch 13101 RMD160 653b69113754242117f203bfe5120170314e6895 SHA1 aa8ceff76dd7b320e5890ef9ac8220449b434cdc SHA256 83b280b2df87decdb05d031d34abc264479394b9adfaa092e6f3ff2cde6541c7 +MD5 e4c25ce86cd6f9926b7cf7e721185bd3 files/prc-tools-2.3-gcc4.patch 13101 +RMD160 653b69113754242117f203bfe5120170314e6895 files/prc-tools-2.3-gcc4.patch 13101 +SHA256 83b280b2df87decdb05d031d34abc264479394b9adfaa092e6f3ff2cde6541c7 files/prc-tools-2.3-gcc4.patch 13101 +DIST MsectGdb2.3-1Patch.tar.bz2 14210 RMD160 527a45bde13f02133f158e90243800fde8af81fd SHA1 bc66fd0a9c32aa9b9827f1ace193538b292fb658 SHA256 4befe806424014b4b5865e7fb0b5f5aed6bcde633bd92757ec3747d61ecdc359 +DIST binutils-2.14.tar.bz2 10921504 RMD160 e629a1256b5f75552e3360a315d28ad37f11a604 SHA1 66b4f057bf687126d7cc11d0a68ed89182541ae7 SHA256 e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59 +DIST gcc-2.95.3.tar.bz2 9848842 RMD160 09cca1860ce897000df19643dfd944ae28366a1d SHA1 1741fd70901a39442e5135e31dde370d1c194e6c SHA256 cf91a6b4f41248895f06bcd0570a62d2417ee99d32e6e2c5f70490e0eb6af5e4 +DIST gcc-3.3.1.tar.bz2 23544362 RMD160 b3c0025b10de0917a30df55b669e8c6c7ec5814b SHA1 65ba4142dbf345d1aac1ed323f64b5f49294aee7 SHA256 e6c498d1d310de2f4e5834def91603229e089ad814ac47c8ed6dd6c191b46f35 +DIST gdb-5.3.tar.bz2 11198721 RMD160 92c5ee92e993354839f002231164296f51882570 SHA1 fe03cb6dd40be2297766ded8142135bd1a32f685 SHA256 6e559a98636a1a5d92fd8df31161ed9307eca2234ae2d783dd8c84f500cddb6c +DIST prc-tools-2.3.tar.gz 333417 RMD160 6c5cce0b0a03a5e6b37c6a7b80dc925e64b0c0a1 SHA1 1100d35dc906bae8f3bbfd4564298ccd0359800a SHA256 9ae076efc71eb693815cbd8177826d75bd958fef53fb5c9968511a1b2081a173 +EBUILD prc-tools-2.3-r1.ebuild 4021 RMD160 9aa3e90f3edc3a320b6241e567890ca7d47b9e12 SHA1 eb273ee2e7e30a42d382eb85d963c28928480779 SHA256 7741e136fa81969b15059fd6cb20040d971d069a843d5850e189df6c196c4f02 +MD5 42737efcd8db0df260742ac03662ad1b prc-tools-2.3-r1.ebuild 4021 +RMD160 9aa3e90f3edc3a320b6241e567890ca7d47b9e12 prc-tools-2.3-r1.ebuild 4021 +SHA256 7741e136fa81969b15059fd6cb20040d971d069a843d5850e189df6c196c4f02 prc-tools-2.3-r1.ebuild 4021 +EBUILD prc-tools-2.3.ebuild 3354 RMD160 584213d63323f1110833d5dc02f2e1013405a84e SHA1 f275b4349d12769ba86d630e18ad426dba1a2073 SHA256 edf0695b4417bcbc705f70fa4ef325cf0aa74d3feeb79c952760905e38fc6f9a +MD5 5fdc4c03698ce46609cf3e6ef57ea52a prc-tools-2.3.ebuild 3354 +RMD160 584213d63323f1110833d5dc02f2e1013405a84e prc-tools-2.3.ebuild 3354 +SHA256 edf0695b4417bcbc705f70fa4ef325cf0aa74d3feeb79c952760905e38fc6f9a prc-tools-2.3.ebuild 3354 +MISC ChangeLog 1498 RMD160 e14441ad8b64c428c8e264a419df6ed70c70fb40 SHA1 48babf6bf79ed3d7999e5840c6a3445307e10198 SHA256 2a9cb83e6304b3b025f38df4a908f19c8052eb9a4d828f066df8b0f82ca01966 +MD5 78f5248e5701ac7c1635a674bf9209ba ChangeLog 1498 +RMD160 e14441ad8b64c428c8e264a419df6ed70c70fb40 ChangeLog 1498 +SHA256 2a9cb83e6304b3b025f38df4a908f19c8052eb9a4d828f066df8b0f82ca01966 ChangeLog 1498 +MISC metadata.xml 225 RMD160 d6f2b917ec03bda238f5d0de165092976b04a68f SHA1 5b29c5913449fef5b6accfa86f83a1c091915321 SHA256 ef49ed0988724c20373ad61a01189f8ae45fec631e1194215931610d4d5accb5 +MD5 a5c50833bcc05f696a75e5dc8bb9eb4d metadata.xml 225 +RMD160 d6f2b917ec03bda238f5d0de165092976b04a68f metadata.xml 225 +SHA256 ef49ed0988724c20373ad61a01189f8ae45fec631e1194215931610d4d5accb5 metadata.xml 225 +MD5 35a3e08fd76893eca2dd1818617ade98 files/digest-prc-tools-2.3 1199 +RMD160 798683b1ec72f52732a4fd1506eac3ceb8181408 files/digest-prc-tools-2.3 1199 +SHA256 0cd6b34ad7ffcd90bc042f7623750aa1311b174258d3c557ebe09ed32211321a files/digest-prc-tools-2.3 1199 +MD5 4f4d1967ae51477b749622063c19d15b files/digest-prc-tools-2.3-r1 1455 +RMD160 f86ea0def9e7023788fe696bafcb42c7ee39e7cd files/digest-prc-tools-2.3-r1 1455 +SHA256 cae70ca9ef8d964bff25eb1def95f105402525a9424d59eb8532ea0b7430f26a files/digest-prc-tools-2.3-r1 1455 diff --git a/dev-lang/prc-tools/files/digest-prc-tools-2.3 b/dev-lang/prc-tools/files/digest-prc-tools-2.3 index 4de07be0bcd0..2650308ec6b3 100644 --- a/dev-lang/prc-tools/files/digest-prc-tools-2.3 +++ b/dev-lang/prc-tools/files/digest-prc-tools-2.3 @@ -1,5 +1,15 @@ -MD5 038a42a71a984fee6f906abc85a032ec prc-tools-2.3.tar.gz 333417 MD5 2da8def15d28af3ec6af0982709ae90a binutils-2.14.tar.bz2 10921504 -MD5 70e4ade69a2dff2c7b9af9a4ef44798f gdb-5.3.tar.bz2 11198721 -MD5 1135a104e9fa36fdf7c663598fab5c40 gcc-3.3.1.tar.bz2 23544362 +RMD160 e629a1256b5f75552e3360a315d28ad37f11a604 binutils-2.14.tar.bz2 10921504 +SHA256 e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59 binutils-2.14.tar.bz2 10921504 MD5 87ee083a830683e2aaa57463940a0c3c gcc-2.95.3.tar.bz2 9848842 +RMD160 09cca1860ce897000df19643dfd944ae28366a1d gcc-2.95.3.tar.bz2 9848842 +SHA256 cf91a6b4f41248895f06bcd0570a62d2417ee99d32e6e2c5f70490e0eb6af5e4 gcc-2.95.3.tar.bz2 9848842 +MD5 1135a104e9fa36fdf7c663598fab5c40 gcc-3.3.1.tar.bz2 23544362 +RMD160 b3c0025b10de0917a30df55b669e8c6c7ec5814b gcc-3.3.1.tar.bz2 23544362 +SHA256 e6c498d1d310de2f4e5834def91603229e089ad814ac47c8ed6dd6c191b46f35 gcc-3.3.1.tar.bz2 23544362 +MD5 70e4ade69a2dff2c7b9af9a4ef44798f gdb-5.3.tar.bz2 11198721 +RMD160 92c5ee92e993354839f002231164296f51882570 gdb-5.3.tar.bz2 11198721 +SHA256 6e559a98636a1a5d92fd8df31161ed9307eca2234ae2d783dd8c84f500cddb6c gdb-5.3.tar.bz2 11198721 +MD5 038a42a71a984fee6f906abc85a032ec prc-tools-2.3.tar.gz 333417 +RMD160 6c5cce0b0a03a5e6b37c6a7b80dc925e64b0c0a1 prc-tools-2.3.tar.gz 333417 +SHA256 9ae076efc71eb693815cbd8177826d75bd958fef53fb5c9968511a1b2081a173 prc-tools-2.3.tar.gz 333417 diff --git a/dev-lang/prc-tools/files/digest-prc-tools-2.3-r1 b/dev-lang/prc-tools/files/digest-prc-tools-2.3-r1 index 03f077f1c5e2..b31afd25258f 100644 --- a/dev-lang/prc-tools/files/digest-prc-tools-2.3-r1 +++ b/dev-lang/prc-tools/files/digest-prc-tools-2.3-r1 @@ -1,6 +1,18 @@ -MD5 038a42a71a984fee6f906abc85a032ec prc-tools-2.3.tar.gz 333417 +MD5 32a23e84f5d35f4b5aaa1b425bd1a38c MsectGdb2.3-1Patch.tar.bz2 14210 +RMD160 527a45bde13f02133f158e90243800fde8af81fd MsectGdb2.3-1Patch.tar.bz2 14210 +SHA256 4befe806424014b4b5865e7fb0b5f5aed6bcde633bd92757ec3747d61ecdc359 MsectGdb2.3-1Patch.tar.bz2 14210 MD5 2da8def15d28af3ec6af0982709ae90a binutils-2.14.tar.bz2 10921504 -MD5 70e4ade69a2dff2c7b9af9a4ef44798f gdb-5.3.tar.bz2 11198721 -MD5 1135a104e9fa36fdf7c663598fab5c40 gcc-3.3.1.tar.bz2 23544362 +RMD160 e629a1256b5f75552e3360a315d28ad37f11a604 binutils-2.14.tar.bz2 10921504 +SHA256 e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59 binutils-2.14.tar.bz2 10921504 MD5 87ee083a830683e2aaa57463940a0c3c gcc-2.95.3.tar.bz2 9848842 -MD5 32a23e84f5d35f4b5aaa1b425bd1a38c MsectGdb2.3-1Patch.tar.bz2 14210 +RMD160 09cca1860ce897000df19643dfd944ae28366a1d gcc-2.95.3.tar.bz2 9848842 +SHA256 cf91a6b4f41248895f06bcd0570a62d2417ee99d32e6e2c5f70490e0eb6af5e4 gcc-2.95.3.tar.bz2 9848842 +MD5 1135a104e9fa36fdf7c663598fab5c40 gcc-3.3.1.tar.bz2 23544362 +RMD160 b3c0025b10de0917a30df55b669e8c6c7ec5814b gcc-3.3.1.tar.bz2 23544362 +SHA256 e6c498d1d310de2f4e5834def91603229e089ad814ac47c8ed6dd6c191b46f35 gcc-3.3.1.tar.bz2 23544362 +MD5 70e4ade69a2dff2c7b9af9a4ef44798f gdb-5.3.tar.bz2 11198721 +RMD160 92c5ee92e993354839f002231164296f51882570 gdb-5.3.tar.bz2 11198721 +SHA256 6e559a98636a1a5d92fd8df31161ed9307eca2234ae2d783dd8c84f500cddb6c gdb-5.3.tar.bz2 11198721 +MD5 038a42a71a984fee6f906abc85a032ec prc-tools-2.3.tar.gz 333417 +RMD160 6c5cce0b0a03a5e6b37c6a7b80dc925e64b0c0a1 prc-tools-2.3.tar.gz 333417 +SHA256 9ae076efc71eb693815cbd8177826d75bd958fef53fb5c9968511a1b2081a173 prc-tools-2.3.tar.gz 333417 diff --git a/dev-lang/prc-tools/files/prc-tools-2.3-gcc4.patch b/dev-lang/prc-tools/files/prc-tools-2.3-gcc4.patch new file mode 100644 index 000000000000..7313fc9caed2 --- /dev/null +++ b/dev-lang/prc-tools/files/prc-tools-2.3-gcc4.patch @@ -0,0 +1,354 @@ +--- prc-tools-2.3/binutils/gas/config/tc-m68k.h 2003-01-23 12:51:05.000000000 +0000 ++++ prc-tools-2.3/binutils/gas/config/tc-m68k.h 2006-06-16 22:21:34.000000000 +0100 +@@ -20,6 +20,7 @@ + Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ + ++#include "../tc.h" + #define TC_M68K 1 + + #ifdef ANSI_PROTOTYPES +@@ -106,7 +107,7 @@ + + #if !defined (REGISTER_PREFIX_OPTIONAL) + #if defined (M68KCOFF) || defined (OBJ_ELF) +-#ifndef BFD_ASSEMBLER ++#if !defined(BFD_ASSEMBLER) && !defined(LOCAL_LABEL) + #define LOCAL_LABEL(name) (name[0] == '.' \ + && (name[1] == 'L' || name[1] == '.')) + #endif /* ! BFD_ASSEMBLER */ +--- prc-tools-2.3/binutils/gas/tc.h 2001-11-15 21:28:53.000000000 +0000 ++++ prc-tools-2.3/binutils/gas/tc.h 2006-06-16 22:59:00.000000000 +0100 +@@ -19,6 +19,11 @@ + along with GAS; see the file COPYING. If not, write to + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + ++#ifndef _GAS_TC_H ++#define _GAS_TC_H ++ ++#include "../write.h" ++ + /* In theory (mine, at least!) the machine dependent part of the assembler + should only have to include one file. This one. -- JF */ + +@@ -85,18 +90,6 @@ + #else + extern arelent **tc_gen_reloc PARAMS ((asection *, fixS *)); + #endif +-#else /* not BFD_ASSEMBLER */ +-#ifndef md_convert_frag +-void md_convert_frag PARAMS ((object_headers * headers, segT, fragS * fragP)); +-#endif +- +-#ifndef tc_crawl_symbol_chain +-void tc_crawl_symbol_chain PARAMS ((object_headers * headers)); +-#endif /* tc_crawl_symbol_chain */ +- +-#ifndef tc_headers_hook +-void tc_headers_hook PARAMS ((object_headers * headers)); +-#endif /* tc_headers_hook */ + #endif /* BFD_ASSEMBLER */ + + #ifndef md_section_align +@@ -108,3 +101,5 @@ + #endif + + /* end of tc.h */ ++ ++#endif /* _GAS_TC_H */ +--- prc-tools-2.3/binutils/gas/config/obj-coff.h 2003-04-04 09:15:14.000000000 +0100 ++++ prc-tools-2.3/binutils/gas/config/obj-coff.h 2006-06-16 22:59:00.000000000 +0100 +@@ -903,4 +903,19 @@ + #define SET_SECTION_RELOCS(sec, relocs, n) \ + SA_SET_SCN_NRELOC (section_symbol (sec), n) + ++#ifdef _GAS_TC_H ++#ifndef md_convert_frag ++#include "config/obj-coff.h" ++void md_convert_frag PARAMS ((object_headers * headers, segT, fragS * fragP)); ++#endif ++ ++#ifndef tc_crawl_symbol_chain ++void tc_crawl_symbol_chain PARAMS ((object_headers * headers)); ++#endif /* tc_crawl_symbol_chain */ ++ ++#ifndef tc_headers_hook ++void tc_headers_hook PARAMS ((object_headers * headers)); ++#endif /* tc_headers_hook */ ++#endif ++ + #endif /* OBJ_FORMAT_H */ +--- prc-tools-2.3/gdb-5.3/include/obstack.h 2006-06-16 23:12:30.000000000 +0100 ++++ prc-tools-2.3/gdb/include/obstack.h 2005-05-10 11:21:08.000000000 +0100 +@@ -1,6 +1,6 @@ + /* obstack.h - object stack macros + Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, +- 1999, 2000 ++ 1999, 2000, 2001, 2002, 2003, 2004, 2005 + Free Software Foundation, Inc. + + +@@ -19,7 +19,7 @@ + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, ++ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, + USA. */ + + /* Summary: +@@ -145,11 +145,7 @@ + + #if defined _LIBC || defined HAVE_STRING_H + # include +-# if defined __STDC__ && __STDC__ +-# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N)) +-# else +-# define _obstack_memcpy(To, From, N) memcpy ((To), (char *)(From), (N)) +-# endif ++# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N)) + #else + # ifdef memcpy + # define _obstack_memcpy(To, From, N) memcpy ((To), (char *)(From), (N)) +@@ -174,18 +170,12 @@ + char *chunk_limit; /* address of char after current chunk */ + PTR_INT_TYPE temp; /* Temporary for some macros. */ + int alignment_mask; /* Mask of alignment for each object. */ +-#if defined __STDC__ && __STDC__ + /* These prototypes vary based on `use_extra_arg', and we use + casts to the prototypeless function type in all assignments, + but having prototypes here quiets -Wstrict-prototypes. */ + struct _obstack_chunk *(*chunkfun) (void *, long); + void (*freefun) (void *, struct _obstack_chunk *); + void *extra_arg; /* first arg for chunk alloc/dealloc funcs */ +-#else +- struct _obstack_chunk *(*chunkfun) (); /* User's fcn to allocate a chunk. */ +- void (*freefun) (); /* User's function to free a chunk. */ +- char *extra_arg; /* first arg for chunk alloc/dealloc funcs */ +-#endif + unsigned use_extra_arg:1; /* chunk alloc/dealloc funcs take extra arg */ + unsigned maybe_empty_object:1;/* There is a possibility that the current + chunk contains a zero-length object. This +@@ -198,7 +188,6 @@ + + /* Declare the external functions we use; they are in obstack.c. */ + +-#if defined __STDC__ && __STDC__ + extern void _obstack_newchunk (struct obstack *, int); + extern void _obstack_free (struct obstack *, void *); + extern int _obstack_begin (struct obstack *, int, int, +@@ -207,16 +196,7 @@ + void *(*) (void *, long), + void (*) (void *, void *), void *); + extern int _obstack_memory_used (struct obstack *); +-#else +-extern void _obstack_newchunk (); +-extern void _obstack_free (); +-extern int _obstack_begin (); +-extern int _obstack_begin_1 (); +-extern int _obstack_memory_used (); +-#endif + +-#if defined __STDC__ && __STDC__ +- + /* Do the function-declarations after the structs + but before defining the macros. */ + +@@ -255,19 +235,10 @@ + int obstack_chunk_size (struct obstack *obstack); + int obstack_memory_used (struct obstack *obstack); + +-#endif /* __STDC__ */ +- +-/* Non-ANSI C cannot really support alternative functions for these macros, +- so we do not declare them. */ +- + /* Error handler called when `obstack_chunk_alloc' failed to allocate + more memory. This can be set to a user defined function. The + default action is to print a message and abort. */ +-#if defined __STDC__ && __STDC__ + extern void (*obstack_alloc_failed_handler) (void); +-#else +-extern void (*obstack_alloc_failed_handler) (); +-#endif + + /* Exit value used when `print_and_abort' is used. */ + extern int obstack_exit_failure; +@@ -292,8 +263,6 @@ + + /* To prevent prototype warnings provide complete argument list in + standard C version. */ +-#if defined __STDC__ && __STDC__ +- + # define obstack_init(h) \ + _obstack_begin ((h), 0, 0, \ + (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free) +@@ -317,33 +286,7 @@ + # define obstack_freefun(h, newfreefun) \ + ((h) -> freefun = (void (*)(void *, struct _obstack_chunk *)) (newfreefun)) + +-#else +- +-# define obstack_init(h) \ +- _obstack_begin ((h), 0, 0, \ +- (void *(*) ()) obstack_chunk_alloc, (void (*) ()) obstack_chunk_free) +- +-# define obstack_begin(h, size) \ +- _obstack_begin ((h), (size), 0, \ +- (void *(*) ()) obstack_chunk_alloc, (void (*) ()) obstack_chunk_free) +- +-# define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \ +- _obstack_begin ((h), (size), (alignment), \ +- (void *(*) ()) (chunkfun), (void (*) ()) (freefun)) +- +-# define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \ +- _obstack_begin_1 ((h), (size), (alignment), \ +- (void *(*) ()) (chunkfun), (void (*) ()) (freefun), (arg)) +- +-# define obstack_chunkfun(h, newchunkfun) \ +- ((h) -> chunkfun = (struct _obstack_chunk *(*)()) (newchunkfun)) +- +-# define obstack_freefun(h, newfreefun) \ +- ((h) -> freefun = (void (*)()) (newfreefun)) +- +-#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 +354,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 +366,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 +395,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) \ +@@ -485,9 +437,9 @@ + # define obstack_free(OBSTACK, OBJ) \ + __extension__ \ + ({ struct obstack *__o = (OBSTACK); \ +- void *__obj = (OBJ); \ ++ void *__obj = (void *) (OBJ); \ + if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit) \ +- __o->next_free = __o->object_base = __obj; \ ++ __o->next_free = __o->object_base = (char *) __obj; \ + else (obstack_free) (__o, __obj); }) + + #else /* not __GNUC__ or not __STDC__ */ +@@ -530,26 +482,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))) +@@ -574,21 +529,12 @@ + (h)->object_base = (h)->next_free, \ + __INT_TO_PTR ((h)->temp)) + +-# if defined __STDC__ && __STDC__ +-# define obstack_free(h,obj) \ ++# 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 \ + = (h)->temp + (char *) (h)->chunk) \ + : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0))) +-# else +-# 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 \ +- = (h)->temp + (char *) (h)->chunk) \ +- : (_obstack_free ((h), (h)->temp + (char *) (h)->chunk), 0))) +-# endif + + #endif /* not __GNUC__ or not __STDC__ */ + +--- prc-tools-2.3/gdb/gdb/remote-palmos.c~ 2006-06-16 23:22:00.000000000 +0100 ++++ prc-tools-2.3/gdb/gdb/remote-palmos.c 2006-06-16 23:29:32.000000000 +0100 +@@ -127,8 +127,6 @@ + other form of hairy serial connection, I would think 2 seconds would + be plenty. */ + +-static int remote_timeout = 2; +- + static CORE_ADDR text_addr=0, data_addr=0, bss_addr=0, __text___addr=0; + static int ncodesects=0; + static CORE_ADDR save_ssp, save_usp; diff --git a/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild b/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild index bbcd3f4a5f1d..f96162aae2f4 100644 --- a/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild +++ b/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild,v 1.5 2006/01/01 22:01:59 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/prc-tools-2.3-r1.ebuild,v 1.6 2006/06/17 22:32:15 plasmaroo Exp $ -inherit flag-o-matic eutils +inherit flag-o-matic eutils toolchain-funcs BIN_V="binutils-2.14" GDB_V="gdb-5.3" @@ -45,6 +45,7 @@ src_unpack() { echo -n " "; epatch ${P}/${GDB_V}.palmos.diff || die echo -n " "; EPATCH_OPTS="-l" epatch ${P}/../MsectGdb2.3-1.diff || die echo -n " "; epatch ${FILESDIR}/${P}-compilefix.patch || die + echo -n " "; epatch ${FILESDIR}/${P}-gcc4.patch || die # This last patch disables dummy headers being copied. # a) They're not needed @@ -76,7 +77,18 @@ src_config() { ALLOWED_FLAGS="-pipe -0 -01 -02" strip-flags - ../${P}/configure --enable-targets=m68k-palmos,arm-palmos \ + local targets + if [ "$(gcc-major-version)" -ge '4' ] + then + ewarn "Disabling ARM support as the 3.3 GCC prc-tools uses can't be" + ewarn "compiled using your GCC4+ compiler. Switch to GCC 3.x and rerun" + ewarn "the merge to get ARM support." + echo + else + targets=',arm-palmos' + fi + + ../${P}/configure --enable-targets=m68k-palmos"${targets}" \ --enable-languages=c,c++ \ --with-headers=${WORKDIR}/build/empty --enable-html-docs \ --with-palmdev-prefix=/opt/palmdev --prefix=/usr || die -- 2.26.2