Committed the gcc 4.3 patch this time, thanks to Christopher Head (bug #228819).

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686)

2 files changed, 200 insertions, 1 deletions

diff --git a/dev-embedded/gpsim/ChangeLog b/dev-embedded/gpsim/ChangeLog
index 9ccbb0b7232c..7cf647758550 100644
--- a/dev-embedded/gpsim/ChangeLog
+++ b/dev-embedded/gpsim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/gpsim
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.38 2008/06/17 11:33:00 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gpsim/ChangeLog,v 1.39 2008/06/22 08:22:48 calchan Exp $
+
+  22 Jun 2008; Denis Dupeyron <calchan@gentoo.org>
+  +files/gpsim-0.22.0-gcc43.patch:
+  Committed the gcc 4.3 patch this time, thanks to Christopher Head (bug
+  #228819).
 
   17 Jun 2008; Denis Dupeyron <calchan@gentoo.org> gpsim-0.22.0.ebuild:
   Fixed compilation with gcc 4.3, thanks to GerbilSoft (bug #218210).
diff --git a/dev-embedded/gpsim/files/gpsim-0.22.0-gcc43.patch b/dev-embedded/gpsim/files/gpsim-0.22.0-gcc43.patch
new file mode 100644
index 000000000000..34c4d5306b12
--- /dev/null
+++ b/dev-embedded/gpsim/files/gpsim-0.22.0-gcc43.patch
@@ -0,0 +1,194 @@
+diff -u --recursive gpsim-0.22.0-orig/cli/cmd_clear.cc gpsim-0.22.0/cli/cmd_clear.cc
+--- gpsim-0.22.0-orig/cli/cmd_clear.cc	2006-04-08 22:09:49.000000000 -0400
++++ gpsim-0.22.0/cli/cmd_clear.cc	2008-05-29 22:26:11.000000000 -0400
+@@ -22,6 +22,7 @@
+ #include <iostream>
+ #include <iomanip>
+ #include <string>
++#include <typeinfo>
+ 
+ #include "command.h"
+ #include "cmd_clear.h"
+diff -u --recursive gpsim-0.22.0-orig/cli/cmd_x.cc gpsim-0.22.0/cli/cmd_x.cc
+--- gpsim-0.22.0-orig/cli/cmd_x.cc	2006-04-08 22:09:49.000000000 -0400
++++ gpsim-0.22.0/cli/cmd_x.cc	2008-05-29 22:26:14.000000000 -0400
+@@ -22,7 +22,7 @@
+ #include <iostream>
+ #include <iomanip>
+ #include <string>
+-
++#include <typeinfo>
+ 
+ #include "command.h"
+ #include "cmd_x.h"
+diff -u --recursive gpsim-0.22.0-orig/gui/gui_regwin.cc gpsim-0.22.0/gui/gui_regwin.cc
+--- gpsim-0.22.0-orig/gui/gui_regwin.cc	2006-11-07 12:15:53.000000000 -0500
++++ gpsim-0.22.0/gui/gui_regwin.cc	2008-05-29 22:26:18.000000000 -0400
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#include <typeinfo>
+ 
+ #include "../config.h"
+ #ifdef HAVE_GUI
+diff -u --recursive gpsim-0.22.0-orig/gui/gui_src.cc gpsim-0.22.0/gui/gui_src.cc
+--- gpsim-0.22.0-orig/gui/gui_src.cc	2006-08-13 11:58:27.000000000 -0400
++++ gpsim-0.22.0/gui/gui_src.cc	2008-05-29 22:26:20.000000000 -0400
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#include <typeinfo>
+ 
+ #include "../config.h"
+ #ifdef HAVE_GUI
+diff -u --recursive gpsim-0.22.0-orig/gui/gui_stack.cc gpsim-0.22.0/gui/gui_stack.cc
+--- gpsim-0.22.0-orig/gui/gui_stack.cc	2006-04-08 22:09:45.000000000 -0400
++++ gpsim-0.22.0/gui/gui_stack.cc	2008-05-29 22:26:25.000000000 -0400
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#include <typeinfo>
+ 
+ #include "../config.h"
+ #ifdef HAVE_GUI
+diff -u --recursive gpsim-0.22.0-orig/gui/gui_symbols.cc gpsim-0.22.0/gui/gui_symbols.cc
+--- gpsim-0.22.0-orig/gui/gui_symbols.cc	2006-11-07 09:09:20.000000000 -0500
++++ gpsim-0.22.0/gui/gui_symbols.cc	2008-05-29 22:26:23.000000000 -0400
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
++#include <typeinfo>
+ 
+ #include "../config.h"
+ #ifdef HAVE_GUI
+diff -u --recursive gpsim-0.22.0-orig/gui/settings_exdbm.cc gpsim-0.22.0/gui/settings_exdbm.cc
+--- gpsim-0.22.0-orig/gui/settings_exdbm.cc	2006-04-08 22:09:45.000000000 -0400
++++ gpsim-0.22.0/gui/settings_exdbm.cc	2008-05-29 22:26:51.000000000 -0400
+@@ -20,7 +20,7 @@
+ Boston, MA 02111-1307, USA.  */
+ 
+ #include "settings_exdbm.h"
+-
++#include <stdlib.h>
+ 
+ SettingsEXdbm::SettingsEXdbm(const char *appl_name)
+ {
+diff -u --recursive gpsim-0.22.0-orig/modules/switch.cc gpsim-0.22.0/modules/switch.cc
+--- gpsim-0.22.0-orig/modules/switch.cc	2006-10-29 09:03:35.000000000 -0500
++++ gpsim-0.22.0/modules/switch.cc	2008-05-29 22:26:29.000000000 -0400
+@@ -37,6 +37,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <assert.h>
++#include <typeinfo>
+ 
+ #include <errno.h>
+ #include <stdlib.h>
+diff -u --recursive gpsim-0.22.0-orig/src/gpsim_object.cc gpsim-0.22.0/src/gpsim_object.cc
+--- gpsim-0.22.0-orig/src/gpsim_object.cc	2006-11-01 09:23:35.000000000 -0500
++++ gpsim-0.22.0/src/gpsim_object.cc	2008-05-29 22:08:51.000000000 -0400
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include "gpsim_object.h"
++#include <cstring>
+ 
+ //========================================================================
+ 
+diff -u --recursive gpsim-0.22.0-orig/src/modules.cc gpsim-0.22.0/src/modules.cc
+--- gpsim-0.22.0-orig/src/modules.cc	2006-09-12 00:44:38.000000000 -0400
++++ gpsim-0.22.0/src/modules.cc	2008-05-29 22:09:56.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include <string>
+ #include <list>
+ #include <vector>
++#include <typeinfo>
+ 
+ #include "../config.h"
+ 
+diff -u --recursive gpsim-0.22.0-orig/src/modules.h gpsim-0.22.0/src/modules.h
+--- gpsim-0.22.0-orig/src/modules.h	2006-09-12 00:44:38.000000000 -0400
++++ gpsim-0.22.0/src/modules.h	2008-05-29 22:04:12.000000000 -0400
+@@ -31,6 +31,8 @@
+ #ifndef __MODULES_H__
+ #define __MODULES_H__
+ 
++#include <cstdlib>
++#include <cstring>
+ #include <list>
+ #include <string>
+ #include <map>
+diff -u --recursive gpsim-0.22.0-orig/src/operator.cc gpsim-0.22.0/src/operator.cc
+--- gpsim-0.22.0-orig/src/operator.cc	2006-07-29 23:56:45.000000000 -0400
++++ gpsim-0.22.0/src/operator.cc	2008-05-29 22:12:02.000000000 -0400
+@@ -5,6 +5,7 @@
+ #include "symbol.h"
+ #include "processor.h"
+ 
++#include <typeinfo>
+ 
+ static bool isFloat(Value *v)
+ {
+diff -u --recursive gpsim-0.22.0-orig/src/processor.cc gpsim-0.22.0/src/processor.cc
+--- gpsim-0.22.0-orig/src/processor.cc	2006-11-09 08:34:36.000000000 -0500
++++ gpsim-0.22.0/src/processor.cc	2008-05-29 22:11:04.000000000 -0400
+@@ -51,6 +51,8 @@
+ #include "cmd_gpsim.h"
+ #include "sim_context.h"
+ 
++#include <typeinfo>
++
+ //------------------------------------------------------------------------
+ // active_cpu  is a pointer to the pic processor that is currently 'active'. 
+ // 'active' means that it's the one currently being simulated or the one
+diff -u --recursive gpsim-0.22.0-orig/src/processor.h gpsim-0.22.0/src/processor.h
+--- gpsim-0.22.0-orig/src/processor.h	2006-10-18 20:16:30.000000000 -0400
++++ gpsim-0.22.0/src/processor.h	2008-05-29 22:04:31.000000000 -0400
+@@ -395,7 +395,7 @@
+   /// (for those processors that support interrupts), the processor is
+   /// in a different 'state' then when the interrupt flag is cleared.
+ 
+-  list<ProgramMemoryAccess *> pma_context;
++  std::list<ProgramMemoryAccess *> pma_context;
+ 
+   /// Tracing
+   /// The readTT and writeTT are TraceType objects for tracing
+diff -u --recursive gpsim-0.22.0-orig/src/symbol.cc gpsim-0.22.0/src/symbol.cc
+--- gpsim-0.22.0-orig/src/symbol.cc	2006-07-29 23:58:17.000000000 -0400
++++ gpsim-0.22.0/src/symbol.cc	2008-05-29 22:11:23.000000000 -0400
+@@ -47,6 +47,8 @@
+ #include "cmd_gpsim.h"
+ #include "sim_context.h"
+ 
++#include <typeinfo>
++
+ class IIndexedCollection;
+ 
+ //
+diff -u --recursive gpsim-0.22.0-orig/src/value.cc gpsim-0.22.0/src/value.cc
+--- gpsim-0.22.0-orig/src/value.cc	2006-07-29 23:57:39.000000000 -0400
++++ gpsim-0.22.0/src/value.cc	2008-05-29 22:12:18.000000000 -0400
+@@ -33,6 +33,8 @@
+ #include "../config.h"
+ #include "cmd_gpsim.h"
+ 
++#include <typeinfo>
++
+ char * TrimWhiteSpaceFromString(char * pBuffer) {
+   size_t iPos = 0;
+   char * pChar = pBuffer;
+diff -u --recursive gpsim-0.22.0-orig/src/value.h gpsim-0.22.0/src/value.h
+--- gpsim-0.22.0-orig/src/value.h	2006-07-29 23:49:06.000000000 -0400
++++ gpsim-0.22.0/src/value.h	2008-05-29 22:04:04.000000000 -0400
+@@ -23,6 +23,7 @@
+ 
+ #include "gpsim_object.h"
+ #include <glib.h>
++#include <cstring>
+ 
+ class Processor;
+ class Module;