diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix index 164929b5fcb..1351df29f57 100644 --- a/pkgs/development/libraries/glibc-2.12/common.nix +++ b/pkgs/development/libraries/glibc-2.12/common.nix @@ -75,9 +75,6 @@ stdenv.mkDerivation ({ /* Allow nixos and nix handle the locale-archive. */ ./nix-locale-archive.patch - /* Patch already sent upstream against a segafult on libpthread load */ - ./libpthread_init.patch - /* Fix for a vulnerability, taken from upstream */ ./audit_suid.patch ]; diff --git a/pkgs/development/libraries/glibc-2.12/libpthread_init.patch b/pkgs/development/libraries/glibc-2.12/libpthread_init.patch deleted file mode 100644 index 9ce2e6f846e..00000000000 --- a/pkgs/development/libraries/glibc-2.12/libpthread_init.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://sourceware.org/bugzilla/show_bug.cgi?id=12123 - -diff --git a/nptl/sysdeps/i386/Makefile b/nptl/sysdeps/i386/Makefile -index 2f0d88f..3d9d223 100644 ---- a/nptl/sysdeps/i386/Makefile -+++ b/nptl/sysdeps/i386/Makefile -@@ -21,6 +21,8 @@ gen-as-const-headers += tcb-offsets.sym - endif - - ifeq ($(subdir),nptl) -+CFLAGS-nptl-init.c += -mpreferred-stack-boundary=4 -+CFLAGS-pt-initfini.c += -mpreferred-stack-boundary=4 - CFLAGS-pthread_create.c += -mpreferred-stack-boundary=4 - CFLAGS-tst-align.c += -mpreferred-stack-boundary=4 - CFLAGS-tst-align2.c += -mpreferred-stack-boundary=4