diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-08-24 12:38:42 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-08-24 12:38:42 +0000 |
| commit | 46454ac2a8a7d693ac135f0d4a9461bbcf24eea9 (patch) | |
| tree | 86488784b36537f382ccd448c6684d60f1540527 /apps/plugins | |
| parent | 20de4c55a2ddfa802a01cc353884d73a934bf7ba (diff) | |
| download | rockbox-46454ac2a8a7d693ac135f0d4a9461bbcf24eea9.zip rockbox-46454ac2a8a7d693ac135f0d4a9461bbcf24eea9.tar.gz rockbox-46454ac2a8a7d693ac135f0d4a9461bbcf24eea9.tar.bz2 rockbox-46454ac2a8a7d693ac135f0d4a9461bbcf24eea9.tar.xz | |
Move setjmp to lib and add setjmp for sh (imported from newlib) and compile it as separate library.
It's used by both, plugins and codecs, and sh/hwcodec doesn't compile codecs
so it doesn't fit into sources.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27869 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/lib/SOURCES | 16 | ||||
| -rw-r--r-- | apps/plugins/lib/pluginlib_exit.h | 4 | ||||
| -rw-r--r-- | apps/plugins/lua/rockconf.h | 4 | ||||
| -rw-r--r-- | apps/plugins/plugins.make | 2 |
4 files changed, 1 insertions, 25 deletions
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES index fa12f94..1db9896 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES @@ -75,19 +75,3 @@ pluginlib_albumart.c #ifdef HAVE_TOUCHSCREEN pluginlib_touchscreen.c #endif - -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) - -#ifdef CPU_ARM -../../codecs/lib/setjmp_arm.S -#endif - -#ifdef CPU_COLDFIRE -../../codecs/lib/setjmp_cf.S -#endif - -#ifdef CPU_MIPS -../../codecs/lib/setjmp_mips.S -#endif - -#endif /* PLATFORM_NATIVE */ diff --git a/apps/plugins/lib/pluginlib_exit.h b/apps/plugins/lib/pluginlib_exit.h index 00cbc8d..8c7f0c4 100644 --- a/apps/plugins/lib/pluginlib_exit.h +++ b/apps/plugins/lib/pluginlib_exit.h @@ -23,11 +23,7 @@ #define __PLUGINLIB_EXIT_H__ #include "config.h" -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) -#include "../../codecs/lib/setjmp.h" -#else #include <setjmp.h> -#endif #define _PLUGINLIB_EXIT_INIT(atexit) switch(setjmp(__exit_env)) \ { \ diff --git a/apps/plugins/lua/rockconf.h b/apps/plugins/lua/rockconf.h index dd7f98f..c0a2331 100644 --- a/apps/plugins/lua/rockconf.h +++ b/apps/plugins/lua/rockconf.h @@ -31,11 +31,7 @@ #undef LUA_PATH_DEFAULT #define LUA_PATH_DEFAULT "$/?.lua;" "$/?/init.lua;" VIEWERS_DIR"/lua/?.lua;" VIEWERS_DIR"/lua/?/init.lua;" -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) -#include "../../codecs/lib/setjmp.h" -#else #include <setjmp.h> -#endif #include "lib/pluginlib_exit.h" diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index d3c66c3..532dba6 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -89,7 +89,7 @@ else endif PLUGINLDFLAGS += $(GLOBAL_LDOPTS) -$(BUILDDIR)/%.rock: +$(BUILDDIR)/%.rock: $(LIBSETJMP) $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(BUILDDIR)/$*.elf \ $(filter %.o, $^) \ $(filter %.a, $+) \ |