aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/sparc
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/sparc')
-rw-r--r--sysdeps/sparc/DEFS.h12
-rw-r--r--sysdeps/sparc/Dist2
-rw-r--r--sysdeps/sparc/alloca.S4
-rw-r--r--sysdeps/sparc/divrem.m42
-rw-r--r--sysdeps/sparc/dotmul.S4
-rw-r--r--sysdeps/sparc/elf/DEFS.h5
-rw-r--r--sysdeps/sparc/rem.S12
-rw-r--r--sysdeps/sparc/sdiv.S12
-rw-r--r--sysdeps/sparc/udiv.S12
-rw-r--r--sysdeps/sparc/udiv_qrnnd.S4
-rw-r--r--sysdeps/sparc/urem.S12
11 files changed, 47 insertions, 34 deletions
diff --git a/sysdeps/sparc/DEFS.h b/sysdeps/sparc/DEFS.h
deleted file mode 100644
index ab70f5550e..0000000000
--- a/sysdeps/sparc/DEFS.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifdef HAVE_ELF
-# define FUNC(name) \
- .global name; \
- .type name,@function; \
- .align 4; \
- name:
-#else
-# define FUNC(name) \
- .global name; \
- .align 4; \
- name:
-#endif
diff --git a/sysdeps/sparc/Dist b/sysdeps/sparc/Dist
index 55f26143fd..8bd3729740 100644
--- a/sysdeps/sparc/Dist
+++ b/sysdeps/sparc/Dist
@@ -1,5 +1,3 @@
-DEFS.h
-elf/DEFS.h
dotmul.S umul.S
divrem.m4 sdiv.S udiv.S rem.S urem.S
alloca.S
diff --git a/sysdeps/sparc/alloca.S b/sysdeps/sparc/alloca.S
index 207f75ca4c..dcbd171163 100644
--- a/sysdeps/sparc/alloca.S
+++ b/sysdeps/sparc/alloca.S
@@ -16,7 +16,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include "DEFS.h"
+#include "sysdep.h"
/* Code produced by Sun's C compiler calls this function with two extra
arguments which it makes relocatable symbols but seem always to be
@@ -26,7 +26,7 @@
#define __builtin_alloca ___builtin_alloca
#endif
-FUNC (__builtin_alloca)
+ENTRY (__builtin_alloca)
sub %sp, %o0, %sp /* Push some stack space. */
retl /* Return; the returned buffer leaves 96 */
add %sp, 96, %o0 /* bytes of register save area at the top. */
diff --git a/sysdeps/sparc/divrem.m4 b/sysdeps/sparc/divrem.m4
index cada804706..665abf11ae 100644
--- a/sysdeps/sparc/divrem.m4
+++ b/sysdeps/sparc/divrem.m4
@@ -82,7 +82,7 @@ L.$1.eval(2**N+$2):
', ` DEVELOP_QUOTIENT_BITS(incr($1), `eval(2*$2-1)')')
ifelse($1, 1, `9:')')dnl
-#include "DEFS.h"
+#include "sysdep.h"
#ifdef __linux__
#include <asm/traps.h>
#else
diff --git a/sysdeps/sparc/dotmul.S b/sysdeps/sparc/dotmul.S
index 1c59a27e80..7ce695cb7a 100644
--- a/sysdeps/sparc/dotmul.S
+++ b/sysdeps/sparc/dotmul.S
@@ -10,8 +10,8 @@
* This code optimizes short (less than 13-bit) multiplies.
*/
-#include "DEFS.h"
-FUNC(.mul)
+#include "sysdep.h"
+ENTRY(.mul)
mov %o0, %y ! multiplier -> Y
andncc %o0, 0xfff, %g0 ! test bits 12..31
be Lmul_shortway ! if zero, can do it the short way
diff --git a/sysdeps/sparc/elf/DEFS.h b/sysdeps/sparc/elf/DEFS.h
deleted file mode 100644
index 84f078ae40..0000000000
--- a/sysdeps/sparc/elf/DEFS.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#define FUNC(name) \
- .global name; \
- .type name,@function; \
- .align 4; \
- name:
diff --git a/sysdeps/sparc/rem.S b/sysdeps/sparc/rem.S
index 05916f0b06..d50f1af630 100644
--- a/sysdeps/sparc/rem.S
+++ b/sysdeps/sparc/rem.S
@@ -37,10 +37,18 @@
-#include "DEFS.h"
+#include "sysdep.h"
+#ifdef __linux__
+#include <asm/traps.h>
+#else
+#ifdef __svr4__
#include <sys/trap.h>
+#else
+#include <machine/trap.h>
+#endif
+#endif
-FUNC(.rem)
+ENTRY(.rem)
! compute sign of result; if neither is negative, no problem
orcc %o1, %o0, %g0 ! either negative?
bge 2f ! no, go do the divide
diff --git a/sysdeps/sparc/sdiv.S b/sysdeps/sparc/sdiv.S
index 910cea528a..02ed2e973c 100644
--- a/sysdeps/sparc/sdiv.S
+++ b/sysdeps/sparc/sdiv.S
@@ -37,10 +37,18 @@
-#include "DEFS.h"
+#include "sysdep.h"
+#ifdef __linux__
+#include <asm/traps.h>
+#else
+#ifdef __svr4__
#include <sys/trap.h>
+#else
+#include <machine/trap.h>
+#endif
+#endif
-FUNC(.div)
+ENTRY(.div)
! compute sign of result; if neither is negative, no problem
orcc %o1, %o0, %g0 ! either negative?
bge 2f ! no, go do the divide
diff --git a/sysdeps/sparc/udiv.S b/sysdeps/sparc/udiv.S
index 49df8ab2a7..4a7d1526b0 100644
--- a/sysdeps/sparc/udiv.S
+++ b/sysdeps/sparc/udiv.S
@@ -37,10 +37,18 @@
-#include "DEFS.h"
+#include "sysdep.h"
+#ifdef __linux__
+#include <asm/traps.h>
+#else
+#ifdef __svr4__
#include <sys/trap.h>
+#else
+#include <machine/trap.h>
+#endif
+#endif
-FUNC(.udiv)
+ENTRY(.udiv)
! Ready to divide. Compute size of quotient; scale comparand.
orcc %o1, %g0, %o5
diff --git a/sysdeps/sparc/udiv_qrnnd.S b/sysdeps/sparc/udiv_qrnnd.S
index 9126b64f50..74b932d34b 100644
--- a/sysdeps/sparc/udiv_qrnnd.S
+++ b/sysdeps/sparc/udiv_qrnnd.S
@@ -26,7 +26,7 @@
! n1 i1
! n0 i2
! d i3
-#include "DEFS.h"
+
#include "sysdep.h"
#undef ret /* Kludge for glibc */
@@ -38,7 +38,7 @@ LC1: .double 0r2147483648
.align 4
.global __udiv_qrnnd
.type __udiv_qrnnd,@function
-FUNC(__udiv_qrnnd)
+ENTRY(__udiv_qrnnd)
!#PROLOGUE# 0
save %sp,-104,%sp
!#PROLOGUE# 1
diff --git a/sysdeps/sparc/urem.S b/sysdeps/sparc/urem.S
index 7f6a0812bf..e72c33dd63 100644
--- a/sysdeps/sparc/urem.S
+++ b/sysdeps/sparc/urem.S
@@ -37,10 +37,18 @@
-#include "DEFS.h"
+#include "sysdep.h"
+#ifdef __linux__
+#include <asm/traps.h>
+#else
+#ifdef __svr4__
#include <sys/trap.h>
+#else
+#include <machine/trap.h>
+#endif
+#endif
-FUNC(.urem)
+ENTRY(.urem)
! Ready to divide. Compute size of quotient; scale comparand.
orcc %o1, %g0, %o5