diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 1563498030a..b712954d6d2 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -219,12 +219,12 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
tf_http_archive(
name = "nasm",
urls = [
- "https://mirror.bazel.build/www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.bz2",
- "http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2",
- "http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.bz2",
+ "https://mirror.bazel.build/www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.bz2",
+ "http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.13.03.tar.bz2/sha512/d7a6b4cee8dfd603d8d4c976e5287b5cc542fa0b466ff989b743276a6e28114e64289bf02a7819eca63142a5278aa6eed57773007e5f589e15768e6456a8919d/nasm-2.13.03.tar.bz2",
+ "http://www.nasm.us/pub/nasm/releasebuilds/2.13.03/nasm-2.13.03.tar.bz2",
],
- sha256 = "00b0891c678c065446ca59bcee64719d0096d54d6886e6e472aeee2e170ae324",
- strip_prefix = "nasm-2.12.02",
+ sha256 = "63ec86477ad3f0f6292325fd89e1d93aea2e2fd490070863f17d48f7cd387011",
+ strip_prefix = "nasm-2.13.03",
build_file = clean_dep("//third_party:nasm.BUILD"),
)
diff --git a/third_party/nasm.BUILD b/third_party/nasm.BUILD
index 341d58068be..89330eac540 100644
--- a/third_party/nasm.BUILD
+++ b/third_party/nasm.BUILD
@@ -8,45 +8,93 @@ exports_files(["LICENSE"])
cc_binary(
name = "nasm",
srcs = [
- "assemble.c",
- "assemble.h",
- "compiler.h",
- "crc64.c",
- "directiv.c",
- "directiv.h",
- "disp8.c",
- "disp8.h",
- "eval.c",
- "eval.h",
- "exprlib.c",
- "float.c",
- "float.h",
- "hashtbl.c",
- "hashtbl.h",
- "iflag.c",
- "iflag.h",
- "iflaggen.h",
- "ilog2.c",
- "insns.h",
- "insnsa.c",
- "insnsb.c",
- "insnsi.h",
- "labels.c",
- "labels.h",
- "lib/strlcpy.c",
- "listing.c",
- "listing.h",
- "macros.c",
- "md5.h",
- "md5c.c",
- "nasm.c",
- "nasm.h",
- "nasmlib.c",
- "nasmlib.h",
- "opflags.h",
+ "asm/assemble.c",
+ "asm/assemble.h",
+ "asm/directbl.c",
+ "asm/directiv.c",
+ "asm/directiv.h",
+ "asm/error.c",
+ "asm/eval.c",
+ "asm/eval.h",
+ "asm/exprdump.c",
+ "asm/exprlib.c",
+ "asm/float.c",
+ "asm/float.h",
+ "asm/labels.c",
+ "asm/listing.c",
+ "asm/listing.h",
+ "asm/nasm.c",
+ "asm/parser.c",
+ "asm/parser.h",
+ "asm/pptok.c",
+ "asm/pptok.h",
+ "asm/pragma.c",
+ "asm/preproc.c",
+ "asm/preproc.h",
+ "asm/preproc-nop.c",
+ "asm/quote.c",
+ "asm/quote.h",
+ "asm/rdstrnum.c",
+ "asm/segalloc.c",
+ "asm/stdscan.c",
+ "asm/stdscan.h",
+ "asm/strfunc.c",
+ "asm/tokens.h",
+ "asm/tokhash.c",
+ "common/common.c",
+ "config/unknown.h",
+ "disasm/disasm.c",
+ "disasm/disasm.h",
+ "disasm/sync.c",
+ "disasm/sync.h",
+ "include/compiler.h",
+ "include/disp8.h",
+ "include/error.h",
+ "include/hashtbl.h",
+ "include/iflag.h",
+ "include/insns.h",
+ "include/labels.h",
+ "include/md5.h",
+ "include/nasm.h",
+ "include/nasmint.h",
+ "include/nasmlib.h",
+ "include/opflags.h",
+ "include/perfhash.h",
+ "include/raa.h",
+ "include/rbtree.h",
+ "include/rdoff.h",
+ "include/saa.h",
+ "include/strlist.h",
+ "include/tables.h",
+ "include/ver.h",
+ "macros/macros.c",
+ "nasmlib/badenum.c",
+ "nasmlib/bsi.c",
+ "nasmlib/crc64.c",
+ "nasmlib/file.c",
+ "nasmlib/file.h",
+ "nasmlib/filename.c",
+ "nasmlib/hashtbl.c",
+ "nasmlib/ilog2.c",
+ "nasmlib/malloc.c",
+ "nasmlib/md5c.c",
+ "nasmlib/mmap.c",
+ "nasmlib/path.c",
+ "nasmlib/perfhash.c",
+ "nasmlib/raa.c",
+ "nasmlib/rbtree.c",
+ "nasmlib/readnum.c",
+ "nasmlib/realpath.c",
+ "nasmlib/saa.c",
+ "nasmlib/srcfile.c",
+ "nasmlib/string.c",
+ "nasmlib/strlist.c",
+ "nasmlib/ver.c",
+ "nasmlib/zerobuf.c",
"output/codeview.c",
"output/dwarf.h",
"output/elf.h",
+ "output/legacy.c",
"output/nulldbg.c",
"output/nullout.c",
"output/outaout.c",
@@ -56,9 +104,6 @@ cc_binary(
"output/outdbg.c",
"output/outelf.c",
"output/outelf.h",
- "output/outelf32.c",
- "output/outelf64.c",
- "output/outelfx32.c",
"output/outform.c",
"output/outform.h",
"output/outieee.c",
@@ -69,35 +114,31 @@ cc_binary(
"output/outrdf2.c",
"output/pecoff.h",
"output/stabs.h",
- "parser.c",
- "parser.h",
- "pptok.c",
- "pptok.h",
- "preproc.c",
- "preproc.h",
- "preproc-nop.c",
- "quote.c",
- "quote.h",
- "raa.c",
- "raa.h",
- "rbtree.c",
- "rbtree.h",
- "rdoff/rdoff.h",
- "realpath.c",
- "regflags.c",
- "regs.h",
- "regvals.c",
- "saa.c",
- "saa.h",
- "srcfile.c",
- "stdscan.c",
- "stdscan.h",
- "strfunc.c",
- "tables.h",
- "tokens.h",
- "tokhash.c",
- "ver.c",
+ "stdlib/snprintf.c",
+ "stdlib/strlcpy.c",
+ "stdlib/strnlen.c",
+ "stdlib/vsnprintf.c",
"version.h",
+ "x86/disp8.c",
+ "x86/iflag.c",
+ "x86/iflaggen.h",
+ "x86/insnsa.c",
+ "x86/insnsb.c",
+ "x86/insnsd.c",
+ "x86/insnsi.h",
+ "x86/insnsn.c",
+ "x86/regdis.c",
+ "x86/regdis.h",
+ "x86/regflags.c",
+ "x86/regs.c",
+ "x86/regs.h",
+ "x86/regvals.c",
+ ],
+ includes = [
+ "asm",
+ "include",
+ "output",
+ "x86",
],
copts = select({
":windows": [],
@@ -110,7 +151,10 @@ cc_binary(
defines = select({
":windows": [],
":windows_msvc": [],
- "//conditions:default": ["HAVE_SNPRINTF"],
+ "//conditions:default": [
+ "HAVE_SNPRINTF",
+ "HAVE_SYS_TYPES_H",
+ ],
}),
visibility = ["@jpeg//:__pkg__"],
)