harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Salikh Zakirov <Salikh.Zaki...@Intel.com>
Subject Re: [drlvm] DRLVM segfaults in hythread_tls_get()
Date Mon, 03 Jul 2006 18:12:33 GMT
Andrey Chernyshev wrote:

> (a) Do a quick-fix in build.xml / deploy.copy_classlib target -  add a
> filter which will will exclude hythr from copying;

Verified.

The Andrey's suggestion worked out (patch below).
To make the smoke tests pass on Linux I had to further apply more patches:
* fix String.intern() (patch from HARMONY-721)
* add -Bsymbolic flag to hyzlib linking command, as suggested by Gregory 
  to avoid name clashes with system libz during dynamic linking. (Patch to classlib further
below).


---
Subject: [PATCH] Workaround to avoid copying *hythr* from classlib's bin/ directory

--- a/build/make/build.xml
+++ b/build/make/build.xml
@@ -432,6 +432,7 @@ Version: $Revision: 1.16.2.20 $
             <fileset dir="${external.dep.CLASSLIB}/deploy/jdk/jre/bin">
                 <include name="*"/>
                 <exclude name="java*"/>
+                <exclude name="*hythr*"/>
             </fileset>
         </copy>
 
-- 

---
Subject: [PATCH] added overridable LDFLAGS in rules.mk, use -Bsymbolic for hyzlib

--- a/depends/build/rules.mk
+++ b/depends/build/rules.mk
@@ -26,7 +26,7 @@ all: $(DLLNAME) $(EXENAME) $(LIBNAME)
        -Wl,-soname=$(@F) $(VMLINK) -o $@ \
        $(BUILDFILES) $(SYSLIBFILES) \
        -Xlinker --start-group $(MDLLIBFILES) -Xlinker --end-group \
-       -lc -lm -ldl
+       -lc -lm -ldl $(LDFLAGS)
 
 $(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
        $(CC) $(VMLINK) \
--- a/native-src/linux.IA32/zlib/makefile
+++ b/native-src/linux.IA32/zlib/makefile
@@ -29,4 +29,6 @@ BUILDFILES = \
 
 DLLNAME = ../libhyzlib.so
 
+LDFLAGS = -Wl,-Bsymbolic
+
 include $(HY_HDK)/build/make/rules.mk
-- 

---------------------------------------------------------------------
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