41 LANG := C, \ |
41 LANG := C, \ |
42 OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \ |
42 OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \ |
43 CFLAGS := $(CFLAGS_JDKLIB) \ |
43 CFLAGS := $(CFLAGS_JDKLIB) \ |
44 -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \ |
44 -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \ |
45 CFLAGS_windows_debug := -DLOGGING, \ |
45 CFLAGS_windows_debug := -DLOGGING, \ |
|
46 CFLAGS_aix := -qfloat=nomaf, \ |
46 ARFLAGS := $(ARFLAGS), \ |
47 ARFLAGS := $(ARFLAGS), \ |
47 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \ |
48 OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \ |
48 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
49 DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES))) |
49 |
50 |
50 else |
51 else |
196 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
197 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
197 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
198 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
198 LDFLAGS_SUFFIX_posix := -ljvm -lverify, \ |
199 LDFLAGS_SUFFIX_posix := -ljvm -lverify, \ |
199 LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \ |
200 LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \ |
200 LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \ |
201 LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \ |
|
202 LDFLAGS_SUFFIX_aix := $(LIBDL) $(BUILD_LIBFDLIBM) -lm,\ |
201 LDFLAGS_SUFFIX_macosx := -L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \ |
203 LDFLAGS_SUFFIX_macosx := -L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \ |
202 -framework CoreFoundation \ |
204 -framework CoreFoundation \ |
203 -framework Foundation \ |
205 -framework Foundation \ |
204 -framework Security -framework SystemConfiguration, \ |
206 -framework Security -framework SystemConfiguration, \ |
205 LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \ |
207 LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \ |
264 LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ |
266 LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ |
265 -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \ |
267 -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \ |
266 $(WIN_JAVA_LIB), \ |
268 $(WIN_JAVA_LIB), \ |
267 LDFLAGS_SUFFIX_linux := -ljvm -ljava $(LIBZ), \ |
269 LDFLAGS_SUFFIX_linux := -ljvm -ljava $(LIBZ), \ |
268 LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \ |
270 LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \ |
|
271 LDFLAGS_SUFFIX_aix := -ljvm -ljava $(LIBZ),\ |
269 LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \ |
272 LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \ |
270 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
273 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
271 RC_FLAGS := $(RC_FLAGS) \ |
274 RC_FLAGS := $(RC_FLAGS) \ |
272 -D "JDK_FNAME=zip.dll" \ |
275 -D "JDK_FNAME=zip.dll" \ |
273 -D "JDK_INTERNAL_NAME=zip" \ |
276 -D "JDK_INTERNAL_NAME=zip" \ |
402 LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
405 LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
403 LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
406 LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \ |
404 LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \ |
407 LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \ |
405 LDFLAGS_SUFFIX_solaris := $(LIBZ) $(LIBDL) -lc, \ |
408 LDFLAGS_SUFFIX_solaris := $(LIBZ) $(LIBDL) -lc, \ |
406 LDFLAGS_SUFFIX_linux := $(LIBZ) $(LIBDL) -lc -lpthread, \ |
409 LDFLAGS_SUFFIX_linux := $(LIBZ) $(LIBDL) -lc -lpthread, \ |
|
410 LDFLAGS_SUFFIX_aix := $(LIBZ) $(LIBDL),\ |
407 LDFLAGS_SUFFIX_macosx := $(LIBZ), \ |
411 LDFLAGS_SUFFIX_macosx := $(LIBZ), \ |
408 LDFLAGS_SUFFIX_windows := \ |
412 LDFLAGS_SUFFIX_windows := \ |
409 -export:JLI_Launch \ |
413 -export:JLI_Launch \ |
410 -export:JLI_ManifestIterate \ |
414 -export:JLI_ManifestIterate \ |
411 -export:JLI_SetTraceLauncher \ |
415 -export:JLI_SetTraceLauncher \ |
467 |
471 |
468 $(JDK_OUTPUTDIR)/objs/libjli_static.a: $(BUILD_LIBJLI_STATIC) |
472 $(JDK_OUTPUTDIR)/objs/libjli_static.a: $(BUILD_LIBJLI_STATIC) |
469 $(call install-file) |
473 $(call install-file) |
470 |
474 |
471 BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a |
475 BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a |
|
476 |
|
477 else ifeq ($(OPENJDK_TARGET_OS), aix) |
|
478 # AIX also requires a static libjli because the compiler doesn't support '-rpath' |
|
479 $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC,\ |
|
480 STATIC_LIBRARY:=jli_static,\ |
|
481 OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs,\ |
|
482 SRC:=$(BUILD_LIBJLI_SRC_DIRS),\ |
|
483 INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\ |
|
484 LANG:=C,\ |
|
485 OPTIMIZATION:=HIGH, \ |
|
486 CFLAGS:=$(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS),\ |
|
487 ARFLAGS:=$(ARFLAGS),\ |
|
488 OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli_static)) |
|
489 |
|
490 BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a |
|
491 |
472 endif |
492 endif |
473 |
493 |
474 ########################################################################################## |
494 ########################################################################################## |
475 |
495 |
476 $(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \ |
496 $(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \ |