diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/runtime/go-caller.c | 2 | ||||
| -rw-r--r-- | libgo/runtime/proc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index acb1d95..41f809f 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -adc6eb826f156d0980f0ad9f9efc5c919ec4905e +af46ad16dc34773877068393d331ac8ae34b2219 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/runtime/go-caller.c b/libgo/runtime/go-caller.c index 360bae6..ee8abdc 100644 --- a/libgo/runtime/go-caller.c +++ b/libgo/runtime/go-caller.c @@ -159,7 +159,7 @@ syminfo_callback (void *data, uintptr_t pc __attribute__ ((unused)), /* Set *VAL to the value of the symbol for PC. */ static _Bool -__go_symbol_value (uintptr_t pc, uintptr_t *val) +__go_symbol_value (uintptr pc, uintptr *val) { *val = 0; backtrace_syminfo (__go_get_backtrace_state (), pc, syminfo_callback, diff --git a/libgo/runtime/proc.c b/libgo/runtime/proc.c index e591824..d6e42e6 100644 --- a/libgo/runtime/proc.c +++ b/libgo/runtime/proc.c @@ -179,7 +179,7 @@ fixcontext(ucontext_t* c) // So we make the field larger in runtime2.go and pick an appropriate // offset within the field here. static ucontext_t* -ucontext_arg(uintptr* go_ucontext) +ucontext_arg(uintptr_t* go_ucontext) { uintptr_t p = (uintptr_t)go_ucontext; size_t align = __alignof__(ucontext_t); |