harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sean Qiu <sean.xx....@gmail.com>
Subject Re: svn commit: r788299 - in /harmony/enhanced/classlib/trunk: depends/build/ depends/build/platform/ modules/archive/src/main/native/zlib/unix/ modules/luni/src/main/native/fdlibm/unix/
Date Wed, 08 Jul 2009 05:26:18 GMT
Hi, Mark

I'm trying to build our Java 6  branch on Aix 32 after the latest merging.
But I got below error message.

------------------------------------
     [echo] Making "" in
/u2/foreman/sandbox/community-src/modules/portlib/src/main/native/common/unix
     [exec] xlc -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst=""
-DIPv6_FUNCTION_SUPPORT 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 -D_REENTRANT -DHY_NO_THR -DHY_ZIP_API
-I/u2/foreman/sandbox/community-src/deploy/include
-I/u2/foreman/sandbox/community-src/deploy/jdk/include -I.
-I../shared/ -O1 -DNDEBUG -fpic     -c -o ../shared/libglob.o
../shared/libglob.c
     [exec] xlc: 1501-228 input file PLATFORM not found
     [exec] xlc: 1501-228 input file += not found
     [exec] xlc: 1501-210 command option -O contains an incorrect subargument
     [exec] gmake: *** [../shared/libglob.o] Error 252
--------------------------------------

The AixPPC 64 one works well.
I found there is a extra "\" in your patch of AixPPc32 which I guess
is the root cause.
"+DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT \"

Am I missing something?

Best Regards
Sean, Xiao Xia Qiu




2009/6/25  <hindessm@apache.org>:
> Author: hindessm
> Date: Thu Jun 25 09:09:40 2009
> New Revision: 788299
>
> URL: http://svn.apache.org/viewvc?rev=788299&view=rev
> Log:
> Fixing the compile flags for Aix.
> Essentially moving the platform-specific "constant" flags from OPT to
> PLATFORM so that modules can change OPT without resulting in the loss
> of crucial platform flags - like -q64 on Aix.
>
> Modified:
>    harmony/enhanced/classlib/trunk/depends/build/defines.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86_64.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86_64.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk
>    harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk
>    harmony/enhanced/classlib/trunk/depends/build/rules.mk
>    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile
>    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/makefile
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Thu Jun 25 09:09:40 2009
> @@ -37,6 +37,7 @@
>        -Xlinker
>  WARNFLAGS=-Werror
>
> +PLATFORM = -fpic
>  HYDEBUGCFLAGS = -ggdb -O0
>  HYRELEASECFLAGS = -O1 -DNDEBUG
>
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk Thu Jun 25 09:09:40
2009
> @@ -14,16 +14,19 @@
>  #  limitations under the License.
>
>  CC = xlc
> -DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
> -OPT += -fpic -qcpluscmt -O3 -s -q mbcs -qlanglvl=extended -qarch=ppc -qinfo=pro -qalias=noansi
-D_XOPEN_SOURCE_EXTENDED=1 -D_ALL_SOURCE -D_LARGE_FILES -qsuppress=1500-010
> +DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT \
> +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
>  XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
>  STDCLIBS =
>  WARNFLAGS =
> -HYDEBUGCFLAGS = -g
> +HYDEBUGCFLAGS = -g -O0
> +HYRELEASEFLAGS = -s -O3 -DNDEBUG
>
>  ARFLAGS = -X32 rcv
> -ASFLAGS += -mppc
> +ASFLAGS += -a32 -mppc
>  DLL_LD = $(LD)
>  DLL_LDFLAGS = -bE:$(EXPFILE)
>  LDFLAGS += -G -bnoentry -bernotok
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk Thu Jun 25 09:09:40
2009
> @@ -15,12 +15,15 @@
>
>  CC = xlc
>  DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
> -OPT += -fpic -qcpluscmt -O3 -s -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
> +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
>  XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig -lXext -lXtst
>  STDCLIBS =
>  WARNFLAGS =
> -HYDEBUGCFLAGS = -g
> +HYDEBUGCFLAGS = -g -O0
> +HYRELEASEFLAGS = -s -O3 -DNDEBUG
>
>  ARFLAGS = -X64 rcv
>  ASFLAGS += -a64 -many
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk Thu Jun 25
09:09:40 2009
> @@ -13,8 +13,9 @@
>  #  See the License for the specific language governing permissions and
>  #  limitations under the License.
>
> -DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES -DIPv6_FUNCTION_SUPPORT
> -OPT += -fpic -march=pentium3
> +DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES \
> +           -DIPv6_FUNCTION_SUPPORT
> +PLATFORM += -march=pentium3
>  OSLIBS = -L/usr/local/lib -lpthread -lm
>  INCLUDES += -I/usr/local/include
>  XLIBS = -lX11 -lXft -lXext -lXtst
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86_64.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86_64.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86_64.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86_64.mk Thu Jun
25 09:09:40 2009
> @@ -13,8 +13,8 @@
>  #  See the License for the specific language governing permissions and
>  #  limitations under the License.
>
> -DEFINES += -DFREEBSD -DFREEBSD_X86_64 -DHYX86_64 -DNEEDS_SYS_TYPES -DIPv6_FUNCTION_SUPPORT
> -OPT += -fpic
> +DEFINES += -DFREEBSD -DFREEBSD_X86_64 -DHYX86_64 -DNEEDS_SYS_TYPES \
> +           -DIPv6_FUNCTION_SUPPORT
>  OSLIBS = -L/usr/local/lib -lpthread -lm
>  INCLUDES += -I/usr/local/include
>  XLIBS = -lX11 -lXft -lXext -lXtst
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk Thu Jun 25 09:09:40
2009
> @@ -14,6 +14,4 @@
>  #  limitations under the License.
>
>  DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64 -DIPv6_FUNCTION_SUPPORT
> -
> -OPT += -fpic
>  OSLIBS += -ldl
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk Thu Jun 25
09:09:40 2009
> @@ -14,8 +14,7 @@
>  #  limitations under the License.
>
>  DEFINES += -DLINUX -DLINUX_PPC32 -DHYPPC32 -DIPv6_FUNCTION_SUPPORT
> -OPT += -fpic -m32
> -
> +PLATFORM += -m32
>  ASFLAGS += -a32
>  LDFLAGS += -m32
>  OSLIBS += -ldl
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk Thu Jun 25
09:09:40 2009
> @@ -14,9 +14,8 @@
>  #  limitations under the License.
>
>  DEFINES += -DLINUX -DLINUX_PPC64 -DHYPPC64 -DIPv6_FUNCTION_SUPPORT
> -OPT += -fpic -m64
> +PLATFORM += -m64
>  XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
> -
>  ASFLAGS += -a64
>  LDFLAGS += -m64
>  OSLIBS += -ldl
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk Thu Jun 25 09:09:40
2009
> @@ -14,8 +14,7 @@
>  #  limitations under the License.
>
>  DEFINES += -DLINUX -DLINUX_S390 -DHYS390 -DIPv6_FUNCTION_SUPPORT
> -OPT += -fpic -m31
> -
> +PLATFORM += -m31
>  ASFLAGS += -m31
>  LDFLAGS += -m31
>  OSLIBS += -ldl
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk Thu Jun 25
09:09:40 2009
> @@ -14,8 +14,7 @@
>  #  limitations under the License.
>
>  DEFINES += -DLINUX -DLINUX_S390X -DHYS390X -DIPv6_FUNCTION_SUPPORT
> -OPT += -fpic -m64
> -
> +PLATFORM += -m64
>  ASFLAGS += -m64
>  LDFLAGS += -m64
>  OSLIBS += -ldl
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk Thu Jun 25 09:09:40
2009
> @@ -14,5 +14,5 @@
>  #  limitations under the License.
>
>  DEFINES += -DLINUX -DLINUX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
> -OPT += -fpic -march=pentium3
> +PLATFORM += -march=pentium3
>  OSLIBS += -ldl
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk Thu Jun 25
09:09:40 2009
> @@ -14,6 +14,5 @@
>  #  limitations under the License.
>
>  DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
> -OPT += -fpic
>  XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
>  OSLIBS += -ldl
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk Thu Jun 25
09:09:40 2009
> @@ -14,7 +14,7 @@
>  #  limitations under the License.
>
>  DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32 -DIPv6_FUNCTION_SUPPORT
> -OPT += -fpic -fno-common
> +PLATFORM += -fno-common
>  OSLIBS += -ldl -liconv
>  XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
>         -L/sw/lib/freetype2/lib -lfreetype -lfontconfig
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86.mk Thu Jun 25 09:09:40
2009
> @@ -17,7 +17,7 @@
>
>  # Add the default location of the macports.org install to the includes
>  INCLUDES += -I/opt/local/include
> -OPT += -fPIC -fno-common
> +PLATFORM = -fPIC -fno-common
>  OSLIBS = -L/opt/local/lib -lc -lm -ldl -liconv
>  XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst -lXrender -lexpat \
>         -lfreetype -lfontconfig
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86_64.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86_64.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86_64.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/macosx.x86_64.mk Thu Jun 25
09:09:40 2009
> @@ -17,7 +17,7 @@
>
>  # Add the default location of the macports.org install to the includes
>  INCLUDES += -I/opt/local/include
> -OPT += -arch x86_64 -mmacosx-version-min=10.5 -fPIC -fno-common
> +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
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk Thu Jun 25 09:09:40
2009
> @@ -20,12 +20,14 @@
>  CXX = cxx
>
>  DEFINES += -DZOS -DZOS_S390 -DHYS390 -DHY_ATOE
> -OPT += -Wc,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wa,goff -Wc,NOANSIALIAS
-Wc,DLL,EXPORTALL
> +PLATFORM = -Wc,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wa,goff \
> +           -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
>
>  CFLAGS += -Wc,"SSCOMM" -Wc,"langlvl(commonc)" -Wc,gonumber
>  CXXFLAGS += -+ -Wc,"langlvl(extended)" -Wc,gonumber
>
> -ASFLAGS += -Wc,xplink,convlit\(ISO8859-1\) -Wc,gonumber -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
-c
> +ASFLAGS += -Wc,xplink,convlit\(ISO8859-1\) -Wc,gonumber -Wa,goff \
> +           -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL -c
>  LDFLAGS += -Wl,xplink,dll
>
>  # No need for --start-group and --end-group tags here
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk Thu Jun 25 09:09:40
2009
> @@ -20,12 +20,14 @@
>  CXX = cxx
>
>  DEFINES += -DZOS -DZOS_S390X -DHYS390X -DHY_ATOE
> -OPT += -Wc,lp64,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wa,goff -Wc,NOANSIALIAS
-Wc,DLL,EXPORTALL
> +PLATFORM = -Wc,lp64,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) \
> +           -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
>
>  CFLAGS += -Wc,"SSCOMM" -Wc,"langlvl(commonc)"
>  CXXFLAGS += -+ -Wc,"langlvl(extended)"
>
> -ASFLAGS += -Wc,lp64,xplink,convlit\(ISO8859-1\)  -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
-Wa,SYSPARM\(BIT64\) -c
> +ASFLAGS += -Wc,lp64,xplink,convlit\(ISO8859-1\)  -Wa,goff -Wc,NOANSIALIAS \
> +           -Wc,DLL,EXPORTALL -Wa,SYSPARM\(BIT64\) -c
>  LDFLAGS += -Wl,lp64 -Wl,xplink,dll
>
>  # No need for --start-group and --end-group tags here
>
> Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mk
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mk?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
> +++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Thu Jun 25 09:09:40 2009
> @@ -17,8 +17,8 @@
>  # Configuration Makefile
>  #
>
> -CFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(CFLAGS) $(WARNFLAGS)
> -CXXFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(CXXFLAGS) $(WARNFLAGS)
> +CFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(PLATFORM) $(CFLAGS) $(WARNFLAGS)
> +CXXFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(PLATFORM) $(CXXFLAGS) $(WARNFLAGS)
>  EXPFILE = $(notdir $(basename $(DLLNAME))).exp
>
>  ifneq ($(HY_OS),zos)
>
> Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile
(original)
> +++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile
Thu Jun 25 09:09:40 2009
> @@ -20,6 +20,8 @@
>  # We don't need to debug into zlib
>  HY_CFG=release
>
> +include $(HY_HDK)/build/make/defines.mk
> +
>  HYRELEASECFLAGS = -O3
>
>  # Further performance improvement on x86 and x86_64
> @@ -27,8 +29,6 @@
>  HYRELEASECFLAGS += -DUNALIGNED_OK
>  endif
>
> -include $(HY_HDK)/build/make/defines.mk
> -
>  ZLIB_DIST=../../zlib_dist/# Path to zlib
>
>  BUILDFILES = \
>
> Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/makefile
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/makefile?rev=788299&r1=788298&r2=788299&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/makefile
(original)
> +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/makefile
Thu Jun 25 09:09:40 2009
> @@ -44,15 +44,16 @@
>        $(FDLIBM_DIST)w_log.o $(FDLIBM_DIST)w_log10.o $(FDLIBM_DIST)w_pow.o $(FDLIBM_DIST)w_remainder.o
\
>        $(FDLIBM_DIST)w_scalb.o $(FDLIBM_DIST)w_sinh.o $(FDLIBM_DIST)w_sqrt.o
>
> +DEFINES += -D_IEEE_LIBM
> +
> +LIBNAME = $(LIBPATH)libhyfdlibm.a
> +
>  # OPT is overriden except on zOS (fpic, for example, is not an option on zOS)
>  ifneq ($(HY_OS),zos)
>  ifneq ($(HY_OS),aix)
> -OPT = -O0 -ffloat-store -fPIC
> +OPT = -O0 -ffloat-store
>  endif
>  endif
> -
> -DEFINES += -D_IEEE_LIBM
> -
> -LIBNAME = $(LIBPATH)libhyfdlibm.a
> +PLATFORM := $(subst -fpic,-fPIC,$(PLATFORM))
>
>  include $(HY_HDK)/build/make/rules.mk
>
>
>

Mime
View raw message