fix: make crt-cmp position-independent

gemesa · Dec 20, 2024 · b2c58e5 · b2c58e5
1 parent f5f6c13
commit b2c58e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -118,7 +118,7 @@ $(BUILDDIR)/linux/x64/nocrt-args: lab/linux/asm-hive/x64/nocrt-args.s
 	ld $(BUILDDIR)/linux/x64/nocrt-args.o -g -o $@
 
 $(BUILDDIR)/linux/x64/crt-cmp: lab/linux/asm-hive/x64/crt-cmp.s
-	gcc $< -g -o $@
+	gcc $< -fPIE -pie -g -o $@
 
 $(BUILDDIR)/linux/x64/crt-loop: lab/linux/asm-hive/x64/crt-loop.s
 	gcc $< -g -o $@

diff --git a/lab/linux/asm-hive/x64/crt-cmp.s b/lab/linux/asm-hive/x64/crt-cmp.s
@@ -14,7 +14,7 @@ main_:
 	mov  $1, %edi
 	mov  $2, %esi
 	call min
-	mov  $format_string, %edi
+	lea  format_string(%rip), %rdi
 	mov  %eax, %esi
 	call printf
 	xor  %eax, %eax
@@ -42,7 +42,7 @@ main:
 	mov  edi, 1
 	mov  esi, 2
 	call min
-	mov  edi, offset format_string
+	lea  rdi, [rip + format_string]
 	mov  esi, eax
 	call printf
 	xor  eax, eax