9 files changed, 6 insertions, 21 deletions
diff --git a/libc/sysdeps/linux/h8300/crt0.S b/libc/sysdeps/linux/h8300/crt0.S
index a593b88e2..ebdca18e5 100644
--- a/libc/sysdeps/linux/h8300/crt0.S
+++ b/libc/sysdeps/linux/h8300/crt0.S
@@ -56,12 +56,8 @@ __exit:
  */
 empty_func:
 	rts
-#if defined(__HAVE_ELF__)
 	.weak atexit
 	atexit = empty_func
-#else
-	.set atexit,empty_func
-#endif
 
 
 /* Define a symbol for the first piece of initialized data.  */
diff --git a/libc/sysdeps/linux/h8300/vfork.S b/libc/sysdeps/linux/h8300/vfork.S
index 343bb0183..4156fae17 100644
--- a/libc/sysdeps/linux/h8300/vfork.S
+++ b/libc/sysdeps/linux/h8300/vfork.S
@@ -14,9 +14,7 @@
 	.align 2
 	.globl _errno
 	.globl _vfork
-#if defined __HAVE_ELF__
 	.type	 vfork,@function
-#endif
 _vfork:
 	mov.l	@sp+, er1
 	sub.l	er0,er0
diff --git a/libc/sysdeps/linux/i960/README b/libc/sysdeps/linux/i960/README
index e1ca11f9a..185fe2572 100644
--- a/libc/sysdeps/linux/i960/README
+++ b/libc/sysdeps/linux/i960/README
@@ -16,8 +16,7 @@ prepended underscore
 --------------------
 
 As the i960 compiler prepends an underscore to symbols, it is critical that
-the Config file define __C_SYMBOL_PREFIX__ as
-    __C_SYMBOL_PREFIX__ = _
+bits/uClibc_arch_features.h undefines __UCLIBC_NO_UNDERSCORES__
 to make sure that underscores are applied to symbol names when needed.
 
 
diff --git a/libc/sysdeps/linux/m68k/Makefile.arch b/libc/sysdeps/linux/m68k/Makefile.arch
index 1ce72a61a..a1ded80f2 100644
--- a/libc/sysdeps/linux/m68k/Makefile.arch
+++ b/libc/sysdeps/linux/m68k/Makefile.arch
@@ -9,8 +9,4 @@ CSRC := ptrace.c brk.c __syscall_error.c syscall.c
 
 SSRC := __longjmp.S bsd-_setjmp.S bsd-setjmp.S clone.S setjmp.S vfork.S
 
-ifneq ($(HAVE_ELF),y)
-ARCH_HEADERS := float.h
-endif
-
 include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch
diff --git a/libc/sysdeps/linux/m68k/vfork.S b/libc/sysdeps/linux/m68k/vfork.S
index ec319d077..58564f765 100644
--- a/libc/sysdeps/linux/m68k/vfork.S
+++ b/libc/sysdeps/linux/m68k/vfork.S
@@ -18,9 +18,7 @@
 	.align 2
 	.globl errno
 	.globl	vfork
-#ifdef __HAVE_ELF__
 	.type	vfork,@function
-#endif
 
 vfork:
 	movl	%sp@+, %a1               /* save the return address for later */
diff --git a/libc/sysdeps/linux/nios/vfork.S b/libc/sysdeps/linux/nios/vfork.S
index 3ac3da9b3..2479fe752 100644
--- a/libc/sysdeps/linux/nios/vfork.S
+++ b/libc/sysdeps/linux/nios/vfork.S
@@ -23,9 +23,7 @@
    .text
    .align 2
    .globl vfork
-#if defined __HAVE_ELF__
    .type  vfork,@function
-#endif
 vfork:
 	MOVIP	%g1, __NR_vfork
 	trap	63
diff --git a/libc/sysdeps/linux/sh/clone.S b/libc/sysdeps/linux/sh/clone.S
index 80c623b81..1806313e0 100644
--- a/libc/sysdeps/linux/sh/clone.S
+++ b/libc/sysdeps/linux/sh/clone.S
@@ -25,7 +25,7 @@
 #include <bits/errno.h>
 
 
-#if defined __HAVE_ELF__ && defined __HAVE_SHARED__ 
+#ifdef __HAVE_SHARED__ 
 #define PLTJMP(_x)	_x##@PLT
 #else
 #define PLTJMP(_x)	_x
@@ -98,7 +98,7 @@ clone:
 
 	/* we are done, passing the return value through r0  */
 	mov.l	.L1, r1
-#if defined __HAVE_ELF__ && defined __HAVE_SHARED__ 
+#ifdef __HAVE_SHARED__ 
 	mov.l	r12, @-r15
 	sts.l	pr, @-r15
 	mov	r0, r4
diff --git a/libc/sysdeps/linux/sh/setjmp.S b/libc/sysdeps/linux/sh/setjmp.S
index bb87ff0fb..3296c2ba9 100644
--- a/libc/sysdeps/linux/sh/setjmp.S
+++ b/libc/sysdeps/linux/sh/setjmp.S
@@ -77,7 +77,7 @@ __sigsetjmp_intern:
 	mov.l	r9, @-r4
 	mov.l	r8, @-r4
 
-#if defined __HAVE_ELF__ && defined __HAVE_SHARED__ 
+#ifdef __HAVE_SHARED__ 
 	mov.l	.LG, r2
 	mova	.LG, r0
 	add	r0, r2
diff --git a/libc/sysdeps/linux/sh/syscall_error.S b/libc/sysdeps/linux/sh/syscall_error.S
index 7115120db..1764ebfc8 100644
--- a/libc/sysdeps/linux/sh/syscall_error.S
+++ b/libc/sysdeps/linux/sh/syscall_error.S
@@ -3,7 +3,7 @@ __syscall_error:
 	/* Call errno_location, store '-r4' in errno and return -1 */
 	mov.l	r12, @-r15
 	sts.l	pr, @-r15
-#if defined __HAVE_ELF__ && defined __HAVE_SHARED__ 
+#ifdef __HAVE_SHARED__ 
 	mova	.LG, r0
 	mov.l	.LG, r12
 	add	r0, r12
@@ -27,7 +27,7 @@ __syscall_error:
 
 	.align	4
 
-#if defined __HAVE_ELF__ && defined __HAVE_SHARED__ 
+#ifdef __HAVE_SHARED__ 
 1:	.long   __errno_location@GOT
 .LG:	.long	_GLOBAL_OFFSET_TABLE_
 #else