From 851be21f671feb0bf41e1dcaaced4d7e2e5cf72c Mon Sep 17 00:00:00 2001
From: Rafaël Carré <rafael.carre@gmail.com>
Date: Tue, 3 Aug 2010 19:00:29 +0000
Subject: system-arm.c/__div0 are for ARM native builds only

Android can now be built with CPU_ARM defined
Needs investigation (and test_codec) to see if/how this helps

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27684 a1c6a512-1295-4272-9138-f99709370657
---
 apps/codecs.c    | 2 +-
 apps/codecs.h    | 2 +-
 apps/plugin.c    | 2 +-
 apps/plugin.h    | 2 +-
 firmware/SOURCES | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/codecs.c b/apps/codecs.c
index 29a664425a..9e77dd9099 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -119,7 +119,7 @@ struct codec_api ci = {
     NULL, /* configure */
     
     /* kernel/ system */
-#ifdef CPU_ARM
+#if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE
     __div0,
 #endif
     PREFIX(sleep),
diff --git a/apps/codecs.h b/apps/codecs.h
index 7e4fe948c2..97b33ec9ad 100644
--- a/apps/codecs.h
+++ b/apps/codecs.h
@@ -156,7 +156,7 @@ struct codec_api {
     void (*configure)(int setting, intptr_t value);
 
     /* kernel/ system */
-#ifdef CPU_ARM
+#if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE
     void (*__div0)(void);
 #endif
     void (*sleep)(int ticks);
diff --git a/apps/plugin.c b/apps/plugin.c
index b3baea757c..cc540cd988 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -345,7 +345,7 @@ static const struct plugin_api rockbox_api = {
     dir_exists,
 
     /* kernel/ system */
-#ifdef CPU_ARM
+#if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE
     __div0,
 #endif
     PREFIX(sleep),
diff --git a/apps/plugin.h b/apps/plugin.h
index 5ee18d0078..624b7039b8 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -450,7 +450,7 @@ struct plugin_api {
     bool (*dir_exists)(const char *path);
 
     /* kernel/ system */
-#ifdef CPU_ARM
+#if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE
     void (*__div0)(void);
 #endif
     void (*sleep)(int ticks);
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 4092f71e04..f27a7dd140 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -448,7 +448,9 @@ target/arm/memset16-arm.S
 #ifdef HAVE_PRIORITY_SCHEDULING
 target/arm/ffs-arm.S
 #endif
+#if CONFIG_PLATFORM & PLATFORM_NATIVE
 target/arm/system-arm.c
+#endif
 #if CONFIG_I2C == I2C_PP5024 || CONFIG_I2C == I2C_PP5020 || CONFIG_I2C == I2C_PP5002
 target/arm/i2c-pp.c
 #elif CONFIG_I2C == I2C_PNX0101
-- 
cgit v1.2.3