Contiki IAR Workbench v6.x.x patch

contiki-iar.patch

diff --git a/cpu/msp430/isr_compat.h b/cpu/msp430/isr_compat.h
index 5d1a2dc..6662b24 100644
--- a/cpu/msp430/isr_compat.h
+++ b/cpu/msp430/isr_compat.h
@@ -67,8 +67,8 @@
 #elif defined(__IAR_SYSTEMS_ICC__)  &&  (((__TID__ >> 8) & 0x7f) == 43)  &&  (__VER__ < 200)
     /* This is V1.xx of the IAR compiler. */
 #define ISR(a,b) interrupt[a ## _VECTOR] void b(void)
-#elif defined(__IAR_SYSTEMS_ICC__)  &&  (((__TID__ >> 8) & 0x7f) == 43)  &&  (__VER__ < 600)
-    /* This is V2.xx, V3.xx, V4.xx, V5.xx of the IAR compiler. */
+#elif defined(__IAR_SYSTEMS_ICC__)  &&  (((__TID__ >> 8) & 0x7f) == 43)
+    /* This is V2.xx, V3.xx, V4.xx, V5.xx, V6.xx of the IAR compiler. */
 #define ISR(a,b) \
 __PRAGMA__(vector=a ##_VECTOR) \
 __interrupt void b(void)
diff --git a/platform/sky/Makefile.common b/platform/sky/Makefile.common
index 64484e1..2edeadf 100644
--- a/platform/sky/Makefile.common
+++ b/platform/sky/Makefile.common
@@ -29,7 +29,7 @@ contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/,symbols.o}
 
 
 ifdef IAR
-LDFLAGSNO += -xm "$(IAR_PATH)/lib/dlib/dl430fn.r43" -f "$(IAR_PATH)/config/lnk430f1611.xcl"
+LDFLAGSNO += -xm "$(IAR_PATH)/lib/dlib/dl430fn.r43" -f "$(IAR_PATH)/config/linker/lnk430f1611.xcl"
 LDFLAGS += $(LDFLAGSNO) -Felf -yn
 endif # IAR