H. Peter Anvin 1917f45ec2 Merge remote-tracking branch 'origin/nasm-2.12.xx' ...

Resolved Conflicts:
	output/codeview.c
	output/outelf32.c
	output/outelf64.c
	output/outelfx32.c
	output/outform.c
	output/outform.h
	output/outieee.c
	output/outobj.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

2016-03-08 01:08:53 -08:00

..

codeview.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

dwarf.h

output/dwarf.h: update dwarf constants

2009-08-10 16:00:43 -07:00

elf.h

Elf: Use SHA_ANY constant instead of open coded number

2010-04-11 12:58:05 +04:00

nulldbg.c

More constification, mostly of struct dfmt

2016-02-18 02:16:36 -08:00

nullout.c

Rename SEGALIGN to SECTALIGN

2010-04-21 18:09:54 +04:00

outaout.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outaout.mac

NASM: relicense under the 2-clause BSD license

2009-07-06 11:09:11 -07:00

outas86.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outas86.mac

NASM: relicense under the 2-clause BSD license

2009-07-06 11:09:11 -07:00

outbin.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outbin.mac

NASM: relicense under the 2-clause BSD license

2009-07-06 11:09:11 -07:00

outcoff.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outcoff.mac

NASM: relicense under the 2-clause BSD license

2009-07-06 11:09:11 -07:00

outdbg.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outelf32.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outelf64.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outelf.c

output: elf -- Move elf_directive into single instance

2014-08-29 20:30:57 +04:00

outelf.h

output: elf -- Move common structures into outelf.h header

2014-09-21 13:03:26 +04:00

outelf.mac

NASM: relicense under the 2-clause BSD license

2009-07-06 11:09:11 -07:00

outelfx32.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outform.c

Defer debug format search until after command line parsing

2016-03-07 23:20:00 -08:00

outform.h

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outieee.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outlib.c

Add support for one-byte relocations

2010-05-06 15:33:24 -07:00

outlib.h

More constification, mostly of struct dfmt

2016-02-18 02:16:36 -08:00

outmacho.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outmacho.mac

macho64: Manually merge macho64 branch with master branch.

2009-07-08 23:04:52 -05:00

outobj.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outobj.mac

NASM: relicense under the 2-clause BSD license

2009-07-06 11:09:11 -07:00

outrdf2.c

Merge remote-tracking branch 'origin/nasm-2.12.xx'

2016-03-08 01:08:53 -08:00

outrdf2.mac

NASM: relicense under the 2-clause BSD license

2009-07-06 11:09:11 -07:00

outrdf.mac

NASM: relicense under the 2-clause BSD license

2009-07-06 11:09:11 -07:00

pecoff.h

coff: Add support for the Codeview 8 debug format

2016-01-24 14:14:39 +03:00

stabs.h

Remove unnecessary C99-isms

2016-03-02 10:48:53 -08:00