From cf656bcc8706eeac7e473448d5a1947bd74eff15 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Fri, 22 Jun 2018 13:26:50 +0000 Subject: [PATCH 1/4] Update nasm from 2.12.02 to 2.13.03 This fix updates nasm from 2.12.02 (2016-07-06) to the latest version of 2.13.03 (2018-02-07) Signed-off-by: Yong Tang --- tensorflow/workspace.bzl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index 693c09f370c..ba3404b3588 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -196,12 +196,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"), ) From 6021e256d757de89873569cdb94d7327a9b18c5e Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Fri, 22 Jun 2018 22:13:19 +0000 Subject: [PATCH 2/4] Update nasm.BUILD file Signed-off-by: Yong Tang --- third_party/nasm.BUILD | 190 +++++++++++++++++++++++------------------ 1 file changed, 106 insertions(+), 84 deletions(-) diff --git a/third_party/nasm.BUILD b/third_party/nasm.BUILD index 341d58068be..6471b361f01 100644 --- a/third_party/nasm.BUILD +++ b/third_party/nasm.BUILD @@ -8,96 +8,115 @@ 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", - "output/codeview.c", - "output/dwarf.h", - "output/elf.h", + "version.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", + "asm/nasm.c", + "stdlib/snprintf.c", + "stdlib/vsnprintf.c", + "stdlib/strlcpy.c", + "stdlib/strnlen.c", + "nasmlib/ver.c", + "nasmlib/crc64.c", + "nasmlib/malloc.c", + "nasmlib/md5c.c", + "nasmlib/string.c", + "nasmlib/file.c", + "nasmlib/file.h", + "nasmlib/mmap.c", + "nasmlib/ilog2.c", + "nasmlib/realpath.c", + "nasmlib/path.c", + "nasmlib/filename.c", + "nasmlib/srcfile.c", + "nasmlib/zerobuf.c", + "nasmlib/readnum.c", + "nasmlib/bsi.c", + "nasmlib/rbtree.c", + "nasmlib/hashtbl.c", + "nasmlib/raa.c", + "nasmlib/saa.c", + "nasmlib/strlist.c", + "nasmlib/perfhash.c", + "nasmlib/badenum.c", + "common/common.c", + "x86/insnsa.c", + "x86/insnsb.c", + "x86/insnsd.c", + "x86/insnsn.c", + "x86/regs.c", + "x86/regvals.c", + "x86/regflags.c", + "x86/regdis.c", + "x86/disp8.c", + "x86/iflag.c", + "asm/error.c", + "asm/float.c", + "asm/directiv.c", + "asm/directbl.c", + "asm/pragma.c", + "asm/assemble.c", + "asm/labels.c", + "asm/parser.c", + "asm/preproc.c", + "asm/quote.c", + "asm/pptok.c", + "asm/listing.c", + "asm/eval.c", + "asm/exprlib.c", + "asm/exprdump.c", + "asm/stdscan.c", + "asm/strfunc.c", + "asm/tokhash.c", + "asm/segalloc.c", + "asm/preproc-nop.c", + "asm/rdstrnum.c", + "macros/macros.c", + "output/outform.c", + "output/outlib.c", + "output/legacy.c", "output/nulldbg.c", "output/nullout.c", - "output/outaout.c", - "output/outas86.c", "output/outbin.c", + "output/outaout.c", "output/outcoff.c", - "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", - "output/outlib.c", - "output/outlib.h", - "output/outmacho.c", "output/outobj.c", + "output/outas86.c", "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", - "version.h", + "output/outdbg.c", + "output/outieee.c", + "output/outmacho.c", + "output/codeview.c", + "disasm/disasm.c", + "disasm/disasm.h", + "disasm/sync.c", + "disasm/sync.h", + "config/unknown.h", + ], + includes = [ + "include", + "asm", + "output", + "x86", ], copts = select({ ":windows": [], @@ -110,7 +129,10 @@ cc_binary( defines = select({ ":windows": [], ":windows_msvc": [], - "//conditions:default": ["HAVE_SNPRINTF"], + "//conditions:default": [ + "HAVE_SNPRINTF", + "HAVE_SYS_TYPES_H", + ], }), visibility = ["@jpeg//:__pkg__"], ) From 7eb35449b87c40b4700b7d40a5f21436f6869fb5 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Fri, 29 Jun 2018 03:41:55 +0000 Subject: [PATCH 3/4] Add missing files Signed-off-by: Yong Tang --- third_party/nasm.BUILD | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/third_party/nasm.BUILD b/third_party/nasm.BUILD index 6471b361f01..c79b340293e 100644 --- a/third_party/nasm.BUILD +++ b/third_party/nasm.BUILD @@ -58,40 +58,61 @@ cc_binary( "nasmlib/perfhash.c", "nasmlib/badenum.c", "common/common.c", + "x86/iflaggen.h", "x86/insnsa.c", "x86/insnsb.c", "x86/insnsd.c", + "x86/insnsi.h", "x86/insnsn.c", "x86/regs.c", + "x86/regs.h", "x86/regvals.c", "x86/regflags.c", "x86/regdis.c", + "x86/regdis.h", "x86/disp8.c", "x86/iflag.c", + "asm/pptok.h", "asm/error.c", + "asm/float.h", "asm/float.c", "asm/directiv.c", + "asm/directiv.h", "asm/directbl.c", "asm/pragma.c", "asm/assemble.c", + "asm/assemble.h", "asm/labels.c", "asm/parser.c", + "asm/parser.h", "asm/preproc.c", "asm/quote.c", + "asm/quote.h", "asm/pptok.c", "asm/listing.c", + "asm/listing.h", "asm/eval.c", + "asm/eval.h", "asm/exprlib.c", "asm/exprdump.c", - "asm/stdscan.c", - "asm/strfunc.c", - "asm/tokhash.c", - "asm/segalloc.c", + "asm/preproc.h", "asm/preproc-nop.c", "asm/rdstrnum.c", + "asm/stdscan.c", + "asm/stdscan.h", + "asm/strfunc.c", + "asm/tokens.h", + "asm/tokhash.c", + "asm/segalloc.c", "macros/macros.c", + "output/dwarf.h", + "output/stabs.h", + "output/elf.h", + "output/pecoff.h", "output/outform.c", + "output/outform.h", "output/outlib.c", + "output/outlib.h", "output/legacy.c", "output/nulldbg.c", "output/nullout.c", @@ -99,6 +120,7 @@ cc_binary( "output/outaout.c", "output/outcoff.c", "output/outelf.c", + "output/outelf.h", "output/outobj.c", "output/outas86.c", "output/outrdf2.c", From b3c9474bbd848a569ba0fabc0c12dd0fbfce2b71 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Tue, 3 Jul 2018 17:45:10 +0000 Subject: [PATCH 4/4] Update the nasm.BUILD to re-order the input source files Signed-off-by: Yong Tang --- third_party/nasm.BUILD | 182 ++++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/third_party/nasm.BUILD b/third_party/nasm.BUILD index c79b340293e..89330eac540 100644 --- a/third_party/nasm.BUILD +++ b/third_party/nasm.BUILD @@ -8,7 +8,45 @@ exports_files(["LICENSE"]) cc_binary( name = "nasm", srcs = [ - "version.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", @@ -29,114 +67,76 @@ cc_binary( "include/strlist.h", "include/tables.h", "include/ver.h", - "asm/nasm.c", - "stdlib/snprintf.c", - "stdlib/vsnprintf.c", - "stdlib/strlcpy.c", - "stdlib/strnlen.c", - "nasmlib/ver.c", + "macros/macros.c", + "nasmlib/badenum.c", + "nasmlib/bsi.c", "nasmlib/crc64.c", - "nasmlib/malloc.c", - "nasmlib/md5c.c", - "nasmlib/string.c", "nasmlib/file.c", "nasmlib/file.h", - "nasmlib/mmap.c", - "nasmlib/ilog2.c", - "nasmlib/realpath.c", - "nasmlib/path.c", "nasmlib/filename.c", - "nasmlib/srcfile.c", - "nasmlib/zerobuf.c", - "nasmlib/readnum.c", - "nasmlib/bsi.c", - "nasmlib/rbtree.c", "nasmlib/hashtbl.c", - "nasmlib/raa.c", - "nasmlib/saa.c", - "nasmlib/strlist.c", + "nasmlib/ilog2.c", + "nasmlib/malloc.c", + "nasmlib/md5c.c", + "nasmlib/mmap.c", + "nasmlib/path.c", "nasmlib/perfhash.c", - "nasmlib/badenum.c", - "common/common.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", + "output/outas86.c", + "output/outbin.c", + "output/outcoff.c", + "output/outdbg.c", + "output/outelf.c", + "output/outelf.h", + "output/outform.c", + "output/outform.h", + "output/outieee.c", + "output/outlib.c", + "output/outlib.h", + "output/outmacho.c", + "output/outobj.c", + "output/outrdf2.c", + "output/pecoff.h", + "output/stabs.h", + "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", - "x86/regflags.c", - "x86/regdis.c", - "x86/regdis.h", - "x86/disp8.c", - "x86/iflag.c", - "asm/pptok.h", - "asm/error.c", - "asm/float.h", - "asm/float.c", - "asm/directiv.c", - "asm/directiv.h", - "asm/directbl.c", - "asm/pragma.c", - "asm/assemble.c", - "asm/assemble.h", - "asm/labels.c", - "asm/parser.c", - "asm/parser.h", - "asm/preproc.c", - "asm/quote.c", - "asm/quote.h", - "asm/pptok.c", - "asm/listing.c", - "asm/listing.h", - "asm/eval.c", - "asm/eval.h", - "asm/exprlib.c", - "asm/exprdump.c", - "asm/preproc.h", - "asm/preproc-nop.c", - "asm/rdstrnum.c", - "asm/stdscan.c", - "asm/stdscan.h", - "asm/strfunc.c", - "asm/tokens.h", - "asm/tokhash.c", - "asm/segalloc.c", - "macros/macros.c", - "output/dwarf.h", - "output/stabs.h", - "output/elf.h", - "output/pecoff.h", - "output/outform.c", - "output/outform.h", - "output/outlib.c", - "output/outlib.h", - "output/legacy.c", - "output/nulldbg.c", - "output/nullout.c", - "output/outbin.c", - "output/outaout.c", - "output/outcoff.c", - "output/outelf.c", - "output/outelf.h", - "output/outobj.c", - "output/outas86.c", - "output/outrdf2.c", - "output/outdbg.c", - "output/outieee.c", - "output/outmacho.c", - "output/codeview.c", - "disasm/disasm.c", - "disasm/disasm.h", - "disasm/sync.c", - "disasm/sync.h", - "config/unknown.h", ], includes = [ - "include", "asm", + "include", "output", "x86", ],