diff options
author | Kai Tietz <kai.tietz@onevision.com> | 2011-04-18 15:40:27 +0000 |
---|---|---|
committer | Kai Tietz <kai.tietz@onevision.com> | 2011-04-18 15:40:27 +0000 |
commit | 675d2e735b2efd3ed23c122e877e6aa635fc2cf7 (patch) | |
tree | 7c6e3373fe8cf57b1399ecd32e32bf843a34a609 /ld/deffilep.y | |
parent | 7eb7fc1afcd16280ab71c71e2470f9f4353fdf5a (diff) | |
download | binutils-redhat-675d2e735b2efd3ed23c122e877e6aa635fc2cf7.tar.gz |
2011-04-18 Kai Tietz <ktietz@redhat.com>
* deffilep.y (def_aligncomm): Avoid duplets.
Diffstat (limited to 'ld/deffilep.y')
-rw-r--r-- | ld/deffilep.y | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/ld/deffilep.y b/ld/deffilep.y index c1c95d2872..58f3dd27b7 100644 --- a/ld/deffilep.y +++ b/ld/deffilep.y @@ -1095,13 +1095,39 @@ def_directive (char *str) static void def_aligncomm (char *str, int align) { - def_file_aligncomm *c = xmalloc (sizeof (def_file_aligncomm)); + def_file_aligncomm *c, *p; + + p = NULL; + c = def->aligncomms; + while (c != NULL) + { + int e = strcmp (c->symbol_name, str); + if (!e) + { + /* Not sure if we want to allow here duplicates with + different alignments, but for now we keep them. */ + e = (int) c->alignment - align; + if (!e) + return; + } + if (e > 0) + break; + c = (p = c)->next; + } + c = xmalloc (sizeof (def_file_aligncomm)); c->symbol_name = xstrdup (str); c->alignment = (unsigned int) align; - - c->next = def->aligncomms; - def->aligncomms = c; + if (!p) + { + c->next = def->aligncomms; + def->aligncomms = c; + } + else + { + c->next = p->next; + p->next = c; + } } static int |