Merged revisions 793,2259 via svnmerge from

http://[email protected]/svn/fpc/trunk

........
r793 | daniel | 2005-08-04 22:03:02 +0200 (Thu, 04 Aug 2005) | 2 lines

  * Make watchdog external

........
r2259 | florian | 2006-01-11 22:45:53 +0100 (Wed, 11 Jan 2006) | 2 lines

* don't link explicitly against libgcc on linux

........

git-svn-id: branches/fixes_2_0@2451 -

packages/base/gdbint/gdbint.pp

@@ -58,12 +58,11 @@ interface
 {$endif go32v2}
 
 {$ifdef linux}
- {$ifndef bsd}
   {$undef NotImplemented}
   {$LINKLIB libgdb.a}
- {$ifdef GDB_HAS_SIM}
-  {$LINKLIB libsim.a}
- {$endif GDB_HAS_SIM}
+  {$ifdef GDB_HAS_SIM}
+    {$LINKLIB libsim.a}
+  {$endif GDB_HAS_SIM}
   {$LINKLIB libbfd.a}
   {$LINKLIB libreadline.a}
   {$LINKLIB libopcodes.a}
@@ -73,8 +72,7 @@ interface
   {$LINKLIB m}
   {$LINKLIB dl}
   {$LINKLIB c}
-  {$LINKLIB gcc}
- {$endif bsd}
+  { don't link explicitly against (FK) $LINKLIB gcc}
 {$endif linux}
 
 {$ifdef freebsd}
@@ -1037,7 +1035,7 @@ var
   interpreter_p : pchar;cvar;
 
 { we need also to declare some vars }
-  watchdog      : longint;cvar;public;
+  watchdog      : longint;cvar;external;
   gdb_error     : longint;cvar;public;
   display_time  : longbool;cvar;public;
   display_space : longbool;cvar;public;