116 DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
116 DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
117 DISABLED_WARNINGS_microsoft := 4244 4267, \ |
117 DISABLED_WARNINGS_microsoft := 4244 4267, \ |
118 MAPFILE := $(TOPDIR)/make/mapfiles/libverify/mapfile-vers, \ |
118 MAPFILE := $(TOPDIR)/make/mapfiles/libverify/mapfile-vers, \ |
119 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
119 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
120 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
120 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
121 LIBS_unix := -ljvm -lc, \ |
121 LIBS_unix := -ljvm, \ |
122 LIBS_windows := jvm.lib, \ |
122 LIBS_windows := jvm.lib, \ |
123 REORDER := $(BUILD_LIBVERIFY_REORDER), \ |
123 REORDER := $(BUILD_LIBVERIFY_REORDER), \ |
124 )) |
124 )) |
125 |
125 |
126 TARGETS += $(BUILD_LIBVERIFY) |
126 TARGETS += $(BUILD_LIBVERIFY) |
167 LDFLAGS_windows := -export:winFileHandleOpen -export:handleLseek \ |
167 LDFLAGS_windows := -export:winFileHandleOpen -export:handleLseek \ |
168 -export:getLastErrorString \ |
168 -export:getLastErrorString \ |
169 -export:getErrorString -delayload:shell32.dll, \ |
169 -export:getErrorString -delayload:shell32.dll, \ |
170 LIBS_unix := -ljvm -lverify, \ |
170 LIBS_unix := -ljvm -lverify, \ |
171 LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \ |
171 LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \ |
172 LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \ |
172 LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM), \ |
173 LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) $(LIBM),\ |
173 LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) $(LIBM),\ |
174 LIBS_macosx := -lfdlibm \ |
174 LIBS_macosx := -lfdlibm \ |
175 -framework CoreFoundation \ |
175 -framework CoreFoundation \ |
176 -framework Foundation \ |
176 -framework Foundation \ |
177 -framework Security -framework SystemConfiguration, \ |
177 -framework Security -framework SystemConfiguration, \ |
223 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
223 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
224 LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ |
224 LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ |
225 -export:ZIP_ReadEntry -export:ZIP_GetNextEntry \ |
225 -export:ZIP_ReadEntry -export:ZIP_GetNextEntry \ |
226 -export:ZIP_InflateFully -export:ZIP_CRC32 -export:ZIP_FreeEntry, \ |
226 -export:ZIP_InflateFully -export:ZIP_CRC32 -export:ZIP_FreeEntry, \ |
227 LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \ |
227 LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \ |
228 LIBS_solaris := -lc, \ |
|
229 LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ |
228 LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ |
230 )) |
229 )) |
231 |
230 |
232 $(BUILD_LIBZIP): $(BUILD_LIBJAVA) |
231 $(BUILD_LIBZIP): $(BUILD_LIBJAVA) |
233 |
232 |
259 LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \ |
258 LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \ |
260 -export:JIMAGE_PackageToModule \ |
259 -export:JIMAGE_PackageToModule \ |
261 -export:JIMAGE_FindResource -export:JIMAGE_GetResource \ |
260 -export:JIMAGE_FindResource -export:JIMAGE_GetResource \ |
262 -export:JIMAGE_ResourceIterator -export:JIMAGE_ResourcePath, \ |
261 -export:JIMAGE_ResourceIterator -export:JIMAGE_ResourcePath, \ |
263 LIBS_unix := -ljvm -ldl $(LIBCXX), \ |
262 LIBS_unix := -ljvm -ldl $(LIBCXX), \ |
264 LIBS_solaris := -lc, \ |
|
265 LIBS_macosx := -lc++, \ |
263 LIBS_macosx := -lc++, \ |
266 LIBS_windows := jvm.lib, \ |
264 LIBS_windows := jvm.lib, \ |
267 )) |
265 )) |
268 |
266 |
269 $(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA) |
267 $(BUILD_LIBJIMAGE): $(BUILD_LIBJAVA) |
367 -export:JLI_InitArgProcessing \ |
365 -export:JLI_InitArgProcessing \ |
368 -export:JLI_PreprocessArg \ |
366 -export:JLI_PreprocessArg \ |
369 -export:JLI_AddArgsFromEnvVar \ |
367 -export:JLI_AddArgsFromEnvVar \ |
370 -export:JLI_GetAppArgIndex, \ |
368 -export:JLI_GetAppArgIndex, \ |
371 LIBS_unix := $(LIBZ_LIBS), \ |
369 LIBS_unix := $(LIBZ_LIBS), \ |
372 LIBS_linux := $(LIBDL) -lc -lpthread, \ |
370 LIBS_linux := $(LIBDL) -lpthread, \ |
373 LIBS_solaris := $(LIBDL) -lc, \ |
371 LIBS_solaris := $(LIBDL), \ |
374 LIBS_aix := $(LIBDL),\ |
372 LIBS_aix := $(LIBDL),\ |
375 LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \ |
373 LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \ |
376 LIBS_windows := advapi32.lib comctl32.lib user32.lib, \ |
374 LIBS_windows := advapi32.lib comctl32.lib user32.lib, \ |
377 )) |
375 )) |
378 |
376 |