--- a/patches/acme/Makefile.in.diff Tue Jan 12 11:09:38 2016 +0000
+++ b/patches/acme/Makefile.in.diff Wed Jan 18 08:46:18 2017 +0000
@@ -1,5 +1,5 @@
---- v1.25.src/src/acme/Makefile.in.orig 2016-01-12 08:52:04.208315888 +0000
-+++ v1.25.src/src/acme/Makefile.in 2016-01-12 08:52:19.104378085 +0000
+--- v1.30.src/src/acme/Makefile.in.orig 2016-11-22 11:46:22.000000000 +0000
++++ v1.30.src/src/acme/Makefile.in 2017-01-18 08:32:50.201915867 +0000
@@ -194,11 +194,7 @@
# For an installed makeinfo, we require it to be from texinfo 4 or
# higher, else we use the "missing" dummy.
--- a/patches/acme/coff-pic30.c.diff Tue Jan 12 11:09:38 2016 +0000
+++ b/patches/acme/coff-pic30.c.diff Wed Jan 18 08:46:18 2017 +0000
@@ -1,6 +1,6 @@
---- v1.25.src/src/acme/bfd/coff-pic30.c.orig 2015-06-30 15:29:32.000000000 +0100
-+++ v1.25.src/src/acme/bfd/coff-pic30.c 2016-01-12 08:01:38.975684280 +0000
-@@ -2603,7 +2603,7 @@
+--- v1.30.src/src/acme/bfd/coff-pic30.c.orig 2016-11-22 11:46:26.000000000 +0000
++++ v1.30.src/src/acme/bfd/coff-pic30.c 2017-01-18 08:32:50.205915883 +0000
+@@ -2913,7 +2913,7 @@
break;
case R_PIC30_PCREL_BRANCH_SLIT6:
/* valid range is [-32..31] and not [-2, -1, 0] */
@@ -9,7 +9,7 @@
{
*error_msg = (char *) malloc(BUFSIZ);
sprintf(*error_msg,
-@@ -2615,7 +2615,7 @@
+@@ -2925,7 +2925,7 @@
case R_PIC30_PCREL_BRANCH:
case R_PIC30_BRANCH_ABSOLUTE:
/* valid range is [-32768..32767] and not [-2, -1, 0] */
@@ -18,7 +18,7 @@
{
*error_msg = (char *) malloc(BUFSIZ);
sprintf(*error_msg,
-@@ -2628,7 +2628,7 @@
+@@ -2938,7 +2938,7 @@
case R_PIC30_PCREL_DO:
case R_PIC30_DO_ABSOLUTE:
/* valid range is [-32768..32767] and not [-2, -1, 0] */
--- a/patches/acme/cpu-pic30.c.diff Tue Jan 12 11:09:38 2016 +0000
+++ b/patches/acme/cpu-pic30.c.diff Wed Jan 18 08:46:18 2017 +0000
@@ -1,6 +1,6 @@
---- v1.25.src/src/acme/bfd/cpu-pic30.c.orig 2014-08-19 11:49:12.000000000 +0100
-+++ v1.25.src/src/acme/bfd/cpu-pic30.c 2014-09-28 21:20:48.669994596 +0100
-@@ -103,7 +103,10 @@
+--- v1.30.src/src/acme/bfd/cpu-pic30.c.orig 2016-11-22 11:46:22.000000000 +0000
++++ v1.30.src/src/acme/bfd/cpu-pic30.c 2017-01-18 08:32:50.205915883 +0000
+@@ -106,7 +106,10 @@
const bfd_arch_info_type * global_PROCESSOR = NULL;
@@ -12,17 +12,17 @@
#define EOL ,
#define ARCH(machine, printable_name, default_machine, next, flags) \
-@@ -191,9 +194,6 @@
- unsigned int aivtloc_mask = 0;
+@@ -197,9 +200,6 @@
bfd_boolean pic30_has_floating_aivt = FALSE;
+ bfd_boolean pic30_has_fixed_aivt = FALSE;
-#define QUOTE2(X) #X
-#define QUOTE(X) QUOTE2(X)
-
int
pic30_is_generic_machine(unsigned int machine) {
- if ((machine == 0) || ((machine >= 90) && (machine <= 94))) return 1;
-@@ -290,13 +290,6 @@
+ if ((machine == 0) || ((machine >= 90) && (machine <= 95))) return 1;
+@@ -296,13 +296,6 @@
if (dosPATH) free(dosPATH);
if (PATH) tool_name = command;
}
@@ -36,7 +36,7 @@
}
void pic30_update_resource(const char *resource) {
-@@ -318,7 +311,7 @@
+@@ -324,7 +317,7 @@
if ((*Microchip) && ((*Microchip == '_') || (*Microchip == '.'))) {
Microchip++;
minor = strtol(Microchip, &Microchip, 0);
@@ -45,7 +45,7 @@
}
pic30_tool_version = major *100 + minor;
version_part1 = new_version;
-@@ -339,16 +332,14 @@
+@@ -345,16 +338,14 @@
if (err_return) return;
--- a/patches/acme/elf32-pic30.c.diff Tue Jan 12 11:09:38 2016 +0000
+++ b/patches/acme/elf32-pic30.c.diff Wed Jan 18 08:46:18 2017 +0000
@@ -1,6 +1,6 @@
---- v1.25.src/src/acme/bfd/elf32-pic30.c.orig 2015-06-30 15:29:32.000000000 +0100
-+++ v1.25.src/src/acme/bfd/elf32-pic30.c 2016-01-12 08:02:51.631987650 +0000
-@@ -2807,7 +2807,7 @@
+--- v1.30.src/src/acme/bfd/elf32-pic30.c.orig 2016-11-22 11:46:22.000000000 +0000
++++ v1.30.src/src/acme/bfd/elf32-pic30.c 2017-01-18 08:32:50.205915883 +0000
+@@ -3518,7 +3518,7 @@
break;
case R_PIC30_PCREL_BRANCH_SLIT6:
/* valid range is [-32..31] */
@@ -9,7 +9,7 @@
{
*error_msg = (char *) malloc(BUFSIZ);
sprintf(*error_msg,
-@@ -2819,7 +2819,7 @@
+@@ -3530,7 +3530,7 @@
case R_PIC30_PCREL_BRANCH:
case R_PIC30_BRANCH_ABSOLUTE:
/* valid range is [-32768..32767] and not [-2, -1, 0] */
@@ -18,7 +18,7 @@
{
*error_msg = (char *) malloc(BUFSIZ);
sprintf(*error_msg,
-@@ -2832,7 +2832,7 @@
+@@ -3543,7 +3543,7 @@
case R_PIC30_PCREL_DO:
case R_PIC30_DO_ABSOLUTE:
/* valid range is [-32768..32767] and not [-2, -1, 0] */
--- a/patches/c30/c30_flag_definitions.h.diff Tue Jan 12 11:09:38 2016 +0000
+++ b/patches/c30/c30_flag_definitions.h.diff Wed Jan 18 08:46:18 2017 +0000
@@ -1,6 +1,6 @@
---- v1.25.src/src/c30_resource/src/c30/c30_flag_definitions.h.orig 2016-01-12 07:54:45.193878568 +0000
-+++ v1.25.src/src/c30_resource/src/c30/c30_flag_definitions.h 2016-01-12 07:54:49.929898343 +0000
-@@ -117,75 +117,75 @@
+--- v1.30.src/src/c30_resource/src/c30/c30_flag_definitions.h.orig 2016-11-22 11:45:36.000000000 +0000
++++ v1.30.src/src/c30_resource/src/c30/c30_flag_definitions.h 2017-01-18 08:32:50.201915867 +0000
+@@ -132,75 +132,75 @@
* Multiple paths may be separated by colons
* '/' is converted to the correct directory separator for the OS
*/
@@ -92,7 +92,7 @@
"support" DIR_SEPARATOR_STR \
"generic" DIR_SEPARATOR_STR \
"inc"
-@@ -194,59 +194,59 @@
+@@ -209,59 +209,59 @@
* Multiple paths may be separated by colons
* '/' is converted to the correct directory separator for the OS
*/
@@ -168,7 +168,7 @@
"support" DIR_SEPARATOR_STR \
"peripheral_30F_24H_33F"
/*
-@@ -254,77 +254,77 @@
+@@ -269,77 +269,77 @@
* Multiple paths may be separated by colons
* '/' is converted to the correct directory separator for the OS
*/
--- a/patches/gcc/config.gcc.diff Tue Jan 12 11:09:38 2016 +0000
+++ b/patches/gcc/config.gcc.diff Wed Jan 18 08:46:18 2017 +0000
@@ -1,5 +1,5 @@
---- v1.25.src/src/XC_GCC/gcc/gcc/config.gcc.orig 2014-08-19 11:58:10.000000000 +0100
-+++ v1.25.src/src/XC_GCC/gcc/gcc/config.gcc 2014-09-28 20:46:54.453360170 +0100
+--- v1.30.src/src/XC_GCC/gcc/gcc/config.gcc.orig 2016-11-22 11:54:18.000000000 +0000
++++ v1.30.src/src/XC_GCC/gcc/gcc/config.gcc 2017-01-18 08:32:50.209915901 +0000
@@ -2038,9 +2038,8 @@
pic30-*-coff)
host_can_use_collect2=no
--- a/patches/gcc/configure.diff Tue Jan 12 11:09:38 2016 +0000
+++ b/patches/gcc/configure.diff Wed Jan 18 08:46:18 2017 +0000
@@ -1,5 +1,5 @@
---- v1.25.src/src/XC_GCC/gcc/configure.orig 2013-09-30 17:32:28.000000000 +0100
-+++ v1.25.src/src/XC_GCC/gcc/configure 2013-11-19 09:32:46.105657490 +0000
+--- v1.30.src/src/XC_GCC/gcc/configure.orig 2016-11-22 11:54:16.000000000 +0000
++++ v1.30.src/src/XC_GCC/gcc/configure 2017-01-18 08:32:50.209915901 +0000
@@ -3595,10 +3595,6 @@
pic30-*-*)
extra_host_args="${extra_host_args} --program-prefix=${program_prefix}"
--- a/patches/gcc/gcc.c.diff Tue Jan 12 11:09:38 2016 +0000
+++ b/patches/gcc/gcc.c.diff Wed Jan 18 08:46:18 2017 +0000
@@ -1,5 +1,5 @@
---- v1.25.src/src/XC_GCC/gcc/gcc/gcc.c.orig 2015-06-30 15:41:04.000000000 +0100
-+++ v1.25.src/src/XC_GCC/gcc/gcc/gcc.c 2016-01-12 08:06:52.224992226 +0000
+--- v1.30.src/src/XC_GCC/gcc/gcc/gcc.c.orig 2016-11-22 11:54:18.000000000 +0000
++++ v1.30.src/src/XC_GCC/gcc/gcc/gcc.c 2017-01-18 08:32:50.213915917 +0000
@@ -2996,18 +2996,7 @@
return NULL;
}
--- a/patches/gcc/make-relative-prefix.c.diff Tue Jan 12 11:09:38 2016 +0000
+++ b/patches/gcc/make-relative-prefix.c.diff Wed Jan 18 08:46:18 2017 +0000
@@ -1,5 +1,5 @@
---- v1.25.src/src/XC_GCC/gcc/libiberty/make-relative-prefix.c.orig 2013-11-19 08:05:45.437870977 +0000
-+++ v1.25.src/src/XC_GCC/gcc/libiberty/make-relative-prefix.c 2013-11-19 08:08:17.210470074 +0000
+--- v1.30.src/src/XC_GCC/gcc/libiberty/make-relative-prefix.c.orig 2016-11-22 11:54:20.000000000 +0000
++++ v1.30.src/src/XC_GCC/gcc/libiberty/make-relative-prefix.c 2017-01-18 08:32:50.213915917 +0000
@@ -322,9 +322,10 @@
if (strcmp (prog_dirs[i], bin_dirs[i]) != 0)
break;
--- a/patches/gcc/pic30.c.diff Tue Jan 12 11:09:38 2016 +0000
+++ b/patches/gcc/pic30.c.diff Wed Jan 18 08:46:18 2017 +0000
@@ -1,6 +1,6 @@
---- v1.25.src/src/XC_GCC/gcc/gcc/config/pic30/pic30.c.orig 2015-06-30 15:41:42.000000000 +0100
-+++ v1.25.src/src/XC_GCC/gcc/gcc/config/pic30/pic30.c 2016-01-12 08:11:12.794080210 +0000
-@@ -11484,7 +11484,7 @@
+--- v1.30.src/src/XC_GCC/gcc/gcc/config/pic30/pic30.c.orig 2016-11-22 11:54:32.000000000 +0000
++++ v1.30.src/src/XC_GCC/gcc/gcc/config/pic30/pic30.c 2017-01-18 08:32:50.213915917 +0000
+@@ -11913,7 +11913,7 @@
int fInterrupt;
int nLastReg;
int regno;
--- a/patches/gcc/pic30.h.diff Tue Jan 12 11:09:38 2016 +0000
+++ b/patches/gcc/pic30.h.diff Wed Jan 18 08:46:18 2017 +0000
@@ -1,6 +1,6 @@
---- v1.25.src/src/XC_GCC/gcc/gcc/config/pic30/pic30.h.orig 2015-06-30 15:41:02.000000000 +0100
-+++ v1.25.src/src/XC_GCC/gcc/gcc/config/pic30/pic30.h 2016-01-12 08:14:35.502926604 +0000
-@@ -150,17 +150,15 @@
+--- v1.30.src/src/XC_GCC/gcc/gcc/config/pic30/pic30.h.orig 2016-11-22 11:54:32.000000000 +0000
++++ v1.30.src/src/XC_GCC/gcc/gcc/config/pic30/pic30.h 2017-01-18 08:32:50.217915934 +0000
+@@ -156,17 +156,15 @@
#define QUOTE2(X) #X
#define QUOTE(X) QUOTE2(X)
@@ -21,7 +21,7 @@
/*
** A C string constant that tells the GNU CC driver program how to run any
-@@ -177,7 +175,7 @@
+@@ -183,7 +181,7 @@
"%{pipe: %e-pipe and -mpa are incompatible} "\
"%{!mpa: %{save-temps: -o %b.s} %{!save-temps: %{!S:-o %g.s} %{S:%{!o*:-o %b.s}%{o*:%{o*}}}}\n}" \
"%{mpa: %{save-temps: -o %b.p} %{!save-temps: %{S: -o %b.p\n} %{!S:-o %g.p}}\n" \
@@ -30,7 +30,7 @@
"%{save-temps: -o%b.s}" \
"%{!save-temps: %{!S:-o%g.s} %{S:%{!o*:-o%b.s}%{o*:%{o*}}}} " \
"%{save-temps: %b.p} %{!save-temps: %{S: %b.p} %{!S: %g.p}}\n}"
-@@ -246,9 +244,9 @@
+@@ -252,9 +250,9 @@
gcc executable's directory. */
#undef STANDARD_EXEC_PREFIX
#undef STANDARD_BINDIR_PREFIX
--- a/scripts/include Tue Jan 12 11:09:38 2016 +0000
+++ b/scripts/include Wed Jan 18 08:46:18 2017 +0000
@@ -6,7 +6,7 @@
exit
fi
-export MICROCHIP=/opt/microchip/xc16/v1.25
+export MICROCHIP=/opt/microchip/xc16/v1.30
if test ! -d "${MICROCHIP}"; then
echo "${MICROCHIP} not found"
exit
@@ -17,17 +17,17 @@
export SRCDIR=/var/tmp/pic30-src
export BUILD=/var/tmp/pic30-build
export TARGET=/opt/pic30-tools
-export ZIP="v1.25.src.zip"
+export ZIP="v1.30.src.zip"
export NONFREE=${TARGET}/non-free
-export SOURCE=${SRCDIR}/v1.25.src/src
+export SOURCE=${SRCDIR}/v1.30.src/src
export GCCSRC=${SOURCE}/XC_GCC
export C30_RESOURCE_DIR=${SOURCE}/c30_resource/src/c30
export DEVICE_INFO=${NONFREE}/bin/c30_device.info
export CC="gcc"
-export CFLAGS="-DMCHP_VERSION=v1.25 -D_BUILD_C30_ -D_BUILD_MCHP_ -DRESOURCE_MISMATCH_OK -DDEVICE_INFO=${DEVICE_INFO} -I${C30_RESOURCE_DIR}"
+export CFLAGS="-DMCHP_VERSION=v1.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