From: OpenOCD-Gerrit <ope...@us...> - 2021-02-13 13:09:50
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via ba0f382137749b78b27ac58238735cc20a6fa847 (commit) via 54ef790149918df40e6bc2220ffd52ade1b9669b (commit) from 84a2302af790d28f5dd7e03620703710300305f1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ba0f382137749b78b27ac58238735cc20a6fa847 Author: Antonio Borneo <bor...@gm...> Date: Thu Feb 11 19:47:46 2021 +0100 autotools: generate list of NEWS-xx file during configure Commit 4fc0f3530c51 ("Makefile.am: fix non-POSIX warning from automake") uses the BSD make extension '!=' to generate the list of files NEWS-xx, but it's not POSIX (yet), it's not backward compatible with GNU make 3.82 (used in CentOS 7, EOL scheduled for 2024) and depending on automake evolution it could trigger again the warning 'apparently' just fixed. Move in configure the generation of the file list. The only drawback is that when a developer adds a new NEWS-xx file, he/she has to run configure again before 'make distcheck', otherwise will get failure. Change-Id: Ia97e7f4e612655a97702f95e8451040539659b85 Signed-off-by: Antonio Borneo <bor...@gm...> Reported-by: Jan Matyáš <jm...@co...> Reviewed-on: http://openocd.zylin.com/6054 Tested-by: jenkins Reviewed-by: Jan Matyas <ma...@co...> Reviewed-by: Andreas Fritiofson <and...@gm...> diff --git a/Makefile.am b/Makefile.am index a6e7ab232..75f0c0993 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,7 +42,6 @@ if INTERNAL_JIMTCL AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \ -I$(top_builddir)/jimtcl endif -EXTRA_DIST_NEWS != ls $(srcdir)/NEWS-* EXTRA_DIST += \ BUGS \ HACKING \ diff --git a/configure.ac b/configure.ac index 158ba1599..f1fa5875f 100644 --- a/configure.ac +++ b/configure.ac @@ -854,6 +854,8 @@ AS_IF([test "x$gcc_warnings" = "xyes"], [ AC_SUBST([GCC_WARNINGS], [$GCC_WARNINGS]) ]) +AC_SUBST(EXTRA_DIST_NEWS, ["$(echo $srcdir/NEWS-*)"]) + AC_CONFIG_FILES([ Makefile ]) commit 54ef790149918df40e6bc2220ffd52ade1b9669b Author: Peter Mamonov <pma...@gm...> Date: Mon Oct 12 15:02:44 2020 +0300 target: use proper macro for parsing watchpoint address Currently wp/rwp commands fail on 64-bit targets: > wp 0xffffffff80001400 4 addr option value ('0xffffffff80001400') is not valid Change-Id: I94d4af906b02b7bd463c8d79a6235a3646dfc434 Signed-off-by: Peter Mamonov <pma...@gm...> Reviewed-on: http://openocd.zylin.com/6058 Tested-by: jenkins Reviewed-by: Andreas Fritiofson <and...@gm...> Reviewed-by: Antonio Borneo <bor...@gm...> diff --git a/src/target/target.c b/src/target/target.c index fa98c884b..033fc0714 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -4056,7 +4056,7 @@ COMMAND_HANDLER(handle_wp_command) } enum watchpoint_rw type = WPT_ACCESS; - uint32_t addr = 0; + target_addr_t addr = 0; uint32_t length = 0; uint32_t data_value = 0x0; uint32_t data_mask = 0xffffffff; @@ -4086,7 +4086,7 @@ COMMAND_HANDLER(handle_wp_command) /* fall through */ case 2: COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], length); - COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr); + COMMAND_PARSE_ADDRESS(CMD_ARGV[0], addr); break; default: @@ -4106,8 +4106,8 @@ COMMAND_HANDLER(handle_rwp_command) if (CMD_ARGC != 1) return ERROR_COMMAND_SYNTAX_ERROR; - uint32_t addr; - COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr); + target_addr_t addr; + COMMAND_PARSE_ADDRESS(CMD_ARGV[0], addr); struct target *target = get_current_target(CMD_CTX); watchpoint_remove(target, addr); ----------------------------------------------------------------------- Summary of changes: Makefile.am | 1 - configure.ac | 2 ++ src/target/target.c | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- Main OpenOCD repository |