From 74c87465950d7373fae090a575332fa66d9b7047 Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Sun, 22 Jan 2012 20:33:37 +0100
Subject: Don't filter out -O for sims.

It's not useful as it means we test code at a different -O level than
we run it at.
Fixes build errors caused by gcc 4.3. Fix some warnings
the change would introduce as well.

Change-Id: Id9ff31dc08694b0bfc5272f5e690c41f7918ed22
---
 apps/codecs/wma.c          |  2 +-
 apps/plugin.h              | 14 ++++++++------
 apps/plugins/doom/z_zone.c |  2 +-
 tools/configure            |  4 ----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/apps/codecs/wma.c b/apps/codecs/wma.c
index 8986531744..361fee6175 100644
--- a/apps/codecs/wma.c
+++ b/apps/codecs/wma.c
@@ -46,7 +46,7 @@ enum codec_status codec_run(void)
     asf_waveformatex_t wfx;
     size_t resume_offset;
     int i;
-    int wmares;
+    int wmares = 0;
     int res = 0;
     uint8_t* audiobuf;
     int audiobufsize;
diff --git a/apps/plugin.h b/apps/plugin.h
index 918206ab69..d83f6f4845 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -37,6 +37,14 @@
 #include "string-extra.h"
 #include "gcc_extensions.h"
 
+
+
+/* on some platforms strcmp() seems to be a tricky define which
+ * breaks if we write down strcmp's prototype */
+#undef strcmp
+#undef strncmp
+#undef strchr
+
 char* strncpy(char *, const char *, size_t);
 void* plugin_get_buffer(size_t *buffer_size);
 
@@ -119,12 +127,6 @@ void* plugin_get_buffer(size_t *buffer_size);
 #endif
 
 
-/* on some platforms strcmp() seems to be a tricky define which
- * breaks if we write down strcmp's prototype */
-#undef strcmp
-#undef strncmp
-#undef strchr
-
 #ifdef PLUGIN
 
 #if defined(DEBUG) || defined(SIMULATOR)
diff --git a/apps/plugins/doom/z_zone.c b/apps/plugins/doom/z_zone.c
index adf17a7ee0..df00d6a9d7 100644
--- a/apps/plugins/doom/z_zone.c
+++ b/apps/plugins/doom/z_zone.c
@@ -248,7 +248,7 @@ void Z_Init(void)
 
    zonebase_size=size;
 
-   printf("Z_Init: Allocated %uldKb zone memory\n", (long unsigned)(size >> 10));
+   printf("Z_Init: Allocated %luKb zone memory\n", (long unsigned)(size >> 10));
 
    // Align on cache boundary
 
diff --git a/tools/configure b/tools/configure
index ac2c66a6b1..795966c9eb 100755
--- a/tools/configure
+++ b/tools/configure
@@ -227,10 +227,6 @@ simcc () {
  app_type=$1
  winbuild=""
  GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//`
- if [ "$app_type" != "sdl-app" ]; then
-     # Disable optimizations for non-app builds
-     GCCOPTS=`echo $GCCOPTS | sed -e s/-O//`
- fi
 
  GCCOPTS="$GCCOPTS -fno-builtin -g"
  GCCOPTIMIZE=''
-- 
cgit v1.2.3