svn commit: r532317 - in /harmony/enhanced/classlib/trunk/depends/build: defines.mk platform/aix.ppc32.mk platform/aix.ppc64.mk rules.mk

[hi...@apache.org]

Author: hindessm
Date: Wed Apr 25 04:12:41 2007
New Revision: 532317

URL: http://svn.apache.org/viewvc?view=rev&rev=532317
Log:
Extend make rules to support aix.

Added:
    harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk
Modified:
    harmony/enhanced/classlib/trunk/depends/build/defines.mk
    harmony/enhanced/classlib/trunk/depends/build/rules.mk

Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?view=diff&rev=532317&r1=532316&r2=532317
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Wed Apr 25 04:12:41 2007
@@ -22,11 +22,8 @@
 AS = as
 AR = ar
 ARFLAGS = rcv
-ifneq ($(HY_OS),aix)
 DLL_LD = $(CC)
-else
-DLL_LD = $(LD)
-endif
+DLL_LDFLAGS = -shared -Wl,-soname=$(@F) -Wl,--version-script,$(EXPFILE)
 CXX_DLL_LD = $(CXX)
 STDCLIBS = -lstdc++
 OSLIBS = -lc -lm

Added: 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?view=auto&rev=532317
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk (added)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk Wed Apr 25 04:12:41 2007
@@ -0,0 +1,30 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst=""
+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
+OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
+XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig
+STDCLIBS = 
+
+ARFLAGS = -X32 rcv
+ASFLAGS += -mppc
+DLL_LD = $(LD)
+DLL_LDFLAGS = -bE:$(EXPFILE)
+LDFLAGS += -G -bnoentry -bernotok
+EXELDFLAGS = -brtl
+EXERPATHPREFIX =
+MDLLIBPREFIX =
+MDLLIBSUFFIX =

Added: 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?view=auto&rev=532317
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk (added)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk Wed Apr 25 04:12:41 2007
@@ -0,0 +1,30 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst=""
+OPT += -fpic -q64 -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
+OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
+XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig
+STDCLIBS = 
+
+ARFLAGS = -X64 rcv
+ASFLAGS += -a64 -many
+DLL_LD = $(LD)
+DLL_LDFLAGS = -bE:$(EXPFILE)
+LDFLAGS += -b64 -G -bnoentry -bernotok
+EXELDFLAGS = -q64 -brtl
+EXERPATHPREFIX =
+MDLLIBPREFIX =
+MDLLIBSUFFIX =

Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mk?view=diff&rev=532317&r1=532316&r2=532317
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Wed Apr 25 04:12:41 2007
@@ -38,8 +38,7 @@
 endif
 
 $(DLLNAME): $(BUILDFILES) $(MDLLIBFILES) $(EXPFILE)
-	$(DLL_LD) -shared -Wl,-soname=$(@F) -Wl,--version-script,$(EXPFILE) \
-	$(LDFLAGS) $(VMLINK) -o $@ \
+	$(DLL_LD) $(DLL_LDFLAGS) $(LDFLAGS) $(VMLINK) -o $@ \
 	$(BUILDFILES) \
 	$(MDLLIBPREFIX) $(MDLLIBFILES) $(MDLLIBSUFFIX) \
 	$(OSLIBS)