Merge branch 'master' into benesp16

Conflicts:
	build/rtems/config.target

diff --cc build/rtems/config.target
index b07411b96e1c8e7946239e31a07fa240a946be33,83628af4b880d55039a46f60445abf50a97b6f63..3fdade32b1b4d9a90a12ca3eef4ea562d8dd6ae9
--- 1/build/rtems/config.target
--- 2/build/rtems/config.target
+++ b/build/rtems/config.target
@@@ -9,9 -9,9 +9,9 @@@ test: wvtes
  .PHONY: test
  
  # Platform name as preprocessor symbol
 -export PLATFORM=rtems
 +export PLATFORM=RTEMS
  # Platform name as used in file names
- export PLATFORM_FN=RTEMS
+ export PLATFORM_FN=rtems
  
  # Create symbolic links to headers instead of copying them. Useful
  # during development.

diff --cc src/forb/src/forb.h
index 2e4a2c4623a79e0ee51cdf2cb98bdf7baa0bdcc4,e44d49cdd4f4e5ab64474336a658c87c949ed19b..595ed1ff38cc5ab5a9d8ef6dfa2419af01826824
--- 1/src/forb/src/forb.h
--- 2/src/forb/src/forb.h
+++ b/src/forb/src/forb.h
@@@ -237,6 -237,23 +237,23 @@@ forb_daemon_ready()
  int
  forb_signal_server_ready();   
  
 -#ifdef rtems
+ /** 
+  * \def FORB_MAIN(id, orb, argc, argv)
+  *
+  * Introduce the definition of the main forb function i.e. the
+  * function which is called upon loading the FORB "component".
+  * 
+  * @param id "C" identifier of the function. On some platforms, it is
+  * used to distinguish multiple FORB_MAIN functions from each other. *
+  *
+  * Example usage: FORB_MAIN(frm_dummy, forb_orb orb, int argc, char *argv[])
+  */
++#ifdef RTEMS
+ #define FORB_MAIN(id, orb, argc, argv) int forb_main_ ## id(orb, argc, argv)
+ #else 
+ #define FORB_MAIN(id, orb, argc, argv) int forb_main(orb, argc, argv)
+ #endif
+ 
  #ifdef __cplusplus
  } /* extern "C"*/
  #endif