diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-07-13 21:41:33 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-07-13 21:41:33 -0400 |
| commit | 340ee009d63596b1352d2f648e9b1d342f447861 (patch) | |
| tree | ad81e0d13de58eedab60ad6ff6d790ec215d4efe | |
| parent | ad01495da81e1892dba3a8d8de7011b00c8a8511 (diff) | |
| parent | 44a0d177f09b3e7c5627c3772c9b406254eaaf64 (diff) | |
| download | nasm-340ee009d63596b1352d2f648e9b1d342f447861.tar.gz nasm-340ee009d63596b1352d2f648e9b1d342f447861.tar.bz2 nasm-340ee009d63596b1352d2f648e9b1d342f447861.zip | |
Merge branch 'master' into new-preproc
Conflicts:
.gitignore
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | output/outelf32.c | 6 | ||||
| -rw-r--r-- | output/outelf64.c | 4 |
3 files changed, 10 insertions, 2 deletions
@@ -61,8 +61,8 @@ /regs.c /regs.h /regvals.c -/test/perf/*.asm /test/golden +/test/perf/*.asm /test/testresults /tokens.h /tokhash.c diff --git a/output/outelf32.c b/output/outelf32.c index a3a8c7a..1e2d573 100644 --- a/output/outelf32.c +++ b/output/outelf32.c @@ -1581,9 +1581,13 @@ static void debug32_typevalue(int32_t type) stype = STT_OBJECT; break; case TY_OWORD: - ssize = 8; + ssize = 16; stype = STT_OBJECT; break; + case TY_YWORD: + ssize = 32; + stype = STT_OBJECT; + break; case TY_COMMON: ssize = 0; stype = STT_COMMON; diff --git a/output/outelf64.c b/output/outelf64.c index cf6e378..c98bfae 100644 --- a/output/outelf64.c +++ b/output/outelf64.c @@ -1633,6 +1633,10 @@ static void debug64_typevalue(int32_t type) ssize = 16; stype = STT_OBJECT; break; + case TY_YWORD: + ssize = 32; + stype = STT_OBJECT; + break; case TY_COMMON: ssize = 0; stype = STT_COMMON; |