r20124 broke codecs on targets without IRAM such as Gigabeat F. Behavior should be identical to r20123 on all sim builds and targets and apply a more correct fix for OS X.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20135 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 2 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 963818551f..55d5ffd06f 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -624,7 +624,6 @@
 #define ICONST_ATTR     __attribute__ ((section(".irodata")))
 #define IDATA_ATTR      __attribute__ ((section(".idata")))
 #define IBSS_ATTR       __attribute__ ((section(".ibss")))
-#define DATA_ATTR       __attribute__ ((section(".data")))
 #define USE_IRAM
 #if CONFIG_CPU != SH7034
 #define PLUGIN_USE_IRAM
@@ -642,10 +641,15 @@
 #define ICONST_ATTR
 #define IDATA_ATTR
 #define IBSS_ATTR
-#define DATA_ATTR
 #define STATICIRAM static
 #endif
 
+#if defined(SIMULATOR) && defined(__APPLE__)
+#define DATA_ATTR       __attribute__ ((section(".section __DATA, __data")))
+#else
+#define DATA_ATTR       __attribute__ ((section(".data")))
+#endif
+
 #ifndef IRAM_LCDFRAMEBUFFER
 /* if the LCD framebuffer has not been moved to IRAM, define it empty here */
 #define IRAM_LCDFRAMEBUFFER