diff --git a/README.md b/README.md
index b4b4d52..91f734e 100644
--- a/README.md
+++ b/README.md
@@ -34,12 +34,14 @@ load("@bazel_bootlin//toolchains:toolchains.bzl", "bootlin_toolchain_deps")
 
 bootlin_toolchain_deps(
     architecture = "x86-64-core-i7",
+    cstdlib = "glibc",
     buildroot_version = "2020.08-1",
 )
 ```
 
 * `architecture` - refers to the [architecture
   string](https://toolchains.bootlin.com/toolchains.html) used by Bootlin.
+* `cstdlib` - refers to the [cstdlib string](https://toolchains.bootlin.com/releases_x86-64-core-i7.html#:~:text=64%2Dcore%2Di7%2D%2D-,glibc%2D%2Dstable,-%2D2022.08%2D1%20Download) used by bootlin.
 * `buildroot_version` - refers to the [Buildroot version
   string](https://toolchains.bootlin.com/releases_x86-64-core-i7.html#:~:text=i7%2D%2Dglibc%2D%2Dstable%2D-,2021.11%2D1,-Download%20sha256)
 used by Bootlin.
@@ -49,12 +51,12 @@ used by Bootlin.
 Currently `bazel_bootlin` only provides the "glibc--stable" version of the following Bootlin
 toolchains:
 
-| Architecture | Buildroot Version |
-| --- | --- |
-| `x86-64` | `2022.08-1`, `2021.11-5` |
-| `x86-64-core-i7` | `2020.08-1` |
-| `aarch64` | `2021.11-1`, `2020.08-1` |
-| `armv7-eabihf` | `2020.08-1` |
+| Architecture | cstdlib | Buildroot Version |
+| --- | --- | --- |
+| `x86-64` | `glibc` | `2022.08-1`, `2021.11-5` |
+| `x86-64-core-i7` |`glibc` | `2020.08-1` |
+| `aarch64` | `glibc`, `musl` | `2021.11-1`, `2020.08-1` |
+| `armv7-eabihf` | `glibc` | `2020.08-1` |
 
 This list is easily expanded.  If a toolchain of interest isn't available feel free to submit and
 [issue](https://github.com/agoessling/bazel_bootlin/issues), or alternatively take a look at
@@ -74,7 +76,7 @@ toolchain that is included.  The platforms specify `constraint_value` for the ca
 
 ```Starlark
 platform(
-    name = "{architecture}-linux-gnu-{buildroot_version}",
+    name = "{architecture}-linux-{cstdlib}-{buildroot_version}",
     constraint_values = [
         "@platforms//cpu:{architecture}",
         "@platforms//os:linux",
@@ -91,7 +93,7 @@ In order to enable toolchain selection via platforms, Bazel requires a special f
 target platform:
 
 ```Shell
-bazel build --incompatible_enable_cc_toolchain_resolution --platforms=@bazel_bootlin//platforms:{architecture}-linux-gnu-{buildroot_version} //...
+bazel build --incompatible_enable_cc_toolchain_resolution --platforms=@bazel_bootlin//platforms:{architecture}-linux-{cstdlib}-{buildroot_version} //...
 ```
 
 The ergonomics can be improved by placing the flags in a
@@ -99,7 +101,7 @@ The ergonomics can be improved by placing the flags in a
 
 ```Shell
 build --incompatible_enable_cc_toolchain_resolution
-build --platforms=@bazel_bootlin//platforms:{architecture}-linux-gnu-{buildroot_version}
+build --platforms=@bazel_bootlin//platforms:{architecture}-linux-{cstdlib}-{buildroot_version}
 ```
 
 Then a simple `bazel build //...` will utilize the desired toolchain.
diff --git a/platforms/platforms.bzl b/platforms/platforms.bzl
index f459c19..44b3ca8 100644
--- a/platforms/platforms.bzl
+++ b/platforms/platforms.bzl
@@ -2,22 +2,23 @@ load("@bazel_bootlin//toolchains:toolchain_info.bzl", "AVAILABLE_TOOLCHAINS")
 
 def all_platforms():
     for architecture in AVAILABLE_TOOLCHAINS:
-        for buildroot_version in AVAILABLE_TOOLCHAINS[architecture]:
-            if buildroot_version not in native.existing_rules():
-                native.constraint_value(
-                    name = buildroot_version,
-                    constraint_setting = "@bazel_bootlin//platforms:buildroot_version",
+        for cstdlib  in AVAILABLE_TOOLCHAINS[architecture]:
+            for buildroot_version in AVAILABLE_TOOLCHAINS[architecture][cstdlib]:
+                if buildroot_version not in native.existing_rules():
+                    native.constraint_value(
+                        name = buildroot_version,
+                        constraint_setting = "@bazel_bootlin//platforms:buildroot_version",
+                        visibility = ["//visibility:public"],
+                    )
+
+                native.platform(
+                    name = "{0}-linux-{1}-{2}".format(architecture, cstdlib, buildroot_version),
+                    constraint_values = [
+                        "@platforms//cpu:{0}".format(
+                            AVAILABLE_TOOLCHAINS[architecture][cstdlib][buildroot_version]["platform_arch"],
+                        ),
+                        "@platforms//os:linux",
+                        "@bazel_bootlin//platforms:{0}".format(buildroot_version),
+                    ],
                     visibility = ["//visibility:public"],
                 )
-
-            native.platform(
-                name = "{0}-linux-gnu-{1}".format(architecture, buildroot_version),
-                constraint_values = [
-                    "@platforms//cpu:{0}".format(
-                        AVAILABLE_TOOLCHAINS[architecture][buildroot_version]["platform_arch"],
-                    ),
-                    "@platforms//os:linux",
-                    "@bazel_bootlin//platforms:{0}".format(buildroot_version),
-                ],
-                visibility = ["//visibility:public"],
-            )
diff --git a/setup_toolchains.py b/setup_toolchains.py
index bce2042..ac8da0d 100644
--- a/setup_toolchains.py
+++ b/setup_toolchains.py
@@ -3,41 +3,56 @@
 
 _AVAILABLE_TOOLCHAINS = {
     'x86-64': {
-        '2021.11-5': {
-            'sha256': '6fe812add925493ea0841365f1fb7ca17fd9224bab61a731063f7f12f3a621b0',
-            'platform_arch': 'x86_64',
-            'tool_prefix': 'x86_64-buildroot-linux-gnu',
-        },
-        '2022.08-1': {
-            'sha256': '861c1e8ad0a66e4c28e7a1f8319d68080ab0ff8d16a765e65540f1957203a190',
-            'platform_arch': 'x86_64',
-            'tool_prefix': 'x86_64-buildroot-linux-gnu',
+        'glibc': {
+          '2021.11-5': {
+              'sha256': '6fe812add925493ea0841365f1fb7ca17fd9224bab61a731063f7f12f3a621b0',
+              'platform_arch': 'x86_64',
+              'tool_prefix': 'x86_64-buildroot-linux-gnu',
+          },
+          '2022.08-1': {
+              'sha256': '861c1e8ad0a66e4c28e7a1f8319d68080ab0ff8d16a765e65540f1957203a190',
+              'platform_arch': 'x86_64',
+              'tool_prefix': 'x86_64-buildroot-linux-gnu',
+          },
         },
     },
     'x86-64-core-i7': {
-        '2020.08-1': {
-            'sha256': '3dd408e857f5c8e579748995477f2783fcf5ad0aac89719ea3c5c75446dfa63c',
-            'platform_arch': 'x86_64',
-            'tool_prefix': 'x86_64-buildroot-linux-gnu',
+        'glibc': {
+          '2020.08-1': {
+              'sha256': '3dd408e857f5c8e579748995477f2783fcf5ad0aac89719ea3c5c75446dfa63c',
+              'platform_arch': 'x86_64',
+              'tool_prefix': 'x86_64-buildroot-linux-gnu',
+          },
         },
     },
     'aarch64': {
-        '2021.11-1': {
-            'sha256': 'dec070196608124fa14c3f192364c5b5b057d7f34651ad58ebb8fc87959c97f7',
-            'platform_arch': 'aarch64',
-            'tool_prefix': 'aarch64-buildroot-linux-gnu',
+        'glibc': {
+          '2021.11-1': {
+              'sha256': 'dec070196608124fa14c3f192364c5b5b057d7f34651ad58ebb8fc87959c97f7',
+              'platform_arch': 'aarch64',
+              'tool_prefix': 'aarch64-buildroot-linux-gnu',
+          },
+          '2020.08-1': {
+              'sha256': '8ab7a2f17cb96621b048ab0a872650dd62faa54cd74c961b9902b8c04bff7dd1',
+              'platform_arch': 'aarch64',
+              'tool_prefix': 'aarch64-buildroot-linux-gnu',
+          },
         },
-        '2020.08-1': {
-            'sha256': '8ab7a2f17cb96621b048ab0a872650dd62faa54cd74c961b9902b8c04bff7dd1',
-            'platform_arch': 'aarch64',
-            'tool_prefix': 'aarch64-buildroot-linux-gnu',
+        'musl': {
+            '2021.11-1': {
+                'sha256': '6919b4cf04b8c5628a2a93bcf4b05e1143ab15dfb4bc2acde02a2e3c075bf041',
+                'platform_arch': 'aarch64',
+                'tool_prefix': 'aarch64-buildroot-linux-musl',
+            },
         },
     },
     'armv7-eabihf': {
-        '2020.08-1': {
-            'sha256': '7b6682603af9a9b5c0e46fd57165723483bb68295e827d14d238e63f33a147a8',
-            'platform_arch': 'armv7',
-            'tool_prefix': 'arm-buildroot-linux-gnueabihf',
+        'glibc': {
+          '2020.08-1': {
+              'sha256': '7b6682603af9a9b5c0e46fd57165723483bb68295e827d14d238e63f33a147a8',
+              'platform_arch': 'armv7',
+              'tool_prefix': 'arm-buildroot-linux-gnueabihf',
+          },
         },
     },
 }
@@ -71,31 +86,37 @@
 
 
 def create_wrappers(wrapper_dir):
-  for arch, buildroot_versions in _AVAILABLE_TOOLCHAINS.items():
+  for arch, cstdlibs in _AVAILABLE_TOOLCHAINS.items():
     try:
       os.mkdir(os.path.join(wrapper_dir, arch))
     except FileExistsError:
       pass
 
-    for version, version_info in buildroot_versions.items():
+    for cstdlib, buildroot_versions in cstdlibs.items():
       try:
-        os.mkdir(os.path.join(wrapper_dir, arch, version))
+        os.mkdir(os.path.join(wrapper_dir, arch, cstdlib))
       except FileExistsError:
         pass
 
-      for tool, tool_info in _ALL_TOOLS.items():
-        toolchain_name = f'{arch}-linux-gnu-{version}'
-        wrapper_name = f'{toolchain_name}-{tool}'
-        actual_tool_name = f'{version_info["tool_prefix"]}-{tool_info["buildroot_name"]}'
-        wrapper_path = os.path.join(wrapper_dir, arch, version, wrapper_name)
+      for version, version_info in buildroot_versions.items():
+        try:
+          os.mkdir(os.path.join(wrapper_dir, arch, cstdlib, version))
+        except FileExistsError:
+          pass
+
+        for tool, tool_info in _ALL_TOOLS.items():
+          toolchain_name = f'{arch}-linux-{cstdlib}-{version}'
+          wrapper_name = f'{toolchain_name}-{tool}'
+          actual_tool_name = f'{version_info["tool_prefix"]}-{tool_info["buildroot_name"]}'
+          wrapper_path = os.path.join(wrapper_dir, arch, cstdlib, version, wrapper_name)
 
-        with open(wrapper_path, 'w') as f:
-          f.write('#!/bin/bash\n')
-          # Uses buildroot's ".br_real" wrapper to allow -no-canonical-prefix,
-          # -fno-canonical-system-headers, and --sysroot to correctly work (using relative paths).
-          f.write(f'exec external/{toolchain_name}/bin/{actual_tool_name} $@\n')
+          with open(wrapper_path, 'w') as f:
+            f.write('#!/bin/bash\n')
+            # Uses buildroot's ".br_real" wrapper to allow -no-canonical-prefix,
+            # -fno-canonical-system-headers, and --sysroot to correctly work (using relative paths).
+            f.write(f'exec external/{toolchain_name}/bin/{actual_tool_name} $@\n')
 
-        os.chmod(wrapper_path, 0o777)
+          os.chmod(wrapper_path, 0o777)
 
 
 def write_toolchain_info(filename):
@@ -110,11 +131,12 @@ def write_test_script(filename):
     f.write('set -e\n')
     f.write('set -o xtrace\n\n')
 
-    for arch, buildroot_versions in _AVAILABLE_TOOLCHAINS.items():
-      for version in buildroot_versions:
-        platform = f'@bazel_bootlin//platforms:{arch}-linux-gnu-{version}'
-        f.write(f'bazel build --verbose_failures --platforms={platform} //test:test_cpp\n')
-        f.write(f'bazel build --verbose_failures --platforms={platform} //test:test_c\n')
+    for arch, cstdlibs in _AVAILABLE_TOOLCHAINS.items():
+      for cstdlib, buildroot_versions in cstdlibs.items():
+        for version in buildroot_versions:
+          platform = f'@bazel_bootlin//platforms:{arch}-linux-{cstdlib}-{version}'
+          f.write(f'bazel build --verbose_failures --platforms={platform} //test:test_cpp\n')
+          f.write(f'bazel build --verbose_failures --platforms={platform} //test:test_c\n')
 
   os.chmod(filename, 0o777)
 
diff --git a/test_build_all.sh b/test_build_all.sh
index 3533bc0..5b5eab0 100755
--- a/test_build_all.sh
+++ b/test_build_all.sh
@@ -2,15 +2,17 @@
 set -e
 set -o xtrace
 
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-linux-gnu-2021.11-5 //test:test_cpp
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-linux-gnu-2021.11-5 //test:test_c
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-linux-gnu-2022.08-1 //test:test_cpp
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-linux-gnu-2022.08-1 //test:test_c
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-core-i7-linux-gnu-2020.08-1 //test:test_cpp
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-core-i7-linux-gnu-2020.08-1 //test:test_c
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:aarch64-linux-gnu-2021.11-1 //test:test_cpp
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:aarch64-linux-gnu-2021.11-1 //test:test_c
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:aarch64-linux-gnu-2020.08-1 //test:test_cpp
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:aarch64-linux-gnu-2020.08-1 //test:test_c
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:armv7-eabihf-linux-gnu-2020.08-1 //test:test_cpp
-bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:armv7-eabihf-linux-gnu-2020.08-1 //test:test_c
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-linux-glibc-2021.11-5 //test:test_cpp
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-linux-glibc-2021.11-5 //test:test_c
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-linux-glibc-2022.08-1 //test:test_cpp
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-linux-glibc-2022.08-1 //test:test_c
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-core-i7-linux-glibc-2020.08-1 //test:test_cpp
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:x86-64-core-i7-linux-glibc-2020.08-1 //test:test_c
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:aarch64-linux-glibc-2021.11-1 //test:test_cpp
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:aarch64-linux-glibc-2021.11-1 //test:test_c
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:aarch64-linux-glibc-2020.08-1 //test:test_cpp
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:aarch64-linux-glibc-2020.08-1 //test:test_c
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:aarch64-linux-musl-2021.11-1 //test:test_cpp
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:aarch64-linux-musl-2021.11-1 //test:test_c
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:armv7-eabihf-linux-glibc-2020.08-1 //test:test_cpp
+bazel build --verbose_failures --platforms=@bazel_bootlin//platforms:armv7-eabihf-linux-glibc-2020.08-1 //test:test_c
diff --git a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-ar b/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-ar
deleted file mode 100755
index c64857a..0000000
--- a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-ar
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-ar $@
diff --git a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-cpp b/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-cpp
deleted file mode 100755
index 76068ca..0000000
--- a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-gcc b/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-gcc
deleted file mode 100755
index 26a1bed..0000000
--- a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-gcc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-gcov b/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-gcov
deleted file mode 100755
index eacfaf0..0000000
--- a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-gcov
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-gcov $@
diff --git a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-ld b/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-ld
deleted file mode 100755
index 782e2c3..0000000
--- a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-ld
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-ld $@
diff --git a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-nm b/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-nm
deleted file mode 100755
index e28e291..0000000
--- a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-nm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-nm $@
diff --git a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-objdump b/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-objdump
deleted file mode 100755
index 05fc529..0000000
--- a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-objdump
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-objdump $@
diff --git a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-strip b/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-strip
deleted file mode 100755
index 09f291c..0000000
--- a/toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-strip
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-strip $@
diff --git a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-ar b/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-ar
deleted file mode 100755
index 6b499a9..0000000
--- a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-ar
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-ar $@
diff --git a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-cpp b/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-cpp
deleted file mode 100755
index ddcc27c..0000000
--- a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-gcc b/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-gcc
deleted file mode 100755
index 7b14922..0000000
--- a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-gcc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-gcov b/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-gcov
deleted file mode 100755
index f28a767..0000000
--- a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-gcov
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-gcov $@
diff --git a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-ld b/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-ld
deleted file mode 100755
index e79b651..0000000
--- a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-ld
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-ld $@
diff --git a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-nm b/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-nm
deleted file mode 100755
index b162a5e..0000000
--- a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-nm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-nm $@
diff --git a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-objdump b/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-objdump
deleted file mode 100755
index 276f9ff..0000000
--- a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-objdump
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-objdump $@
diff --git a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-strip b/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-strip
deleted file mode 100755
index 31c0f98..0000000
--- a/toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-strip
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-strip $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-ar b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-ar
new file mode 100755
index 0000000..4aff192
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-ar
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2020.08-1/bin/aarch64-buildroot-linux-gnu-ar $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-cpp b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-cpp
new file mode 100755
index 0000000..497503c
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-cpp
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2020.08-1/bin/aarch64-buildroot-linux-gnu-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-gcc b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-gcc
new file mode 100755
index 0000000..3d1636d
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-gcc
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2020.08-1/bin/aarch64-buildroot-linux-gnu-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-gcov b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-gcov
new file mode 100755
index 0000000..b6222d1
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-gcov
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2020.08-1/bin/aarch64-buildroot-linux-gnu-gcov $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-ld b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-ld
new file mode 100755
index 0000000..bb4f97c
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-ld
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2020.08-1/bin/aarch64-buildroot-linux-gnu-ld $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-nm b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-nm
new file mode 100755
index 0000000..af7a84e
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-nm
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2020.08-1/bin/aarch64-buildroot-linux-gnu-nm $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-objdump b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-objdump
new file mode 100755
index 0000000..d21be3d
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-objdump
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2020.08-1/bin/aarch64-buildroot-linux-gnu-objdump $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-strip b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-strip
new file mode 100755
index 0000000..40f260c
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2020.08-1/aarch64-linux-glibc-2020.08-1-strip
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2020.08-1/bin/aarch64-buildroot-linux-gnu-strip $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-ar b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-ar
new file mode 100755
index 0000000..ebaa335
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-ar
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2021.11-1/bin/aarch64-buildroot-linux-gnu-ar $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-cpp b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-cpp
new file mode 100755
index 0000000..2b231a3
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-cpp
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2021.11-1/bin/aarch64-buildroot-linux-gnu-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-gcc b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-gcc
new file mode 100755
index 0000000..16ba09e
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-gcc
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2021.11-1/bin/aarch64-buildroot-linux-gnu-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-gcov b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-gcov
new file mode 100755
index 0000000..546fd84
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-gcov
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2021.11-1/bin/aarch64-buildroot-linux-gnu-gcov $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-ld b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-ld
new file mode 100755
index 0000000..6241d01
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-ld
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2021.11-1/bin/aarch64-buildroot-linux-gnu-ld $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-nm b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-nm
new file mode 100755
index 0000000..3f83171
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-nm
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2021.11-1/bin/aarch64-buildroot-linux-gnu-nm $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-objdump b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-objdump
new file mode 100755
index 0000000..0d6df9e
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-objdump
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2021.11-1/bin/aarch64-buildroot-linux-gnu-objdump $@
diff --git a/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-strip b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-strip
new file mode 100755
index 0000000..b50b5c1
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/glibc/2021.11-1/aarch64-linux-glibc-2021.11-1-strip
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-glibc-2021.11-1/bin/aarch64-buildroot-linux-gnu-strip $@
diff --git a/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-ar b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-ar
new file mode 100755
index 0000000..cdb4a5c
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-ar
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-musl-2021.11-1/bin/aarch64-buildroot-linux-musl-ar $@
diff --git a/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-cpp b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-cpp
new file mode 100755
index 0000000..84d566b
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-cpp
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-musl-2021.11-1/bin/aarch64-buildroot-linux-musl-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-gcc b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-gcc
new file mode 100755
index 0000000..7176457
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-gcc
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-musl-2021.11-1/bin/aarch64-buildroot-linux-musl-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-gcov b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-gcov
new file mode 100755
index 0000000..038e2d4
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-gcov
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-musl-2021.11-1/bin/aarch64-buildroot-linux-musl-gcov $@
diff --git a/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-ld b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-ld
new file mode 100755
index 0000000..9dca958
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-ld
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-musl-2021.11-1/bin/aarch64-buildroot-linux-musl-ld $@
diff --git a/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-nm b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-nm
new file mode 100755
index 0000000..e924b9e
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-nm
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-musl-2021.11-1/bin/aarch64-buildroot-linux-musl-nm $@
diff --git a/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-objdump b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-objdump
new file mode 100755
index 0000000..d1e5859
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-objdump
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-musl-2021.11-1/bin/aarch64-buildroot-linux-musl-objdump $@
diff --git a/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-strip b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-strip
new file mode 100755
index 0000000..c2c5c40
--- /dev/null
+++ b/toolchains/tool_wrappers/aarch64/musl/2021.11-1/aarch64-linux-musl-2021.11-1-strip
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/aarch64-linux-musl-2021.11-1/bin/aarch64-buildroot-linux-musl-strip $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-ar b/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-ar
deleted file mode 100755
index a8a6123..0000000
--- a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-ar
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-ar $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-cpp b/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-cpp
deleted file mode 100755
index 004ebdd..0000000
--- a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-gcc b/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-gcc
deleted file mode 100755
index 7c43a38..0000000
--- a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-gcc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-gcov b/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-gcov
deleted file mode 100755
index 8160455..0000000
--- a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-gcov
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-gcov $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-ld b/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-ld
deleted file mode 100755
index 2d57a2d..0000000
--- a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-ld
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-ld $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-nm b/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-nm
deleted file mode 100755
index 598b3b5..0000000
--- a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-nm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-nm $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-objdump b/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-objdump
deleted file mode 100755
index 2d72926..0000000
--- a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-objdump
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-objdump $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-strip b/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-strip
deleted file mode 100755
index 3c9b47e..0000000
--- a/toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-strip
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-strip $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-ar b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-ar
new file mode 100755
index 0000000..ef48d6d
--- /dev/null
+++ b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-ar
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/armv7-eabihf-linux-glibc-2020.08-1/bin/arm-buildroot-linux-gnueabihf-ar $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-cpp b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-cpp
new file mode 100755
index 0000000..bfa965c
--- /dev/null
+++ b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-cpp
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/armv7-eabihf-linux-glibc-2020.08-1/bin/arm-buildroot-linux-gnueabihf-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-gcc b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-gcc
new file mode 100755
index 0000000..bb2f49b
--- /dev/null
+++ b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-gcc
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/armv7-eabihf-linux-glibc-2020.08-1/bin/arm-buildroot-linux-gnueabihf-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-gcov b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-gcov
new file mode 100755
index 0000000..0165429
--- /dev/null
+++ b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-gcov
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/armv7-eabihf-linux-glibc-2020.08-1/bin/arm-buildroot-linux-gnueabihf-gcov $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-ld b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-ld
new file mode 100755
index 0000000..ff3f9b8
--- /dev/null
+++ b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-ld
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/armv7-eabihf-linux-glibc-2020.08-1/bin/arm-buildroot-linux-gnueabihf-ld $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-nm b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-nm
new file mode 100755
index 0000000..50692bf
--- /dev/null
+++ b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-nm
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/armv7-eabihf-linux-glibc-2020.08-1/bin/arm-buildroot-linux-gnueabihf-nm $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-objdump b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-objdump
new file mode 100755
index 0000000..08dd8e5
--- /dev/null
+++ b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-objdump
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/armv7-eabihf-linux-glibc-2020.08-1/bin/arm-buildroot-linux-gnueabihf-objdump $@
diff --git a/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-strip b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-strip
new file mode 100755
index 0000000..2a1aa86
--- /dev/null
+++ b/toolchains/tool_wrappers/armv7-eabihf/glibc/2020.08-1/armv7-eabihf-linux-glibc-2020.08-1-strip
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/armv7-eabihf-linux-glibc-2020.08-1/bin/arm-buildroot-linux-gnueabihf-strip $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-ar b/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-ar
deleted file mode 100755
index 2f01fe9..0000000
--- a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-ar
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-ar $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-cpp b/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-cpp
deleted file mode 100755
index c2d3c00..0000000
--- a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-gcc b/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-gcc
deleted file mode 100755
index a9cd64e..0000000
--- a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-gcc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-gcov b/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-gcov
deleted file mode 100755
index 9df8b87..0000000
--- a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-gcov
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-gcov $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-ld b/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-ld
deleted file mode 100755
index 487f492..0000000
--- a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-ld
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-ld $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-nm b/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-nm
deleted file mode 100755
index a848ada..0000000
--- a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-nm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-nm $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-objdump b/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-objdump
deleted file mode 100755
index 50fd1aa..0000000
--- a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-objdump
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-objdump $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-strip b/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-strip
deleted file mode 100755
index 40ea202..0000000
--- a/toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-strip
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-strip $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-ar b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-ar
new file mode 100755
index 0000000..b6d0db3
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-ar
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-core-i7-linux-glibc-2020.08-1/bin/x86_64-buildroot-linux-gnu-ar $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-cpp b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-cpp
new file mode 100755
index 0000000..9373efd
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-cpp
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-core-i7-linux-glibc-2020.08-1/bin/x86_64-buildroot-linux-gnu-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-gcc b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-gcc
new file mode 100755
index 0000000..c0849c0
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-gcc
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-core-i7-linux-glibc-2020.08-1/bin/x86_64-buildroot-linux-gnu-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-gcov b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-gcov
new file mode 100755
index 0000000..b1e65d1
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-gcov
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-core-i7-linux-glibc-2020.08-1/bin/x86_64-buildroot-linux-gnu-gcov $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-ld b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-ld
new file mode 100755
index 0000000..457f76e
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-ld
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-core-i7-linux-glibc-2020.08-1/bin/x86_64-buildroot-linux-gnu-ld $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-nm b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-nm
new file mode 100755
index 0000000..814d020
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-nm
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-core-i7-linux-glibc-2020.08-1/bin/x86_64-buildroot-linux-gnu-nm $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-objdump b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-objdump
new file mode 100755
index 0000000..d400ebe
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-objdump
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-core-i7-linux-glibc-2020.08-1/bin/x86_64-buildroot-linux-gnu-objdump $@
diff --git a/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-strip b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-strip
new file mode 100755
index 0000000..4fce5ef
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64-core-i7/glibc/2020.08-1/x86-64-core-i7-linux-glibc-2020.08-1-strip
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-core-i7-linux-glibc-2020.08-1/bin/x86_64-buildroot-linux-gnu-strip $@
diff --git a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-ar b/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-ar
deleted file mode 100755
index 454f282..0000000
--- a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-ar
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-ar $@
diff --git a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-cpp b/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-cpp
deleted file mode 100755
index 6b3cd9a..0000000
--- a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-gcc b/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-gcc
deleted file mode 100755
index b3357a8..0000000
--- a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-gcc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-gcov b/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-gcov
deleted file mode 100755
index 03ed9ba..0000000
--- a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-gcov
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-gcov $@
diff --git a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-ld b/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-ld
deleted file mode 100755
index b9c9180..0000000
--- a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-ld
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-ld $@
diff --git a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-nm b/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-nm
deleted file mode 100755
index 111a2df..0000000
--- a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-nm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-nm $@
diff --git a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-objdump b/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-objdump
deleted file mode 100755
index 0fa4a6e..0000000
--- a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-objdump
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-objdump $@
diff --git a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-strip b/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-strip
deleted file mode 100755
index a75a950..0000000
--- a/toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-strip
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-strip $@
diff --git a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-ar b/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-ar
deleted file mode 100755
index 7687344..0000000
--- a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-ar
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2022.08-1/bin/x86_64-buildroot-linux-gnu-ar $@
diff --git a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-cpp b/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-cpp
deleted file mode 100755
index 937a921..0000000
--- a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2022.08-1/bin/x86_64-buildroot-linux-gnu-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-gcc b/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-gcc
deleted file mode 100755
index ff92070..0000000
--- a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-gcc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2022.08-1/bin/x86_64-buildroot-linux-gnu-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-gcov b/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-gcov
deleted file mode 100755
index baac9f2..0000000
--- a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-gcov
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2022.08-1/bin/x86_64-buildroot-linux-gnu-gcov $@
diff --git a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-ld b/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-ld
deleted file mode 100755
index 10b36df..0000000
--- a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-ld
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2022.08-1/bin/x86_64-buildroot-linux-gnu-ld $@
diff --git a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-nm b/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-nm
deleted file mode 100755
index d1377eb..0000000
--- a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-nm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2022.08-1/bin/x86_64-buildroot-linux-gnu-nm $@
diff --git a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-objdump b/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-objdump
deleted file mode 100755
index 11b4321..0000000
--- a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-objdump
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2022.08-1/bin/x86_64-buildroot-linux-gnu-objdump $@
diff --git a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-strip b/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-strip
deleted file mode 100755
index 6686437..0000000
--- a/toolchains/tool_wrappers/x86-64/2022.08-1/x86-64-linux-gnu-2022.08-1-strip
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec external/x86-64-linux-gnu-2022.08-1/bin/x86_64-buildroot-linux-gnu-strip $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-ar b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-ar
new file mode 100755
index 0000000..0aae216
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-ar
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2021.11-5/bin/x86_64-buildroot-linux-gnu-ar $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-cpp b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-cpp
new file mode 100755
index 0000000..7842547
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-cpp
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2021.11-5/bin/x86_64-buildroot-linux-gnu-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-gcc b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-gcc
new file mode 100755
index 0000000..79607e4
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-gcc
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2021.11-5/bin/x86_64-buildroot-linux-gnu-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-gcov b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-gcov
new file mode 100755
index 0000000..c229297
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-gcov
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2021.11-5/bin/x86_64-buildroot-linux-gnu-gcov $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-ld b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-ld
new file mode 100755
index 0000000..3d50e65
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-ld
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2021.11-5/bin/x86_64-buildroot-linux-gnu-ld $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-nm b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-nm
new file mode 100755
index 0000000..97ab325
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-nm
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2021.11-5/bin/x86_64-buildroot-linux-gnu-nm $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-objdump b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-objdump
new file mode 100755
index 0000000..57483bb
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-objdump
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2021.11-5/bin/x86_64-buildroot-linux-gnu-objdump $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-strip b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-strip
new file mode 100755
index 0000000..c45dbc1
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2021.11-5/x86-64-linux-glibc-2021.11-5-strip
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2021.11-5/bin/x86_64-buildroot-linux-gnu-strip $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-ar b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-ar
new file mode 100755
index 0000000..c79c102
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-ar
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2022.08-1/bin/x86_64-buildroot-linux-gnu-ar $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-cpp b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-cpp
new file mode 100755
index 0000000..262a99a
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-cpp
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2022.08-1/bin/x86_64-buildroot-linux-gnu-cpp.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-gcc b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-gcc
new file mode 100755
index 0000000..293b139
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-gcc
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2022.08-1/bin/x86_64-buildroot-linux-gnu-gcc.br_real $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-gcov b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-gcov
new file mode 100755
index 0000000..73ed6fa
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-gcov
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2022.08-1/bin/x86_64-buildroot-linux-gnu-gcov $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-ld b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-ld
new file mode 100755
index 0000000..3a9e4bc
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-ld
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2022.08-1/bin/x86_64-buildroot-linux-gnu-ld $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-nm b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-nm
new file mode 100755
index 0000000..4792045
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-nm
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2022.08-1/bin/x86_64-buildroot-linux-gnu-nm $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-objdump b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-objdump
new file mode 100755
index 0000000..89be660
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-objdump
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2022.08-1/bin/x86_64-buildroot-linux-gnu-objdump $@
diff --git a/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-strip b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-strip
new file mode 100755
index 0000000..4226a87
--- /dev/null
+++ b/toolchains/tool_wrappers/x86-64/glibc/2022.08-1/x86-64-linux-glibc-2022.08-1-strip
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec external/x86-64-linux-glibc-2022.08-1/bin/x86_64-buildroot-linux-gnu-strip $@
diff --git a/toolchains/toolchain_info.bzl b/toolchains/toolchain_info.bzl
index 8275888..7bac1f6 100644
--- a/toolchains/toolchain_info.bzl
+++ b/toolchains/toolchain_info.bzl
@@ -1,2 +1,2 @@
-AVAILABLE_TOOLCHAINS = {'x86-64': {'2021.11-5': {'sha256': '6fe812add925493ea0841365f1fb7ca17fd9224bab61a731063f7f12f3a621b0', 'platform_arch': 'x86_64', 'tool_prefix': 'x86_64-buildroot-linux-gnu'}, '2022.08-1': {'sha256': '861c1e8ad0a66e4c28e7a1f8319d68080ab0ff8d16a765e65540f1957203a190', 'platform_arch': 'x86_64', 'tool_prefix': 'x86_64-buildroot-linux-gnu'}}, 'x86-64-core-i7': {'2020.08-1': {'sha256': '3dd408e857f5c8e579748995477f2783fcf5ad0aac89719ea3c5c75446dfa63c', 'platform_arch': 'x86_64', 'tool_prefix': 'x86_64-buildroot-linux-gnu'}}, 'aarch64': {'2021.11-1': {'sha256': 'dec070196608124fa14c3f192364c5b5b057d7f34651ad58ebb8fc87959c97f7', 'platform_arch': 'aarch64', 'tool_prefix': 'aarch64-buildroot-linux-gnu'}, '2020.08-1': {'sha256': '8ab7a2f17cb96621b048ab0a872650dd62faa54cd74c961b9902b8c04bff7dd1', 'platform_arch': 'aarch64', 'tool_prefix': 'aarch64-buildroot-linux-gnu'}}, 'armv7-eabihf': {'2020.08-1': {'sha256': '7b6682603af9a9b5c0e46fd57165723483bb68295e827d14d238e63f33a147a8', 'platform_arch': 'armv7', 'tool_prefix': 'arm-buildroot-linux-gnueabihf'}}}
+AVAILABLE_TOOLCHAINS = {'x86-64': {'glibc': {'2021.11-5': {'sha256': '6fe812add925493ea0841365f1fb7ca17fd9224bab61a731063f7f12f3a621b0', 'platform_arch': 'x86_64', 'tool_prefix': 'x86_64-buildroot-linux-gnu'}, '2022.08-1': {'sha256': '861c1e8ad0a66e4c28e7a1f8319d68080ab0ff8d16a765e65540f1957203a190', 'platform_arch': 'x86_64', 'tool_prefix': 'x86_64-buildroot-linux-gnu'}}}, 'x86-64-core-i7': {'glibc': {'2020.08-1': {'sha256': '3dd408e857f5c8e579748995477f2783fcf5ad0aac89719ea3c5c75446dfa63c', 'platform_arch': 'x86_64', 'tool_prefix': 'x86_64-buildroot-linux-gnu'}}}, 'aarch64': {'glibc': {'2021.11-1': {'sha256': 'dec070196608124fa14c3f192364c5b5b057d7f34651ad58ebb8fc87959c97f7', 'platform_arch': 'aarch64', 'tool_prefix': 'aarch64-buildroot-linux-gnu'}, '2020.08-1': {'sha256': '8ab7a2f17cb96621b048ab0a872650dd62faa54cd74c961b9902b8c04bff7dd1', 'platform_arch': 'aarch64', 'tool_prefix': 'aarch64-buildroot-linux-gnu'}}, 'musl': {'2021.11-1': {'sha256': '6919b4cf04b8c5628a2a93bcf4b05e1143ab15dfb4bc2acde02a2e3c075bf041', 'platform_arch': 'aarch64', 'tool_prefix': 'aarch64-buildroot-linux-musl'}}}, 'armv7-eabihf': {'glibc': {'2020.08-1': {'sha256': '7b6682603af9a9b5c0e46fd57165723483bb68295e827d14d238e63f33a147a8', 'platform_arch': 'armv7', 'tool_prefix': 'arm-buildroot-linux-gnueabihf'}}}}
 ALL_TOOLS = ['ar', 'cpp', 'gcc', 'gcov', 'ld', 'nm', 'objdump', 'strip']
diff --git a/toolchains/toolchains.bzl b/toolchains/toolchains.bzl
index 44c5b01..e9b4e6d 100644
--- a/toolchains/toolchains.bzl
+++ b/toolchains/toolchains.bzl
@@ -14,13 +14,14 @@ load(
     "AVAILABLE_TOOLCHAINS",
 )
 
-def bootlin_toolchain_deps(architecture, buildroot_version):
+def bootlin_toolchain_deps(architecture, cstdlib, buildroot_version):
     if (architecture not in AVAILABLE_TOOLCHAINS or
-        buildroot_version not in AVAILABLE_TOOLCHAINS[architecture]):
+        cstdlib not in AVAILABLE_TOOLCHAINS[architecture] or
+        buildroot_version not in AVAILABLE_TOOLCHAINS[architecture][cstdlib]):
         fail("""
-Bootlin architecture and buildroot version combo ({0}, {1}) not supported.
+Bootlin architecture and buildroot version combo ({0}, {1}, {2}) not supported.
 If required, file an issue here: https://github.com/agoessling/bazel_bootlin/issues
-""".format(architecture, buildroot_version))
+""".format(architecture, cstdlib, buildroot_version))
 
     TOOLCHAIN_BUILD_FILE = """
 filegroup(
@@ -29,18 +30,19 @@ filegroup(
     visibility = ["//visibility:public"],
 )"""
 
-    toolchain_name = "{0}-linux-gnu-{1}".format(architecture, buildroot_version)
+    toolchain_name = "{0}-linux-{1}-{2}".format(architecture, cstdlib, buildroot_version)
 
     http_archive(
         name = toolchain_name,
         build_file_content = TOOLCHAIN_BUILD_FILE,
         url = ("https://toolchains.bootlin.com/downloads/releases/toolchains/" +
-               "{0}/tarballs/{0}--glibc--stable-{1}.tar.bz2").format(
+               "{0}/tarballs/{0}--{1}--stable-{2}.tar.bz2").format(
             architecture,
+            cstdlib,
             buildroot_version,
         ),
-        sha256 = AVAILABLE_TOOLCHAINS[architecture][buildroot_version]["sha256"],
-        strip_prefix = "{0}--glibc--stable-{1}".format(architecture, buildroot_version),
+        sha256 = AVAILABLE_TOOLCHAINS[architecture][cstdlib][buildroot_version]["sha256"],
+        strip_prefix = "{0}--{1}--stable-{2}".format(architecture, cstdlib, buildroot_version),
     )
 
     native.register_toolchains(
@@ -49,11 +51,12 @@ filegroup(
 
 def bootlin_all_toolchain_deps():
     for architecture in AVAILABLE_TOOLCHAINS:
-        for buildroot_version in AVAILABLE_TOOLCHAINS[architecture]:
-            bootlin_toolchain_deps(architecture, buildroot_version)
+        for cstdlib in AVAILABLE_TOOLCHAINS[architecture]:
+            for buildroot_version in AVAILABLE_TOOLCHAINS[architecture][cstdlib]:
+                bootlin_toolchain_deps(architecture, cstdlib, buildroot_version)
 
-def bootlin_toolchain_defs(architecture, buildroot_version):
-    toolchain_name = "{0}-linux-gnu-{1}".format(architecture, buildroot_version)
+def bootlin_toolchain_defs(architecture, cstdlib, buildroot_version):
+    toolchain_name = "{0}-linux-{1}-{2}".format(architecture, cstdlib, buildroot_version)
 
     native.filegroup(
         name = "{0}_all_files".format(toolchain_name),
@@ -67,6 +70,7 @@ def bootlin_toolchain_defs(architecture, buildroot_version):
         name = "{0}_toolchain_config".format(toolchain_name),
         architecture = architecture,
         buildroot_version = buildroot_version,
+        cstdlib = cstdlib,
     )
 
     native.cc_toolchain(
@@ -89,7 +93,7 @@ def bootlin_toolchain_defs(architecture, buildroot_version):
         ],
         target_compatible_with = [
             "@platforms//cpu:{0}".format(
-                AVAILABLE_TOOLCHAINS[architecture][buildroot_version]["platform_arch"],
+                AVAILABLE_TOOLCHAINS[architecture][cstdlib][buildroot_version]["platform_arch"],
             ),
             "@platforms//os:linux",
             "@bazel_bootlin//platforms:{0}".format(buildroot_version),
@@ -100,8 +104,9 @@ def bootlin_toolchain_defs(architecture, buildroot_version):
 
 def bootlin_all_toolchain_defs():
     for architecture in AVAILABLE_TOOLCHAINS:
-        for buildroot_version in AVAILABLE_TOOLCHAINS[architecture]:
-            bootlin_toolchain_defs(architecture, buildroot_version)
+        for cstdlib in AVAILABLE_TOOLCHAINS[architecture]:
+            for buildroot_version in AVAILABLE_TOOLCHAINS[architecture][cstdlib]:
+                bootlin_toolchain_defs(architecture, cstdlib, buildroot_version)
 
 def _impl_cc_bootlin_toolchain_config(ctx):
     """Generic implementation for toolchains provided by Bootlin built from buildroot.
@@ -110,11 +115,11 @@ def _impl_cc_bootlin_toolchain_config(ctx):
     https://github.com/bazelbuild/rules_cc/blob/main/cc/private/toolchain/unix_cc_toolchain_config.bzl
     https://github.com/bazelbuild/rules_cc/blob/main/cc/private/toolchain/unix_cc_configure.bzl
     """
-    toolchain_name = "{0}-linux-gnu-{1}".format(ctx.attr.architecture, ctx.attr.buildroot_version)
+    toolchain_name = "{0}-linux-{1}-{2}".format(ctx.attr.architecture, ctx.attr.cstdlib, ctx.attr.buildroot_version)
 
     sysroot = "external/{0}/{1}/sysroot".format(
         toolchain_name,
-        AVAILABLE_TOOLCHAINS[ctx.attr.architecture][ctx.attr.buildroot_version]["tool_prefix"],
+        AVAILABLE_TOOLCHAINS[ctx.attr.architecture][ctx.attr.cstdlib][ctx.attr.buildroot_version]["tool_prefix"],
     )
 
     all_compile_actions = [
@@ -148,8 +153,9 @@ def _impl_cc_bootlin_toolchain_config(ctx):
 
     tool_paths = []
     for tool in ALL_TOOLS:
-        tool_wrapper = "tool_wrappers/{0}/{1}/{2}-{3}".format(
+        tool_wrapper = "tool_wrappers/{0}/{1}/{2}/{3}-{4}".format(
             ctx.attr.architecture,
+            ctx.attr.cstdlib,
             ctx.attr.buildroot_version,
             toolchain_name,
             tool,
@@ -274,6 +280,10 @@ cc_bootlin_toolchain_config = rule(
             mandatory = True,
             doc = "Toolchain buildroot version.",
         ),
+        "cstdlib": attr.string(
+            mandatory = True,
+            doc = "Toolchain cstlib type i.e. glibc, musl, etc...",
+        ),
     },
     provides = [CcToolchainConfigInfo],
 )