summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorPascal Stumpf <pascal@cvs.openbsd.org>2012-08-22 17:19:36 +0000
committerPascal Stumpf <pascal@cvs.openbsd.org>2012-08-22 17:19:36 +0000
commit0b17a3ce8acce6123900b78334061ec5da7fff13 (patch)
tree899daa1fa911a22452f013b57bb5873909dd7ed4 /sys/arch/amd64
parent9e13e109aa5166fac25ad417e38996ce27251c67 (diff)
Convert cpp | as rules in bsd.lib.mk and lib/libc/sys/Makefile.inc to pure cc
invocations. This allows us to use the compiler builtin define __PIC__ to check for PIC/PIEness rather than passing -DPIC. Simplifies PIE work a lot. ok matthew@, conceptually ok kurt@
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/include/asm.h4
-rw-r--r--sys/arch/amd64/include/profile.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/include/asm.h b/sys/arch/amd64/include/asm.h
index d9b41e9ac10..23bd1caf3b6 100644
--- a/sys/arch/amd64/include/asm.h
+++ b/sys/arch/amd64/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */
+/* $OpenBSD: asm.h,v 1.4 2012/08/22 17:19:35 pascal Exp $ */
/* $NetBSD: asm.h,v 1.2 2003/05/02 18:05:47 yamt Exp $ */
/*-
@@ -38,7 +38,7 @@
#ifndef _MACHINE_ASM_H_
#define _MACHINE_ASM_H_
-#ifdef PIC
+#ifdef __PIC__
#define PIC_PLT(x) x@PLT
#define PIC_GOT(x) x@GOTPCREL(%rip)
#else
diff --git a/sys/arch/amd64/include/profile.h b/sys/arch/amd64/include/profile.h
index 56b984d2671..9cb638f6ad2 100644
--- a/sys/arch/amd64/include/profile.h
+++ b/sys/arch/amd64/include/profile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: profile.h,v 1.3 2006/10/28 16:20:04 kettenis Exp $ */
+/* $OpenBSD: profile.h,v 1.4 2012/08/22 17:19:35 pascal Exp $ */
/* $NetBSD: profile.h,v 1.3 2003/11/28 23:22:45 fvdl Exp $ */
/*
@@ -34,7 +34,7 @@
#define _MCOUNT_DECL void _mcount
-#ifdef PIC
+#ifdef __PIC__
#define __MCPLT "@PLT"
#else
#define __MCPLT