aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 2214b93..3223527 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 03fd89c..c1ce74b 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 7e4077e..748790b 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 e3a3201..3110427 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 08c5a96..526673e 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 fbabf69..a5e4036 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