equal
deleted
inserted
replaced
107 UnixAsynchronousSocketChannelImpl.c \ |
107 UnixAsynchronousSocketChannelImpl.c \ |
108 GnomeFileTypeDetector.c \ |
108 GnomeFileTypeDetector.c \ |
109 SolarisNativeDispatcher.c \ |
109 SolarisNativeDispatcher.c \ |
110 SolarisWatchService.c \ |
110 SolarisWatchService.c \ |
111 UnixCopyFile.c \ |
111 UnixCopyFile.c \ |
|
112 UnixNativeDispatcher.c |
|
113 endif |
|
114 |
|
115 ifeq ($(OPENJDK_TARGET_OS), aix) |
|
116 BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) |
|
117 BUILD_LIBNIO_SRC += \ |
|
118 $(JDK_TOPDIR)/src/aix/native/sun/nio/ch \ |
|
119 $(JDK_TOPDIR)/src/aix/native/sun/nio/fs |
|
120 BUILD_LIBNIO_FILES += \ |
|
121 AixPollPort.c \ |
|
122 InheritedChannel.c \ |
|
123 NativeThread.c \ |
|
124 PollArrayWrapper.c \ |
|
125 UnixAsynchronousServerSocketChannelImpl.c \ |
|
126 UnixAsynchronousSocketChannelImpl.c \ |
|
127 GnomeFileTypeDetector.c \ |
|
128 UnixCopyFile.c \ |
|
129 AixNativeDispatcher.c \ |
112 UnixNativeDispatcher.c |
130 UnixNativeDispatcher.c |
113 endif |
131 endif |
114 |
132 |
115 $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \ |
133 $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \ |
116 LIBRARY := nio, \ |
134 LIBRARY := nio, \ |
123 $(BUILD_LIBNIO_CFLAGS), \ |
141 $(BUILD_LIBNIO_CFLAGS), \ |
124 MAPFILE := $(BUILD_LIBNIO_MAPFILE), \ |
142 MAPFILE := $(BUILD_LIBNIO_MAPFILE), \ |
125 LDFLAGS := $(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \ |
143 LDFLAGS := $(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \ |
126 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
144 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
127 LDFLAGS_SUFFIX_linux := -ljava -lnet -lpthread $(LIBDL), \ |
145 LDFLAGS_SUFFIX_linux := -ljava -lnet -lpthread $(LIBDL), \ |
|
146 LDFLAGS_SUFFIX_aix := -ljava -lnet $(LIBDL),\ |
128 LDFLAGS_SUFFIX_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \ |
147 LDFLAGS_SUFFIX_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \ |
129 -lsendfile -ljava -lnet -lc, \ |
148 -lsendfile -ljava -lnet -lc, \ |
130 LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \ |
149 LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \ |
131 $(JDK_OUTPUTDIR)/objs/libnet/net.lib \ |
150 $(JDK_OUTPUTDIR)/objs/libnet/net.lib \ |
132 advapi32.lib, \ |
151 advapi32.lib, \ |
146 |
165 |
147 ########################################################################################## |
166 ########################################################################################## |
148 |
167 |
149 ifeq ($(OPENJDK_TARGET_OS_API), posix) |
168 ifeq ($(OPENJDK_TARGET_OS_API), posix) |
150 |
169 |
151 ifneq ($(OPENJDK_TARGET_OS), macosx) |
170 ifeq (, $(filter $(OPENJDK_TARGET_OS), macosx aix)) |
152 |
171 |
153 # Suppress unused parameters required by exported JNI functions. |
172 # Suppress unused parameters required by exported JNI functions. |
154 SCTP_WERROR := -Werror -Wno-error=unused-parameter |
173 SCTP_WERROR := -Werror -Wno-error=unused-parameter |
155 ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc) |
174 ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc) |
156 SCTP_WERROR := |
175 SCTP_WERROR := |