From 04a9e7f2510aa2988b855ad6abc081801a2a96e7 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 23 Sep 2004 05:56:12 +0000
Subject: [PATCH] Remove glibc-execstack-disable.patch patch, use
 glibc-nptl-check.patch even on current fedora (GCC 3.4.*).

---
 fedora/glibc-execstack-disable.patch | 65 ------------------------------------
 fedora/glibc.spec.in                 |  8 ++---
 2 files changed, 3 insertions(+), 70 deletions(-)
 delete mode 100644 fedora/glibc-execstack-disable.patch

diff --git a/fedora/glibc-execstack-disable.patch b/fedora/glibc-execstack-disable.patch
deleted file mode 100644
index dc0663635f..0000000000
--- a/fedora/glibc-execstack-disable.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- libc/config.make.in.jj	Wed Sep 24 05:39:06 2003
-+++ libc/config.make.in	Wed Sep 24 17:03:11 2003
-@@ -42,7 +42,7 @@ have-z-nodelete = @libc_cv_z_nodelete@
- have-z-nodlopen = @libc_cv_z_nodlopen@
- have-z-initfirst = @libc_cv_z_initfirst@
- have-z-combreloc = @libc_cv_z_combreloc@
--have-z-execstack = @libc_cv_z_execstack@
-+have-z-execstack = no
- have-initfini = @libc_cv_have_initfini@
- have-Bgroup = @libc_cv_Bgroup@
- need-nopic-initfini = @nopic_initfini@
---- libc/linuxthreads/sysdeps/unix/sysv/linux/dl-execstack.c.jj	Thu Apr 11 10:25:15 2002
-+++ libc/linuxthreads/sysdeps/unix/sysv/linux/dl-execstack.c	Wed Sep 24 17:45:40 2003
-@@ -0,0 +1 @@
-+#include <sysdeps/generic/dl-execstack.c>
---- libc/elf/rtld.c.jj	Wed Sep 24 05:39:07 2003
-+++ libc/elf/rtld.c	Wed Sep 24 17:52:43 2003
-@@ -764,6 +764,7 @@ of this helper program; chances are you 
- 	 load the program below unless it has a PT_GNU_STACK indicating
- 	 nonexecutable stack is ok.  */
- 
-+      if (0)
-       for (ph = phdr; ph < &phdr[phnum]; ++ph)
- 	if (ph->p_type == PT_GNU_STACK)
- 	  {
-@@ -929,7 +930,7 @@ of this helper program; chances are you 
- 	break;
- #endif
-       case PT_GNU_STACK:
--	GL(dl_stack_flags) = ph->p_flags;
-+//	GL(dl_stack_flags) = ph->p_flags;
- 	break;
-       }
- #ifdef USE_TLS
---- libc/elf/dl-support.c.jj	Wed Sep 24 06:22:50 2003
-+++ libc/elf/dl-support.c	Wed Sep 24 17:54:05 2003
-@@ -281,7 +281,7 @@ _dl_non_dynamic_init (void)
- #endif
- 
-   /* Scan for a program header telling us the stack is nonexecutable.  */
--  if (_dl_phdr != NULL)
-+  if (0 && _dl_phdr != NULL)
-     for (uint_fast16_t i = 0; i < _dl_phnum; ++i)
-       if (_dl_phdr[i].p_type == PT_GNU_STACK)
- 	{
---- libc/elf/dl-load.c.jj	2003-09-24 05:34:10.000000000 -0400
-+++ libc/elf/dl-load.c	2003-09-24 18:10:41.000000000 -0400
-@@ -1063,7 +1063,7 @@ cannot allocate TLS data structures for 
- 	  break;
- 
- 	case PT_GNU_STACK:
--	  stack_flags = ph->p_flags;
-+//	  stack_flags = ph->p_flags;
- 	  break;
- 	}
- 
-@@ -1341,7 +1341,7 @@ cannot allocate TLS data structures for 
-   l->l_dev = st.st_dev;
-   l->l_ino = st.st_ino;
- 
--  if (__builtin_expect ((stack_flags &~ GL(dl_stack_flags)) & PF_X, 0))
-+  if (0 && __builtin_expect ((stack_flags &~ GL(dl_stack_flags)) & PF_X, 0))
-     {
-       /* The stack is presently not executable, but this module
- 	 requires that it be executable.  */
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 30ee1c409c..047dc56d01 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -18,8 +18,7 @@ Source1: %{name}-fedora-%{glibcdate}.tar.bz2
 Patch0: %{name}-fedora.patch
 Patch1: %{name}-nptl-check.patch
 Patch2: %{name}-ppc-assume.patch
-Patch3: %{name}-execstack-disable.patch
-Patch4: %{name}-ia64-lib64.patch
+Patch3: %{name}-ia64-lib64.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes:  linuxthreads, gencat, locale, ldconfig, locale-ja
@@ -249,7 +248,7 @@ package or when debugging this package.
 %setup -q -n %{glibcsrcdir} -a1
 %patch0 -p1
 case "`gcc --version | head -1`" in
-gcc*\ 3.3*)
+gcc*\ 3.[34]*)
 %ifarch %{nptlarches}
 %patch1 -p1
 %endif
@@ -257,12 +256,11 @@ gcc*\ 3.3*)
 gcc*\ 3.2.3*)
   case "`uname -r`" in *.ent*|*.EL*)
 %patch2 -p1
-%patch3 -p1
   ;; esac ;;
 esac
 %ifarch ia64
 %if "%{_lib}" == "lib64"
-%patch4 -p1
+%patch3 -p1
 %endif
 %endif
 
-- 
2.11.4.GIT