Mercurial > hg > heapstats
changeset 136:65bb27a1c262
Bug 2802: Agent build failed on Raspbian Jessie.
Reviewed-by: ykubota
GitHub: https://github.com/HeapStats/heapstats/pull/3
| author | Yasumasa Suenaga <yasuenag@gmail.com> |
|---|---|
| date | Sat, 23 Jan 2016 22:04:41 +0900 |
| parents | a8c44d8b2172 |
| children | ef19ed367737 |
| files | ChangeLog agent/src/heapstats-engines/arch/arm/overrideFunc.arm.S |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 23 17:39:05 2016 +0900 +++ b/ChangeLog Sat Jan 23 22:04:41 2016 +0900 @@ -1,6 +1,7 @@ 2016-01-23 Yasumasa Suenaga <yasuenag@gmail.com> * Bug 2795: [REFACTORING] Aggregate static variables for SNMP to trapSender.* + * Bug 2802: Agent build failed on Raspbian Jessie. 2016-01-22 KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
--- a/agent/src/heapstats-engines/arch/arm/overrideFunc.arm.S Sat Jan 23 17:39:05 2016 +0900 +++ b/agent/src/heapstats-engines/arch/arm/overrideFunc.arm.S Sat Jan 23 22:04:41 2016 +0900 @@ -3,7 +3,7 @@ * \brief This file is used to override JVM inner function for ARM.<br> * The function defined this file, used with v-table hook.<br> * So in this file, all function is written by only assembler and macro. - * Copyright (C) 2015 Yasumasa Suenaga + * Copyright (C) 2015-2016 Yasumasa Suenaga * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -105,7 +105,8 @@ \ /* Call callback function. */ ; \ DO_JMP_TO_CALLBACK(header, ary_idx, oop_arg_idx) \ - b .LORIGINAL_FUNC; + b .LORIGINAL_FUNC; \ + .ltorg; #define OVERRIDE_DEFINE_WITHOUT_PERMCHECK(header, ary_idx, oop_arg_idx) \ OVERRIDE_FUNC_DEFINE(header, ary_idx) \