--- a/patches/gcc/pic30.h.diff	Wed Jan 18 08:46:18 2017 +0000
+++ b/patches/gcc/pic30.h.diff	Sat Jan 21 12:58:55 2017 +0000
@@ -5,7 +5,7 @@
  #define QUOTE(X) QUOTE2(X)
  
 -#define ASM_SPEC   "%{mpartition=*:--partition %*} %{!.s:%{!.S:--relax}} %{mcpu=*:-p%*} -omf=" OMF
-+#define ASM_SPEC   "%{mpartition=*:--partition %*} %{!.s:%{!.S:--relax}} %{mcpu=*:-p%*}"
++#define ASM_SPEC   "%{mpartition=*:-partition} %{!.s:%{!.S:--relax}} %{mcpu=*:-p%*}"
  
  #ifndef MCHP_CCI_CC1_SPEC
  #error MCHP_CCI_CC1_SPEC not defined
@@ -17,7 +17,7 @@
 +#define CC1_SPEC  "%(mchp_cci_cc1_spec) -mresource="QUOTE(DEVICE_INFO)
  
 -#define LINK_SPEC   "%{mmemorysummary=*:--memorysummary %*} %{mpartition=*:--partition %*} %{mcpu=*:-p%*} -omf=" OMF
-+#define LINK_SPEC   "%{mmemorysummary=*:--memorysummary %*} %{mpartition=*:--partition %*} %{mcpu=*:-p%*}"
++#define LINK_SPEC   "%{mmemorysummary=*:--memorysummary %*} %{mpartition=*:-partition} %{mcpu=*:-p%*}"
  
  /*
  ** A C string constant that tells the GNU CC driver program how to run any

--- a/scripts/include	Wed Jan 18 08:46:18 2017 +0000
+++ b/scripts/include	Sat Jan 21 12:58:55 2017 +0000
@@ -27,7 +27,7 @@
 export DEVICE_INFO=${NONFREE}/bin/c30_device.info
 
 export CC="gcc"
-export CFLAGS="-DMCHP_VERSION=v1.30 -D_BUILD_C30_ -D_BUILD_MCHP_ -DRESOURCE_MISMATCH_OK -DDEVICE_INFO=${DEVICE_INFO} -I${C30_RESOURCE_DIR}"
+export CFLAGS="-DMCHP_VERSION=1.30 -D_BUILD_C30_ -D_BUILD_MCHP_ -DRESOURCE_MISMATCH_OK -DDEVICE_INFO=${DEVICE_INFO} -I${C30_RESOURCE_DIR}"
 export CXX="g++"
 export CXXFLAGS="${CFLAGS} -fpermissive"
 export MAKEINFO=/bin/true