harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r590755 - in /harmony/enhanced/classlib/trunk: depends/build/ depends/build/platform/ modules/archive/src/main/native/archive/unix/ modules/archive/src/main/native/zip/unix/ modules/archive/src/main/native/zlib/unix/ modules/auth/src/main/n...
Date Wed, 31 Oct 2007 17:14:31 GMT
Author: odeakin
Date: Wed Oct 31 10:14:29 2007
New Revision: 590755

URL: http://svn.apache.org/viewvc?rev=590755&view=rev
Log:
Move -fpic compiler option and IPv6_FUNCTION_SUPPORT define into platform specific makefile
includes. Also adding z/OS specific makefile includes.

Added:
    harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk   (with props)
    harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk   (with props)
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/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/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/unix/makefile
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/fdlibm/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/makefile
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile
    harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/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=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Wed Oct 31 10:14:29 2007
@@ -42,15 +42,17 @@
 endif
 
 ifneq ($(HY_OS),freebsd)
+ifneq ($(HY_OS),zos)
 OSLIBS += -ldl
 endif
+endif
 
 EXEPATH=../
 LIBPATH=$(HY_HDK)/lib/
 DLLPATH=$(HY_HDK)/jdk/jre/bin/
 SHAREDSUB=../shared/
 
-DEFINES += -D_REENTRANT -DIPv6_FUNCTION_SUPPORT
+DEFINES += -D_REENTRANT
 INCLUDES += -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
 
 ifndef HYDEBUGCFLAGS

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=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc32.mk Wed Oct 31 10:14:29
2007
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DAIX -DAIX_PPC32 -DHYPPC32 -D_Xconst=""
+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
 OSLIBS = -lc_r -lC_r -lm -lpthread -liconv
 XLIBS = -L/opt/freeware/lib -lX11 -lXft -lfreetype -lfontconfig

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=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/aix.ppc64.mk Wed Oct 31 10:14:29
2007
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst=""
+DEFINES += -DAIX -DAIX_PPC64 -DHYPPC64 -D_Xconst="" -DIPv6_FUNCTION_SUPPORT
 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

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=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/freebsd.x86.mk Wed Oct 31 10:14:29
2007
@@ -13,6 +13,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES
-OPT += -march=pentium3
+DEFINES += -DFREEBSD -DFREEBSD_X86 -DHYX86 -DNEEDS_SYS_TYPES -DIPv6_FUNCTION_SUPPORT
+OPT += -fpic -march=pentium3
 OSLIBS = -lpthread -lm

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=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk Wed Oct 31 10:14:29
2007
@@ -13,4 +13,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64
+DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64 -DIPv6_FUNCTION_SUPPORT
+
+OPT += -fpic

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=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk Wed Oct 31 10:14:29
2007
@@ -13,8 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_PPC32 -DHYPPC32
-OPT += -m32
+DEFINES += -DLINUX -DLINUX_PPC32 -DHYPPC32 -DIPv6_FUNCTION_SUPPORT
+OPT += -fpic -m32
 
 ASFLAGS += -a32
 LDFLAGS += -m32

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=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk Wed Oct 31 10:14:29
2007
@@ -13,8 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_PPC64 -DHYPPC64
-OPT += -m64
+DEFINES += -DLINUX -DLINUX_PPC64 -DHYPPC64 -DIPv6_FUNCTION_SUPPORT
+OPT += -fpic -m64
 XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft
 
 ASFLAGS += -a64

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=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk Wed Oct 31 10:14:29
2007
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_S390 -DHYS390
+DEFINES += -DLINUX -DLINUX_S390 -DHYS390 -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -m31
 
 ASFLAGS += -m31

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=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk Wed Oct 31 10:14:29
2007
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_S390X -DHYS390X
+DEFINES += -DLINUX -DLINUX_S390X -DHYS390X -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic -m64
 
 ASFLAGS += -m64

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=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk Wed Oct 31 10:14:29
2007
@@ -13,5 +13,5 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_X86 -DHYX86
-OPT += -march=pentium3
+DEFINES += -DLINUX -DLINUX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
+OPT += -fpic -march=pentium3

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=590755&r1=590754&r2=590755&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 Wed Oct 31 10:14:29
2007
@@ -13,6 +13,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64
+DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
 OPT += -fpic
 XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft

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=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk Wed Oct 31 10:14:29
2007
@@ -13,8 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32
-OPT += -fno-common
+DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32 -DIPv6_FUNCTION_SUPPORT
+OPT += -fpic -fno-common
 OSLIBS = -lc -lm -ldl -liconv
 XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXrender -lexpat \
         -L/sw/lib/freetype2/lib -lfreetype -lfontconfig

Added: 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=590755&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk (added)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk Wed Oct 31 10:14:29
2007
@@ -0,0 +1,39 @@
+#  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.
+
+# Use cc for assembly compiles on z/OS
+AS = cc
+
+# Use cxx/c++ for c++ compiles on z/OS
+CXX = cxx
+
+DEFINES += -DZOS -DZOS_S390 -DHYS390 -DHY_ATOE
+OPT += -Wc,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wc,"langlvl(commonc)" -Wa,goff
-Wc,NOANSIALIAS -Wc,DLL,EXPORTALL
+
+CFLAGS += -Wc,"SSCOMM" -Wc,"langlvl(commonc)"
+CXXFLAGS += -+ -Wc,"langlvl(extended)"
+
+ASFLAGS += -Wc,xplink,convlit\(ISO8859-1\) -Wa,goff -Wc,NOANSIALIAS -Wc,DLL,EXPORTALL -c
+LDFLAGS += -Wl,xplink,dll
+
+# No need for --start-group and --end-group tags here
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+
+# Don't use these flags on zOS
+DLL_LDFLAGS =
+
+# We can't use the -Xlinker options on zOS
+EXERPATHPREFIX =

Propchange: harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390.mk
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=590755&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk (added)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk Wed Oct 31 10:14:29
2007
@@ -0,0 +1,39 @@
+#  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.
+
+# Use cc for assembly compiles on z/OS
+AS = cc
+
+# Use cxx/c++ for c++ compiles on z/OS
+CXX = cxx
+
+DEFINES += -DZOS -DZOS_S390X -DHYS390X -DHY_ATOE
+OPT += -Wc,lp64,xplink,convlit\(ISO8859-1\),FLOAT\(IEEE,FOLD,AFP\) -Wc,"langlvl(commonc)"
-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
+LDFLAGS += -Wl,lp64 -Wl,xplink,dll
+
+# No need for --start-group and --end-group tags here
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+
+# Don't use these flags on z/OS
+DLL_LDFLAGS =
+
+# We can't use the -Xlinker options on z/OS
+EXERPATHPREFIX = 

Propchange: harmony/enhanced/classlib/trunk/depends/build/platform/zos.s390x.mk
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
Wed Oct 31 10:14:29 2007
@@ -20,7 +20,6 @@
 include $(HY_HDK)/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common -I../../zlib_dist -I../../include/shared
-CFLAGS += -fpic
 
 BUILDFILES = $(SHAREDSUB)archive_copyright.o $(SHAREDSUB)jclcrc32.o \
 	$(SHAREDSUB)zip.o $(SHAREDSUB)adler32.o $(SHAREDSUB)inflater.o \

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zip/unix/makefile Wed
Oct 31 10:14:29 2007
@@ -20,7 +20,6 @@
 include $(HY_HDK)/build/make/defines.mk
 
 INCLUDES += -I../../zlib_dist
-CFLAGS += -fpic
 
 BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
 	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o

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=590755&r1=590754&r2=590755&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 Wed
Oct 31 10:14:29 2007
@@ -21,8 +21,6 @@
 
 ZLIB_DIST=../../zlib_dist/# Path to zlib
 
-CFLAGS += -fpic
-
 BUILDFILES = \
 	$(SHAREDSUB)zlib_copyright.o $(ZLIB_DIST)adler32.o $(ZLIB_DIST)compress.o \
 	$(ZLIB_DIST)crc32.o $(ZLIB_DIST)deflate.o $(ZLIB_DIST)infback.o $(ZLIB_DIST)inffast.o \
@@ -32,9 +30,15 @@
 EXPNAME = HYZLIB_0.1
 
 ifeq ($(DLL_LD),$(CC))
+ifneq ($(HY_OS),zos)
 ifneq ($(HY_OS),macosx)
 LDFLAGS += -Wl,-Bsymbolic
 endif
+endif
+endif
+
+ifeq ($(HY_OS),zos)
+OPT += -DSTDC
 endif
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile Wed Oct
31 10:14:29 2007
@@ -19,7 +19,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
 
 ifneq ($(HY_ZIP_API),true)

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile Wed
Oct 31 10:14:29 2007
@@ -15,7 +15,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile Wed Oct 31
10:14:29 2007
@@ -17,7 +17,6 @@
 
 PNG_DIR=$(HY_HDK)/../depends/libs/build/png
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include -I$(PNG_DIR)
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
Wed Oct 31 10:14:29 2007
@@ -17,7 +17,6 @@
 
 JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include -I$(JPEG_DIR)
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile Wed Oct
31 10:14:29 2007
@@ -17,7 +17,6 @@
 
 LCMS_DIR=$(HY_HDK)/../depends/libs/build/lcms
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include -I$(LCMS_DIR)
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile Wed
Oct 31 10:14:29 2007
@@ -15,7 +15,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I/usr/X11R6/include -I/usr/include/freetype2 \
             -Iinclude -I../../fontlib/unix -I../../fontlib/shared # TOFIX move includes
 ifeq ($(HY_OS),freebsd)

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile Wed
Oct 31 10:14:29 2007
@@ -15,7 +15,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile Wed
Oct 31 10:14:29 2007
@@ -15,7 +15,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I/usr/X11R6/include
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
Wed Oct 31 10:14:29 2007
@@ -17,7 +17,6 @@
 
 JPEG_DIR=$(HY_HDK)/../depends/libs/build/jpeg/
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include -I$(JPEG_DIR)
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
Wed Oct 31 10:14:29 2007
@@ -17,7 +17,6 @@
 
 PNG_DIR=$(HY_HDK)/../depends/libs/build/png/
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include -I$(PNG_DIR)
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
Wed Oct 31 10:14:29 2007
@@ -19,8 +19,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
-
 BUILDFILES = \
 	../shared/instrument.o ../shared/inst_agt.o 
 

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=590755&r1=590754&r2=590755&view=diff
==============================================================================
Binary files /tmp/tmpi6GNah and /tmp/tmp05ejrx differ

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile Wed Oct
31 10:14:29 2007
@@ -20,7 +20,9 @@
 include $(HY_HDK)/build/make/defines.mk
 
 # CFLAGS += -fpic -Wall -Werror 
-CFLAGS += -fpic -Wall
+ifneq ($(HY_OS),zos)
+CFLAGS += -Wall
+endif
 
 BUILDFILES = \
 	$(SHAREDSUB)luni_copyright.o $(SHAREDSUB)file.o procimpl.o \

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/makefile Wed Oct
31 10:14:29 2007
@@ -19,7 +19,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 BUILDFILES = $(SHAREDSUB)vmi_copyright.o $(SHAREDSUB)vmi.o
 MDLLIBFILES = $(LIBPATH)libhypool.a
 

Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile Wed
Oct 31 10:14:29 2007
@@ -15,7 +15,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 INCLUDES += -I$(SHARED)common
 
 BUILDFILES = \

Modified: harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile Wed Oct
31 10:14:29 2007
@@ -19,8 +19,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
-
 BUILDFILES = \
 	../shared/DirectBufferUtil.o ../shared/AddressUtil.o
 ifeq ($(HY_OS),linux)

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile
Wed Oct 31 10:14:29 2007
@@ -19,8 +19,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
-
 BUILDFILES = \
   ../shared/CP_1250.o \
   ../shared/CP_1251.o \

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile Wed
Oct 31 10:14:29 2007
@@ -20,7 +20,6 @@
 include $(HY_HDK)/build/make/defines.mk
 
 INCLUDES += -DHYPORT_LIBRARY_DEFINE -I$(HY_PLATFORM)
-CFLAGS += -fpic
 
 BUILDFILES = \
 	$(SHAREDSUB)port_copyright.o hycpu.o $(SHAREDSUB)hyerror.o \

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile Wed
Oct 31 10:14:29 2007
@@ -19,7 +19,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
 BUILDFILES = $(SHAREDSUB)hysig_copyright.o hysiglinux.o hysigunix.o
 MDLLIBFILES =
 DLLNAME = ../libhysig$(HY_SHLIB_SUFFIX)

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile Wed
Oct 31 10:14:29 2007
@@ -19,8 +19,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
-
 BUILDFILES = \
 	$(SHAREDSUB)thread_copyright.o $(HY_ARCH)/thrhelp.o $(HY_ARCH)/thrspinlock.o \
 	$(SHAREDSUB)hythread.o $(SHAREDSUB)hythreadinspect.o linuxonexit.o priority.o \

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/unix/makefile?rev=590755&r1=590754&r2=590755&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/unix/makefile
Wed Oct 31 10:14:29 2007
@@ -19,8 +19,6 @@
 
 include $(HY_HDK)/build/make/defines.mk
 
-CFLAGS += -fpic
-
 BUILDFILES = $(SHAREDSUB)hythread.o
 
 DLLNAME = ../libhythr$(HY_SHLIB_SUFFIX)



Mime
View raw message