Merge 3.16 (after 3.16.2-rc1) into 7.0

2018-10-26 17:04:53 -05:00
parent c08b1ef5d1 94ebd0fe48
commit 2efe56c6d1
157 changed files with 5520 additions and 1623 deletions
@@ -27,7 +27,13 @@
 *     }
 */

-#if defined(vxWorks) || defined(__rtems__)
+#if defined(__rtems__)
+  #ifdef __cplusplus
+    #define MAIN(prog) extern "C" int prog(void); extern "C" int main() __attribute__((weak, alias(#prog))); extern "C" int prog(void)
+  #else
+    #define MAIN(prog) int prog(); int main() __attribute__((weak, alias(#prog))); int prog()
+  #endif
+#elif defined(vxWorks)
  #ifdef __cplusplus
    #define MAIN(prog) extern "C" int prog(void)
  #else