diff options
author | Tom Ross <midgey@rockbox.org> | 2009-02-27 07:30:41 +0000 |
---|---|---|
committer | Tom Ross <midgey@rockbox.org> | 2009-02-27 07:30:41 +0000 |
commit | 5d190bc13ca9af15d50029ecbcb5c178ed3f2b85 (patch) | |
tree | 5022441b453b7204e7cb06ce885c2684cd8463a6 | |
parent | 736f956700b1a0e29c9ebb533bf30212da6418ee (diff) | |
download | rockbox-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.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 4 | ||||
-rw-r--r-- | firmware/export/config.h | 2 |
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 @@ | |||
22 | #include "config.h" | 22 | #include "config.h" |
23 | #include "codeclib.h" | 23 | #include "codeclib.h" |
24 | 24 | ||
25 | struct codec_api *ci __attribute__ ((section (".data"))); | 25 | struct codec_api *ci DATA_ATTR; |
26 | 26 | ||
27 | extern unsigned char iramcopy[]; | 27 | extern unsigned char iramcopy[]; |
28 | extern unsigned char iramstart[]; | 28 | 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 { | |||
805 | extern unsigned char plugin_start_addr[]; | 805 | extern unsigned char plugin_start_addr[]; |
806 | extern unsigned char plugin_end_addr[]; | 806 | extern unsigned char plugin_end_addr[]; |
807 | #define PLUGIN_HEADER \ | 807 | #define PLUGIN_HEADER \ |
808 | const struct plugin_api *rb __attribute__ ((section (".data"))); \ | 808 | const struct plugin_api *rb DATA_ATTR; \ |
809 | const struct plugin_header __header \ | 809 | const struct plugin_header __header \ |
810 | __attribute__ ((section (".header")))= { \ | 810 | __attribute__ ((section (".header")))= { \ |
811 | PLUGIN_MAGIC, TARGET_ID, PLUGIN_API_VERSION, \ | 811 | PLUGIN_MAGIC, TARGET_ID, PLUGIN_API_VERSION, \ |
812 | plugin_start_addr, plugin_end_addr, plugin_start, &rb }; | 812 | plugin_start_addr, plugin_end_addr, plugin_start, &rb }; |
813 | #else /* SIMULATOR */ | 813 | #else /* SIMULATOR */ |
814 | #define PLUGIN_HEADER \ | 814 | #define PLUGIN_HEADER \ |
815 | const struct plugin_api *rb __attribute__ ((section (".data"))); \ | 815 | const struct plugin_api *rb DATA_ATTR; \ |
816 | const struct plugin_header __header \ | 816 | const struct plugin_header __header \ |
817 | __attribute__((visibility("default"))) = { \ | 817 | __attribute__((visibility("default"))) = { \ |
818 | PLUGIN_MAGIC, TARGET_ID, PLUGIN_API_VERSION, \ | 818 | 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 @@ | |||
624 | #define ICONST_ATTR __attribute__ ((section(".irodata"))) | 624 | #define ICONST_ATTR __attribute__ ((section(".irodata"))) |
625 | #define IDATA_ATTR __attribute__ ((section(".idata"))) | 625 | #define IDATA_ATTR __attribute__ ((section(".idata"))) |
626 | #define IBSS_ATTR __attribute__ ((section(".ibss"))) | 626 | #define IBSS_ATTR __attribute__ ((section(".ibss"))) |
627 | #define DATA_ATTR __attribute__ ((section(".data"))) | ||
627 | #define USE_IRAM | 628 | #define USE_IRAM |
628 | #if CONFIG_CPU != SH7034 | 629 | #if CONFIG_CPU != SH7034 |
629 | #define PLUGIN_USE_IRAM | 630 | #define PLUGIN_USE_IRAM |
@@ -641,6 +642,7 @@ | |||
641 | #define ICONST_ATTR | 642 | #define ICONST_ATTR |
642 | #define IDATA_ATTR | 643 | #define IDATA_ATTR |
643 | #define IBSS_ATTR | 644 | #define IBSS_ATTR |
645 | #define DATA_ATTR | ||
644 | #define STATICIRAM static | 646 | #define STATICIRAM static |
645 | #endif | 647 | #endif |
646 | 648 | ||