summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2016-03-07 22:04:54 -0800
committerH. Peter Anvin <hpa@zytor.com>2016-03-07 22:04:54 -0800
commit3def9fcb59fde13cc61184df3eaf49cfed8f6e2c (patch)
tree2b6d3f02fe20fbf1f9e4a18a607f1d19b23f5ed4
parent5686a65fe93bf4946bb76fd37f9543851079bfe5 (diff)
downloadnasm-3def9fcb59fde13cc61184df3eaf49cfed8f6e2c.tar.gz
outieee: no need to filter .. symbols in the debug format anymore
labels.c now filter ..[^@] special symbols from the debug backend, so we don't have to open-code that everywhere. In the actual output format, don't treat ..@ symbols as special. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Jim Kukunas <james.t.kukunas@linux.intel.com>
-rw-r--r--output/outieee.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/output/outieee.c b/output/outieee.c
index 79faa649..f5f6f5a6 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------- *
*
- * Copyright 1996-2013 The NASM Authors - All Rights Reserved
+ * Copyright 1996-2016 The NASM Authors - All Rights Reserved
* See the file AUTHORS included with the NASM distribution for
* the specific copyright holders.
*
@@ -305,7 +305,7 @@ static void ieee_deflabel(char *name, int32_t segment,
* First check for the double-period, signifying something
* unusual.
*/
- if (name[0] == '.' && name[1] == '.') {
+ if (name[0] == '.' && name[1] == '.' && name[2] != '@') {
if (!strcmp(name, "..start")) {
ieee_entry_seg = segment;
ieee_entry_ofs = offset;
@@ -1398,18 +1398,14 @@ static void dbgls_deflabel(char *name, int32_t segment,
(void)special;
/*
- * If it's a special-retry from pass two, discard it.
+ * Note: ..[^@] special symbols are filtered in labels.c
*/
- if (is_global == 3)
- return;
/*
- * First check for the double-period, signifying something
- * unusual.
+ * If it's a special-retry from pass two, discard it.
*/
- if (name[0] == '.' && name[1] == '.' && name[2] != '@') {
+ if (is_global == 3)
return;
- }
/*
* Case (i):