diff options
| -rw-r--r-- | pkg/nasm/.gitignore | 2 | ||||
| -rw-r--r-- | pkg/nasm/config/config.h (renamed from pkg/nasm/config.h) | 30 | ||||
| -rw-r--r-- | pkg/nasm/gen.rc | 77 | ||||
| -rw-r--r-- | pkg/nasm/rev | 2 | ||||
| -rw-r--r-- | pkg/nasm/sha256 | 2 | ||||
| -rw-r--r-- | pkg/nasm/url | 2 |
6 files changed, 86 insertions, 29 deletions
diff --git a/pkg/nasm/.gitignore b/pkg/nasm/.gitignore index 983a28a0..cd2b51a2 100644 --- a/pkg/nasm/.gitignore +++ b/pkg/nasm/.gitignore @@ -1,2 +1,2 @@ -/nasm-2.12.02.tar.xz +/nasm-2.13.01.tar.xz /src diff --git a/pkg/nasm/config.h b/pkg/nasm/config/config.h index 4881121c..e89325d2 100644 --- a/pkg/nasm/config.h +++ b/pkg/nasm/config/config.h @@ -7,17 +7,43 @@ #define HAVE_DECL_STRLCPY 1 #define HAVE_DECL_STRNCASECMP 1 #define HAVE_DECL_STRNICMP 0 +#define HAVE_DECL_STRNLEN 1 #define HAVE_DECL_STRSEP 1 +#define HAVE_FUNC_ATTRIBUTE_ALLOC_SIZE 1 +#define HAVE_FUNC_ATTRIBUTE_CONST 1 +#define HAVE_FUNC_ATTRIBUTE_ERROR 1 +#define HAVE_FUNC_ATTRIBUTE_FORMAT 1 +#define HAVE_FUNC_ATTRIBUTE_MALLOC 1 +#define HAVE_FUNC_ATTRIBUTE_NORETURN 1 +#define HAVE_FUNC_ATTRIBUTE_PURE 1 +#define HAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL 1 +#define HAVE_GETPAGESIZE 1 +/* #undef HAVE_IO_H */ #define HAVE_MEMORY_H 1 +#define HAVE_STDNORETURN_H 1 /* #undef HAVE_STRICMP */ #define HAVE_STRLCPY 1 /* #undef HAVE_STRNICMP */ #define HAVE_STRSEP 1 +#define HAVE_STRUCT_STAT 1 +/* #undef HAVE_STRUCT__STATI64 */ #define HAVE_SYS_PARAM_H 1 -#define HAVE_WORKING_BOOL 1 +/* #undef HAVE__ACCESS */ +#define HAVE__BOOL 1 +/* #undef HAVE__CHSIZE */ +/* #undef HAVE__CHSIZE_S */ +/* #undef HAVE__FILELENGTHI64 */ +/* #undef HAVE__FILENO */ +/* #undef HAVE__FSEEKI64 */ +/* #undef HAVE__FSTATI64 */ /* #undef HAVE__FULLPATH */ /* #undef HAVE__SNPRINTF */ +/* #undef HAVE__STATI64 */ /* #undef HAVE__VSNPRINTF */ +#define HAVE___BUILTIN_CLZ 1 +#define HAVE___BUILTIN_CLZL 1 +#define HAVE___BUILTIN_CLZLL 1 +#define HAVE___BUILTIN_EXPECT 1 #define PACKAGE_BUGREPORT "" #define PACKAGE_NAME "" #define PACKAGE_STRING "" @@ -45,6 +71,7 @@ # define _DARWIN_USE_64_BIT_INODE 1 #endif /* #undef _FILE_OFFSET_BITS */ +/* #undef _LARGEFILE_SOURCE */ /* #undef _LARGE_FILES */ /* #undef _MINIX */ /* #undef _POSIX_1_SOURCE */ @@ -59,3 +86,4 @@ # define __restrict__ #endif /* #undef size_t */ +/* #undef uintptr_t */ diff --git a/pkg/nasm/gen.rc b/pkg/nasm/gen.rc index aa057f8a..2795206d 100644 --- a/pkg/nasm/gen.rc +++ b/pkg/nasm/gen.rc @@ -2,32 +2,61 @@ cflags\ -D HAVE_CONFIG_H\ -I include\ -I '$dir' \ - -I '$srcdir' + -I '$srcdir' \ + -I '$srcdir'/include\ + -I '$srcdir'/x86\ + -I '$srcdir'/asm\ + -I '$srcdir'/disasm\ + -I '$srcdir'/output -exe nasm\ - nasm.c nasmlib.c ver.c\ - raa.c saa.c rbtree.c srcfile.c\ - realpath.c\ - float.c insnsa.c insnsb.c\ - directiv.c\ - assemble.c labels.c hashtbl.c crc64.c parser.c\ - output/outform.c output/outlib.c output/nulldbg.c\ - output/nullout.c\ - output/outbin.c output/outaout.c output/outcoff.c\ - output/outelf.c output/outelf32.c output/outelf64.c\ - output/outelfx32.c\ - output/outobj.c output/outas86.c output/outrdf2.c\ - output/outdbg.c output/outieee.c output/outmacho.c\ - md5c.c output/codeview.c\ - preproc.c quote.c pptok.c\ - macros.c listing.c eval.c exprlib.c stdscan.c\ - strfunc.c tokhash.c regvals.c regflags.c\ - ilog2.c\ - lib/strlcpy.c\ - preproc-nop.c\ - disp8.c\ - iflag.c +lib libnasm.a\ + stdlib/^(snprintf.c vsnprintf.c strlcpy.c strnlen.c)\ + nasmlib/^(\ + ver.c\ + crc64.c malloc.c\ + md5c.c string.c\ + file.c mmap.c ilog2.c\ + realpath.c path.c\ + filename.c srcfile.c\ + zerobuf.c readnum.c bsi.c\ + rbtree.c hashtbl.c\ + raa.c saa.c\ + strlist.c\ + perfhash.c badenum.c\ + )\ + common/common.c\ + x86/^(\ + insnsa.c insnsb.c insnsd.c insnsn.c\ + regs.c regvals.c regflags.c regdis.c\ + disp8.c iflag.c\ + )\ + asm/^(\ + error.c\ + float.c\ + directiv.c directbl.c\ + pragma.c\ + assemble.c labels.c parser.c\ + preproc.c quote.c pptok.c\ + listing.c eval.c exprlib.c exprdump.c\ + stdscan.c\ + strfunc.c tokhash.c\ + segalloc.c\ + preproc-nop.c\ + rdstrnum.c\ + )\ + macros/macros.c\ + output/^(\ + outform.c outlib.c legacy.c\ + nulldbg.c nullout.c\ + outbin.c outaout.c outcoff.c\ + outelf.c\ + outobj.c outas86.c outrdf2.c\ + outdbg.c outieee.c outmacho.c\ + codeview.c\ + )\ + disasm/^(disasm.c sync.c) +exe nasm asm/nasm.c libnasm.a file bin/nasm '$outdir'/nasm 755 man 1 nasm.1 diff --git a/pkg/nasm/rev b/pkg/nasm/rev index 0cfbf088..00750edc 100644 --- a/pkg/nasm/rev +++ b/pkg/nasm/rev @@ -1 +1 @@ -2 +3 diff --git a/pkg/nasm/sha256 b/pkg/nasm/sha256 index c8051b73..ca479c19 100644 --- a/pkg/nasm/sha256 +++ b/pkg/nasm/sha256 @@ -1 +1 @@ -4c866b60c0b1c4ebc715205d007b4640ff4e36af637c9a7deb87b2900e544321 nasm-2.12.02.tar.xz +aa0213008f0433ecbe07bb628506a5c4be8079be20fc3532a5031fd639db9a5e nasm-2.13.01.tar.xz diff --git a/pkg/nasm/url b/pkg/nasm/url index ae040531..ac3053fe 100644 --- a/pkg/nasm/url +++ b/pkg/nasm/url @@ -1 +1 @@ -url = "http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.xz" +url = "http://www.nasm.us/pub/nasm/releasebuilds/2.13.01/nasm-2.13.01.tar.xz" |