From eb58a31b898e7181db90584b1ae8dc90ca675446 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 14 Feb 2018 00:23:12 +0200
Subject: [PATCH] Remove @PlatformIO library.json from GDBStub; fix pattern in
 LD // Resolve #4355

---
 libraries/GDBStub/library.json      | 30 -----------------------------
 tools/sdk/ld/eagle.app.v6.common.ld |  2 +-
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 libraries/GDBStub/library.json

diff --git a/libraries/GDBStub/library.json b/libraries/GDBStub/library.json
deleted file mode 100644
index 6b38685eb..000000000
--- a/libraries/GDBStub/library.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "GDBStub",
-  "version": "0.2",  
-  "keywords": "gdb, debug",
-  "description": "GDB server stub helps debug crashes when JTAG isn't an option.",
-  "repository":
-  {
-    "type": "git",
-    "url": "https://github.com/esp8266/Arduino.git"
-  },
-  "export": {
-    "include": "libraries/GDBStub"
-  },  
-  "authors":
-  [
-    {
-      "name": "Jeroen Domburg"
-    },
-    {
-      "name": "Ivan Grokhotkov",
-      "email": "ivan@esp8266.com",
-      "maintainer": true
-    }
-  ],
-  "frameworks": "arduino",
-  "platforms": "espressif8266",
-  "build": {
-    "libArchive": false
-  }  
-}
diff --git a/tools/sdk/ld/eagle.app.v6.common.ld b/tools/sdk/ld/eagle.app.v6.common.ld
index c9993c7bb..132fae986 100644
--- a/tools/sdk/ld/eagle.app.v6.common.ld
+++ b/tools/sdk/ld/eagle.app.v6.common.ld
@@ -96,7 +96,7 @@ SECTIONS
     *.pioenvs\\*\\lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*)
     *.pioenvs/*/lib*.a:(EXCLUDE_FILE (umm_malloc.o) .literal*, EXCLUDE_FILE (umm_malloc.o) .text*)
     /* project dependencies */
-    *.pioenvs\\*\\lib*\lib*.a:(.literal*, .text*)
+    *.pioenvs\\*\\lib*\\lib*.a:(.literal*, .text*)
     *.pioenvs/*/lib*/lib*.a:(.literal*, .text*)
     /* project source objects */
     *.pioenvs\\*\\src\\*.o(.literal*, .text*)