Module Name: src
Committed By: christos
Date: Tue Jun 30 21:08:24 UTC 2015
Modified Files:
src/sys/arch/amd64/amd64: cpu_in_cksum.S
Log Message:
handle PIC compilation (if we are building a PIE system; this is used by tests)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/amd64/cpu_in_cksum.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/cpu_in_cksum.S
diff -u src/sys/arch/amd64/amd64/cpu_in_cksum.S:1.2 src/sys/arch/amd64/amd64/cpu_in_cksum.S:1.3
--- src/sys/arch/amd64/amd64/cpu_in_cksum.S:1.2 Sat Jun 22 01:56:32 2013
+++ src/sys/arch/amd64/amd64/cpu_in_cksum.S Tue Jun 30 17:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_in_cksum.S,v 1.2 2013/06/22 05:56:32 uebayasi Exp $ */
+/* $NetBSD: cpu_in_cksum.S,v 1.3 2015/06/30 21:08:24 christos Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger <[email protected]>.
@@ -285,9 +285,13 @@ ENTRY(cpu_in_cksum)
ret
.Mout_of_mbufs:
+#ifdef __PIC__
+ leaq .Mout_of_mbufs_msg(%rip), %rdi
+#else
movq $.Mout_of_mbufs_msg, %rdi
+#endif
movl $0, %eax
- call _C_LABEL(printf)
+ call PIC_PLT(_C_LABEL(printf))
jmp .Mreturn
END(cpu_in_cksum)