diff -ur src/control/make/Makefile build/control/make/Makefile --- src/control/make/Makefile 2002-02-12 07:51:48.000000000 -0600 +++ build/control/make/Makefile 2002-06-22 19:36:22.000000000 -0500 @@ -77,7 +77,10 @@ include $(BUILDDIR)/generics-rules.gmk include $(BUILDDIR)/cobundle-rules.gmk -all:: sanity $(HOTSPOT) $(MOTIF) $(GENERICS) $(J2SE) +# Removed sanity dependecy, it will fail on gcc-3.1 (by Tushar ) +# Anyone compiling with gcc-3.1 gotta be insane:)) + +all:: $(HOTSPOT) $(MOTIF) $(GENERICS) $(J2SE) ifndef DEV_ONLY ifneq ($(ARCH_DATA_MODEL), 64) diff -ur src/hotspot/src/share/vm/c1/c1_FrameMap.hpp build/hotspot/src/share/vm/c1/c1_FrameMap.hpp --- src/hotspot/src/share/vm/c1/c1_FrameMap.hpp 2002-02-12 07:53:20.000000000 -0600 +++ build/hotspot/src/share/vm/c1/c1_FrameMap.hpp 2002-06-22 19:38:26.000000000 -0500 @@ -171,7 +171,9 @@ //-------------------------------------------------------- class ArgumentLocation VALUE_OBJ_CLASS_SPEC { - friend CallingConvention; + // friend CallingConvention; + // Syntax Error, corrected by Tushar + friend struct CallingConvention; private: int _n; // either a register number 0-5 (I0-I5 or O0-O5), or an offset (in words) from SP/FP @@ -221,7 +223,9 @@ //-------------------------------------------------------- class CallingConvention: public ResourceObj { - friend FrameMap; + // friend FrameMap; + // Syntax Error. Corrected by Tushar + friend class FrameMap; private: intStack* _args; diff -ur src/hotspot/src/share/vm/opto/loopnode.hpp build/hotspot/src/share/vm/opto/loopnode.hpp --- src/hotspot/src/share/vm/opto/loopnode.hpp 2002-02-12 07:53:44.000000000 -0600 +++ build/hotspot/src/share/vm/opto/loopnode.hpp 2002-06-22 19:39:31.000000000 -0500 @@ -308,7 +308,9 @@ // Computes the mapping from Nodes to IdealLoopTrees. Organizes IdealLoopTrees into a // loop tree. Drives the loop-based transformations on the ideal graph. class PhaseIdealLoop : public PhaseTransform { - friend IdealLoopTree; + // friend IdealLoopTree; + // Syntax Error. Corrected by Tushar + friend class IdealLoopTree; // Pre-computed def-use info PhaseIterGVN &_igvn; diff -ur src/hotspot/src/share/vm/prims/jvmdi.cpp build/hotspot/src/share/vm/prims/jvmdi.cpp --- src/hotspot/src/share/vm/prims/jvmdi.cpp 2002-02-12 07:53:48.000000000 -0600 +++ build/hotspot/src/share/vm/prims/jvmdi.cpp 2002-06-22 19:41:30.000000000 -0500 @@ -3770,7 +3770,11 @@ } // remove the frame's entry JvmdiFramePops* fps = thread->jvmdi_thread_state()->get_jvmdi_frame_pops(); - fps->clear(JvmdiFramePop(cur_frame_number)); + // fps->clear(JvmdiFramePop(cur_frame_number)); + // Incorrect Syntax. Replaced by Tushar + // Thanks to Matthias Benkmann + JvmdiFramePop MsBTmP(cur_frame_number); + fps->clear(MsBTmP); // recompute method entry and exit flags if no more frame pops if (fps->length() == 0) { recompute_method_entry_and_exit_on(); diff -ur src/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c build/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c --- src/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c 2002-02-12 08:10:26.000000000 -0600 +++ build/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c 2002-06-22 19:42:33.000000000 -0500 @@ -12,6 +12,8 @@ #include #include #include +// Required for newer gcc. Added by Tushar . +#include #include #include "plugin_defs.h" #include "pluginversion.h" diff -ur src/j2se/ext/plugin/oji-plugin/src/motif/navig5/remotejni.cpp build/j2se/ext/plugin/oji-plugin/src/motif/navig5/remotejni.cpp --- src/j2se/ext/plugin/oji-plugin/src/motif/navig5/remotejni.cpp 2002-02-12 08:10:28.000000000 -0600 +++ build/j2se/ext/plugin/oji-plugin/src/motif/navig5/remotejni.cpp 2002-06-22 19:43:20.000000000 -0500 @@ -16,6 +16,8 @@ #include #include #include +// Required by newer gcc. Added by Tushar +#include #include #include #include diff -ur src/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po build/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po --- src/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po 2002-02-12 08:10:28.000000000 -0600 +++ build/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW/sunw_java_plugin.po 2002-06-22 19:44:24.000000000 -0500 @@ -21,8 +21,9 @@ msgstr "plugin: java á£Ê©ÄØÇÞعæÀÈÔäÚ" msgid " a core file was generated" msgstr " ÄØܨÆíÕøÅÀóòÕù" -msgid "Plugin: trouble with work request from child" -msgstr "Plugin: ÄÍùËɱÍÔÓÑÊåÎûÄÖÉ¢àõÆíÙÂ÷î" +# Duplicate msgid. Removed by Tushar +#msgid "Plugin: trouble with work request from child" +#msgstr "Plugin: ÄÍùËɱÍÔÓÑÊåÎûÄÖÉ¢àõÆíÙÂ÷î" msgid "Plugin: can't find IP address for current host" msgstr "Plugin: ÊÆÄâ̯ÆøЩÅäñ¢Îû IP ÈíÉß" msgid "Plugin: trouble reading Netscape proxy configuration URL from\n" diff -ur src/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po build/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po --- src/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po 2002-02-12 08:10:28.000000000 -0600 +++ build/j2se/ext/plugin/oji-plugin/src/motif/resources/zh_TW.BIG5/sunw_java_plugin.po 2002-06-22 19:45:10.000000000 -0500 @@ -21,8 +21,9 @@ msgstr "plugin: java µ{§Ç¤w¦]°T¸¹¦Ó·´" msgid " a core file was generated" msgstr " ¤w²£¥Í®Ö¤ßÀÉ®×" -msgid "Plugin: trouble with work request from child" -msgstr "Plugin: ¤lÃþ§O©Ò­n¨Dªº¤u§@µo¥Í°ÝÃD" +# Duplicate msgid, removed by Tushar +#msgid "Plugin: trouble with work request from child" +#msgstr "Plugin: ¤lÃþ§O©Ò­n¨Dªº¤u§@µo¥Í°ÝÃD" msgid "Plugin: can't find IP address for current host" msgstr "Plugin: §ä¤£¨ì¥Ø«e¥D¾÷ªº IP ¦ì§}" msgid "Plugin: trouble reading Netscape proxy configuration URL from\n" diff -ur src/j2se/make/jpda/back/Makefile build/j2se/make/jpda/back/Makefile --- src/j2se/make/jpda/back/Makefile 2002-02-12 07:55:28.000000000 -0600 +++ build/j2se/make/jpda/back/Makefile 2002-06-22 19:45:57.000000000 -0500 @@ -35,6 +35,9 @@ OTHER_LDLIBS = -ldl -lsocket endif # PLATFORM +# Link to libjvm since it contains fork1 +# Added by Tushar +OTHER_LDLIBS += $(JVMLIB) # # Files to compile. diff -ur src/j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/fontObject.cpp build/j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/fontObject.cpp --- src/j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/fontObject.cpp 2002-02-12 08:06:58.000000000 -0600 +++ build/j2se/src/share/native/sun/awt/font/fontmanager/fontobjects/fontObject.cpp 2002-06-22 19:46:42.000000000 -0500 @@ -899,8 +899,10 @@ /* * u_strncmpi - Compare unicode strings case independent + * Added return type int since newer gcc doesn't include it by default. + * Fixed by Tushar . */ -u_strncmpi(const Unicode * n1, const Unicode * n2, int len) { +int u_strncmpi(const Unicode * n1, const Unicode * n2, int len) { int len2 = 0; const Unicode * str2 = n2;