diff --git a/crc/crc64_multibinary.asm b/crc/crc64_multibinary.asm index a20c8a7..81ae2ec 100644 --- a/crc/crc64_multibinary.asm +++ b/crc/crc64_multibinary.asm @@ -35,12 +35,6 @@ default rel [bits 64] -%ifidn __OUTPUT_FORMAT__, elf64 -%define WRT_OPT wrt ..plt -%else -%define WRT_OPT -%endif - %include "reg_sizes.asm" extern crc64_ecma_refl_by8 diff --git a/crc/crc_multibinary.asm b/crc/crc_multibinary.asm index 2bbab0e..7c6d631 100644 --- a/crc/crc_multibinary.asm +++ b/crc/crc_multibinary.asm @@ -30,12 +30,6 @@ default rel [bits 64] -%ifidn __OUTPUT_FORMAT__, elf64 -%define WRT_OPT wrt ..plt -%else -%define WRT_OPT -%endif - %include "reg_sizes.asm" extern crc32_iscsi_00 diff --git a/erasure_code/ec_multibinary.asm b/erasure_code/ec_multibinary.asm index 4bb4273..e862850 100644 --- a/erasure_code/ec_multibinary.asm +++ b/erasure_code/ec_multibinary.asm @@ -27,12 +27,6 @@ ; 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 "multibinary.asm" diff --git a/igzip/igzip_inflate_multibinary.asm b/igzip/igzip_inflate_multibinary.asm index 4d60802..ef2ce68 100644 --- a/igzip/igzip_inflate_multibinary.asm +++ b/igzip/igzip_inflate_multibinary.asm @@ -30,12 +30,6 @@ default rel [bits 64] -%ifidn __OUTPUT_FORMAT__, elf64 -%define WRT_OPT wrt ..plt -%else -%define WRT_OPT -%endif - %include "reg_sizes.asm" extern decode_huffman_code_block_stateless_base diff --git a/igzip/igzip_multibinary.asm b/igzip/igzip_multibinary.asm index 52df6d3..157d4d3 100644 --- a/igzip/igzip_multibinary.asm +++ b/igzip/igzip_multibinary.asm @@ -30,12 +30,6 @@ default rel [bits 64] -%ifidn __OUTPUT_FORMAT__, elf64 -%define WRT_OPT wrt ..plt -%else -%define WRT_OPT -%endif - %include "reg_sizes.asm" extern isal_deflate_body_base diff --git a/include/reg_sizes.asm b/include/reg_sizes.asm index 48de53c..872ebb5 100644 --- a/include/reg_sizes.asm +++ b/include/reg_sizes.asm @@ -198,6 +198,15 @@ section .text section .note.GNU-stack noalloc noexec nowrite progbits section .text %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 %define elf64 macho64 %endif diff --git a/raid/raid_multibinary.asm b/raid/raid_multibinary.asm index 72ef5d4..25d4aad 100644 --- a/raid/raid_multibinary.asm +++ b/raid/raid_multibinary.asm @@ -27,12 +27,6 @@ ; 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 "multibinary.asm" diff --git a/raid/raid_multibinary_i32.asm b/raid/raid_multibinary_i32.asm index 6da4c9d..eee7fd5 100644 --- a/raid/raid_multibinary_i32.asm +++ b/raid/raid_multibinary_i32.asm @@ -27,12 +27,6 @@ ; 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 "multibinary.asm"