harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Geir Magnusson Jr." <g...@pobox.com>
Subject Re: [drlvm] is_name_lowercase() in natives_support.cpp
Date Mon, 18 Sep 2006 16:20:56 GMT


Artem Aliev wrote:
> Geir,
> 
> The current DRLVM build is still failed.

Because I was waiting for Alexey :)

I'll take your patch though.

geir

> I attach patch  for the current state of VM.
> Could you please apply it or commit  new version of natives_support.cpp
> 
> Thanks
> Artem
> 
> 
> On 9/18/06, Alexey Varlamov <alexey.v.varlamov@gmail.com> wrote:
>> Geir,
>>
>> The DRLVM build is broken now on gcc3.3.3 (SUSE9):
>>
>> build.native.cpp:
>>        [cc] 135 total files to be compiled.
>>        [cc] drlvm/vm/vmcore/src/util/natives_support.cpp: In
>>        [cc]    function `apr_dso_handle_t* natives_load_library(const
> 
> ------------------------------------------------------------------------
> 
> Index: vm/vmcore/src/util/natives_support.cpp
> ===================================================================
> --- vm/vmcore/src/util/natives_support.cpp	(revision 447423)
> +++ vm/vmcore/src/util/natives_support.cpp	(working copy)
> @@ -203,7 +203,12 @@
>      
>      char *localLibName = (char *) library_name;
>      NativeLibraryHandle returnCode = NULL;
> -    
> +    NativeLibInfo* pfound;
> +    NativeLibInfo* pinfo;
> +    NativeLibraryHandle handle;
> +    apr_status_t apr_status; 
> +    Global_Env *ge;
> +    jint UNREF res;
>  #ifdef PLATFORM_NT
>      TRACE2("init", "### lib name = " << library_name);
>  
> @@ -221,7 +226,7 @@
>  
>      jni_libs.lock._lock();
>  
> -    NativeLibInfo* pfound = search_library_list(localLibName);
> +    pfound = search_library_list(localLibName);
>  
>      if (pfound)
>      {
> @@ -237,8 +242,7 @@
>      *just_loaded = true;
>  
>      // library was not loaded previously, try to load it
> -    NativeLibraryHandle handle;
> -    apr_status_t apr_status = port_dso_load_ex(&handle, localLibName,
> +    apr_status = port_dso_load_ex(&handle, localLibName,
>                                                 PORT_DSO_BIND_DEFER, jni_libs.ppool);
>      if (APR_SUCCESS != apr_status)
>      {
> @@ -255,7 +259,7 @@
>          goto NATIVES_LOAD_LIBRARY_EXIT;
>      }
>  
> -    NativeLibInfo* pinfo = (NativeLibInfo*)apr_palloc(jni_libs.ppool, sizeof(NativeLibInfo));
> +    pinfo = (NativeLibInfo*)apr_palloc(jni_libs.ppool, sizeof(NativeLibInfo));
>      if (NULL == pinfo)
>      {
>          apr_dso_unload(handle);
> @@ -270,7 +274,7 @@
>  
>      pinfo->handle = handle;
>  
> -    Global_Env *ge = VM_Global_State::loader_env;
> +    ge = VM_Global_State::loader_env;
>      pinfo->name = ge->string_pool.lookup(localLibName);
>  
>      pinfo->next = jni_libs.lib_info_list;
> @@ -278,7 +282,7 @@
>  
>      jni_libs.lock._unlock();
>  
> -    jint UNREF res = find_call_JNI_OnLoad(pinfo->handle); // What to do with result???
> +    res = find_call_JNI_OnLoad(pinfo->handle); // What to do with result???
>  
>      *pstatus = APR_SUCCESS;
>  
> 
> 
> ------------------------------------------------------------------------
> 
> ---------------------------------------------------------------------
> Terms of use : http://incubator.apache.org/harmony/mailing.html
> To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
> For additional commands, e-mail: harmony-dev-help@incubator.apache.org

---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org


Mime
View raw message