diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-11-08 12:57:33 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-11-08 12:57:33 +0900 |
| commit | 4c7e812bc06ab5ed4d9220397998de9728ee2d7e (patch) | |
| tree | b34c1b6c4c0ef2f924b8cf13f3139082aa6026eb | |
| parent | 3e0575ecb1a45411b011a9e658b1ee2524323cb1 (diff) | |
| parent | fbadd660d198bef9346cec44b91c2f717c1b7446 (diff) | |
| download | mruby-4c7e812bc06ab5ed4d9220397998de9728ee2d7e.tar.gz mruby-4c7e812bc06ab5ed4d9220397998de9728ee2d7e.zip | |
Merge branch 'master' of github.com:mruby/mruby
| -rw-r--r-- | examples/targets/build_config_ArduinoDue.rb | 7 | ||||
| -rw-r--r-- | src/dump.c | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/examples/targets/build_config_ArduinoDue.rb b/examples/targets/build_config_ArduinoDue.rb index eadcfdd43..194fcb0f4 100644 --- a/examples/targets/build_config_ArduinoDue.rb +++ b/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" diff --git a/src/dump.c b/src/dump.c index 67dd82e43..af12ed605 100644 --- a/src/dump.c +++ b/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; } |