You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2006/11/09 14:45:24 UTC
svn commit: r472898 - in /incubator/harmony/enhanced/drlvm/trunk/build/make:
components/vm/hythr.xml components/vm/vmcore.xml targets/common_extra.xml
targets/common_vm.xml
Author: gshimansky
Date: Thu Nov 9 05:45:23 2006
New Revision: 472898
URL: http://svn.apache.org/viewvc?view=rev&rev=472898
Log:
Reverted HARMONY-1907 [drlvm][threading] Stack size attribute has no effect.
It appears that it breaks SUSE9
Modified:
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml?view=diff&rev=472898&r1=472897&r2=472898
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/hythr.xml Thu Nov 9 05:45:23 2006
@@ -95,11 +95,11 @@
</select>
<select os="lnx">
- <syslibset libs="pthread,rt" />
+ <syslibset libs="rt" />
<linkerarg value="-Wl,-init" />
<linkerarg value="-Wl,hythread_library_init" />
<linkerarg value="-Wl,--version-script,${src}/thread/src/hythr.exp" />
- </select>
+ </select>
<select os="win">
<syslibset libs="advapi32,ws2_32" />
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml?view=diff&rev=472898&r1=472897&r2=472898
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml Thu Nov 9 05:45:23 2006
@@ -292,6 +292,13 @@
<select os="lnx">
<syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread,gcc_s,rt" />
+ <linkerarg value="--export-dynamic" />
+ <!--linkerarg value="-lz" />
+ <linkerarg value="-lxml2" />
+ <linkerarg value="-lm" />
+ <linkerarg value="-ldl" />
+ <linkerarg value="-lpthread" />
+ <linkerarg value="-lstdc++" /-->
</select>
</linker>
</target>
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml?view=diff&rev=472898&r1=472897&r2=472898
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_extra.xml Thu Nov 9 05:45:23 2006
@@ -46,8 +46,8 @@
<syslibset libs="advapi32,odbc32,userenv,ws2_32,mswsock" />
</select>
<select os="lnx">
- <syslibset type="static" libs="z,xml2" />
- <syslibset type="shared" libs="m,dl,stdc++,pthread" />
+ <syslibset type="static" libs="z,pthread,xml2" />
+ <syslibset type="shared" libs="m,dl,stdc++" />
</select>
<select os="lnx" cxx="gcc">
<syslibset type="shared" libs="gcc_s" />
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml?view=diff&rev=472898&r1=472897&r2=472898
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/common_vm.xml Thu Nov 9 05:45:23 2006
@@ -207,8 +207,8 @@
<syslibset libs="advapi32,odbc32,userenv,ws2_32,mswsock" />
</select>
<select os="lnx" arch="ia32">
- <syslibset type="static" libs="z,xml2" />
- <syslibset type="shared" libs="m,dl,stdc++,rt,pthread" />
+ <syslibset type="static" libs="z,pthread,xml2" />
+ <syslibset type="shared" libs="m,dl,stdc++,rt" />
</select>
<select os="lnx" cxx="gcc" arch="ia32">
<linkerarg value="-lgcc_s" />