OpenJDK / portola / portola
changeset 50534:99f4d3b6d487
8204861: fix for 8196993 has broken the build on linux
Summary: undo the changes done for 8196993
Reviewed-by: stefank, shade
| author | sdama |
|---|---|
| date | Tue, 12 Jun 2018 18:30:52 +0530 |
| parents | 32ab7150a270 |
| children | 7b7c75d87f9b |
| files | make/launcher/Launcher-jdk.pack.gmk src/jdk.pack/share/native/common-unpack/unpack.cpp src/jdk.pack/share/native/common-unpack/zip.cpp |
| diffstat | 3 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/launcher/Launcher-jdk.pack.gmk Tue Jun 12 10:01:23 2018 +0200 +++ b/make/launcher/Launcher-jdk.pack.gmk Tue Jun 12 18:30:52 2018 +0530 @@ -90,6 +90,7 @@ 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), \
--- a/src/jdk.pack/share/native/common-unpack/unpack.cpp Tue Jun 12 10:01:23 2018 +0200 +++ b/src/jdk.pack/share/native/common-unpack/unpack.cpp Tue Jun 12 18:30:52 2018 +0530 @@ -1799,7 +1799,6 @@ 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;
--- a/src/jdk.pack/share/native/common-unpack/zip.cpp Tue Jun 12 10:01:23 2018 +0200 +++ b/src/jdk.pack/share/native/common-unpack/zip.cpp Tue Jun 12 18:30:52 2018 +0530 @@ -533,8 +533,6 @@ 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 @@ 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 ||