View | Details | Raw Unified | Return to bug 193009 | Differences between
and this patch

Collapse All | Expand All

(-)jdk/make/CompileLaunchers.gmk (-4 / +6 lines)
Lines 49-55 else Link Here
49
  ORIGIN_ROOT := /..
49
  ORIGIN_ROOT := /..
50
endif
50
endif
51
51
52
ifneq ($(findstring $(OPENJDK_TARGET_OS), bsd macosx), )
52
ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx), )
53
  ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
53
  ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
54
else
54
else
55
  ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
55
  ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
Lines 90-97 define SetupLauncher Link Here
90
  $1_LDFLAGS := $3
90
  $1_LDFLAGS := $3
91
  $1_LDFLAGS_SUFFIX :=
91
  $1_LDFLAGS_SUFFIX :=
92
  ifeq ($(OPENJDK_TARGET_OS), bsd)
92
  ifeq ($(OPENJDK_TARGET_OS), bsd)
93
    $1_LDFLAGS += -Wl,--whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
94
        -Wl,--no-whole-archive
95
    $1_LDFLAGS_SUFFIX += -pthread
93
    $1_LDFLAGS_SUFFIX += -pthread
96
  endif
94
  endif
97
95
Lines 177-182 define SetupLauncher Link Here
177
          $(ORIGIN_ARG) \
175
          $(ORIGIN_ARG) \
178
          $$($1_LDFLAGS), \
176
          $$($1_LDFLAGS), \
179
      LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \
177
      LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \
178
      LDFLAGS_bsd := -pthread \
179
          $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
180
      LDFLAGS_linux := -lpthread \
180
      LDFLAGS_linux := -lpthread \
181
          $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
181
          $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
182
      LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \
182
      LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \
Lines 187-192 define SetupLauncher Link Here
187
      LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \
187
      LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \
188
          $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5, \
188
          $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5, \
189
      LDFLAGS_SUFFIX_linux := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
189
      LDFLAGS_SUFFIX_linux := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
190
      LDFLAGS_SUFFIX_bsd := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
190
      LDFLAGS_SUFFIX_solaris := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
191
      LDFLAGS_SUFFIX_solaris := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
191
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR), \
192
      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR), \
192
      OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \
193
      OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \
Lines 203-209 define SetupLauncher Link Here
203
204
204
  BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
205
  BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
205
206
206
  ifneq (,$(filter $(OPENJDK_TARGET_OS), bsd macosx aix))
207
  ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix))
207
    $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjli_static.a
208
    $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjli_static.a
208
  endif
209
  endif
209
210
Lines 499-504 $(eval $(call SetupNativeCompilation,BUI Link Here
499
        $(call SET_SHARED_LIBRARY_ORIGIN), \
500
        $(call SET_SHARED_LIBRARY_ORIGIN), \
500
    LDFLAGS_linux := -lc, \
501
    LDFLAGS_linux := -lc, \
501
    LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
502
    LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
503
    LDFLAGS_bsd := -lstdc++ -lc, \
502
    LDFLAGS_SUFFIX := $(LIBCXX), \
504
    LDFLAGS_SUFFIX := $(LIBCXX), \
503
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
505
    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
504
    OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
506
    OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \

Return to bug 193009