From b3d6bf0dbec0ecfa6c334c90aff8affecdaf508c Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 28 Jun 2016 20:49:39 -0700 Subject: [PATCH] Remove old asm pause from third_party --- third_party/pause/LICENSE | 19 ------------- third_party/pause/Makefile | 13 --------- third_party/pause/pause.asm | 57 ------------------------------------- 3 files changed, 89 deletions(-) delete mode 100644 third_party/pause/LICENSE delete mode 100644 third_party/pause/Makefile delete mode 100644 third_party/pause/pause.asm diff --git a/third_party/pause/LICENSE b/third_party/pause/LICENSE deleted file mode 100644 index 2b5e5ff1ab..0000000000 --- a/third_party/pause/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -The Expat/MIT License - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. diff --git a/third_party/pause/Makefile b/third_party/pause/Makefile deleted file mode 100644 index 723b8a9c4c..0000000000 --- a/third_party/pause/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -pause: pause.asm -ifneq ($(shell uname), Linux) - echo "Must build on Linux" - exit 1 -else - nasm -o $@ $< - chmod +x pause -endif - -all: pause - -clean: - rm -f pause diff --git a/third_party/pause/pause.asm b/third_party/pause/pause.asm deleted file mode 100644 index 90576d4ce1..0000000000 --- a/third_party/pause/pause.asm +++ /dev/null @@ -1,57 +0,0 @@ -; This is heavily based on https://github.com/tianon/dockerfiles/tree/master/true -; which is in turn especially thanks to: -; http://blog.markloiseau.com/2012/05/tiny-64-bit-elf-executables/ - -BITS 64 - org 0x00400000 ; Program load offset - -; 64-bit ELF header -ehdr: - ; 1), 0 (ABI ver.) - db 0x7F, "ELF", 2, 1, 1, 0 ; e_ident - times 8 db 0 ; reserved (zeroes) - - dw 2 ; e_type: Executable file - dw 0x3e ; e_machine: AMD64 - dd 1 ; e_version: current version - dq _start ; e_entry: program entry address (0x78) - dq phdr - $$ ; e_phoff program header offset (0x40) - dq 0 ; e_shoff no section headers - dd 0 ; e_flags no flags - dw ehdrsize ; e_ehsize: ELF header size (0x40) - dw phdrsize ; e_phentsize: program header size (0x38) - dw 1 ; e_phnum: one program header - dw 0 ; e_shentsize - dw 0 ; e_shnum - dw 0 ; e_shstrndx - -ehdrsize equ $ - ehdr - -; 64-bit ELF program header -phdr: - dd 1 ; p_type: loadable segment - dd 5 ; p_flags read and execute - dq 0 ; p_offset - dq $$ ; p_vaddr: start of the current section - dq $$ ; p_paddr: " " - dq filesize ; p_filesz - dq filesize ; p_memsz - dq 0x200000 ; p_align: 2^11=200000 = section alignment - -; program header size -phdrsize equ $ - phdr - -_start: - ; pause() - - mov al, 34 ; pause syscall number - syscall - - ; sys_exit(return_code) - - mov al, 60 ; sys_exit syscall number - cdq ; Sign-extend eax into edi to return 0 (success) - syscall - -; File size calculation -filesize equ $ - $$