From a12e313f810b548c98a310d590a6b7f08a42a6d5 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 24 Feb 2014 14:40:33 +0200
Subject: [PATCH 1/2] config/optimize: remove fast/speed

---
 config/optimize | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/config/optimize b/config/optimize
index 2bdedc671b..efc9d71112 100644
--- a/config/optimize
+++ b/config/optimize
@@ -1,32 +1,16 @@
-if [ "$OPTIMIZATIONS" = fast ];then
-  GCC_OPTIM="-Ofast"
-  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
-  LD_OPTIM="-Wl,--as-needed"
-fi
-
-if [ "$OPTIMIZATIONS" = speed ];then
-  GCC_OPTIM="$GCC_OPTIM -O3"
-  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
-  GCC_OPTIM="$GCC_OPTIM -ffast-math"
-  LD_OPTIM="-Wl,--as-needed"
-fi
-
 if [ "$OPTIMIZATIONS" = normal ];then
-  GCC_OPTIM="$GCC_OPTIM -O2"
+  GCC_OPTIM="-O2"
   LD_OPTIM=""
 fi
 
 if [ "$OPTIMIZATIONS" = size ];then
-  GCC_OPTIM="$GCC_OPTIM -Os"
-  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
-  GCC_OPTIM="$GCC_OPTIM -ffast-math"
+  GCC_OPTIM="-Os -fexcess-precision=fast -ffast-math"
   LD_OPTIM="-Wl,--as-needed"
 fi
 
 if [ "$LTO_SUPPORT" = yes ];then
   GCC_OPTIM="$GCC_OPTIM -flto"
-  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
-  LD_OPTIM="$LD_OPTIM -flto"
+  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin -flto"
 fi
 
 if [ "$GOLD_SUPPORT" = yes ];then

From 58d8de3770e388251c8bee8f546a6affa1520cc2 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 24 Feb 2014 14:42:22 +0200
Subject: [PATCH 2/2] projects/*/options: make it clear that only size/normal
 is supported

---
 projects/ATV/options     | 2 +-
 projects/Cuboxi/options  | 2 +-
 projects/Generic/options | 2 +-
 projects/RPi/options     | 2 +-
 projects/Virtual/options | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/ATV/options b/projects/ATV/options
index 5760ceab06..ab6b677e9e 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -67,7 +67,7 @@
       ;;
   esac
 
-# Build optimizations (size/speed)
+# Build optimizations (size/normal)
   OPTIMIZATIONS="size"
 
 # Project CFLAGS
diff --git a/projects/Cuboxi/options b/projects/Cuboxi/options
index 95753402a0..156b182311 100644
--- a/projects/Cuboxi/options
+++ b/projects/Cuboxi/options
@@ -67,7 +67,7 @@
       ;;
   esac
 
-# Build optimizations (size/normal/speed)
+# Build optimizations (size/normal)
   OPTIMIZATIONS="size"
 
 # Project CFLAGS
diff --git a/projects/Generic/options b/projects/Generic/options
index ed84428030..239ad01a2d 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -67,7 +67,7 @@
       ;;
   esac
 
-# Build optimizations (size/speed)
+# Build optimizations (size/normal)
   OPTIMIZATIONS="size"
 
 # Project CFLAGS
diff --git a/projects/RPi/options b/projects/RPi/options
index c62ec9ec11..b4caa98a38 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -67,7 +67,7 @@
       ;;
   esac
 
-# Build optimizations (size/normal/speed)
+# Build optimizations (size/normal)
   OPTIMIZATIONS="size"
 
 # Project CFLAGS
diff --git a/projects/Virtual/options b/projects/Virtual/options
index 115d00cae7..cc8a5828d4 100644
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -62,7 +62,7 @@
       ;;
   esac
 
-# Build optimizations (size/speed)
+# Build optimizations (size/normal)
   OPTIMIZATIONS="size"
 
 # Project CFLAGS