PATCH for CVS mainline sources to make ``--enable-nls'' work

Manfred Hollstein manfred@s-direktnet.de
Sun Feb 21 06:32:00 GMT 1999


Today I tried adding ``--enable-nls'' when configure'ing a current checkout
from CVS (as of 1999/02/21 11:38:10 +0100).  It failed miserably in directory
"po" due to files mentionened in "gcc/po/POTFILES.in", which may exist in the
current gcc2 tree, but which have been eliminated (such as the bytecode stuff)
or moved elsewhere in the egcs tree. After fixing that, linking failed for
"xgcc" and "gcj" becaused they didn't link "intl.o".

This patch takes care of all that.  Building with this patch applied leaves my
tree with these files added to $(srcdir):

  gcc/po/cat-id-tbl.c
  gcc/po/gcc.pot
  gcc/po/stamp-cat-id

I don't know, if they should be checked into the CVS tree???

Anyway, the bootstrap later on failed due to the known regmove problem :-(

manfred


gcc/ChangeLog:

1999-02-21  Manfred Hollstein  <manfred@s-direktnet.de>

	* Makefile.in (xgcc$(exeext)): Add intl.o to list of files to be
	linked with.

gcc/java/ChangeLog:

1999-02-21  Manfred Hollstein  <manfred@s-direktnet.de>

	* Make-lang.in ($(GCJ)$(exeext)): Add intl.o to list of files to be
	linked with.

gcc/po/ChangeLog:

1999-02-21  Manfred Hollstein  <manfred@s-direktnet.de>

	POTFILES.in: Comment files which either do not exist anymore
	in egcs, or which have been moved elsewhere.

diff -rup -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-19990221.orig/gcc/Makefile.in egcs-19990221/gcc/Makefile.in
--- egcs-19990221.orig/gcc/Makefile.in	Fri Feb 19 11:40:46 1999
+++ egcs-19990221/gcc/Makefile.in	Sun Feb 21 13:03:10 1999
@@ -875,7 +875,7 @@ stamp-objlist: $(OBJS) 
 # and CC is `gcc'.  It is renamed to `gcc' when it is installed.
 xgcc$(exeext): gcc.o version.o intl.o prefix.o \
    version.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o prefix.o version.o \
+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ gcc.o intl.o prefix.o version.o \
 	  $(EXTRA_GCC_OBJS) $(LIBS)
 
 # Dump a specs file to make -B./ read these specs over installed ones.
diff -rup -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-19990221.orig/gcc/java/Make-lang.in egcs-19990221/gcc/java/Make-lang.in
--- egcs-19990221.orig/gcc/java/Make-lang.in	Thu Feb  4 09:03:37 1999
+++ egcs-19990221/gcc/java/Make-lang.in	Sun Feb 21 13:10:03 1999
@@ -101,8 +101,8 @@ $(GCJ).o: $(CONFIG_H) multilib.h config.
 
 # Create the compiler driver for $(GCJ).
 $(GCJ)$(exeext): $(GCJ).o jvspec.o version.o \
-	   prefix.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCJ).o jvspec.o prefix.o \
+	   prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCJ).o jvspec.o prefix.o intl.o \
 	  version.o $(EXTRA_GCC_OBJS) $(LIBS)
 
 # Create a version of the $(GCJ) driver which calls the cross-compiler.
diff -rup -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-19990221.orig/gcc/po/POTFILES.in egcs-19990221/gcc/po/POTFILES.in
--- egcs-19990221.orig/gcc/po/POTFILES.in	Thu Dec 17 07:45:44 1998
+++ egcs-19990221/gcc/po/POTFILES.in	Sun Feb 21 12:38:53 1999
@@ -47,27 +47,27 @@
 
 
 acconfig.h
-alloca.c
+#alloca.c is part of libiberty in egcs
 assert.h
 basic-block.h
-bc-emit.c
-bc-emit.h
-bc-optab.c
-bc-optab.h
-bc-typecd.h
-bi-arity.c
-bi-defs.h
-bi-lexer.c
-bi-opcode.c
-bi-opname.c
-bi-parser.c
-bi-parser.h
-bi-reverse.c
-bi-run.h
+#bc-emit.c does not exist anymore in egcs
+#bc-emit.h does not exist anymore in egcs
+#bc-optab.c does not exist anymore in egcs
+#bc-optab.h does not exist anymore in egcs
+#bc-typecd.h does not exist anymore in egcs
+#bi-arity.c does not exist anymore in egcs
+#bi-defs.h does not exist anymore in egcs
+#bi-lexer.c does not exist anymore in egcs
+#bi-opcode.c does not exist anymore in egcs
+#bi-opname.c does not exist anymore in egcs
+#bi-parser.c does not exist anymore in egcs
+#bi-parser.h does not exist anymore in egcs
+#bi-reverse.c does not exist anymore in egcs
+#bi-run.h does not exist anymore in egcs
 bitmap.c
 bitmap.h
-bytecode.h
-bytetypes.h
+#bytecode.h does not exist anymore in egcs
+#bytetypes.h does not exist anymore in egcs
 c-aux-info.c
 c-common.c
 c-convert.c
@@ -87,7 +87,7 @@ caller-save.c
 calls.c
 cccp.c
 cexp.c
-choose-temp.c
+#choose-temp.c is part of libiberty in egcs
 collect2.c
 combine.c
 conditions.h
@@ -120,7 +120,7 @@ config/arm/arm.c
 config/arm/arm.h
 config/arm/coff.h
 config/arm/linux-gas.h
-config/arm/linux.h
+#config/arm/linux.h does not exist anymore in egcs
 config/arm/netbsd.h
 config/arm/riscix.h
 config/arm/riscix1-1.h
@@ -168,7 +168,7 @@ config/i386/att.h
 config/i386/bsd.h
 config/i386/bsd386.h
 config/i386/crtdll.h
-config/i386/cygwin32.h
+config/i386/cygwin.h
 config/i386/dgux.c
 config/i386/dgux.h
 config/i386/freebsd-elf.h
@@ -228,7 +228,7 @@ config/i386/vsta.h
 config/i386/win-nt.h
 config/i386/winnt.c
 config/i386/xm-aix.h
-config/i386/xm-cygwin32.h
+config/i386/xm-cygwin.h
 config/i386/xm-dos.h
 config/i386/xm-go32.h
 config/i386/xm-i386.h
@@ -453,7 +453,7 @@ config/romp/xm-romp.h
 config/rs6000/aix31.h
 config/rs6000/aix3newas.h
 config/rs6000/aix41.h
-config/rs6000/cygwin32.h
+config/rs6000/cygwin.h
 config/rs6000/eabi-ctors.c
 config/rs6000/eabi.h
 config/rs6000/eabiaix.h
@@ -464,7 +464,7 @@ config/rs6000/linux.h
 config/rs6000/lynx.h
 config/rs6000/mach.h
 config/rs6000/netware.h
-config/rs6000/powerpc.h
+#config/rs6000/powerpc.h does not exist anymore in egcs
 config/rs6000/rs6000.c
 config/rs6000/rs6000.h
 config/rs6000/rtems.h
@@ -474,7 +474,7 @@ config/rs6000/sysv4.h
 config/rs6000/sysv4le.h
 config/rs6000/vxppc.h
 config/rs6000/win-nt.h
-config/rs6000/xm-cygwin32.h
+config/rs6000/xm-cygwin.h
 config/rs6000/xm-lynx.h
 config/rs6000/xm-mach.h
 config/rs6000/xm-rs6000.h
@@ -559,7 +559,7 @@ convert.c
 convert.h
 cp/call.c
 cp/class.c
-cp/class.h
+#cp/class.h does not exist anymore in egcs
 cp/cp-tree.h
 cp/cvt.c
 cp/decl.c
@@ -594,7 +594,7 @@ cp/tree.c
 cp/typeck.c
 cp/typeck2.c
 cp/xref.c
-cplus-dem.c
+#cplus-dem.c is part of libiberty in egcs
 cppalloc.c
 cpperror.c
 cppexp.c
@@ -608,7 +608,7 @@ cse.c
 dbxout.c
 dbxstclass.h
 defaults.h
-demangle.h
+#demangle.h is part of libiberty in egcs
 doschk.c
 dwarf.h
 dwarf2.h
@@ -651,9 +651,9 @@ gcov.c
 #genoutput.c is used only by GCC maintainers and installers
 #genpeep.c is used only by GCC maintainers and installers
 #genrecog.c is used only by GCC maintainers and installers
-getopt.c
-getopt.h
-getopt1.c
+#getopt.c is part of libiberty in egcs
+#getopt.h is part of libiberty in egcs
+#getopt1.c is part of libiberty in egcs
 getpwd.c
 ginclude/iso646.h
 ginclude/math-3300.h
@@ -725,49 +725,49 @@ loop.h
 machmode.h
 #mips-tdump.c is not yet internationalized
 #mips-tfile.c is not yet internationalized
-objc/NXConstStr.h
-objc/Object.h
-objc/Protocol.h
-objc/archive.c
-objc/class.c
-objc/encoding.c
-objc/encoding.h
-objc/hash.c
-objc/hash.h
-objc/init.c
-objc/libobjc_entry.c
-objc/misc.c
-objc/nil_method.c
+#objc/NXConstStr.h is part of libobjc in egcs
+#objc/Object.h is part of libobjc in egcs
+#objc/Protocol.h is part of libobjc in egcs
+#objc/archive.c is part of libobjc in egcs
+#objc/class.c is part of libobjc in egcs
+#objc/encoding.c is part of libobjc in egcs
+#objc/encoding.h is part of libobjc in egcs
+#objc/hash.c is part of libobjc in egcs
+#objc/hash.h is part of libobjc in egcs
+#objc/init.c is part of libobjc in egcs
+#objc/libobjc_entry.c is part of libobjc in egcs
+#objc/misc.c is part of libobjc in egcs
+#objc/nil_method.c is part of libobjc in egcs
 objc/objc-act.c
 objc/objc-act.h
-objc/objc-api.h
-objc/objc-list.h
+#objc/objc-api.h is part of libobjc in egcs
+#objc/objc-list.h is part of libobjc in egcs
 objc/objc-parse.c
-objc/objc.h
-objc/objects.c
-objc/runtime.h
-objc/sarray.c
-objc/sarray.h
-objc/selector.c
-objc/sendmsg.c
-objc/thr-decosf1.c
-objc/thr-irix.c
-objc/thr-mach.c
-objc/thr-os2.c
-objc/thr-posix.c
-objc/thr-pthreads.c
-objc/thr-single.c
-objc/thr-solaris.c
-objc/thr-win32.c
-objc/thr.c
-objc/thr.h
-objc/typedstream.h
-obstack.c
-obstack.h
+#objc/objc.h is part of libobjc in egcs
+#objc/objects.c is part of libobjc in egcs
+#objc/runtime.h is part of libobjc in egcs
+#objc/sarray.c is part of libobjc in egcs
+#objc/sarray.h is part of libobjc in egcs
+#objc/selector.c is part of libobjc in egcs
+#objc/sendmsg.c is part of libobjc in egcs
+#objc/thr-decosf1.c is part of libobjc in egcs
+#objc/thr-irix.c is part of libobjc in egcs
+#objc/thr-mach.c is part of libobjc in egcs
+#objc/thr-os2.c is part of libobjc in egcs
+#objc/thr-posix.c is part of libobjc in egcs
+#objc/thr-pthreads.c is part of libobjc in egcs
+#objc/thr-single.c is part of libobjc in egcs
+#objc/thr-solaris.c is part of libobjc in egcs
+#objc/thr-win32.c is part of libobjc in egcs
+#objc/thr.c is part of libobjc in egcs
+#objc/thr.h is part of libobjc in egcs
+#objc/typedstream.h is part of libobjc in egcs
+#obstack.c is part of libiberty in egcs
+#obstack.h is part of libiberty in egcs
 optabs.c
 output.h
 pcp.h
-pexecute.c
+#pexecute.c is part of libiberty in egcs
 #po/cat-id-tbl.c contains the translation tables themselves
 prefix.c
 print-rtl.c


More information about the Gcc-patches mailing list