FYI: 2 patches for RH 4.1 branch

[Marco Trudel]

Marco Trudel wrote:
> Marco Trudel wrote:
>> Mohan Embar wrote:
>>
>> <snip>
>>
>>> /datal/gcc/build/crossgcc/i686-pc-mingw32/bin/ isn't
>> in my path, so I don't know why it wants to use this as.
>>>
>>> The last time I tried doing this was a day or two ago. Marco:
>>> when was the last time you got and built the trunk?
>>
>> rev 121'693. But I will do an update today. I'll inform you if it 
>> works...
> 
> Todays svn trunk (rev 122072) works for me (host=linux, target=mingw). 
> The only thing I encountered was that mingw seems to have a problem with 
> ::OUT.
> Keith, this is a jdwp thing. So I assume it's one from your changes... I 
> attached a patch of my simple workaround. Maybe you can do something 
> better?
> 
> 
> Marco
> 
> 
> ------------------------------------------------------------------------
> 
> Index: gnu/classpath/jdwp/JdwpConstants$StepDepth.h
> ===================================================================
> --- gnu/classpath/jdwp/JdwpConstants$StepDepth.h	(revision 122072)
> +++ gnu/classpath/jdwp/JdwpConstants$StepDepth.h	(working copy)
> @@ -28,7 +28,7 @@
>    JdwpConstants$StepDepth();
>    static const jint INTO = 0;
>    static const jint OVER = 1;
> -  static const jint OUT = 2;
> +  static const jint OUTT = 2;
>    static ::java::lang::Class class$;
>  };

BTW: Quite a trick one to search the problem in:
   vi gnu/classpath/jdwp/JdwpConstants$StepDepth.h
especially if gnu/classpath/jdwp/JdwpConstants.h exists ;-)


Marco


> Index: gnu/classpath/jdwp/natVMVirtualMachine.cc
> ===================================================================
> --- gnu/classpath/jdwp/natVMVirtualMachine.cc	(revision 122072)
> +++ gnu/classpath/jdwp/natVMVirtualMachine.cc	(working copy)
> @@ -889,7 +889,7 @@
>  	    }
>  	  break;
>  
> -	case JdwpConstants$StepDepth::OUT:
> +	case JdwpConstants$StepDepth::OUTT:
>  	  // All we need to do is check the stack depth
>  	  if (sinfo->stack_depth > frame->depth ())
>  	    handle_single_step (env, sinfo, thread, method, location);