Message-ID: <397338CB.507123E4@softhome.net>
Date: Mon, 17 Jul 2000 18:48:11 +0200
From: Laurynas Biveinis <lauras AT softhome DOT net>
X-Mailer: Mozilla 4.73 [en] (Win98; U)
X-Accept-Language: lt,en
MIME-Version: 1.0
To: DJGPP Workers <djgpp-workers AT delorie DOT com>
Subject: Patch to remove outdated DJGPP configuration
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Reply-To: djgpp-workers AT delorie DOT com

This is what I gonna send to gcc-patches. Other maintainers, do
you have any comments?
------
This patch removes terribly outdated stuff. While DJGPP maintainers
haven't started discussing, how new configuration system should look
like, we have little use in old one. Configure.bat, which is shared
with NT configuration is removed too, as Win maintainers consider it
obsolete. However, I haven't touched gcc/config/winnt directory.

I've deleted gcc/config/msdos/ directory. If we will
need one in future, gcc/config/djgpp/ is a better name. 

gcc/ChangeLog:

2000-07-17 Laurynas Biveinis <lauras AT softhome DOT net>

	* configure.bat: remove.
	* install.texi (i[345]86-*-winnt3.5): delete building on NT 
        instructions with and without configure.bat.
        * INSTALL: regenerate. 
	* config/msdos/configur.bat, config/msdos/libgcc.mak, 
        config/msdos/mklibgcc.c, config/msdos/top.sed: remove.
	* config/msdos/: remove directory.

diff -u -r -N cvs/gcc/gcc/config/msdos/configur.bat gcc/config/msdos/configur.bat
--- cvs/gcc/gcc/config/msdos/configur.bat	Wed Dec 16 22:10:28 1998
+++ gcc/config/msdos/configur.bat	Thu Jan  1 00:00:00 1970
@@ -1,47 +0,0 @@
-@echo off
-echo Configuring GCC for go32
-rem This batch file assumes a unix-type "sed" program
-
-if not exist config\msdos\configure.bat chdir ..\..
-
-update config\i386\xm-dos.h config.h
-update config\i386\xm-dos.h hconfig.h
-update config\i386\xm-dos.h tconfig.h
-update config\i386\go32.h tm.h
-update config\i386\i386.md md
-update config\i386\i386.c aux-output.c
-
-echo # Makefile generated by "configure.bat"> Makefile
-echo all.dos: cccp cc1 cc1obj xgcc libgcc.a s-objlist >> Makefile
-sed -f config/msdos/top.sed Makefile.in >> Makefile
-
-set LANG=
-
-if not exist ada\make-lang.in goto no_ada
-sed -f config/msdos/top.sed ada\make-lang.in >> Makefile
-sed -f config/msdos/top.sed ada\makefile.in > ada\Makefile
-set LANG=%LANG% ada.&   
-:no_ada
-
-if not exist cp\make-lang.in goto no_cp
-sed -f config/msdos/top.sed cp\make-lang.in >> Makefile
-sed -f config/msdos/top.sed cp\makefile.in > cp\Makefile
-set LANG=%LANG% c++.&	
-:no_cp
-
-echo lang.mostlyclean: %LANG% | sed "s/&/mostlyclean/g" >> Makefile
-echo lang.clean: %LANG% | sed "s/&/clean/g" >> Makefile
-echo lang.distclean: %LANG% | sed "s/&/distclean/g" >> Makefile
-echo lang.maintainer-clean: %LANG% | sed "s/&/maintainer-clean/g" >> Makefile
-echo /* options.h */ > options.h
-if exist cp\lang-options.h echo #include "cp/lang-options.h" >> options.h
-if exist ada\lang-options.h echo #include "ada/lang-options.h" >> options.h
-if exist f\lang-options.h echo #include "f/lang-options.h" >> options.h
-echo /* specs.h */ > specs.h
-if exist cp\lang-specs.h echo #include "cp/lang-specs.h" >> specs.h
-if exist ada\lang-specs.h echo #include "ada/lang-specs.h" >> specs.h
-if exist f\lang-specs.h echo #include "f/lang-specs.h" >> specs.h
-
-echo #define MULTILIB_SELECT ". ;" > multilib.h1
-update multilib.h1 multilib.h
-del multilib.h1
diff -u -r -N cvs/gcc/gcc/config/msdos/libgcc.mak gcc/config/msdos/libgcc.mak
--- cvs/gcc/gcc/config/msdos/libgcc.mak	Wed Dec 16 22:10:30 1998
+++ gcc/config/msdos/libgcc.mak	Thu Jan  1 00:00:00 1970
@@ -1,14 +0,0 @@
-# Build libgcc.a
-
-libgcc.a : libgcc1.c libgcc2.c mklibgcc
-	./mklibgcc -c
-	./mklibgcc '$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES)' libgcc1.c $(LIB1FUNCS)
-	./mklibgcc '$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES)' libgcc2.c $(LIB2FUNCS)
-	-command /c mklibnow.bat
-	-command /c del libgcc.a
-	ar rvs libgcc.a lgcctmp/*.o
-
-mklibgcc : config/msdos/mklibgcc.c
-	gcc $(CFLAGS) $^ -o $@
-
-
diff -u -r -N cvs/gcc/gcc/config/msdos/mklibgcc.c gcc/config/msdos/mklibgcc.c
--- cvs/gcc/gcc/config/msdos/mklibgcc.c	Wed Dec 16 22:10:30 1998
+++ gcc/config/msdos/mklibgcc.c	Thu Jan  1 00:00:00 1970
@@ -1,98 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-
-char *skips[] = {
-  "__main",
-  "_ctors",
-  "_exit",
-  "_ctor_list",
-  "_dtor_list",
-  0
-};
-
-int
-do_clean()
-{
-  DIR *dir;
-  struct dirent *de;
-  remove("mklibnow.bat");
-
-  dir = opendir("lgcctmp");
-  if (!dir)
-    return 0;
-  while ((de=readdir(dir)))
-  {
-    char buf[30];
-    if (de->d_name[0] == '.')
-      continue;
-    sprintf(buf, "lgcctmp/%s", de->d_name);
-    unlink(buf);
-  }
-  closedir(dir);
-  return 0;
-}
-
-int
-main(int argc, char **argv)
-{
-  char *cc = argv[1];
-  char *csrc=argv[2];
-  int i;
-  FILE *batfile;
-  FILE *cfile;
-
-  if (argc > 1 && strcmp(argv[1], "-c")==0)
-    return do_clean();
-
-  mkdir("lgcctmp", 0755);
-
-  batfile = fopen("mklibnow.bat", "a");
-  if (!batfile)
-  {
-    perror("mklibnow.bat");
-    return 1;
-  }
-  fprintf(batfile, "@echo off\n");
-
-  for (i=3; i<argc; i++)
-  {
-    char basename[30], *bp;
-    int s;
-    for (s=0; skips[s]; s++)
-      if (strcmp(skips[s], argv[i]) == 0)
-	break;
-    if (skips[s])
-      continue;
-    strcpy(basename, "lgcctmp/");
-    if (strncmp(argv[i], "_fix", 4)==0)
-    {
-      strcat(basename, "fx");
-      strcat(basename, argv[i]+4);
-    }
-    else if (strncmp(argv[i], "_float", 4)==0)
-    {
-      strcat(basename, "flt");
-      strcat(basename, argv[i]+6);
-    }
-    else
-    {
-      strcat(basename, argv[i]);
-    }
-    bp = basename + strlen(basename);
-    fprintf(batfile, "%s -c %s.c -o %s.o\n", cc, basename, basename);
-    strcpy(bp, ".c");
-    cfile = fopen(basename, "w");
-    if (cfile)
-    {
-      *bp = 0;
-      fprintf(cfile, "#define L%s\n#include \"%s\"\n", argv[i], csrc);
-      fclose(cfile);
-    }
-    else
-      perror(basename);
-  }
-
-  fclose(batfile);
-  return 0;
-}
diff -u -r -N cvs/gcc/gcc/config/msdos/top.sed gcc/config/msdos/top.sed
--- cvs/gcc/gcc/config/msdos/top.sed	Sun Jun 18 09:55:36 2000
+++ gcc/config/msdos/top.sed	Thu Jan  1 00:00:00 1970
@@ -1,58 +0,0 @@
-/\.o[ 	]*:/ s/config.status//
-/^multilib.h/ s/multilib/not-multilib/
-/^target=/ c\
-target=go32
-/^out_file=/ c\
-out_file=config/i386/i386.c
-/^out_object_file=/ c\
-out_object_file=i386.o
-/^md_file=/ c\
-md_file=config/i386/i386.md
-/^tm_file=/ c\
-tm_file=config/i386/go32.h
-/^build_xm_file=/ c\
-build_xm_file=config/i386/xm-dos.h
-/^host_xm_file=/ c\
-host_xm_file=config/i386/xm-dos.h
-/^lang_specs_files=/ d
-/^lang_options_files=/ d
-/^xmake_file=/ d
-/^tmake_file=/ d
-/^version=/ c\
-version=2.8.1
-/^mainversion=/ c\
-mainversion=2.8.1
-s/CC = cc/CC = gcc/
-s/:\$/: \$/g
-s/^	\ *\.\//	/
-s/<\ *\$(srcdir)\//< $(srcdir)\\/g
-s/^	\$(SHELL) \$(srcdir)\/move-if-change/	update/
-s/^	\$(srcdir)\/move-if-change/	update/
-s/^USE_/# USE_/
-s/`echo \$(srcdir)\///g
-s/ | sed 's,\^\\\.\/,,'`//g
-s/^	cd \$(srcdir)[ 	]*;/	/
-/^# USE_HOST_OBSTACK/ i\
-USE_HOST_OBSTACK=obstack.o
-/^stamp-attrtab/,/update/ {
-  /\\/d
-  /[ 	]fi[ 	]/d
-  /[ 	]fi$/d
-  /update/ i\
-	genattrtab md > t-attrtab.c
-}
-/^enquire[ 	]*:/ s/\$(GCC_PARTS)//g
-/^enquire.o[ 	]*:/ s/\$(GCC_PASSES)//g
-/^GCC_FOR_TARGET =/ c\
-GCC_FOR_TARGET = gcc
-s/; *@true//
-s/stamp-/s-/g
-s/tmp-/t-/g
-/> *s-objlist/ c\
-	echo.exe -o s-objlist $(addprefix ../,$(OBJS))
-/^OBJS.*s-objlist/ s?`cat ../s-objlist`?@../s-objlist?
-s/^\(SUBDIR_OBSTACK *=\).*$/\1 ..\/obstack.o/
-s/^\(SUBDIR_USE_ALLOCA *=\).*$/\1/
-s/^\(SUBDIR_MALLOC *=\).*$/\1/
-/^# Build libgcc.a/ r config/msdos/libgcc.mak
-/^# Build libgcc.a/,// d
diff -u -r -N cvs/gcc/gcc/install gcc/install
--- cvs/gcc/gcc/install	Sat Jul 15 08:17:30 2000
+++ gcc/install	Mon Jul 17 18:27:28 2000
@@ -1026,29 +1026,6 @@
      depending on whether or not you have a Unix-like shell and various
      Unix-like utilities.
 
-       1. If you do not have a Unix-like shell and few Unix-like
-          utilities, you will use a DOS style batch script called
-          `configure.bat'.  Invoke it as `configure winnt' from an
-          MSDOS console window or from the program manager dialog box.
-          `configure.bat' assumes you have already installed and have
-          in your path a Unix-like `sed' program which is used to
-          create a working `Makefile' from `Makefile.in'.
-
-          `Makefile' uses the Microsoft Nmake program maintenance
-          utility and the Visual C/C++ V8.00 compiler to build GNU CC.
-          You need only have the utilities `sed' and `touch' to use
-          this installation method, which only automatically builds the
-          compiler itself.  You must then examine what `fixinc.winnt'
-          does, edit the header files by hand and build `libgcc.a'
-          manually.
-
-       2. The second type of installation assumes you are running a
-          Unix-like shell, have a complete suite of Unix-like utilities
-          in your path, and have a previous version of GNU CC already
-          installed, either through building it via the above
-          installation method or acquiring a pre-built binary.  In this
-          case, use the `configure' script in the normal fashion.
-
 `i860-intel-osf1'
      This is the Paragon.  If you have version 1.0 of the operating
      system, you need to take special steps to build GNU CC due to
diff -u -r -N cvs/gcc/gcc/install.texi gcc/install.texi
--- cvs/gcc/gcc/install.texi	Wed Apr 19 00:34:10 2000
+++ gcc/install.texi	Mon Jul 17 18:25:28 2000
@@ -1179,35 +1179,6 @@
 @samp{-lfoo}, @file{ld.exe} will look first for @file{libfoo.a}
 and then for @file{foo.lib}.
 
-You may install GNU CC for Windows NT in one of two ways, depending on
-whether or not you have a Unix-like shell and various Unix-like
-utilities.
-
-@enumerate
-@item
-If you do not have a Unix-like shell and few Unix-like utilities, you
-will use a DOS style batch script called @file{configure.bat}.  Invoke
-it as @code{configure winnt} from an MSDOS console window or from the
-program manager dialog box.  @file{configure.bat} assumes you have
-already installed and have in your path a Unix-like @file{sed} program
-which is used to create a working @file{Makefile} from @file{Makefile.in}.
-
-@file{Makefile} uses the Microsoft Nmake program maintenance utility and
-the Visual C/C++ V8.00 compiler to build GNU CC.  You need only have the
-utilities @file{sed} and @file{touch} to use this installation method,
-which only automatically builds the compiler itself.  You must then
-examine what @file{fixinc.winnt} does, edit the header files by hand and
-build @file{libgcc.a} manually.
-
-@item
-The second type of installation assumes you are running a Unix-like
-shell, have a complete suite of Unix-like utilities in your path, and
-have a previous version of GNU CC already installed, either through
-building it via the above installation method or acquiring a pre-built
-binary.  In this case, use the @file{configure} script in the normal
-fashion.
-@end enumerate
-
 @item i860-intel-osf1
 This is the Paragon.
 @ifset INSTALLONLY