summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Ross <midgey@rockbox.org>2009-02-27 07:30:41 +0000
committerTom Ross <midgey@rockbox.org>2009-02-27 07:30:41 +0000
commit5d190bc13ca9af15d50029ecbcb5c178ed3f2b85 (patch)
tree5022441b453b7204e7cb06ce885c2684cd8463a6
parent736f956700b1a0e29c9ebb533bf30212da6418ee (diff)
downloadrockbox-5d190bc13ca9af15d50029ecbcb5c178ed3f2b85.tar.gz
rockbox-5d190bc13ca9af15d50029ecbcb5c178ed3f2b85.zip
Mac doesn't handle placing variables in specific sections very well. Building the sim on OS X is now possible once again.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20124 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/codec_crt0.c2
-rw-r--r--apps/plugin.h4
-rw-r--r--firmware/export/config.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/apps/codecs/codec_crt0.c b/apps/codecs/codec_crt0.c
index 09b6982246..ed313634e3 100644
--- a/apps/codecs/codec_crt0.c
+++ b/apps/codecs/codec_crt0.c
@@ -22,7 +22,7 @@
#include "config.h"
#include "codeclib.h"
-struct codec_api *ci __attribute__ ((section (".data")));
+struct codec_api *ci DATA_ATTR;
extern unsigned char iramcopy[];
extern unsigned char iramstart[];
diff --git a/apps/plugin.h b/apps/plugin.h
index 84c3d25654..1c8682f43b 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -805,14 +805,14 @@ struct plugin_header {
extern unsigned char plugin_start_addr[];
extern unsigned char plugin_end_addr[];
#define PLUGIN_HEADER \
- const struct plugin_api *rb __attribute__ ((section (".data"))); \
+ const struct plugin_api *rb DATA_ATTR; \
const struct plugin_header __header \
__attribute__ ((section (".header")))= { \
PLUGIN_MAGIC, TARGET_ID, PLUGIN_API_VERSION, \
plugin_start_addr, plugin_end_addr, plugin_start, &rb };
#else /* SIMULATOR */
#define PLUGIN_HEADER \
- const struct plugin_api *rb __attribute__ ((section (".data"))); \
+ const struct plugin_api *rb DATA_ATTR; \
const struct plugin_header __header \
__attribute__((visibility("default"))) = { \
PLUGIN_MAGIC, TARGET_ID, PLUGIN_API_VERSION, \
diff --git a/firmware/export/config.h b/firmware/export/config.h
index da35f79b33..963818551f 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -624,6 +624,7 @@
#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
@@ -641,6 +642,7 @@
#define ICONST_ATTR
#define IDATA_ATTR
#define IBSS_ATTR
+#define DATA_ATTR
#define STATICIRAM static
#endif