Merge pull request #550 from ikvmnet/jdk8u312-b07

Upgrade to JDK8u312
ikvmnet · Jul 11, 2024 · f5d765b · f5d765b
2 parents e5e4c72 + b99e28d
commit f5d765b
Show file tree

Hide file tree

Showing 8 changed files with 717 additions and 22 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -20,8 +20,8 @@
         <OpenJdkMajorVersion>1</OpenJdkMajorVersion>
         <OpenJdkMinorVersion>8</OpenJdkMinorVersion>
         <OpenJdkMicroVersion>0</OpenJdkMicroVersion>
-        <OpenJdkUpdateVersion>275</OpenJdkUpdateVersion>
-        <OpenJdkBuildNumber>b01</OpenJdkBuildNumber>
+        <OpenJdkUpdateVersion>312</OpenJdkUpdateVersion>
+        <OpenJdkBuildNumber>b07</OpenJdkBuildNumber>
         <OpenJdkVersion>OpenJDK $(OpenJdkMinorVersion)u$(OpenJdkUpdateVersion) $(OpenJdkBuildNumber)</OpenJdkVersion>
         <OpenJdkFullVersion>$(OpenJdkMajorVersion).$(OpenJdkMinorVersion).$(OpenJdkMicroVersion)_$(OpenJdkUpdateVersion)-$(OpenJdkBuildNumber)</OpenJdkFullVersion>
         <OpenJdkVendor>Oracle</OpenJdkVendor>

diff --git a/openjdk b/openjdk
diff --git a/src/IKVM.Image/IKVM.Image.csproj b/src/IKVM.Image/IKVM.Image.csproj
@@ -69,7 +69,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <TzFile Include="africa;antarctica;asia;australasia;europe;northamerica;pacificnew;southamerica;backward;etcetera;gmt;jdk11_backward" />
+        <TzFile Include="africa;antarctica;asia;australasia;europe;northamerica;southamerica;backward;etcetera;gmt;jdk11_backward" />
     </ItemGroup>
 
     <Target Name="GenerateTZDB" DependsOnTargets="OpenJdkBuildTools;ResolveJava" Inputs="$(MSBuildThisFileFullPath);$(OpenJdkBuildToolsStampFile);@(TzFile->'$(TzDataDir)\%(Identity)')" Outputs="$(TzDbDat)">

diff --git a/src/IKVM.Java/local/java/util/zip/ZipFile.java b/src/IKVM.Java/local/java/util/zip/ZipFile.java
@@ -51,6 +51,7 @@
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.jar.JarFile;
 import java.util.stream.Stream;
 import static java.util.zip.ZipConstants64.*;
 
@@ -96,6 +97,7 @@ public class ZipFile implements ZipConstants, Closeable
   private LinkedHashMap<String, ZipEntry> entries;
 
   private boolean closed = false;
+  private int manifestNum = 0;       // number of META-INF/MANIFEST.MF, case insensitive
   final boolean hasLocHeader;
 
   /**
@@ -312,6 +314,10 @@ private void readEntries() throws IOException
           {
             entry.comment = inp.readString(commentLen, (flags & EFS) != 0);
           }
+        if (isManifestName(entry.name))
+          {
+            manifestNum++;
+          }
         entries.put(entry.name, entry);
       }
 
@@ -896,13 +902,25 @@ public void addDummyByte()
     }
   }
 
+  private int getManifestNum() {
+    return manifestNum;
+  }
+
+  public static boolean isManifestName(String name)
+  {
+    return JarFile.MANIFEST_NAME.equalsIgnoreCase(name);
+  }
+
   static {
     sun.misc.SharedSecrets.setJavaUtilZipFileAccess(
       new sun.misc.JavaUtilZipFileAccess() {
         public boolean startsWithLocHeader(ZipFile zip) {
           return zip.hasLocHeader;
         }
+        public int getManifestNum(JarFile jar) {
+          return ((ZipFile)jar).getManifestNum();
+        }
       }
     );
   }
-}
+}
diff --git a/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/jdk/ExcludeList.txt
diff --git a/src/IKVM.OpenJDK.Tests/langtools/ExcludeList.txt b/src/IKVM.OpenJDK.Tests/langtools/ExcludeList.txt
@@ -123,3 +123,6 @@ tools/javac/StringsInSwitch/OneCaseSwitches.java
 
 # unknown
 tools/javac/annotations/8218152/MalformedAnnotationProcessorTests.java                                                  generic-all
+
+# -Xverify:all
+tools/javac/lambda/T8145051.java                                                                                        generic-all
diff --git a/src/IKVM.Tests/Java/java/net/URLTests.cs b/src/IKVM.Tests/Java/java/net/URLTests.cs
@@ -50,8 +50,6 @@ public void CanCreateUnixFileURL()
         }
 
         [DataTestMethod]
-        [DataRow("tls-v1-0")]
-        [DataRow("tls-v1-1")]
         [DataRow("tls-v1-2")]
         [DataRow("sha256")]
         //[DataRow("sha384")]

diff --git a/src/libiava/libiava.clangproj b/src/libiava/libiava.clangproj
@@ -92,7 +92,7 @@
     </ItemGroup>
     <ItemGroup Condition="$(TargetIdentifier.StartsWith('linux-'))">
         <Dependencies Include="c" />
-        <AdditionalLinkOptions Include="-Wl,--version-script=$(OpenJdkDir)jdk\make\mapfiles\libjava\mapfile-vers" />
+        <AdditionalLinkOptions Include="-Wl,--version-script=$(OpenJdkDir)jdk\make\mapfiles\libjava\mapfile-linux" />
         <LibJavaDirs Include="$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\sun\security\provider" />
         <LibJavaDirs Include="$(OpenJdkDir)jdk\src\$(OpenJdkTargetOsApiDir)\native\sun\io" />
         <LibJavaDirs Include="$(OpenJdkDir)jdk\src\linux\native\jdk\internal\platform\cgroupv1" />