multibinary: move WRT_OPT macro to common header

Signed-off-by: Xiaodong Liu <xiaodong.liu@intel.com>
This commit is contained in:
Xiaodong Liu
2017-07-23 22:06:20 -04:00
committed by Greg Tucker
parent 9d243d0ed7
commit 3ab8239097
8 changed files with 9 additions and 42 deletions

View File

@@ -35,12 +35,6 @@
default rel default rel
[bits 64] [bits 64]
%ifidn __OUTPUT_FORMAT__, elf64
%define WRT_OPT wrt ..plt
%else
%define WRT_OPT
%endif
%include "reg_sizes.asm" %include "reg_sizes.asm"
extern crc64_ecma_refl_by8 extern crc64_ecma_refl_by8

View File

@@ -30,12 +30,6 @@
default rel default rel
[bits 64] [bits 64]
%ifidn __OUTPUT_FORMAT__, elf64
%define WRT_OPT wrt ..plt
%else
%define WRT_OPT
%endif
%include "reg_sizes.asm" %include "reg_sizes.asm"
extern crc32_iscsi_00 extern crc32_iscsi_00

View File

@@ -27,12 +27,6 @@
; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
%ifidn __OUTPUT_FORMAT__, elf64
%define WRT_OPT wrt ..plt
%else
%define WRT_OPT
%endif
%include "reg_sizes.asm" %include "reg_sizes.asm"
%include "multibinary.asm" %include "multibinary.asm"

View File

@@ -30,12 +30,6 @@
default rel default rel
[bits 64] [bits 64]
%ifidn __OUTPUT_FORMAT__, elf64
%define WRT_OPT wrt ..plt
%else
%define WRT_OPT
%endif
%include "reg_sizes.asm" %include "reg_sizes.asm"
extern decode_huffman_code_block_stateless_base extern decode_huffman_code_block_stateless_base

View File

@@ -30,12 +30,6 @@
default rel default rel
[bits 64] [bits 64]
%ifidn __OUTPUT_FORMAT__, elf64
%define WRT_OPT wrt ..plt
%else
%define WRT_OPT
%endif
%include "reg_sizes.asm" %include "reg_sizes.asm"
extern isal_deflate_body_base extern isal_deflate_body_base

View File

@@ -198,6 +198,15 @@ section .text
section .note.GNU-stack noalloc noexec nowrite progbits section .note.GNU-stack noalloc noexec nowrite progbits
section .text section .text
%endif %endif
%ifdef REL_TEXT
%define WRT_OPT
%elifidn __OUTPUT_FORMAT__, elf64
%define WRT_OPT wrt ..plt
%else
%define WRT_OPT
%endif
%ifidn __OUTPUT_FORMAT__, macho64 %ifidn __OUTPUT_FORMAT__, macho64
%define elf64 macho64 %define elf64 macho64
%endif %endif

View File

@@ -27,12 +27,6 @@
; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
%ifidn __OUTPUT_FORMAT__, elf64
%define WRT_OPT wrt ..plt
%else
%define WRT_OPT
%endif
%include "reg_sizes.asm" %include "reg_sizes.asm"
%include "multibinary.asm" %include "multibinary.asm"

View File

@@ -27,12 +27,6 @@
; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
%ifidn __OUTPUT_FORMAT__, elf64
%define WRT_OPT wrt ..plt
%else
%define WRT_OPT
%endif
%include "reg_sizes.asm" %include "reg_sizes.asm"
%include "multibinary.asm" %include "multibinary.asm"