I suppose the diff of the glibc-upgrade branch is a bit cleaner without including these unnecessary changes.
We only have one version of Glibc so no need for a separate directory.