From aacd348637e38795dd7ae3c7c8c908d8c0cd24fd Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 27 Feb 2014 22:03:25 -0500
Subject: rename superh port to "sh" for consistency

linux, gcc, etc. all use "sh" as the name for the superh arch. there
was already some inconsistency internally in musl: the dynamic linker
was searching for "ld-musl-sh.path" as its path file despite its own
name being "ld-musl-superh.so.1". there was some sentiment in both
directions as to how to resolve the inconsistency, but overall "sh"
was favored.
---
 src/ldso/sh/dlsym.s     | 10 ++++++++++
 src/ldso/sh/start.s     | 26 ++++++++++++++++++++++++++
 src/ldso/superh/dlsym.s | 10 ----------
 src/ldso/superh/start.s | 26 --------------------------
 4 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 src/ldso/sh/dlsym.s
 create mode 100644 src/ldso/sh/start.s
 delete mode 100644 src/ldso/superh/dlsym.s
 delete mode 100644 src/ldso/superh/start.s

(limited to 'src/ldso')

diff --git a/src/ldso/sh/dlsym.s b/src/ldso/sh/dlsym.s
new file mode 100644
index 00000000..8258507f
--- /dev/null
+++ b/src/ldso/sh/dlsym.s
@@ -0,0 +1,10 @@
+.text
+.global dlsym
+.type   dlsym, @function
+dlsym:
+	mov.l L1, r0
+	braf  r0
+1:	 mov.l @r15, r6
+
+.align 2
+L1:	.long __dlsym@PLT-(1b-.)
diff --git a/src/ldso/sh/start.s b/src/ldso/sh/start.s
new file mode 100644
index 00000000..ca6b7fc9
--- /dev/null
+++ b/src/ldso/sh/start.s
@@ -0,0 +1,26 @@
+.text
+.global _start
+.type   _start, @function
+_start:
+	mov.l  @r15, r4
+	mov    r15, r5
+	mov.l  L1, r0
+	bsrf   r0
+	 add   #4, r5
+
+2:	mov    r0, r2
+	mov.l  @r15+, r1
+1:	mov.l  @r15+, r0
+	cmp/eq #-1, r0
+	bt/s   1b
+	 add   #-1, r1
+
+	add    #1, r1
+	mov.l  r0, @-r15
+	mov.l  r1, @-r15
+	mov    #0, r4
+	jmp    @r2
+	 nop
+
+.align 2
+L1:	.long __dynlink@PLT-(2b-.)
diff --git a/src/ldso/superh/dlsym.s b/src/ldso/superh/dlsym.s
deleted file mode 100644
index 8258507f..00000000
--- a/src/ldso/superh/dlsym.s
+++ /dev/null
@@ -1,10 +0,0 @@
-.text
-.global dlsym
-.type   dlsym, @function
-dlsym:
-	mov.l L1, r0
-	braf  r0
-1:	 mov.l @r15, r6
-
-.align 2
-L1:	.long __dlsym@PLT-(1b-.)
diff --git a/src/ldso/superh/start.s b/src/ldso/superh/start.s
deleted file mode 100644
index ca6b7fc9..00000000
--- a/src/ldso/superh/start.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.text
-.global _start
-.type   _start, @function
-_start:
-	mov.l  @r15, r4
-	mov    r15, r5
-	mov.l  L1, r0
-	bsrf   r0
-	 add   #4, r5
-
-2:	mov    r0, r2
-	mov.l  @r15+, r1
-1:	mov.l  @r15+, r0
-	cmp/eq #-1, r0
-	bt/s   1b
-	 add   #-1, r1
-
-	add    #1, r1
-	mov.l  r0, @-r15
-	mov.l  r1, @-r15
-	mov    #0, r4
-	jmp    @r2
-	 nop
-
-.align 2
-L1:	.long __dynlink@PLT-(2b-.)
-- 
cgit v1.2.1