Merge branch 'master' of github.com:mruby/mruby

examples/targets/build_config_ArduinoDue.rb

@@ -21,11 +21,16 @@ end
 MRuby::CrossBuild.new("ArduinoDue") do |conf|
   toolchain :gcc
 
-  # Mac OS X
+  # Mac OS X, Arduino IDE <= 1.5.6
   # ARDUINO_PATH = '/Applications/Arduino.app/Contents/Resources/Java'
+  # Mac OS X, Arduino IDE >= 1.5.7
+  # ARDUINO_PATH = '/Applications/Arduino.app/Contents/Java'
   # GNU Linux
   ARDUINO_PATH = '/opt/arduino'
+   # Arduino IDE <= 1.5.6
   BIN_PATH = "#{ARDUINO_PATH}/hardware/tools/g++_arm_none_eabi/bin"
+  # Arduino IDE >= 1.5.7
+  # BIN_PATH = "#{ARDUINO_PATH}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin"
   SAM_PATH = "#{ARDUINO_PATH}/hardware/arduino/sam"
   TARGET_PATH = "#{SAM_PATH}/variants/arduino_due_x"
 

src/dump.c

@@ -1035,12 +1035,12 @@ mrb_dump_irep_cfunc(mrb_state *mrb, mrb_irep *irep, int debug_info, FILE *fp, co
     if (fprintf(fp,
           "const uint8_t\n"
           "#if defined __GNUC__\n"
-          "__attribute__((aligned(%zu)))\n"
+          "__attribute__((aligned(%u)))\n"
           "#elif defined _MSC_VER\n"
-          "__declspec(align(%zu))\n"
+          "__declspec(align(%u))\n"
           "#endif\n"
-         "%s[] = {",
-          MRB_DUMP_ALIGNMENT, MRB_DUMP_ALIGNMENT, initname) < 0) {
+          "%s[] = {",
+          (uint16_t)MRB_DUMP_ALIGNMENT, (uint16_t)MRB_DUMP_ALIGNMENT, initname) < 0) {
       mrb_free(mrb, bin);
       return MRB_DUMP_WRITE_FAULT;
     }