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

diff --git a/ChangeLog b/ChangeLog
index 2214b93815ad891b9e5180ebbb012442b9d395ab..3223527a2c58fa444a7bd75e2964d78c7dad90e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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

diff --git a/Makeconfig b/Makeconfig
index 03fd89c13e8cab9364e03d7327db7bd298a4d6a3..c1ce74b4b4a68c3c3f4e3772b4805ef219790332 100644 (file)
--- 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 7e4077ee505d2f786ce529f5c0b2f5645d8247f8..748790b591ac9380cc68bcd589625cd0ec91b94a 100644 (file)
--- 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)
 \f
 # Shared library building.
 

diff --git a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile
index e3a3201c4b25c5f64bb296fde868a03211658fef..311042787b45dbbb8db5b5c76dfb315f29e1af51 100644 (file)
--- 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 08c5a96c95db9b598a3d52500455485c8ed7f75e..526673e7b4d527ae5139d3bb209793211e4de262 100644 (file)
--- 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 fbabf692633923211827e43eddca9b9aad82f58b..a5e403630e7468dbebec16196a6867d0917ae916 100644 (file)
--- 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