Author: hindessm
Date: Tue Jun  1 14:23:15 2010
New Revision: 950084

URL: http://svn.apache.org/viewvc?rev=950084&view=rev
Log:
Eliminate needless libm linking.  Tested on linux.

Modified:
    harmony/enhanced/java/trunk/classlib/depends/build/defines.mk
    harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc32.mk
    harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc64.mk
    harmony/enhanced/java/trunk/classlib/depends/build/platform/freebsd.x86.mk
    harmony/enhanced/java/trunk/classlib/depends/build/platform/freebsd.x86_64.mk
    harmony/enhanced/java/trunk/classlib/depends/build/platform/macosx.x86.mk
    harmony/enhanced/java/trunk/classlib/depends/build/platform/macosx.x86_64.mk
    harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile

Modified: harmony/enhanced/java/trunk/classlib/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/defines.mk?rev=950084&r1=950083&r2=950084&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/defines.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/defines.mk Tue Jun  1 14:23:15 2010
@@ -29,7 +29,7 @@ DLL_LD = $(CC)
 DLL_LDFLAGS = -shared -Wl,-soname=$(@F) -Wl,--version-script,$(EXPFILE)
 CXX_DLL_LD = $(CXX)
 STDCLIBS = -lstdc++
-OSLIBS = -lc -lm
+OSLIBS = -lc
 XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst
 MDLLIBPREFIX = -Xlinker --start-group
 MDLLIBSUFFIX = -Xlinker --end-group

Modified: harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc32.mk?rev=950084&r1=950083&r2=950084&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc32.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc32.mk Tue Jun  1 14:23:15 2010
@@ -18,7 +18,7 @@ DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -
 PLATFORM += -qcpluscmt -q32 -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro \
 	    -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
             -D_LARGE_FILES -qsuppress=1500-010
-OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
+OSLIBS = -lc_r -lC_r -lpthread -liconv
 XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
 STDCLIBS = 
 WARNFLAGS =

Modified: harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc64.mk?rev=950084&r1=950083&r2=950084&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc64.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/aix.ppc64.mk Tue Jun  1 14:23:15 2010
@@ -18,7 +18,7 @@ DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -
 PLATFORM += -qcpluscmt -q64 -DPPC64 -q mbcs -qlanglvl=extended -qarch=ppc \
             -qinfo=pro -qalias=noansi -D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE \
             -D_LARGE_FILES -qsuppress=1500-010
-OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
+OSLIBS = -lc_r -lC_r -lpthread -liconv
 XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
 STDCLIBS = 
 WARNFLAGS =

Modified: harmony/enhanced/java/trunk/classlib/depends/build/platform/freebsd.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/freebsd.x86.mk?rev=950084&r1=950083&r2=950084&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/freebsd.x86.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/freebsd.x86.mk Tue Jun  1 14:23:15 2010
@@ -16,6 +16,6 @@
 DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES \
            -DIPv6_FUNCTION_SUPPORT
 PLATFORM += -march=pentium3
-OSLIBS = -L/usr/local/lib -lpthread -lm
+OSLIBS = -L/usr/local/lib -lpthread
 INCLUDES += -I/usr/local/include
 XLIBS = -lX11 -lXft -lXext -lXtst

Modified: harmony/enhanced/java/trunk/classlib/depends/build/platform/freebsd.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/freebsd.x86_64.mk?rev=950084&r1=950083&r2=950084&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/freebsd.x86_64.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/freebsd.x86_64.mk Tue Jun  1 14:23:15 2010
@@ -15,6 +15,6 @@
 
 DEFINES += -DFREEBSD -DFREEBSD_X86_64 -DHYX86_64 -DNEEDS_SYS_TYPES \
            -DIPv6_FUNCTION_SUPPORT
-OSLIBS = -L/usr/local/lib -lpthread -lm
+OSLIBS = -L/usr/local/lib -lpthread
 INCLUDES += -I/usr/local/include
 XLIBS = -lX11 -lXft -lXext -lXtst

Modified: harmony/enhanced/java/trunk/classlib/depends/build/platform/macosx.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/macosx.x86.mk?rev=950084&r1=950083&r2=950084&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/macosx.x86.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/macosx.x86.mk Tue Jun  1 14:23:15 2010
@@ -22,7 +22,7 @@ DEFINES += -DMACOSX -DMACOSX_X86 -DHYX86
 INCLUDES += -I/opt/local/include
 PLATFORM = -fPIC -fno-common -arch i386 -mmacosx-version-min=10.5
 ASFLAGS += -arch i386
-OSLIBS = -L/opt/local/lib -lc -lm -ldl -liconv
+OSLIBS = -L/opt/local/lib -lc -ldl -liconv
 XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
         -lfreetype -lfontconfig
 MDLLIBPREFIX =

Modified: harmony/enhanced/java/trunk/classlib/depends/build/platform/macosx.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/build/platform/macosx.x86_64.mk?rev=950084&r1=950083&r2=950084&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/build/platform/macosx.x86_64.mk (original)
+++ harmony/enhanced/java/trunk/classlib/depends/build/platform/macosx.x86_64.mk Tue Jun  1 14:23:15 2010
@@ -20,7 +20,7 @@ INCLUDES += -I/opt/local/include
 PLATFORM = -fPIC -fno-common -arch x86_64 -mmacosx-version-min=10.5
 ASFLAGS += -arch x86_64
 # WARNFLAGS += -Wconversion -Wformat -Wshorten-64-to-32
-OSLIBS = -L/opt/local/lib -lc -lm -ldl -liconv
+OSLIBS = -L/opt/local/lib -lc -ldl -liconv
 XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
         -lfreetype -lfontconfig
 MDLLIBPREFIX =

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/linuxfont/unix/makefile?rev=950084&r1=950083&r2=950084&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/linuxfont/unix/makefile Tue Jun  1 14:23:15 2010
@@ -34,7 +34,7 @@ MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) \
 	$(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
 
-OSLIBS += $(XLIBS)
+OSLIBS += -lm $(XLIBS)
 
 DLLNAME=$(DLLPATH)liblinuxfont$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLINUXFONT_0.1

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile?rev=950084&r1=950083&r2=950084&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile Tue Jun  1 14:23:15 2010
@@ -47,6 +47,8 @@ endif
 MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
+OSLIBS += -lm
+
 DLLNAME = $(DLLPATH)libhyluni$(HY_SHLIB_SUFFIX)
 EXPNAME = HYLUNI_0.1