about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-09-20 12:18:13 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-09-20 12:18:13 +0200
commit8837917cf17b083ac4178352c740b0bfeada4d7f (patch)
tree9fefc36e2ff8edbe71a8b37577eabef652e209cb
parente68c8d2757f05d1817d95d66cd3f2c2acc538b34 (diff)
downloadglibc-8837917cf17b083ac4178352c740b0bfeada4d7f.tar.gz
glibc-8837917cf17b083ac4178352c740b0bfeada4d7f.tar.xz
glibc-8837917cf17b083ac4178352c740b0bfeada4d7f.zip
Remove remnants of .og patterns
This was used by --enable-omitfp, and the bulk of it was removed in this
commit:

commit bdeba1354b7364d9b7857a048286a71ddbcdff86
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Sat Jan 7 11:29:31 2012 -0500

    Remove --enable-omitfp support
-rw-r--r--ChangeLog8
-rw-r--r--Makeconfig2
-rw-r--r--Makerules1
-rw-r--r--sysdeps/i386/i686/Makefile2
-rw-r--r--sysdeps/sparc/sparc32/sparcv9/Makefile2
-rw-r--r--sysdeps/sparc/sparc64/Makefile1
6 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 2214b93815..3223527a2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2016-09-20  Florian Weimer  <fweimer@redhat.com>
 
+	* Makeconfig (all-object-suffixes): Remove .og.
+	* Makerules (elide-routines.og): Remove.
+	* sysdeps/i386/i686/Makefile (CFLAGS-.og, ASFLAGS-.og): Remove.
+	* sysdeps/sparc/sparc32/sparcv9/Makefile (ASFLAGS-.og): Remove.
+	* sysdeps/sparc/sparc64/Makefile (ASFLAGS-.op): Remove.
+
+2016-09-20  Florian Weimer  <fweimer@redhat.com>
+
 	* scripts/sysd-rules.awk (BEGIN): Only generate rtld patterns for
 	.os objects.
 
diff --git a/Makeconfig b/Makeconfig
index 03fd89c13e..c1ce74b4b4 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -905,7 +905,7 @@ endif
 # 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 .oS
+all-object-suffixes := .o .os .op .oS
 object-suffixes :=
 CPPFLAGS-.o = $(pic-default)
 CFLAGS-.o = $(filter %frame-pointer,$(+cflags))
diff --git a/Makerules b/Makerules
index 7e4077ee50..748790b591 100644
--- a/Makerules
+++ b/Makerules
@@ -497,7 +497,6 @@ elide-routines.os += $(static-only-routines)
 # static libraries.
 elide-routines.o  += $(shared-only-routines)
 elide-routines.op += $(shared-only-routines)
-elide-routines.og += $(shared-only-routines)
 
 # Shared library building.
 
diff --git a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile
index e3a3201c4b..311042787b 100644
--- a/sysdeps/i386/i686/Makefile
+++ b/sysdeps/i386/i686/Makefile
@@ -4,11 +4,9 @@ stack-align-test-flags += -msse
 CFLAGS-.o += -Wa,-mtune=i686
 CFLAGS-.os += -Wa,-mtune=i686
 CFLAGS-.op += -Wa,-mtune=i686
-CFLAGS-.og += -Wa,-mtune=i686
 CFLAGS-.oS += -Wa,-mtune=i686
 
 ASFLAGS-.o += -Wa,-mtune=i686
 ASFLAGS-.os += -Wa,-mtune=i686
 ASFLAGS-.op += -Wa,-mtune=i686
-ASFLAGS-.og += -Wa,-mtune=i686
 ASFLAGS-.oS += -Wa,-mtune=i686
diff --git a/sysdeps/sparc/sparc32/sparcv9/Makefile b/sysdeps/sparc/sparc32/sparcv9/Makefile
index 08c5a96c95..526673e7b4 100644
--- a/sysdeps/sparc/sparc32/sparcv9/Makefile
+++ b/sysdeps/sparc/sparc32/sparcv9/Makefile
@@ -4,13 +4,11 @@ ifeq ($(have-as-vis3),yes)
 ASFLAGS-.o += -Wa,-Av9d
 ASFLAGS-.os += -Wa,-Av9d
 ASFLAGS-.op += -Wa,-Av9d
-ASFLAGS-.og += -Wa,-Av9d
 ASFLAGS-.oS += -Wa,-Av9d
 else
 ASFLAGS-.o += -Wa,-Av9a
 ASFLAGS-.os += -Wa,-Av9a
 ASFLAGS-.op += -Wa,-Av9a
-ASFLAGS-.og += -Wa,-Av9a
 ASFLAGS-.oS += -Wa,-Av9a
 endif
 
diff --git a/sysdeps/sparc/sparc64/Makefile b/sysdeps/sparc/sparc64/Makefile
index fbabf69263..a5e403630e 100644
--- a/sysdeps/sparc/sparc64/Makefile
+++ b/sysdeps/sparc/sparc64/Makefile
@@ -8,7 +8,6 @@ ifeq ($(have-as-vis3),yes)
 ASFLAGS-.o += -Wa,-Av9d
 ASFLAGS-.os += -Wa,-Av9d
 ASFLAGS-.op += -Wa,-Av9d
-ASFLAGS-.og += -Wa,-Av9d
 ASFLAGS-.oS += -Wa,-Av9d
 endif