stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8204861: fix for 8196993 has broken the build on linux

Browse Source 
Undo the changes done for 8196993

Reviewed-by: stefank, shade
This commit is contained in:
Srinivas Dama 2018-06-12 18:30:52 +05:30
parent 411a0016dd
commit 2c389ccbac
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make/launcher/Launcher-jdk.pack.gmk
View File

@ -90,6 +90,7 @@ $(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \
CFLAGS_linux := -fPIC, \
CFLAGS_solaris := -KPIC, \
CFLAGS_macosx := -fPIC, \
DISABLED_WARNINGS_gcc := unused-result implicit-fallthrough, \
LDFLAGS := $(UNPACKEXE_ZIPOBJS) \
$(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN), \

1
src/jdk.pack/share/native/common-unpack/unpack.cpp
View File

@ -1799,7 +1799,6 @@ unpacker::attr_definitions::parseLayout(const char* lp, band** &res,
case 'B': case 'H': case 'I': case 'V': // unsigned_int
case 'S': // signed_int
--lp; // reparse
/* fall through */
case 'F':
lp = parseIntLayout(lp, b, EK_INT);
break;

6
src/jdk.pack/share/native/common-unpack/zip.cpp
View File

@ -533,8 +533,6 @@ static jlong read_input_via_gzip(unpacker* u,
char* bufptr = (char*) buf;
char* inbuf = u->gzin->inbuf;
size_t inbuflen = sizeof(u->gzin->inbuf);
// capture return values from fread to avoid -Werror=unused-result issues
size_t ret = 0;
unpacker::read_input_fn_t read_gzin_fn =
(unpacker::read_input_fn_t) u->gzin->read_input_fn;
z_stream& zs = *(z_stream*) u->gzin->zstream;
@ -581,8 +579,8 @@ static jlong read_input_via_gzip(unpacker* u,
fseek(u->infileptr, -TRAILER_LEN, SEEK_END);
uint filecrc;
uint filelen;
ret = fread(&filecrc, sizeof(filecrc), 1, u->infileptr);
ret = fread(&filelen, sizeof(filelen), 1, u->infileptr);
fread(&filecrc, sizeof(filecrc), 1, u->infileptr);
fread(&filelen, sizeof(filelen), 1, u->infileptr);
filecrc = SWAP_INT(filecrc);
filelen = SWAP_INT(filelen);
if (u->gzin->gzcrc != filecrc ||