From 540caa5873bcc3bc2a0e1896119f5b53a0e8e630 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Tue, 7 Jan 2020 15:31:01 -0500
Subject: lib9: remove getcallerpc implementations

These make no sense and are not really needed at all.
Add a best-effort attempt to get at the gcc/clang macro
in lib9.h, but if it fails, no big deal.

Fixes #324.
---
 src/lib9/getcallerpc-386.c    |  7 -------
 src/lib9/getcallerpc-arm.c    |  8 --------
 src/lib9/getcallerpc-arm64.c  |  8 --------
 src/lib9/getcallerpc-mips.c   |  8 --------
 src/lib9/getcallerpc-power.c  | 11 -----------
 src/lib9/getcallerpc-sun4u.s  |  5 -----
 src/lib9/getcallerpc-x86_64.c |  7 -------
 src/lib9/mkfile               |  2 +-
 8 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 src/lib9/getcallerpc-386.c
 delete mode 100644 src/lib9/getcallerpc-arm.c
 delete mode 100644 src/lib9/getcallerpc-arm64.c
 delete mode 100644 src/lib9/getcallerpc-mips.c
 delete mode 100644 src/lib9/getcallerpc-power.c
 delete mode 100644 src/lib9/getcallerpc-sun4u.s
 delete mode 100644 src/lib9/getcallerpc-x86_64.c

(limited to 'src/lib9')

diff --git a/src/lib9/getcallerpc-386.c b/src/lib9/getcallerpc-386.c
deleted file mode 100644
index 1367370e..00000000
--- a/src/lib9/getcallerpc-386.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <lib9.h>
-
-ulong
-getcallerpc(void *x)
-{
-	return (((ulong*)(x))[-1]);
-}
diff --git a/src/lib9/getcallerpc-arm.c b/src/lib9/getcallerpc-arm.c
deleted file mode 100644
index 9bb4a955..00000000
--- a/src/lib9/getcallerpc-arm.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <lib9.h>
-
-ulong
-getcallerpc(void *x)
-{
-	return ((ulong*)x)[-2];
-}
-
diff --git a/src/lib9/getcallerpc-arm64.c b/src/lib9/getcallerpc-arm64.c
deleted file mode 100644
index 9bb4a955..00000000
--- a/src/lib9/getcallerpc-arm64.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <lib9.h>
-
-ulong
-getcallerpc(void *x)
-{
-	return ((ulong*)x)[-2];
-}
-
diff --git a/src/lib9/getcallerpc-mips.c b/src/lib9/getcallerpc-mips.c
deleted file mode 100644
index 9bb4a955..00000000
--- a/src/lib9/getcallerpc-mips.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <lib9.h>
-
-ulong
-getcallerpc(void *x)
-{
-	return ((ulong*)x)[-2];
-}
-
diff --git a/src/lib9/getcallerpc-power.c b/src/lib9/getcallerpc-power.c
deleted file mode 100644
index b4bf6980..00000000
--- a/src/lib9/getcallerpc-power.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <lib9.h>
-
-ulong
-getcallerpc(void *x)
-{
-	ulong *lp;
-
-	lp = x;
-
-	return lp[-1];
-}
diff --git a/src/lib9/getcallerpc-sun4u.s b/src/lib9/getcallerpc-sun4u.s
deleted file mode 100644
index f28e57f1..00000000
--- a/src/lib9/getcallerpc-sun4u.s
+++ /dev/null
@@ -1,5 +0,0 @@
-.text
-.globl getcallerpc
-getcallerpc:
-	retl
-	or %o7, %r0, %o0
diff --git a/src/lib9/getcallerpc-x86_64.c b/src/lib9/getcallerpc-x86_64.c
deleted file mode 100644
index 1367370e..00000000
--- a/src/lib9/getcallerpc-x86_64.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <lib9.h>
-
-ulong
-getcallerpc(void *x)
-{
-	return (((ulong*)(x))[-1]);
-}
diff --git a/src/lib9/mkfile b/src/lib9/mkfile
index 8f7283ef..943b597b 100644
--- a/src/lib9/mkfile
+++ b/src/lib9/mkfile
@@ -104,7 +104,7 @@ LIB9OFILES=\
 	fcallfmt.$O\
 	frand.$O\
 	get9root.$O\
-	getcallerpc-$OBJTYPE.$O\
+	getcallerpc.$O\
 	getenv.$O\
 	getfields.$O\
 	getnetconn.$O\
-- 
cgit v1.2.3