Update Zephyr pulled in changes to upstream openocd 20181009

[galak]

No description provided.

[nashif]

does this build for you? I am getting:

src/rtos/Zephyr.c:85:25: error: initialization of ‘int (*)(struct rtos *, int64_t,  struct rtos_reg **, int *)’ {aka ‘int (*)(struct rtos *, long int,  struct rtos_reg **, int *)’} from incompatible pointer type ‘int (*)(struct rtos *, int64_t,  char **)’ {aka ‘int (*)(struct rtos *, long int,  char **)’} [-Werror=incompatible-pointer-types]
  .get_thread_reg_list = Zephyr_get_thread_reg_list,
                         ^~~~~~~~~~~~~~~~~~~~~~~~~~
src/rtos/Zephyr.c:85:25: note: (near initialization for ‘Zephyr_rtos.get_thread_reg_list’)
src/rtos/Zephyr.c: In function ‘Zephyr_get_thread_reg_list’:
src/rtos/Zephyr.c:352:22: error: passing argument 4 of ‘rtos_generic_stack_read’ from incompatible pointer type [-Werror=incompatible-pointer-types]
   thr.stack_pointer, hex_reg_list);
                      ^~~~~~~~~~~~
In file included from src/rtos/Zephyr.c:27:
src/rtos/rtos.h:110:21: note: expected ‘struct rtos_reg **’ but argument is of type ‘char **’
   struct rtos_reg **reg_list,
   ~~~~~~~~~~~~~~~~~~^~~~~~~~
src/rtos/Zephyr.c:351:9: error: too few arguments to function ‘rtos_generic_stack_read’
  return rtos_generic_stack_read(rtos->target, params->reg_stacking,
         ^~~~~~~~~~~~~~~~~~~~~~~
In file included from src/rtos/Zephyr.c:27:
src/rtos/rtos.h:107:5: note: declared here
 int rtos_generic_stack_read(struct target *target,
     ^~~~~~~~~~~~~~~~~~~~~~~
src/rtos/Zephyr.c:353:1: error: control reaches end of non-void function [-Werror=return-type]
 }
 ^
cc1: all warnings being treated as errors
make[2]: *** [Makefile:3665: src/rtos/src_rtos_librtos_la-Zephyr.lo] Error 1
make[2]: *** Waiting for unfinished jobs....

[nashif]

this untested patch fixes the build:

diff --git a/src/rtos/Zephyr.c b/src/rtos/Zephyr.c
index 91b09af2..8bea7f3b 100644
--- a/src/rtos/Zephyr.c
+++ b/src/rtos/Zephyr.c
@@ -73,7 +73,7 @@ static struct Zephyr_params Zephyr_params_list[] = {
 static bool Zephyr_detect_rtos(struct target *target);
 static int Zephyr_create(struct target *target);
 static int Zephyr_update_threads(struct rtos *rtos);
-static int Zephyr_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, char **hex_reg_list);
+static int Zephyr_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, struct rtos_reg **reg_list, int *num_regs);
 static int Zephyr_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[]);

 struct rtos_type Zephyr_rtos = {
@@ -326,7 +326,8 @@ static int Zephyr_update_threads(struct rtos *rtos)
        return ERROR_OK;
 }

-static int Zephyr_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, char **hex_reg_list)
+static int Zephyr_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, struct rtos_reg **reg_list,
+                                     int *num_regs)
 {
        struct Zephyr_thread thr;
        struct Zephyr_params *params;
@@ -349,7 +350,7 @@ static int Zephyr_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, char
                return retval;

        return rtos_generic_stack_read(rtos->target, params->reg_stacking,
-               thr.stack_pointer, hex_reg_list);
+               thr.stack_pointer, reg_list, num_regs);
 }

[nashif]

does not build

[galak]

does not build

Should be fixed now.