git: d5bd29ed505f - stable/13 - Revert "[mips] revert r366664 - flip mips back from -O2 to -O"

[Mateusz Guzik]

The branch stable/13 has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=d5bd29ed505f535b52673604951d018a43d72579

commit d5bd29ed505f535b52673604951d018a43d72579
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-01-22 10:17:34 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-01-22 14:25:45 +0000

    Revert "[mips] revert r366664 - flip mips back from -O2 to -O"
    
    This reverts commit bd72252aace382921840ddbceea712b96f4ad242.
    
    The commit at hand breaks the build for all mips targets and does not
    have a one-liner fix.
    
    make[5]: "/usr/src/share/mk/sys.mk" line 169: Malformed conditional (${MACHINE_CPUARCH} == "mips" && ${COMPILER_TYPE} == "gcc")
    
    (cherry picked from commit bb3b6995c4d0ced1a87ec57407f216ece69ab674)
---
 share/mk/sys.mk | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 72f458397683..8f456b28593a 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -166,14 +166,7 @@ CC		?=	c89
 CFLAGS		?=	-O
 .else
 CC		?=	cc
-.if ${MACHINE_CPUARCH} == "mips" && ${COMPILER_TYPE} == "gcc"
-# Note: there are currently issues generating code gcc-6.x targeting
-# code for at least mips32.  The system hits infinite page faults
-# when starting /sbin/init if -O2 is used.
-CFLAGS		?=	-O -pipe
-.else
 CFLAGS		?=	-O2 -pipe
-.endif
 .if defined(NO_STRICT_ALIASING)
 CFLAGS		+=	-fno-strict-aliasing
 .endif