diff options
| -rw-r--r-- | libctf/ChangeLog | 5 | ||||
| -rw-r--r-- | libctf/ctf-link.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libctf/ChangeLog b/libctf/ChangeLog index 5c38c6f..e0d3f7b 100644 --- a/libctf/ChangeLog +++ b/libctf/ChangeLog @@ -1,5 +1,10 @@ 2021-03-02 Nick Alcock <nick.alcock@oracle.com> + * ctf-link.c (ctf_link_one_variable): Remove reference to + "unconflicted link mode". + +2021-03-02 Nick Alcock <nick.alcock@oracle.com> + * ctf-link.c (ctf_create_per_cu): Drop FILENAME now that it is always identical to CUNAME. (ctf_link_deduplicating_one_symtypetab): Adjust. diff --git a/libctf/ctf-link.c b/libctf/ctf-link.c index 5d813db..d598b78 100644 --- a/libctf/ctf-link.c +++ b/libctf/ctf-link.c @@ -499,9 +499,9 @@ ctf_link_one_variable (const char *name, ctf_id_t type, void *arg_) return 0; } - /* In unconflicted link mode, if this type is mapped to a type in the parent - dict, we want to try to add to that first: if it reports a duplicate, - or if the type is in a child already, add straight to the child. */ + /* If this type is mapped to a type in the parent dict, we want to try to add + to that first: if it reports a duplicate, or if the type is in a child + already, add straight to the child. */ insert_fp = arg->out_fp; |