--- old/src/jdk.jdwp.agent/windows/native/libjdwp/linker_md.c	2018-12-11 14:37:33.234658200 +0000
+++ new/src/jdk.jdwp.agent/windows/native/libjdwp/linker_md.c	2018-12-11 14:37:32.204412000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -144,5 +144,17 @@
 
 void * dbgsysFindLibraryEntry(void *handle, const char *name)
 {
+#if defined(_WIN32) && !defined(_WIN64)
+    void *fn;
+    char decoratedName[32];
+    if (strlen(name) < sizeof(decoratedName) - 1 - 3 - 1) {
+        _snprintf(decoratedName, sizeof(decoratedName), "_%s@16", name);
+
+        fn = GetProcAddress(handle, decoratedName);
+        if (fn != NULL) {
+            return fn;
+        }
+    }
+#endif
     return GetProcAddress(handle, name);
 }