equal
deleted
inserted
replaced
131 CFLAGS := $(CFLAGS_JDKLIB) \ |
131 CFLAGS := $(CFLAGS_JDKLIB) \ |
132 $(LIBJAVA_CFLAGS), \ |
132 $(LIBJAVA_CFLAGS), \ |
133 System.c_CFLAGS := $(VERSION_CFLAGS), \ |
133 System.c_CFLAGS := $(VERSION_CFLAGS), \ |
134 jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \ |
134 jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \ |
135 HEADER_FLAGS := \ |
135 HEADER_FLAGS := \ |
136 -I$(call FindHeaderDirForModule, $(MODULE)) \ |
|
137 $(addprefix -I, $(call FindSrcDirsForLib, java.base, fdlibm)), \ |
136 $(addprefix -I, $(call FindSrcDirsForLib, java.base, fdlibm)), \ |
138 WARNINGS_AS_ERRORS_xlc := false, \ |
137 WARNINGS_AS_ERRORS_xlc := false, \ |
139 DISABLED_WARNINGS_gcc := unused-result, \ |
138 DISABLED_WARNINGS_gcc := unused-result, \ |
140 DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
139 DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ |
141 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
140 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
177 OPTIMIZATION := LOW, \ |
176 OPTIMIZATION := LOW, \ |
178 EXCLUDES := $(LIBZIP_EXCLUDES), \ |
177 EXCLUDES := $(LIBZIP_EXCLUDES), \ |
179 CFLAGS := $(CFLAGS_JDKLIB) \ |
178 CFLAGS := $(CFLAGS_JDKLIB) \ |
180 $(LIBZ_CFLAGS), \ |
179 $(LIBZ_CFLAGS), \ |
181 CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \ |
180 CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \ |
182 HEADER_FLAGS := \ |
|
183 -I$(call FindHeaderDirForModule, $(MODULE)), \ |
|
184 DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
181 DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
185 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
182 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
186 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
183 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
187 LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \ |
184 LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \ |
188 LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ |
185 LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \ |
198 NAME := jimage, \ |
195 NAME := jimage, \ |
199 TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
196 TOOLCHAIN := TOOLCHAIN_LINK_CXX, \ |
200 OPTIMIZATION := LOW, \ |
197 OPTIMIZATION := LOW, \ |
201 CFLAGS := $(CFLAGS_JDKLIB), \ |
198 CFLAGS := $(CFLAGS_JDKLIB), \ |
202 CXXFLAGS := $(CXXFLAGS_JDKLIB), \ |
199 CXXFLAGS := $(CXXFLAGS_JDKLIB), \ |
203 HEADER_FLAGS := \ |
|
204 -I$(call FindHeaderDirForModule, $(MODULE)), \ |
|
205 DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
200 DISABLED_WARNINGS_gcc := implicit-fallthrough, \ |
206 CFLAGS_unix := -UDEBUG, \ |
201 CFLAGS_unix := -UDEBUG, \ |
207 LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ |
202 LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ |
208 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
203 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
209 LIBS_unix := -ljvm -ldl $(LIBCXX), \ |
204 LIBS_unix := -ljvm -ldl $(LIBCXX), \ |