--- /dev/c/develop/ports/orig/gdb-5.3/gdb/config/djgpp/djconfig.sh	2002-02-25 16:09:44.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/gdb-5.3/gdb/config/djgpp/djconfig.sh	2003-01-12 11:13:46.000000000 +0000
@@ -129,6 +129,9 @@ export RANLIB=ranlib
 export DEFAULT_YACC="bison -y"
 export YACC="bison -y"
 export DEFAULT_LEX=flex
+# Fileutils built against DJGPP 2.03 and earlier doesn't support
+# proper symlinks.
+export ac_cv_prog_LN_S='cp -pf'
 # Define explicitly the .exe extension because on W95 with LFN=y
 # the check might fail
 export am_cv_exeext=.exe
@@ -138,6 +141,8 @@ export am_cv_exeext=.exe
 # need all that crap.  Assuming that the environment size is less
 # than 4KB, we can afford 12KB of command-line arguments.
 export lt_cv_sys_max_cmd_len=12288
+# Build for 386s and upwards.
+export target=i386-pc-msdosdjgpp
 
 # The configure script needs to see the `install-sh' script, otherwise
 # it decides the source installation is broken.  But "make install" will
@@ -154,7 +159,7 @@ fi
 # support, which is nearly impossible to be supported in the current way,
 # since it relies on file names which will never work on DOS.
 echo "Running the configure script..."
-$srcdir/configure --srcdir="$srcdir" --prefix='${DJDIR}' \
+$srcdir/configure --srcdir="$srcdir" --prefix=/dev/env/DJDIR \
   --disable-shared --disable-nls --verbose --enable-build-warnings=\
 -Wimplicit,-Wcomment,-Wformat,-Wparentheses,-Wpointer-arith $*
 
--- /dev/c/develop/ports/orig/gdb-5.3/gdb/macrotab.c	2002-07-29 22:55:26.000000000 +0000
+++ /dev/c/develop/ports/gnu.dev/gdb-5.3/gdb/macrotab.c	2003-01-12 11:11:34.000000000 +0000
@@ -272,7 +272,14 @@ compare_locations (struct macro_source_f
     {
       /* They can't both be from #included files.  Then we shouldn't
          have walked up this far.  */
+      /* FIXME: Workaround for GCC bug: it misinterprets include from line 1
+         as from line2 when -imacros is used (in this case both lines
+         could be 2)   AP, 2002/09/28 */
+#if defined(__DJGPP__)
+      gdb_assert (! included1 || ! included2 || line1==2);
+#else
       gdb_assert (! included1 || ! included2);
+#endif
 
       /* Any #included position comes after a non-#included position
          with the same line number in the #including file.  */
