diff options
| author | midipix <writeonce@midipix.org> | 2024-01-01 09:16:59 +0000 |
|---|---|---|
| committer | midipix <writeonce@midipix.org> | 2024-01-01 09:16:59 +0000 |
| commit | 343f39d8799670aaa4cca72e7395bb1044a67620 (patch) | |
| tree | fa43c4466c642dd0f99c52f93b4d160d81c912a7 /patches | |
| parent | 6f9ae76123ae6a23799109ed9175fe15af487b99 (diff) | |
| download | midipix_build-343f39d8799670aaa4cca72e7395bb1044a67620.tar.bz2 midipix_build-343f39d8799670aaa4cca72e7395bb1044a67620.tar.xz | |
nasm: upgrade to v2.16.01, update patch and build accordingly.
Diffstat (limited to 'patches')
| l--------- | patches/nasm-2.14.02.local.patch | 1 | ||||
| l--------- | patches/nasm-2.16.01.local.patch | 1 | ||||
| -rw-r--r-- | patches/nasm_host-2.16.01.local.patch (renamed from patches/nasm_host-2.14.02.local.patch) | 24 |
3 files changed, 14 insertions, 12 deletions
diff --git a/patches/nasm-2.14.02.local.patch b/patches/nasm-2.14.02.local.patch deleted file mode 120000 index 0a3acf14..00000000 --- a/patches/nasm-2.14.02.local.patch +++ /dev/null @@ -1 +0,0 @@ -nasm_host-2.14.02.local.patch
\ No newline at end of file diff --git a/patches/nasm-2.16.01.local.patch b/patches/nasm-2.16.01.local.patch new file mode 120000 index 00000000..b2cff0eb --- /dev/null +++ b/patches/nasm-2.16.01.local.patch @@ -0,0 +1 @@ +nasm_host-2.16.01.local.patch
\ No newline at end of file diff --git a/patches/nasm_host-2.14.02.local.patch b/patches/nasm_host-2.16.01.local.patch index defc369b..5e61a289 100644 --- a/patches/nasm_host-2.14.02.local.patch +++ b/patches/nasm_host-2.16.01.local.patch @@ -1,6 +1,8 @@ ---- nasm-2.14.02/output/outcoff.c.orig 2018-12-26 13:44:06.000000000 +0000 -+++ nasm-2.14.02/output/outcoff.c 2019-01-20 13:18:06.240000000 +0000 -@@ -701,6 +701,7 @@ +diff --git nasm-2.16.01/output/outcoff.c.orig nasm-2.16.01/output/outcoff.c +index c2b4eb6..fc57c1e 100644 +--- nasm-2.16.01/output/outcoff.c.orig ++++ nasm-2.16.01/output/outcoff.c +@@ -820,6 +820,7 @@ static void coff_sect_write(struct coff_Section *sect, sect->len += len; } @@ -8,7 +10,7 @@ typedef struct tagString { struct tagString *next; int len; -@@ -765,6 +766,98 @@ +@@ -884,6 +885,98 @@ static void BuildExportTable(STRING **rvp) *rvp = NULL; } @@ -105,10 +107,10 @@ +} +#endif - static enum directive_result - coff_directives(enum directive directive, char *value, int pass) -@@ -793,7 +886,9 @@ - nasm_error(ERR_NONFATAL, "unrecognized export qualifier `%s'", q); + static void coff_defcomdatname(char *name, int32_t segment) + { +@@ -924,7 +1017,9 @@ coff_directives(enum directive directive, char *value) + nasm_nonfatal("unrecognized export qualifier `%s'", q); return DIRR_ERROR; } +#ifndef COFF_MIDIPIX @@ -117,7 +119,7 @@ return DIRR_OK; } case D_SAFESEH: -@@ -888,8 +983,12 @@ +@@ -1039,8 +1134,12 @@ static void coff_write(void) int32_t pos, sympos, vsize; int i; @@ -130,7 +132,7 @@ if (win32) { /* add default value for @feat.00, this allows to 'link /safeseh' */ -@@ -1086,7 +1185,10 @@ +@@ -1278,7 +1377,10 @@ static void coff_write_symbols(void) memset(filename, 0, 18); /* useful zeroed buffer */ for (i = 0; i < (uint32_t) coff_nsects; i++) { @@ -141,4 +143,4 @@ + coff_symbol(NULL, coff_sects[i]->namepos, 0L, i + 1, 0, 3, 1); fwriteint32_t(coff_sects[i]->len, ofile); fwriteint16_t(coff_sects[i]->nrelocs,ofile); - nasm_write(filename, 12, ofile); + if (coff_sects[i]->flags & IMAGE_SCN_LNK_COMDAT) { |