Index: native-src/shared/math/cbigint.c (deleted) =================================================================== Index: native-src/shared/math/fltparse.c (deleted) =================================================================== Index: native-src/shared/math/bigint.h (deleted) =================================================================== Index: native-src/shared/math/jclglob.h (deleted) =================================================================== Index: native-src/shared/math/math_copyright.c (deleted) =================================================================== Index: native-src/shared/math/cbigint.h (deleted) =================================================================== Index: native-src/shared/math/bigint.c (deleted) =================================================================== Index: native-src/shared/math/dblparse.c (deleted) =================================================================== Index: native-src/shared/math/mathglob.c (deleted) =================================================================== Index: native-src/win.IA32/math/hymath.def (deleted) =================================================================== Index: native-src/win.IA32/math/hymath.rc (deleted) =================================================================== Index: native-src/win.IA32/math/makefile (deleted) =================================================================== Index: native-src/win.IA32/luni/hyluni.def =================================================================== --- native-src/win.IA32/luni/hyluni.def (revision 393454) +++ native-src/win.IA32/luni/hyluni.def (working copy) @@ -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 Index: native-src/win.IA32/luni/makefile =================================================================== --- native-src/win.IA32/luni/makefile (revision 393454) +++ native-src/win.IA32/luni/makefile (working copy) @@ -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 \ Index: native-src/win.IA32/makefile =================================================================== --- native-src/win.IA32/makefile (revision 393454) +++ native-src/win.IA32/makefile (working copy) @@ -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 @@ -130,12 +120,6 @@ cd luni $(MAKE) /NOLOGO clean cd .. - cd math - $(MAKE) /NOLOGO clean - cd .. - cd nio - $(MAKE) /NOLOGO clean - cd .. cd text $(MAKE) /NOLOGO clean cd .. Index: native-src/linux.IA32/math/libhymath.exp (deleted) =================================================================== Index: native-src/linux.IA32/math/makefile (deleted) =================================================================== Index: native-src/linux.IA32/luni/libhyluni.exp =================================================================== --- native-src/linux.IA32/luni/libhyluni.exp (revision 393454) +++ native-src/linux.IA32/luni/libhyluni.exp (working copy) @@ -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; Index: native-src/linux.IA32/luni/makefile =================================================================== --- native-src/linux.IA32/luni/makefile (revision 393454) +++ native-src/linux.IA32/luni/makefile (working copy) @@ -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 Index: native-src/linux.IA32/makefile =================================================================== --- native-src/linux.IA32/makefile (revision 393454) +++ native-src/linux.IA32/makefile (working copy) @@ -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 )