Commit 6a52a2ef by Laurynas Biveinis Committed by DJ Delorie

install.texi: remove i[345]86-*-winnt3.5 section.

* install.texi: remove i[345]86-*-winnt3.5 section.
* configur.bat: removed.
* config/msdos: directory removed.

From-SVN: r38153
parent a40bb4d3
2000-12-09 Laurynas Biveinis <lauras@softhome.net>
* install.texi: remove i[345]86-*-winnt3.5 section.
* configur.bat: removed.
* config/msdos: directory removed.
2000-12-09 Neil Booth <neilb@earthling.net> 2000-12-09 Neil Booth <neilb@earthling.net>
* cppfiles.c (NEVER_REREAD, DO_NOT_REREAD): Move from cpphash.h. * cppfiles.c (NEVER_REREAD, DO_NOT_REREAD): Move from cpphash.h.
......
...@@ -2264,8 +2264,9 @@ clean: mostlyclean $(INTL_CLEAN) lang.clean ...@@ -2264,8 +2264,9 @@ clean: mostlyclean $(INTL_CLEAN) lang.clean
fi ; fi fi ; fi
-rm -fr stage1 stage2 stage3 stage4 -rm -fr stage1 stage2 stage3 stage4
# Delete stamps of bootstrap stages # Delete stamps of bootstrap stages
-rm -f stage_* -rm -f stage?_*
-rm -f clean_* -rm -f clean?_*
-rm -f stage_last
# Delete all files that users would normally create # Delete all files that users would normally create
# while building and installing GCC. # while building and installing GCC.
...@@ -2780,84 +2781,133 @@ STAGE2_FLAGS_TO_PASS = \ ...@@ -2780,84 +2781,133 @@ STAGE2_FLAGS_TO_PASS = \
# Only build the C compiler for stage1, because that is the only one that # Only build the C compiler for stage1, because that is the only one that
# we can guarantee will build with the native compiler, and also it is the # we can guarantee will build with the native compiler, and also it is the
# only thing useful for building stage2. # only thing useful for building stage2.
stage_a: stage1_build:
+$(MAKE) CC="$(CC)" libdir=$(libdir) LANGUAGES="$(BOOT_LANGUAGES)" +$(MAKE) CC="$(CC)" libdir=$(libdir) LANGUAGES="$(BOOT_LANGUAGES)"
touch stage_a touch stage1_build
echo stage1_build > stage_last
stage_b: stage_a stage1_copy: stage1_build
$(MAKE) stage1 $(MAKE) stage1
touch stage_b touch stage1_copy
echo stage2_build > stage_last
# This used to define ALLOCA as empty, but that would lead to bad results # This used to define ALLOCA as empty, but that would lead to bad results
# for a subsequent `make install' since that would not have ALLOCA empty. # for a subsequent `make install' since that would not have ALLOCA empty.
# To prevent `make install' from compiling alloca.o and then relinking cc1 # To prevent `make install' from compiling alloca.o and then relinking cc1
# because alloca.o is newer, we permit these recursive makes to compile # because alloca.o is newer, we permit these recursive makes to compile
# alloca.o. Then cc1 is newer, so it won't have to be relinked. # alloca.o. Then cc1 is newer, so it won't have to be relinked.
stage_c: stage_b stage2_build: stage1_copy
+$(MAKE) CC="stage1/xgcc$(exeext) -Bstage1/ -B$(build_tooldir)/bin/" \ +$(MAKE) CC="stage1/xgcc$(exeext) -Bstage1/ -B$(build_tooldir)/bin/" \
STAGE_PREFIX=stage1/ \ STAGE_PREFIX=stage1/ \
$(STAGE2_FLAGS_TO_PASS) $(STAGE2_FLAGS_TO_PASS)
touch stage_c touch stage2_build
echo stage2_build > stage_last
stage_d: stage_c stage2_copy: stage2_build
+$(MAKE) stage2 +$(MAKE) stage2
touch stage_d touch stage2_copy
echo stage3_build > stage_last
stage_e: stage_d stage3_build: stage2_copy
+$(MAKE) CC="stage2/xgcc$(exeext) -Bstage2/ -B$(build_tooldir)/bin/" \ +$(MAKE) CC="stage2/xgcc$(exeext) -Bstage2/ -B$(build_tooldir)/bin/" \
STAGE_PREFIX=stage2/ \ STAGE_PREFIX=stage2/ \
$(STAGE2_FLAGS_TO_PASS) $(STAGE2_FLAGS_TO_PASS)
touch stage_e touch stage3_build
echo stage3_build > stage_last
# For bootstrap4: # For bootstrap4:
stage_f: stage_e stage3_copy: stage3_build
+$(MAKE) stage3
touch stage3_copy
echo stage4_build > stage_last
stage4_build: stage3_copy
+$(MAKE) CC="stage3/xgcc$(exeext) -B$(build_tooldir)/bin/ -Bstage3/" \ +$(MAKE) CC="stage3/xgcc$(exeext) -B$(build_tooldir)/bin/ -Bstage3/" \
STAGE_PREFIX=stage3/ \ STAGE_PREFIX=stage3/ \
$(STAGE2_FLAGS_TO_PASS) $(STAGE2_FLAGS_TO_PASS)
touch stage_f touch stage4_build
echo stage4_build > stage_last
# Additional steps for *-lean targets: # Additional steps for *-lean targets:
clean_s1: stage_b clean_s1: stage1_copy
-(cd stage1 && rm -f $(VOL_FILES)) -(cd stage1 && rm -f $(VOL_FILES))
touch clean_s1 touch clean_s1
clean_s2: stage_d clean_s2: stage2_copy
-rm -rf stage1 -rm -rf stage1
touch clean_s2 touch clean_s2
# This next little bit is the way it is for parallel builds. It's simply # The various entry points for bootstrapping.
# a chain of stages which DO have to be done sequentially.
bootstrap: stage3_build
bootstrap_a: stage_a @echo
bootstrap_b: bootstrap_a stage_b @echo Bootstrap complete - make \"quickstrap\" to redo last build,
bootstrap_c: bootstrap_b stage_c @echo \"restage1\" through \"restage3\" to rebuild specific stages,
bootstrap_d: bootstrap_c stage_d @echo or \"cleanstrap\" to redo the bootstrap from scratch.
bootstrap_e: bootstrap_d stage_e
bootstrap: force bootstrap_e bootstrap-lean : clean_s1 clean_s2 stage3_build
@echo
bootstrap-lean_a: stage_a @echo Bootstrap complete - make \"quickstrap\" to redo last build,
bootstrap-lean_b: bootstrap-lean_a stage_b @echo or \"cleanstrap\" to redo the bootstrap from scratch.
bootstrap-lean_c: bootstrap-lean_b clean_s1
bootstrap-lean_d: bootstrap-lean_c stage_c bootstrap2: bootstrap
bootstrap-lean_e: bootstrap-lean_d stage_d
bootstrap-lean_f: bootstrap-lean_e clean_s2 bootstrap2-lean : bootstrap_lean
bootstrap-lean_g: bootstrap-lean_f stage_e
bootstrap-lean: force bootstrap-lean_g bootstrap3 bootstrap3-lean: bootstrap
bootstrap2_c: stage_c
bootstrap2_d: bootstrap2_c stage_d
bootstrap2_e: bootstrap2_d stage_e
bootstrap2: force bootstrap2_e
bootstrap2-lean_c: stage_c
bootstrap2-lean_d: bootstrap2-lean_c stage_d
bootstrap2-lean_e: bootstrap2-lean_d clean_s2
bootstrap2-lean_f: bootstrap2-lean_e stage_e
bootstrap2-lean: force bootstrap2-lean_f
bootstrap3 bootstrap3-lean: force stage_e
bootstrap4 bootstrap4-lean: force stage_f bootstrap4 bootstrap4-lean: stage4_build
unstage1 unstage2 unstage3 unstage4:
-set -vx; stage=`echo $@ | sed -e 's/un//'`; \
if test -d $$stage; then \
mv $$stage/* . 2>/dev/null; \
for i in `cd $$stage; echo *` ; do \
if test -d $$stage/$$i; then \
mv $$stage/$$i/* $$i/. 2>/dev/null; \
else \
mv $$stage/$$i .; \
fi \
done \
fi ; \
rm -f $${stage}_build $${stage}_copy ;\
echo $${stage}_build > stage_last
restage1: unstage1
$(MAKE) stage1_build
restage2: unstage2
$(MAKE) LANGUAGES="$(LANGUAGES)" stage2_build
restage3: unstage3
$(MAKE) LANGUAGES="$(LANGUAGES)" stage3_build
restage4: unstage4
$(MAKE) LANGUAGES="$(LANGUAGES)" stage4_build
bubblestrap:
if test -f stage3_build; then true; else \
echo; echo You must \"make bootstrap\" first.; \
exit 1; \
fi
for i in stage3 \
unstage1 stage1_build stage1_copy \
unstage2 stage2_build stage2_copy \
unstage3 stage3_build ; \
do \
$(MAKE) LANGUAGES="$(LANGUAGES)" $$i || exit 1 ; \
done
quickstrap:
if test -f stage_last ; then \
LAST=`cat stage_last`; rm $$LAST; $(MAKE) LANGUAGES="$(LANGUAGES)" $$LAST; \
else \
$(MAKE) stage1_build; \
fi
cleanstrap:
-$(MAKE) clean
$(MAKE) LANGUAGES="$(LANGUAGES)" bootstrap
# Compare the object files in the current directory with those in the # Compare the object files in the current directory with those in the
# stage2 directory. # stage2 directory.
......
@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
# 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 $@
#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;
}
/\.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
@echo off
if %1.==go32. goto call_go32
if %1.==winnt. goto call_winnt
echo Usage: configure go32 or configure winnt cpu
goto END
:call_go32
call config\msdos\configure %1 %2 %3 %4
goto END
:call_winnt
if %2.==i386. goto really_call_winnt
if %2.==alpha. goto really_call_winnt
echo Usage: configure winnt i386 or configure winnt alpha
goto END
:really_call_winnt
call config\winnt\config-nt %1 %2 %3 %4
goto END
:END
...@@ -1096,23 +1096,6 @@ seems not to have this problem. ...@@ -1096,23 +1096,6 @@ seems not to have this problem.
See @ref{Sun Install}, for information on installing GNU CC on Sun See @ref{Sun Install}, for information on installing GNU CC on Sun
systems. systems.
@item i[345]86-*-winnt3.5
This version requires a GAS that has not yet been released. Until it
is, you can get a prebuilt binary version via anonymous ftp from
@uref{ftp://cs.washington.edu/pub/gnat} or @uref{ftp://cs.nyu.edu/pub/gnat}. You
must also use the Microsoft header files from the Windows NT 3.5 SDK.
Find these on the CDROM in the @file{/mstools/h} directory dated 9/4/94. You
must use a fixed version of Microsoft linker made especially for NT 3.5,
which is also is available on the NT 3.5 SDK CDROM. If you do not have
this linker, can you also use the linker from Visual C/C++ 1.0 or 2.0.
Installing GNU CC for NT builds a wrapper linker, called @file{ld.exe},
which mimics the behaviour of Unix @file{ld} in the specification of
libraries (@samp{-L} and @samp{-l}). @file{ld.exe} looks for both Unix
and Microsoft named libraries. For example, if you specify
@samp{-lfoo}, @file{ld.exe} will look first for @file{libfoo.a}
and then for @file{foo.lib}.
@item i860-intel-osf1 @item i860-intel-osf1
This is the Paragon. This is the Paragon.
@ifset INSTALLONLY @ifset INSTALLONLY
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment