From acd1e6ee3a22315243597bb6bf9a1a43bb7856f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 28 Oct 2010 23:04:34 +0000 Subject: [PATCH] Removing a patch for glibc that I thought was needed for i686-linux. Building with gcc 4.4 as minimum was needed, and not this patch. http://sourceware.org/bugzilla/show_bug.cgi?id=12123 I uploaded new i686-linux bootstrap-tools with gcc 4.5.1, but I'll not update the i686 reference to those bootstrap-tools until they are reachable by http. The bootstrap-tools we used until now had gcc 4.3, said not to be able to build glibc 2.12.1. Meanwhile other platforms can go on building this glibc already without the patch. svn path=/nixpkgs/branches/stdenv-updates/; revision=24522 --- pkgs/development/libraries/glibc-2.12/common.nix | 3 --- .../libraries/glibc-2.12/libpthread_init.patch | 15 --------------- 2 files changed, 18 deletions(-) delete mode 100644 pkgs/development/libraries/glibc-2.12/libpthread_init.patch 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