From aacd348637e38795dd7ae3c7c8c908d8c0cd24fd Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 27 Feb 2014 22:03:25 -0500 Subject: [PATCH] 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. --- arch/{superh => sh}/atomic.h | 0 arch/{superh => sh}/bits/alltypes.h.in | 0 arch/{superh => sh}/bits/endian.h | 0 arch/{superh => sh}/bits/errno.h | 0 arch/{superh => sh}/bits/fcntl.h | 0 arch/{superh => sh}/bits/fenv.h | 0 arch/{superh => sh}/bits/float.h | 0 arch/{superh => sh}/bits/io.h | 0 arch/{superh => sh}/bits/ioctl.h | 0 arch/{superh => sh}/bits/ipc.h | 0 arch/{superh => sh}/bits/limits.h | 0 arch/{superh => sh}/bits/mman.h | 0 arch/{superh => sh}/bits/msg.h | 0 arch/{superh => sh}/bits/posix.h | 0 arch/{superh => sh}/bits/setjmp.h | 0 arch/{superh => sh}/bits/shm.h | 0 arch/{superh => sh}/bits/signal.h | 0 arch/{superh => sh}/bits/socket.h | 0 arch/{superh => sh}/bits/stat.h | 0 arch/{superh => sh}/bits/statfs.h | 0 arch/{superh => sh}/bits/stdarg.h | 0 arch/{superh => sh}/bits/stdint.h | 0 arch/{superh => sh}/bits/syscall.h | 0 arch/{superh => sh}/bits/termios.h | 0 arch/{superh => sh}/crt_arch.h | 0 arch/{superh => sh}/pthread_arch.h | 0 arch/{superh => sh}/reloc.h | 0 arch/{superh => sh}/src/__fpsrc_values.c | 0 arch/{superh => sh}/src/atomic.c | 0 arch/{superh => sh}/syscall_arch.h | 0 configure | 4 ++-- src/fenv/{superh => sh}/fenv.s | 0 src/internal/{superh => sh}/syscall.s | 0 src/ldso/{superh => sh}/dlsym.s | 0 src/ldso/{superh => sh}/start.s | 0 src/setjmp/{superh => sh}/longjmp.s | 0 src/setjmp/{superh => sh}/setjmp.s | 0 src/signal/{superh => sh}/restore.s | 0 src/signal/{superh => sh}/sigsetjmp.s | 0 src/thread/{superh => sh}/__set_thread_area.s | 0 src/thread/{superh => sh}/__unmapself.s | 0 src/thread/{superh => sh}/clone.s | 0 src/thread/{superh => sh}/syscall_cp.s | 0 src/unistd/{superh => sh}/pipe.s | 0 44 files changed, 2 insertions(+), 2 deletions(-) rename arch/{superh => sh}/atomic.h (100%) rename arch/{superh => sh}/bits/alltypes.h.in (100%) rename arch/{superh => sh}/bits/endian.h (100%) rename arch/{superh => sh}/bits/errno.h (100%) rename arch/{superh => sh}/bits/fcntl.h (100%) rename arch/{superh => sh}/bits/fenv.h (100%) rename arch/{superh => sh}/bits/float.h (100%) rename arch/{superh => sh}/bits/io.h (100%) rename arch/{superh => sh}/bits/ioctl.h (100%) rename arch/{superh => sh}/bits/ipc.h (100%) rename arch/{superh => sh}/bits/limits.h (100%) rename arch/{superh => sh}/bits/mman.h (100%) rename arch/{superh => sh}/bits/msg.h (100%) rename arch/{superh => sh}/bits/posix.h (100%) rename arch/{superh => sh}/bits/setjmp.h (100%) rename arch/{superh => sh}/bits/shm.h (100%) rename arch/{superh => sh}/bits/signal.h (100%) rename arch/{superh => sh}/bits/socket.h (100%) rename arch/{superh => sh}/bits/stat.h (100%) rename arch/{superh => sh}/bits/statfs.h (100%) rename arch/{superh => sh}/bits/stdarg.h (100%) rename arch/{superh => sh}/bits/stdint.h (100%) rename arch/{superh => sh}/bits/syscall.h (100%) rename arch/{superh => sh}/bits/termios.h (100%) rename arch/{superh => sh}/crt_arch.h (100%) rename arch/{superh => sh}/pthread_arch.h (100%) rename arch/{superh => sh}/reloc.h (100%) rename arch/{superh => sh}/src/__fpsrc_values.c (100%) rename arch/{superh => sh}/src/atomic.c (100%) rename arch/{superh => sh}/syscall_arch.h (100%) rename src/fenv/{superh => sh}/fenv.s (100%) rename src/internal/{superh => sh}/syscall.s (100%) rename src/ldso/{superh => sh}/dlsym.s (100%) rename src/ldso/{superh => sh}/start.s (100%) rename src/setjmp/{superh => sh}/longjmp.s (100%) rename src/setjmp/{superh => sh}/setjmp.s (100%) rename src/signal/{superh => sh}/restore.s (100%) rename src/signal/{superh => sh}/sigsetjmp.s (100%) rename src/thread/{superh => sh}/__set_thread_area.s (100%) rename src/thread/{superh => sh}/__unmapself.s (100%) rename src/thread/{superh => sh}/clone.s (100%) rename src/thread/{superh => sh}/syscall_cp.s (100%) rename src/unistd/{superh => sh}/pipe.s (100%) diff --git a/arch/superh/atomic.h b/arch/sh/atomic.h similarity index 100% rename from arch/superh/atomic.h rename to arch/sh/atomic.h diff --git a/arch/superh/bits/alltypes.h.in b/arch/sh/bits/alltypes.h.in similarity index 100% rename from arch/superh/bits/alltypes.h.in rename to arch/sh/bits/alltypes.h.in diff --git a/arch/superh/bits/endian.h b/arch/sh/bits/endian.h similarity index 100% rename from arch/superh/bits/endian.h rename to arch/sh/bits/endian.h diff --git a/arch/superh/bits/errno.h b/arch/sh/bits/errno.h similarity index 100% rename from arch/superh/bits/errno.h rename to arch/sh/bits/errno.h diff --git a/arch/superh/bits/fcntl.h b/arch/sh/bits/fcntl.h similarity index 100% rename from arch/superh/bits/fcntl.h rename to arch/sh/bits/fcntl.h diff --git a/arch/superh/bits/fenv.h b/arch/sh/bits/fenv.h similarity index 100% rename from arch/superh/bits/fenv.h rename to arch/sh/bits/fenv.h diff --git a/arch/superh/bits/float.h b/arch/sh/bits/float.h similarity index 100% rename from arch/superh/bits/float.h rename to arch/sh/bits/float.h diff --git a/arch/superh/bits/io.h b/arch/sh/bits/io.h similarity index 100% rename from arch/superh/bits/io.h rename to arch/sh/bits/io.h diff --git a/arch/superh/bits/ioctl.h b/arch/sh/bits/ioctl.h similarity index 100% rename from arch/superh/bits/ioctl.h rename to arch/sh/bits/ioctl.h diff --git a/arch/superh/bits/ipc.h b/arch/sh/bits/ipc.h similarity index 100% rename from arch/superh/bits/ipc.h rename to arch/sh/bits/ipc.h diff --git a/arch/superh/bits/limits.h b/arch/sh/bits/limits.h similarity index 100% rename from arch/superh/bits/limits.h rename to arch/sh/bits/limits.h diff --git a/arch/superh/bits/mman.h b/arch/sh/bits/mman.h similarity index 100% rename from arch/superh/bits/mman.h rename to arch/sh/bits/mman.h diff --git a/arch/superh/bits/msg.h b/arch/sh/bits/msg.h similarity index 100% rename from arch/superh/bits/msg.h rename to arch/sh/bits/msg.h diff --git a/arch/superh/bits/posix.h b/arch/sh/bits/posix.h similarity index 100% rename from arch/superh/bits/posix.h rename to arch/sh/bits/posix.h diff --git a/arch/superh/bits/setjmp.h b/arch/sh/bits/setjmp.h similarity index 100% rename from arch/superh/bits/setjmp.h rename to arch/sh/bits/setjmp.h diff --git a/arch/superh/bits/shm.h b/arch/sh/bits/shm.h similarity index 100% rename from arch/superh/bits/shm.h rename to arch/sh/bits/shm.h diff --git a/arch/superh/bits/signal.h b/arch/sh/bits/signal.h similarity index 100% rename from arch/superh/bits/signal.h rename to arch/sh/bits/signal.h diff --git a/arch/superh/bits/socket.h b/arch/sh/bits/socket.h similarity index 100% rename from arch/superh/bits/socket.h rename to arch/sh/bits/socket.h diff --git a/arch/superh/bits/stat.h b/arch/sh/bits/stat.h similarity index 100% rename from arch/superh/bits/stat.h rename to arch/sh/bits/stat.h diff --git a/arch/superh/bits/statfs.h b/arch/sh/bits/statfs.h similarity index 100% rename from arch/superh/bits/statfs.h rename to arch/sh/bits/statfs.h diff --git a/arch/superh/bits/stdarg.h b/arch/sh/bits/stdarg.h similarity index 100% rename from arch/superh/bits/stdarg.h rename to arch/sh/bits/stdarg.h diff --git a/arch/superh/bits/stdint.h b/arch/sh/bits/stdint.h similarity index 100% rename from arch/superh/bits/stdint.h rename to arch/sh/bits/stdint.h diff --git a/arch/superh/bits/syscall.h b/arch/sh/bits/syscall.h similarity index 100% rename from arch/superh/bits/syscall.h rename to arch/sh/bits/syscall.h diff --git a/arch/superh/bits/termios.h b/arch/sh/bits/termios.h similarity index 100% rename from arch/superh/bits/termios.h rename to arch/sh/bits/termios.h diff --git a/arch/superh/crt_arch.h b/arch/sh/crt_arch.h similarity index 100% rename from arch/superh/crt_arch.h rename to arch/sh/crt_arch.h diff --git a/arch/superh/pthread_arch.h b/arch/sh/pthread_arch.h similarity index 100% rename from arch/superh/pthread_arch.h rename to arch/sh/pthread_arch.h diff --git a/arch/superh/reloc.h b/arch/sh/reloc.h similarity index 100% rename from arch/superh/reloc.h rename to arch/sh/reloc.h diff --git a/arch/superh/src/__fpsrc_values.c b/arch/sh/src/__fpsrc_values.c similarity index 100% rename from arch/superh/src/__fpsrc_values.c rename to arch/sh/src/__fpsrc_values.c diff --git a/arch/superh/src/atomic.c b/arch/sh/src/atomic.c similarity index 100% rename from arch/superh/src/atomic.c rename to arch/sh/src/atomic.c diff --git a/arch/superh/syscall_arch.h b/arch/sh/syscall_arch.h similarity index 100% rename from arch/superh/syscall_arch.h rename to arch/sh/syscall_arch.h diff --git a/configure b/configure index c622366a..38b36d82 100755 --- a/configure +++ b/configure @@ -229,7 +229,7 @@ x86_64*) ARCH=x86_64 ;; mips-*|mipsel-*) ARCH=mips ;; microblaze-*) ARCH=microblaze ;; powerpc-*) ARCH=powerpc ;; -sh-*) ARCH=superh ;; +sh-*) ARCH=sh ;; unknown) fail "$0: unable to detect target arch; try $0 --target=..." ;; *) fail "$0: unknown or unsupported target \"$target\"" ;; esac @@ -421,7 +421,7 @@ fi test "$ARCH" = "microblaze" && trycppif __MICROBLAZEEL__ "$t" \ && SUBARCH=${SUBARCH}el -test "$ARCH" = "superh" && trycppif __LITTLE_ENDIAN__ "$t" \ +test "$ARCH" = "sh" && trycppif __LITTLE_ENDIAN__ "$t" \ && SUBARCH=${SUBARCH}el test "$SUBARCH" \ diff --git a/src/fenv/superh/fenv.s b/src/fenv/sh/fenv.s similarity index 100% rename from src/fenv/superh/fenv.s rename to src/fenv/sh/fenv.s diff --git a/src/internal/superh/syscall.s b/src/internal/sh/syscall.s similarity index 100% rename from src/internal/superh/syscall.s rename to src/internal/sh/syscall.s diff --git a/src/ldso/superh/dlsym.s b/src/ldso/sh/dlsym.s similarity index 100% rename from src/ldso/superh/dlsym.s rename to src/ldso/sh/dlsym.s diff --git a/src/ldso/superh/start.s b/src/ldso/sh/start.s similarity index 100% rename from src/ldso/superh/start.s rename to src/ldso/sh/start.s diff --git a/src/setjmp/superh/longjmp.s b/src/setjmp/sh/longjmp.s similarity index 100% rename from src/setjmp/superh/longjmp.s rename to src/setjmp/sh/longjmp.s diff --git a/src/setjmp/superh/setjmp.s b/src/setjmp/sh/setjmp.s similarity index 100% rename from src/setjmp/superh/setjmp.s rename to src/setjmp/sh/setjmp.s diff --git a/src/signal/superh/restore.s b/src/signal/sh/restore.s similarity index 100% rename from src/signal/superh/restore.s rename to src/signal/sh/restore.s diff --git a/src/signal/superh/sigsetjmp.s b/src/signal/sh/sigsetjmp.s similarity index 100% rename from src/signal/superh/sigsetjmp.s rename to src/signal/sh/sigsetjmp.s diff --git a/src/thread/superh/__set_thread_area.s b/src/thread/sh/__set_thread_area.s similarity index 100% rename from src/thread/superh/__set_thread_area.s rename to src/thread/sh/__set_thread_area.s diff --git a/src/thread/superh/__unmapself.s b/src/thread/sh/__unmapself.s similarity index 100% rename from src/thread/superh/__unmapself.s rename to src/thread/sh/__unmapself.s diff --git a/src/thread/superh/clone.s b/src/thread/sh/clone.s similarity index 100% rename from src/thread/superh/clone.s rename to src/thread/sh/clone.s diff --git a/src/thread/superh/syscall_cp.s b/src/thread/sh/syscall_cp.s similarity index 100% rename from src/thread/superh/syscall_cp.s rename to src/thread/sh/syscall_cp.s diff --git a/src/unistd/superh/pipe.s b/src/unistd/sh/pipe.s similarity index 100% rename from src/unistd/superh/pipe.s rename to src/unistd/sh/pipe.s -- 2.25.1