... and finally, remove the old named patches.
This commit is contained in:
espie
parent
dcca223ff9
commit
e5d266fafd
@ -1,44 +0,0 @@
|
||||
--- gcc/configure.in.orig Sun Nov 1 19:59:34 1998
|
||||
+++ gcc/configure.in Sun Nov 1 20:02:40 1998
|
||||
@@ -1058,15 +1058,23 @@
|
||||
fixincludes=fixinc.wrap
|
||||
tmake_file=i386/t-freebsd
|
||||
;;
|
||||
- # We are hoping OpenBSD is still close enough to NetBSD that we can
|
||||
- # share the configurations.
|
||||
changequote(,)dnl
|
||||
- i[34567]86-*-netbsd* | i[34567]86-*-openbsd*)
|
||||
+ i[34567]86-*-netbsd*)
|
||||
changequote([,])dnl
|
||||
tm_file=i386/netbsd.h
|
||||
# On NetBSD, the headers are already okay, except for math.h.
|
||||
fixincludes=fixinc.wrap
|
||||
tmake_file=t-netbsd
|
||||
+ ;;
|
||||
+changequote(,)dnl
|
||||
+ i[34567]86-*-openbsd*)
|
||||
+changequote([,])dnl
|
||||
+ tm_file=i386/openbsd.h
|
||||
+ # On OpenBSD, the headers are already okay.
|
||||
+ fixincludes=Makefile.in
|
||||
+ tmake_file=t-openbsd
|
||||
+ # XXX may need adding until the bug is fixed...
|
||||
+ use_collect2=yes
|
||||
;;
|
||||
changequote(,)dnl
|
||||
i[34567]86-*-coff*)
|
||||
@@ -2820,6 +2826,14 @@
|
||||
# On NetBSD, the headers are already okay, except for math.h.
|
||||
fixincludes=fixinc.wrap
|
||||
tmake_file=t-netbsd
|
||||
+ ;;
|
||||
+ sparc-*-openbsd*)
|
||||
+ tm_file=sparc/openbsd.h
|
||||
+ # On OpenBSD, the headers are already okay.
|
||||
+ fixincludes=Makefile.in
|
||||
+ tmake_file=t-openbsd
|
||||
+ # XXX may need adding until the bug is fixed...
|
||||
+ use_collect2=yes
|
||||
;;
|
||||
sparc-*-bsd*)
|
||||
tm_file=sparc/bsd.h
|
||||
@ -1,19 +0,0 @@
|
||||
--- gcc/gcc.texi.orig Sun Nov 1 20:04:09 1998
|
||||
+++ gcc/gcc.texi Sun Nov 1 20:04:35 1998
|
||||
@@ -1,6 +1,6 @@
|
||||
\input texinfo @c -*-texinfo-*-
|
||||
@c %**start of header
|
||||
-@setfilename gcc.info
|
||||
+@setfilename egcc.info
|
||||
@c @setfilename usegcc.info
|
||||
@c @setfilename portgcc.info
|
||||
@c To produce the full manual, use the "gcc.info" setfilename, and
|
||||
@@ -82,7 +82,7 @@
|
||||
@ifinfo
|
||||
@dircategory Programming
|
||||
@direntry
|
||||
-* gcc: (gcc). The GNU C compiler.
|
||||
+* egcc: (egcc). The experimental GNU C compiler.
|
||||
@end direntry
|
||||
@ifset INTERNALS
|
||||
@ifset USING
|
||||
@ -1,10 +0,0 @@
|
||||
--- libstdc++/configure.in.orig Sun Nov 1 20:05:25 1998
|
||||
+++ libstdc++/configure.in Sun Nov 1 20:05:42 1998
|
||||
@@ -49,6 +49,7 @@
|
||||
*-*-irix[56]*) frags="${frags} irix5.ml" ;;
|
||||
*-*-linux*aout*) ;;
|
||||
*-*-linux*) frags="${frags} linux.ml" ;;
|
||||
+ *-*-openbsd*) frags="${frags} openbsd.ml" ;;
|
||||
*-*-sysv4*) frags="${frags} elf.ml" ;;
|
||||
*-*-solaris*) frags="${frags} sol2shm.ml" ;;
|
||||
*-*-sunos4*) frags="${frags} sunos4.ml" ;;
|
||||
@ -1,75 +0,0 @@
|
||||
--- gcc/Makefile.in.orig Sun Nov 1 20:06:26 1998
|
||||
+++ gcc/Makefile.in Sun Nov 1 20:09:30 1998
|
||||
@@ -459,6 +459,10 @@
|
||||
PROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo protoize | sed -e $$t`
|
||||
UNPROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo unprotoize | sed -e $$t`
|
||||
|
||||
+# documentation for cpp should not supersede default documentation
|
||||
+CPP_INFO_NAME = `t='$(program_transform_name)'; echo cpp | sed -e $$t`
|
||||
+CPP_MAN_NAME = `t='$(program_transform_name)'; echo cccp | sed -e $$t`
|
||||
+
|
||||
# Actual name to use when installing a cross-compiler.
|
||||
GCC_CROSS_NAME = `t='$(program_transform_cross_name)'; echo gcc | sed -e $$t`
|
||||
PROTOIZE_CROSS_NAME = `t='$(program_transform_cross_name)'; echo protoize | sed -e $$t`
|
||||
@@ -2163,12 +2167,14 @@
|
||||
info: cpp.info gcc.info lang.info
|
||||
|
||||
cpp.info: $(srcdir)/cpp.texi
|
||||
- $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o cpp.info $(srcdir)/cpp.texi
|
||||
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o $(CPP_INFO_NAME).info \
|
||||
+ $(srcdir)/cpp.texi && touch $@
|
||||
|
||||
gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
|
||||
$(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \
|
||||
$(srcdir)/tm.texi $(srcdir)/gcov.texi
|
||||
- $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o gcc.info $(srcdir)/gcc.texi
|
||||
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o $(GCC_INSTALL_NAME).info \
|
||||
+ $(srcdir)/gcc.texi && touch $@
|
||||
|
||||
dvi: gcc.dvi cpp.dvi lang.dvi
|
||||
|
||||
@@ -2309,6 +2315,7 @@
|
||||
-rm -f cexp.c cexp.output TAGS
|
||||
-rm -f cpp.info* cpp.??s cpp.*aux
|
||||
-rm -f gcc.info* gcc.??s gcc.*aux
|
||||
+ -rm -f $(GCC_INSTALL_NAME).info* $(CPP_INFO_NAME).info*
|
||||
#
|
||||
# Entry points `install' and `uninstall'.
|
||||
# Also use `install-collect2' to install collect2 when the config files don't.
|
||||
@@ -2447,18 +2454,19 @@
|
||||
# $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
|
||||
# to do the install.
|
||||
install-info: doc installdirs lang.install-info
|
||||
- -rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
|
||||
- for f in cpp.info* gcc.info*; do \
|
||||
+ -rm -f $(infodir)/$(CPP_INFO_NAME).info* \
|
||||
+ $(infodir)/$(GCC_INSTALL_NAME).info*
|
||||
+ for f in $(GCC_INSTALL_NAME).info* $(CPP_INFO_NAME).info*; do \
|
||||
$(INSTALL_DATA) $$f $(infodir)/$$f; \
|
||||
done
|
||||
-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
|
||||
if [ -f $(infodir)/dir ] ; then \
|
||||
- for f in cpp.info gcc.info; do \
|
||||
+ for f in $(GCC_INSTALL_NAME).info $(CPP_INFO_NAME).info; do \
|
||||
install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \
|
||||
done; \
|
||||
else true; fi; \
|
||||
else true; fi;
|
||||
- -chmod a-x $(infodir)/cpp.info* $(infodir)/gcc.info*
|
||||
+ -chmod a-x $(infodir)/$(CPP_INFO_NAME).info* $(infodir)/$(GCC_INSTALL_NAME).info*
|
||||
|
||||
# Install the man pages.
|
||||
install-man: installdirs $(srcdir)/gcc.1 $(srcdir)/cccp.1 lang.install-man
|
||||
@@ -2471,9 +2479,9 @@
|
||||
$(INSTALL_DATA) $(srcdir)/gcc.1 $(mandir)/$(GCC_INSTALL_NAME)$(manext); \
|
||||
chmod a-x $(mandir)/$(GCC_INSTALL_NAME)$(manext); \
|
||||
fi
|
||||
- -rm -f $(mandir)/cccp$(manext)
|
||||
- -$(INSTALL_DATA) $(srcdir)/cccp.1 $(mandir)/cccp$(manext)
|
||||
- -chmod a-x $(mandir)/cccp$(manext)
|
||||
+ -rm -f $(mandir)/$(CPP_MAN_NAME)$(manext)
|
||||
+ -$(INSTALL_DATA) $(srcdir)/cccp.1 $(mandir)/$(CPP_MAN_NAME)$(manext)
|
||||
+ -chmod a-x $(mandir)/$(CPP_MAN_NAME)$(manext)
|
||||
|
||||
# Install the library.
|
||||
install-libgcc: libgcc.a installdirs
|
||||
@ -1,16 +0,0 @@
|
||||
--- gcc/cpp.texi.orig Sun Nov 1 20:10:10 1998
|
||||
+++ gcc/cpp.texi Sun Nov 1 20:10:34 1998
|
||||
@@ -1,11 +1,11 @@
|
||||
\input texinfo
|
||||
-@setfilename cpp.info
|
||||
+@setfilename ecpp.info
|
||||
@settitle The C Preprocessor
|
||||
|
||||
@ifinfo
|
||||
@dircategory Programming
|
||||
@direntry
|
||||
-* Cpp: (cpp). The GNU C preprocessor.
|
||||
+* ECpp: (ecpp). The experimental GNU C preprocessor.
|
||||
@end direntry
|
||||
@end ifinfo
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
--- gcc/configure.in.orig Sun Nov 1 19:59:34 1998
|
||||
+++ gcc/configure.in Sun Nov 1 20:02:40 1998
|
||||
@@ -1058,15 +1058,23 @@
|
||||
fixincludes=fixinc.wrap
|
||||
tmake_file=i386/t-freebsd
|
||||
;;
|
||||
- # We are hoping OpenBSD is still close enough to NetBSD that we can
|
||||
- # share the configurations.
|
||||
changequote(,)dnl
|
||||
- i[34567]86-*-netbsd* | i[34567]86-*-openbsd*)
|
||||
+ i[34567]86-*-netbsd*)
|
||||
changequote([,])dnl
|
||||
tm_file=i386/netbsd.h
|
||||
# On NetBSD, the headers are already okay, except for math.h.
|
||||
fixincludes=fixinc.wrap
|
||||
tmake_file=t-netbsd
|
||||
+ ;;
|
||||
+changequote(,)dnl
|
||||
+ i[34567]86-*-openbsd*)
|
||||
+changequote([,])dnl
|
||||
+ tm_file=i386/openbsd.h
|
||||
+ # On OpenBSD, the headers are already okay.
|
||||
+ fixincludes=Makefile.in
|
||||
+ tmake_file=t-openbsd
|
||||
+ # XXX may need adding until the bug is fixed...
|
||||
+ use_collect2=yes
|
||||
;;
|
||||
changequote(,)dnl
|
||||
i[34567]86-*-coff*)
|
||||
@@ -2820,6 +2826,14 @@
|
||||
# On NetBSD, the headers are already okay, except for math.h.
|
||||
fixincludes=fixinc.wrap
|
||||
tmake_file=t-netbsd
|
||||
+ ;;
|
||||
+ sparc-*-openbsd*)
|
||||
+ tm_file=sparc/openbsd.h
|
||||
+ # On OpenBSD, the headers are already okay.
|
||||
+ fixincludes=Makefile.in
|
||||
+ tmake_file=t-openbsd
|
||||
+ # XXX may need adding until the bug is fixed...
|
||||
+ use_collect2=yes
|
||||
;;
|
||||
sparc-*-bsd*)
|
||||
tm_file=sparc/bsd.h
|
||||
@ -1,19 +0,0 @@
|
||||
--- gcc/gcc.texi.orig Sun Nov 1 20:04:09 1998
|
||||
+++ gcc/gcc.texi Sun Nov 1 20:04:35 1998
|
||||
@@ -1,6 +1,6 @@
|
||||
\input texinfo @c -*-texinfo-*-
|
||||
@c %**start of header
|
||||
-@setfilename gcc.info
|
||||
+@setfilename egcc.info
|
||||
@c @setfilename usegcc.info
|
||||
@c @setfilename portgcc.info
|
||||
@c To produce the full manual, use the "gcc.info" setfilename, and
|
||||
@@ -82,7 +82,7 @@
|
||||
@ifinfo
|
||||
@dircategory Programming
|
||||
@direntry
|
||||
-* gcc: (gcc). The GNU C compiler.
|
||||
+* egcc: (egcc). The experimental GNU C compiler.
|
||||
@end direntry
|
||||
@ifset INTERNALS
|
||||
@ifset USING
|
||||
@ -1,10 +0,0 @@
|
||||
--- libstdc++/configure.in.orig Sun Nov 1 20:05:25 1998
|
||||
+++ libstdc++/configure.in Sun Nov 1 20:05:42 1998
|
||||
@@ -49,6 +49,7 @@
|
||||
*-*-irix[56]*) frags="${frags} irix5.ml" ;;
|
||||
*-*-linux*aout*) ;;
|
||||
*-*-linux*) frags="${frags} linux.ml" ;;
|
||||
+ *-*-openbsd*) frags="${frags} openbsd.ml" ;;
|
||||
*-*-sysv4*) frags="${frags} elf.ml" ;;
|
||||
*-*-solaris*) frags="${frags} sol2shm.ml" ;;
|
||||
*-*-sunos4*) frags="${frags} sunos4.ml" ;;
|
||||
@ -1,75 +0,0 @@
|
||||
--- gcc/Makefile.in.orig Sun Nov 1 20:06:26 1998
|
||||
+++ gcc/Makefile.in Sun Nov 1 20:09:30 1998
|
||||
@@ -459,6 +459,10 @@
|
||||
PROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo protoize | sed -e $$t`
|
||||
UNPROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo unprotoize | sed -e $$t`
|
||||
|
||||
+# documentation for cpp should not supersede default documentation
|
||||
+CPP_INFO_NAME = `t='$(program_transform_name)'; echo cpp | sed -e $$t`
|
||||
+CPP_MAN_NAME = `t='$(program_transform_name)'; echo cccp | sed -e $$t`
|
||||
+
|
||||
# Actual name to use when installing a cross-compiler.
|
||||
GCC_CROSS_NAME = `t='$(program_transform_cross_name)'; echo gcc | sed -e $$t`
|
||||
PROTOIZE_CROSS_NAME = `t='$(program_transform_cross_name)'; echo protoize | sed -e $$t`
|
||||
@@ -2163,12 +2167,14 @@
|
||||
info: cpp.info gcc.info lang.info
|
||||
|
||||
cpp.info: $(srcdir)/cpp.texi
|
||||
- $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o cpp.info $(srcdir)/cpp.texi
|
||||
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o $(CPP_INFO_NAME).info \
|
||||
+ $(srcdir)/cpp.texi && touch $@
|
||||
|
||||
gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
|
||||
$(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \
|
||||
$(srcdir)/tm.texi $(srcdir)/gcov.texi
|
||||
- $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o gcc.info $(srcdir)/gcc.texi
|
||||
+ $(MAKEINFO) $(MAKEINFOFLAGS) -I$(srcdir) -o $(GCC_INSTALL_NAME).info \
|
||||
+ $(srcdir)/gcc.texi && touch $@
|
||||
|
||||
dvi: gcc.dvi cpp.dvi lang.dvi
|
||||
|
||||
@@ -2309,6 +2315,7 @@
|
||||
-rm -f cexp.c cexp.output TAGS
|
||||
-rm -f cpp.info* cpp.??s cpp.*aux
|
||||
-rm -f gcc.info* gcc.??s gcc.*aux
|
||||
+ -rm -f $(GCC_INSTALL_NAME).info* $(CPP_INFO_NAME).info*
|
||||
#
|
||||
# Entry points `install' and `uninstall'.
|
||||
# Also use `install-collect2' to install collect2 when the config files don't.
|
||||
@@ -2447,18 +2454,19 @@
|
||||
# $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
|
||||
# to do the install.
|
||||
install-info: doc installdirs lang.install-info
|
||||
- -rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
|
||||
- for f in cpp.info* gcc.info*; do \
|
||||
+ -rm -f $(infodir)/$(CPP_INFO_NAME).info* \
|
||||
+ $(infodir)/$(GCC_INSTALL_NAME).info*
|
||||
+ for f in $(GCC_INSTALL_NAME).info* $(CPP_INFO_NAME).info*; do \
|
||||
$(INSTALL_DATA) $$f $(infodir)/$$f; \
|
||||
done
|
||||
-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
|
||||
if [ -f $(infodir)/dir ] ; then \
|
||||
- for f in cpp.info gcc.info; do \
|
||||
+ for f in $(GCC_INSTALL_NAME).info $(CPP_INFO_NAME).info; do \
|
||||
install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \
|
||||
done; \
|
||||
else true; fi; \
|
||||
else true; fi;
|
||||
- -chmod a-x $(infodir)/cpp.info* $(infodir)/gcc.info*
|
||||
+ -chmod a-x $(infodir)/$(CPP_INFO_NAME).info* $(infodir)/$(GCC_INSTALL_NAME).info*
|
||||
|
||||
# Install the man pages.
|
||||
install-man: installdirs $(srcdir)/gcc.1 $(srcdir)/cccp.1 lang.install-man
|
||||
@@ -2471,9 +2479,9 @@
|
||||
$(INSTALL_DATA) $(srcdir)/gcc.1 $(mandir)/$(GCC_INSTALL_NAME)$(manext); \
|
||||
chmod a-x $(mandir)/$(GCC_INSTALL_NAME)$(manext); \
|
||||
fi
|
||||
- -rm -f $(mandir)/cccp$(manext)
|
||||
- -$(INSTALL_DATA) $(srcdir)/cccp.1 $(mandir)/cccp$(manext)
|
||||
- -chmod a-x $(mandir)/cccp$(manext)
|
||||
+ -rm -f $(mandir)/$(CPP_MAN_NAME)$(manext)
|
||||
+ -$(INSTALL_DATA) $(srcdir)/cccp.1 $(mandir)/$(CPP_MAN_NAME)$(manext)
|
||||
+ -chmod a-x $(mandir)/$(CPP_MAN_NAME)$(manext)
|
||||
|
||||
# Install the library.
|
||||
install-libgcc: libgcc.a installdirs
|
||||
@ -1,16 +0,0 @@
|
||||
--- gcc/cpp.texi.orig Sun Nov 1 20:10:10 1998
|
||||
+++ gcc/cpp.texi Sun Nov 1 20:10:34 1998
|
||||
@@ -1,11 +1,11 @@
|
||||
\input texinfo
|
||||
-@setfilename cpp.info
|
||||
+@setfilename ecpp.info
|
||||
@settitle The C Preprocessor
|
||||
|
||||
@ifinfo
|
||||
@dircategory Programming
|
||||
@direntry
|
||||
-* Cpp: (cpp). The GNU C preprocessor.
|
||||
+* ECpp: (ecpp). The experimental GNU C preprocessor.
|
||||
@end direntry
|
||||
@end ifinfo
|
||||
|
||||
Loading…
Reference in New Issue
Block a user