multibinary: move WRT_OPT macro to common header

Signed-off-by: Xiaodong Liu <[email protected]>
gbtucker · Aug 18, 2017 · 3ab8239 · 3ab8239
1 parent 9d243d0
commit 3ab8239
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 42 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"