Moving from Keil Compiler 5.6 to 6.13

Hello,

I want to move from Keil Compiler 5.6 to 6.13 for my FreeRTOS based code on Cortex M4. I found out the following problems in doing so,

1) cmsis_armclang.h was not found. For this I found a compatible version from web and used that, it works but not sure if it is a good idea.

2) FreeRTOS/portable/RVDS/Cortex_M4F/portmacro.h and port.c has problems with __asm call. To solve this, I started using FreeRTOS/portable/GCC/Cortex_M4F/portmacro.h and port.c. Again this works but, not sure if it is a good idea.

3) There are some keil specific libraries like, Segger's RTT_Syscalls_Keil which does not work anymore. Can I use the GCC one here too?

Please comment on my solutions and problems. If there are better ways or something that I miss, please let me know.