equal
deleted
inserted
replaced
34 |
34 |
35 ifneq ($(OPENJDK_TARGET_OS), windows) |
35 ifneq ($(OPENJDK_TARGET_OS), windows) |
36 ifeq ($(STATIC_BUILD), false) |
36 ifeq ($(STATIC_BUILD), false) |
37 ifeq ($(OPENJDK_TARGET_OS), linux) |
37 ifeq ($(OPENJDK_TARGET_OS), linux) |
38 LIBJSIG_CFLAGS := -fPIC -D_GNU_SOURCE -D_REENTRANT $(EXTRA_CFLAGS) |
38 LIBJSIG_CFLAGS := -fPIC -D_GNU_SOURCE -D_REENTRANT $(EXTRA_CFLAGS) |
39 LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) ${LDFLAGS_NO_EXEC_STACK} $(EXTRA_CFLAGS) |
39 LIBJSIG_LDFLAGS := $(LIBJSIG_HASHSTYLE_LDFLAGS) ${LIBJSIG_NOEXECSTACK_LDFLAGS} $(EXTRA_CFLAGS) |
40 LIBJSIG_LIBS := $(LIBDL) |
40 LIBJSIG_LIBS := $(LIBDL) |
41 |
41 |
42 # NOTE: The old build compiled this library without -soname. |
42 # NOTE: The old build compiled this library without -soname. |
43 # To emulate this, we need to clear out SET_SHARED_LIBRARY_NAME. |
43 # To emulate this, we need to clear out SET_SHARED_LIBRARY_NAME. |
44 SET_SHARED_LIBRARY_NAME := |
44 SET_SHARED_LIBRARY_NAME := |
74 # To emulate this, we need to clear out SET_SHARED_LIBRARY_NAME. |
74 # To emulate this, we need to clear out SET_SHARED_LIBRARY_NAME. |
75 SET_SHARED_LIBRARY_NAME := |
75 SET_SHARED_LIBRARY_NAME := |
76 |
76 |
77 else ifeq ($(OPENJDK_TARGET_OS), macosx) |
77 else ifeq ($(OPENJDK_TARGET_OS), macosx) |
78 LIBJSIG_CFLAGS := -m64 -D_GNU_SOURCE -pthread -mno-omit-leaf-frame-pointer -mstack-alignment=16 -fPIC |
78 LIBJSIG_CFLAGS := -m64 -D_GNU_SOURCE -pthread -mno-omit-leaf-frame-pointer -mstack-alignment=16 -fPIC |
79 LIBJSIG_LDFLAGS := $(LDFLAGS_HASH_STYLE) |
79 LIBJSIG_LDFLAGS := $(LIBJSIG_HASHSTYLE_LDFLAGS) |
80 else |
80 else |
81 $(error Unknown target OS $(OPENJDK_TARGET_OS) in CompileLibjsig.gmk) |
81 $(error Unknown target OS $(OPENJDK_TARGET_OS) in CompileLibjsig.gmk) |
82 endif |
82 endif |
83 |
83 |
84 LIBJSIG_SRC_DIR := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjsig |
84 LIBJSIG_SRC_DIR := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjsig |