1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8148955: libjimage.so compiled with wrong flags

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Erik Joelsson 2016-02-04 09:51:24 +01:00
parent c1893c5ccf
commit f8fa6e063d
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jdk/make/lib/CoreLibraries.gmk
View File

@ -247,6 +247,13 @@ ifeq ($(OPENJDK_TARGET_OS), aix)
LIBJIMAGE_TOOLCHAIN := TOOLCHAIN_LINK_CXX LIBJIMAGE_TOOLCHAIN := TOOLCHAIN_LINK_CXX
endif # OPENJDK_TARGET_OS aix endif # OPENJDK_TARGET_OS aix
JIMAGELIB_CPPFLAGS := \
-I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-I$(JDK_TOPDIR)/src/java.base/share/native/libjimage \
-I$(SUPPORT_OUTPUTDIR)/headers/java.base \
#
$(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \ $(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \
LIBRARY := jimage, \ LIBRARY := jimage, \
TOOLCHAIN := $(LIBJIMAGE_TOOLCHAIN), \ TOOLCHAIN := $(LIBJIMAGE_TOOLCHAIN), \
@ -255,12 +262,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \
SRC := $(JDK_TOPDIR)/src/java.base/share/native/libjimage \ SRC := $(JDK_TOPDIR)/src/java.base/share/native/libjimage \
$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \ $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \
EXCLUDES := $(LIBJIMAGE_EXCLUDES), \ EXCLUDES := $(LIBJIMAGE_EXCLUDES), \
CFLAGS := $(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
$(JIMAGELIB_CPPFLAGS) \ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
-I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-I$(JDK_TOPDIR)/src/java.base/share/native/libjimage \
-I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
CFLAGS_unix := -UDEBUG, \ CFLAGS_unix := -UDEBUG, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \

4
jdk/src/java.base/share/native/libjimage/imageDecompressor.cpp
View File

@ -190,8 +190,8 @@ void SharedStringDecompressor::decompress_resource(u1* data,
{ // String in Strings table { // String in Strings table
*uncompressed_resource = 1; *uncompressed_resource = 1;
uncompressed_resource += 1; uncompressed_resource += 1;
int i = decompress_int(data); int k = decompress_int(data);
const char * string = strings->get(i); const char * string = strings->get(k);
int str_length = (int) strlen(string); int str_length = (int) strlen(string);
Endian::set_java(uncompressed_resource, str_length); Endian::set_java(uncompressed_resource, str_length);
uncompressed_resource += 2; uncompressed_resource += 2;