From 3ccbc830ffa0e93a8c934fd3e43e14787ea15356 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Sun, 1 Jul 2012 07:43:33 +0000
Subject: [PATCH] - upstream removed omitfp

Changed files:
    glibc-no_debuggable_objects.patch -> 1.2
    glibc-no_opt_override.patch -> 1.3
    glibc.spec -> 1.966
---
 glibc-no_debuggable_objects.patch | 27 ---------------------------
 glibc-no_opt_override.patch       | 13 -------------
 glibc.spec                        | 11 ++++-------
 3 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 glibc-no_debuggable_objects.patch
 delete mode 100644 glibc-no_opt_override.patch

diff --git a/glibc-no_debuggable_objects.patch b/glibc-no_debuggable_objects.patch
deleted file mode 100644
index 368b062..0000000
--- a/glibc-no_debuggable_objects.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- glibc-2.5/Makeconfig.orig	2007-02-14 08:43:34.000000000 +0000
-+++ glibc-2.5/Makeconfig	2007-02-14 14:17:07.824692250 +0000
-@@ -693,7 +693,7 @@
- # The compilation rules use $(CPPFLAGS-${SUFFIX}) and $(CFLAGS-${SUFFIX})
- # to pass different flags for each flavor.
- libtypes = $(foreach o,$(object-suffixes-for-libc),$(libtype$o))
--all-object-suffixes := .o .os .op .og .ob .oS
-+all-object-suffixes := .o .os .op .ob .oS
- object-suffixes :=
- CPPFLAGS-.o = $(pic-default)
- CFLAGS-.o = $(filter %frame-pointer,$(+cflags))
-@@ -723,14 +723,9 @@
- endif
- ifeq (yes,$(build-omitfp))
- # Under --enable-omitfp, we build the library optimized without
--# debugging information using -fomit-frame-pointer, and build an extra
--# library with debugging information.  The debuggable objects are named foo.og.
--object-suffixes += .og
--CPPFLAGS-.og = $(pic-default)
--CFLAGS-.og = -g
-+# debugging information using -fomit-frame-pointer.
- CFLAGS-.o = $(filter %frame-pointer,$(+cflags)) -fomit-frame-pointer -D__USE_STRING_INLINES
- CFLAGS-.os += -fomit-frame-pointer -D__USE_STRING_INLINES
--libtype.og = lib%_g.a
- endif
- 
- bppfx = BP-
diff --git a/glibc-no_opt_override.patch b/glibc-no_opt_override.patch
deleted file mode 100644
index 0528053..0000000
--- a/glibc-no_opt_override.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- glibc-2.3.2/Makeconfig.orig	Mon Jan  6 06:31:36 2003
-+++ glibc-2.3.2/Makeconfig	Fri May  9 10:05:02 2003
-@@ -691,8 +691,8 @@
- object-suffixes += .og
- CPPFLAGS-.og = $(pic-default)
- CFLAGS-.og = -g
--CFLAGS-.o = $(filter %frame-pointer,$(+cflags)) -g0 -O99 -fomit-frame-pointer -D__USE_STRING_INLINES
--CFLAGS-.os += -g0 -O99 -fomit-frame-pointer -D__USE_STRING_INLINES
-+CFLAGS-.o = $(filter %frame-pointer,$(+cflags)) -fomit-frame-pointer -D__USE_STRING_INLINES
-+CFLAGS-.os += -fomit-frame-pointer -D__USE_STRING_INLINES
- libtype.og = lib%_g.a
- endif
- 
diff --git a/glibc.spec b/glibc.spec
index be3d186..7301910 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -59,11 +59,11 @@ Patch3:		%{name}-crypt-blowfish.patch
 Patch4:		%{name}-sotruss-sh.patch
 Patch5:		%{name}-sparc-softfp-gcc.patch
 Patch6:		%{name}-paths.patch
-Patch7:		%{name}-no_opt_override.patch
+
 Patch8:		%{name}-missing-nls.patch
 Patch9:		%{name}-java-libc-wait.patch
 Patch10:	%{name}-info.patch
-Patch11:	%{name}-no_debuggable_objects.patch
+
 Patch12:	%{name}-rh-bug-769421.patch
 Patch14:	%{name}-sparc-errno_fix.patch
 Patch15:	%{name}-new-charsets.patch
@@ -920,13 +920,11 @@ mv %{name}-ports-%{ports_version} ports
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-# OBSOLETE?
-#%patch7 -p1
+
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-# CHECK, POSSIBLY UPDATE
-#%patch11 -p1
+
 # CHECK, LIKELY OBSOLETE
 #%patch12 -p1
 %patch14 -p0
@@ -996,7 +994,6 @@ AWK="gawk" \
 ../%configure \
 	--with-binutils=$(pwd)/alt-tools \
 	--enable-kernel="%{min_kernel}" \
-	--enable-omitfp \
 	--with-headers=%{_includedir} \
 	--with%{!?with_selinux:out}-selinux \
 	--with-tls \
-- 
2.44.0