You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/04/20 14:56:29 UTC
svn commit: r395578 - in
/incubator/harmony/enhanced/classlib/trunk/native-src: linux.IA32/
linux.IA32/luni/ linux.IA32/math/ linux.IA32/nio/ shared/luni/ shared/math/
shared/nio/ win.IA32/ win.IA32/luni/ win.IA32/math/ win.IA32/nio/
Author: tellison
Date: Thu Apr 20 05:56:26 2006
New Revision: 395578
URL: http://svn.apache.org/viewcvs?rev=395578&view=rev
Log:
Apply patch for HARMONY-335 (luni java calls math natives)
Added:
incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/cbigint.c
- copied unchanged from r395546, incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/cbigint.c
incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/cbigint.h
- copied unchanged from r395546, incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/cbigint.h
incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/dblparse.c
- copied unchanged from r395546, incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/dblparse.c
incubator/harmony/enhanced/classlib/trunk/native-src/shared/luni/fltparse.c
- copied unchanged from r395546, incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/fltparse.c
Removed:
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/
incubator/harmony/enhanced/classlib/trunk/native-src/shared/math/
incubator/harmony/enhanced/classlib/trunk/native-src/shared/nio/
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/math/
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/
Modified:
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp?rev=395578&r1=395577&r2=395578&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/libhyluni.exp Thu Apr 20 05:56:26 2006
@@ -132,6 +132,9 @@
Java_java_util_TimeZone_getCustomTimeZone;
JNI_OnLoad;
JNI_OnUnload;
+ Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl;
+ Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl;
+ Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl;
Java_org_apache_harmony_luni_platform_OSFileSystem_truncateImpl;
Java_org_apache_harmony_luni_platform_OSFileSystem_getPageSize;
Java_org_apache_harmony_luni_platform_OSFileSystem_writevImpl;
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile?rev=395578&r1=395577&r2=395578&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile Thu Apr 20 05:56:26 2006
@@ -22,14 +22,14 @@
BUILDFILES = \
$(SHAREDSUB)luni_copyright.o $(SHAREDSUB)file.o procimpl.o \
- $(SHAREDSUB)oos.o \
- $(SHAREDSUB)nethelp.o \
+ $(SHAREDSUB)oos.o $(SHAREDSUB)nethelp.o \
$(SHAREDSUB)floatbits.o $(SHAREDSUB)ois.o \
- helpers.o $(SHAREDSUB)math.o $(SHAREDSUB)luniglob.o $(SHAREDSUB)proxy.o \
+ helpers.o $(SHAREDSUB)math.o $(SHAREDSUB)luniglob.o \
+ $(SHAREDSUB)proxy.o \
+ $(SHAREDSUB)cbigint.o $(SHAREDSUB)dblparse.o $(SHAREDSUB)fltparse.o \
$(SHAREDSUB)netif.o $(SHAREDSUB)process.o $(SHAREDSUB)bigint.o \
$(SHAREDSUB)osc.o $(SHAREDSUB)socket.o $(SHAREDSUB)inetadds.o \
- $(SHAREDSUB)filedesc.o \
- $(SHAREDSUB)timezone.o \
+ $(SHAREDSUB)filedesc.o $(SHAREDSUB)timezone.o \
$(SHAREDSUB)OSFileSystem.o OSFileSystemLinux32.o \
OSMemory.o OSMemoryLinux32.o OSNetworkSystem.o OSNetworkSystemLinux.o
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile?rev=395578&r1=395577&r2=395578&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile Thu Apr 20 05:56:26 2006
@@ -18,8 +18,8 @@
all: \
_sig _common _pool _thread _port _fdlibm _zip \
- _zlib _vmi _luni _nio _archive _auth \
- _math _text _vmls _launcher
+ _zlib _vmi _luni _archive _auth \
+ _text _vmls _launcher
_auth:
(cd auth && $(MAKE) )
@@ -54,15 +54,9 @@
_luni: _common _sig _zip _zlib _pool _fdlibm _thread _vmi
(cd luni && $(MAKE) )
-_nio: _sig _zip _zlib _pool _fdlibm _thread _vmi
- (cd nio && $(MAKE) )
-
_archive: _common _sig _zip _zlib _pool _fdlibm _thread _vmi
(cd archive && $(MAKE) )
-_math: _common _sig _zip _zlib _pool _fdlibm _thread _vmi
- (cd math && $(MAKE) )
-
_text: _sig _zip _zlib _pool _fdlibm _thread _vmi
(cd text && $(MAKE) )
@@ -84,9 +78,7 @@
(cd vmi && $(MAKE) clean )
(cd common && $(MAKE) clean )
(cd luni && $(MAKE) clean )
- (cd nio && $(MAKE) clean )
(cd archive && $(MAKE) clean )
- (cd math && $(MAKE) clean )
(cd text && $(MAKE) clean )
(cd vmls && $(MAKE) clean )
(cd launcher && $(MAKE) clean )
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def?rev=395578&r1=395577&r2=395578&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/hyluni.def Thu Apr 20 05:56:26 2006
@@ -208,4 +208,7 @@
Java_org_apache_harmony_luni_platform_OSNetworkSystem_getHostByAddrImpl
Java_org_apache_harmony_luni_platform_OSNetworkSystem_getHostByNameImpl
Java_org_apache_harmony_luni_platform_OSNetworkSystem_setInetAddressImpl
+ Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl
+ Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl
+ Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile?rev=395578&r1=395577&r2=395578&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile Thu Apr 20 05:56:26 2006
@@ -32,6 +32,7 @@
$(SHAREDSUB)nethelp.obj $(SHAREDSUB)floatbits.obj \
$(SHAREDSUB)ois.obj helpers.obj $(SHAREDSUB)math.obj \
$(SHAREDSUB)luniglob.obj $(SHAREDSUB)proxy.obj $(SHAREDSUB)netif.obj \
+ $(SHAREDSUB)cbigint.obj $(SHAREDSUB)dblparse.obj $(SHAREDSUB)fltparse.obj \
$(SHAREDSUB)process.obj $(SHAREDSUB)bigint.obj $(SHAREDSUB)osc.obj \
$(SHAREDSUB)socket.obj $(SHAREDSUB)inetadds.obj \
$(SHAREDSUB)filedesc.obj $(SHAREDSUB)timezone.obj \
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile?rev=395578&r1=395577&r2=395578&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/makefile Thu Apr 20 05:56:26 2006
@@ -20,8 +20,8 @@
all: \
_sig _pool _thread _port _fdlibm _zip \
- _zlib _common _nio _luni _vmi _auth \
- _archive _math _launcher _text _prefs \
+ _zlib _common _luni _vmi _auth \
+ _archive _launcher _text _prefs \
_vmls
_auth:
@@ -73,13 +73,8 @@
cd common
$(MAKE) /NOLOGO
cd ..
-
-_math: _common _sig _zip _zlib _pool _fdlibm _thread
- cd math
- $(MAKE) /NOLOGO
- cd ..
-_luni: _common _sig _zip _zlib _pool _fdlibm _thread
+_luni: _common _sig _zip _zlib _pool _fdlibm _thread _vmi
cd luni
$(MAKE) /NOLOGO
cd ..
@@ -89,11 +84,6 @@
$(MAKE) /NOLOGO
cd ..
-_nio: _sig _zip _zlib _pool _fdlibm _thread _vmi
- cd nio
- $(MAKE) /NOLOGO
- cd ..
-
_text: _sig _zip _zlib _pool _fdlibm _thread
cd text
$(MAKE) /NOLOGO
@@ -128,12 +118,6 @@
$(MAKE) /NOLOGO clean
cd ..
cd luni
- $(MAKE) /NOLOGO clean
- cd ..
- cd math
- $(MAKE) /NOLOGO clean
- cd ..
- cd nio
$(MAKE) /NOLOGO clean
cd ..
cd text