From c0441bbed5d817b4f8f7f27f5d066760f73d6bbc Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 15 Sep 2007 07:50:58 +0000 Subject: Blue Swirl writes: I got the library to compile with the attached patches, though dynamic loader crashes early. In buildroot I changed the architecture name by hand from sparc to sparc64, otherwise the compiler produced 32-bit files with V9 (64-bit) instructions. This configuration is not supported by QEMU, so I aimed for pure 64-bit. I think Sparc64 option needs to be added to buildroot. The _Qp_ ops seem to be required by the ABI. This and setjmp patches are just hacks to get the compilation further. The _Qp_ ops can be found in glibc, would it be OK to use those? V9 assembler requires declarations for global register use. The mem* functions in sparc32 directory did not work. They are actually used only by the hybrid 32-bit + V9 CPU configuration. --- libc/string/sparc/sparc32/sparcv9b/memchr.S | 2 +- libc/string/sparc/sparc32/sparcv9b/memcpy.S | 2 +- libc/string/sparc/sparc32/sparcv9b/memset.S | 2 +- libc/string/sparc/sparc32/sparcv9b/stpcpy.S | 2 +- libc/string/sparc/sparc32/sparcv9b/strcat.S | 2 +- libc/string/sparc/sparc32/sparcv9b/strchr.S | 2 +- libc/string/sparc/sparc32/sparcv9b/strcmp.S | 2 +- libc/string/sparc/sparc32/sparcv9b/strcpy.S | 2 +- libc/string/sparc/sparc32/sparcv9b/strlen.S | 2 +- libc/sysdeps/linux/sparc/Makefile.arch | 2 +- libc/sysdeps/linux/sparc/__longjmp.S | 3 ++- libc/sysdeps/linux/sparc/_math_inc.h | 2 ++ libc/sysdeps/linux/sparc/bits/setjmp.h | 2 +- 13 files changed, 15 insertions(+), 12 deletions(-) (limited to 'libc') diff --git a/libc/string/sparc/sparc32/sparcv9b/memchr.S b/libc/string/sparc/sparc32/sparcv9b/memchr.S index 7e86a2972..43a16ff11 100644 --- a/libc/string/sparc/sparc32/sparcv9b/memchr.S +++ b/libc/string/sparc/sparc32/sparcv9b/memchr.S @@ -1,4 +1,4 @@ #define ASI_PNF 0x82 #define ASI_BLK_P 0xf0 #define XCC icc -#include "sparc64/memchr.S" +#include "../../sparc64/memchr.S" diff --git a/libc/string/sparc/sparc32/sparcv9b/memcpy.S b/libc/string/sparc/sparc32/sparcv9b/memcpy.S index 7f697542e..2024869dd 100644 --- a/libc/string/sparc/sparc32/sparcv9b/memcpy.S +++ b/libc/string/sparc/sparc32/sparcv9b/memcpy.S @@ -1,4 +1,4 @@ #define ASI_PNF 0x82 #define ASI_BLK_P 0xf0 #define XCC icc -#include "sparc64/sparcv9b/memcpy.S" +#include "../../sparc64/sparcv9b/memcpy.S" diff --git a/libc/string/sparc/sparc32/sparcv9b/memset.S b/libc/string/sparc/sparc32/sparcv9b/memset.S index ac67b7ab7..e49173172 100644 --- a/libc/string/sparc/sparc32/sparcv9b/memset.S +++ b/libc/string/sparc/sparc32/sparcv9b/memset.S @@ -1,4 +1,4 @@ #define ASI_PNF 0x82 #define ASI_BLK_P 0xf0 #define XCC icc -#include +#include "../../sparc64/memset.S" diff --git a/libc/string/sparc/sparc32/sparcv9b/stpcpy.S b/libc/string/sparc/sparc32/sparcv9b/stpcpy.S index 440ad7e21..17ffa5e4d 100644 --- a/libc/string/sparc/sparc32/sparcv9b/stpcpy.S +++ b/libc/string/sparc/sparc32/sparcv9b/stpcpy.S @@ -1,4 +1,4 @@ #define ASI_PNF 0x82 #define ASI_BLK_P 0xf0 #define XCC icc -#include +#include "../../sparc64/stpcpy.S" diff --git a/libc/string/sparc/sparc32/sparcv9b/strcat.S b/libc/string/sparc/sparc32/sparcv9b/strcat.S index 7a2223570..9ed125a4b 100644 --- a/libc/string/sparc/sparc32/sparcv9b/strcat.S +++ b/libc/string/sparc/sparc32/sparcv9b/strcat.S @@ -1,4 +1,4 @@ #define ASI_PNF 0x82 #define ASI_BLK_P 0xf0 #define XCC icc -#include +#include "../../sparc64/strcat.S" diff --git a/libc/string/sparc/sparc32/sparcv9b/strchr.S b/libc/string/sparc/sparc32/sparcv9b/strchr.S index ddd32120d..6b2727a1f 100644 --- a/libc/string/sparc/sparc32/sparcv9b/strchr.S +++ b/libc/string/sparc/sparc32/sparcv9b/strchr.S @@ -1,4 +1,4 @@ #define ASI_PNF 0x82 #define ASI_BLK_P 0xf0 #define XCC icc -#include +#include "../../sparc64/strchr.S" diff --git a/libc/string/sparc/sparc32/sparcv9b/strcmp.S b/libc/string/sparc/sparc32/sparcv9b/strcmp.S index 5330f4359..854403ffd 100644 --- a/libc/string/sparc/sparc32/sparcv9b/strcmp.S +++ b/libc/string/sparc/sparc32/sparcv9b/strcmp.S @@ -1,4 +1,4 @@ #define ASI_PNF 0x82 #define ASI_BLK_P 0xf0 #define XCC icc -#include +#include "../../sparc64/strcmp.S" diff --git a/libc/string/sparc/sparc32/sparcv9b/strcpy.S b/libc/string/sparc/sparc32/sparcv9b/strcpy.S index 0b35c9be0..e8102bde4 100644 --- a/libc/string/sparc/sparc32/sparcv9b/strcpy.S +++ b/libc/string/sparc/sparc32/sparcv9b/strcpy.S @@ -1,4 +1,4 @@ #define ASI_PNF 0x82 #define ASI_BLK_P 0xf0 #define XCC icc -#include +#include "../../sparc64/strcpy.S" diff --git a/libc/string/sparc/sparc32/sparcv9b/strlen.S b/libc/string/sparc/sparc32/sparcv9b/strlen.S index b8f4dba4f..8673333a2 100644 --- a/libc/string/sparc/sparc32/sparcv9b/strlen.S +++ b/libc/string/sparc/sparc32/sparcv9b/strlen.S @@ -1,4 +1,4 @@ #define ASI_PNF 0x82 #define ASI_BLK_P 0xf0 #define XCC icc -#include +#include "../../sparc64/strlen.S" diff --git a/libc/sysdeps/linux/sparc/Makefile.arch b/libc/sysdeps/linux/sparc/Makefile.arch index 1e401fc84..4562eaba5 100644 --- a/libc/sysdeps/linux/sparc/Makefile.arch +++ b/libc/sysdeps/linux/sparc/Makefile.arch @@ -5,7 +5,7 @@ # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # -CSRC := brk.c __syscall_error.c +CSRC := brk.c __syscall_error.c qp_ops.c SSRC := \ __longjmp.S fork.S vfork.S clone.S setjmp.S bsd-setjmp.S bsd-_setjmp.S \ diff --git a/libc/sysdeps/linux/sparc/__longjmp.S b/libc/sysdeps/linux/sparc/__longjmp.S index fa60264ef..c7d4f0794 100644 --- a/libc/sysdeps/linux/sparc/__longjmp.S +++ b/libc/sysdeps/linux/sparc/__longjmp.S @@ -30,7 +30,8 @@ .type __longjmp,%function .align 4 __longjmp: - + .register %g2, #scratch + .register %g3, #scratch /* Store our arguments in global registers so we can still * use them while unwinding frames and their register windows. */ diff --git a/libc/sysdeps/linux/sparc/_math_inc.h b/libc/sysdeps/linux/sparc/_math_inc.h index f08aa5869..1bf84f04e 100644 --- a/libc/sysdeps/linux/sparc/_math_inc.h +++ b/libc/sysdeps/linux/sparc/_math_inc.h @@ -7,7 +7,9 @@ #include #define __ASSEMBLY__ +#ifndef __sparc_v9__ #include +#endif /* Is alignment really needed? */ diff --git a/libc/sysdeps/linux/sparc/bits/setjmp.h b/libc/sysdeps/linux/sparc/bits/setjmp.h index dac9ac5cb..ac5a4b2d6 100644 --- a/libc/sysdeps/linux/sparc/bits/setjmp.h +++ b/libc/sysdeps/linux/sparc/bits/setjmp.h @@ -25,7 +25,7 @@ #include -#if __WORDSIZE == 64 +#if 0 /*__WORDSIZE == 64*/ #ifndef _ASM typedef struct __sparc64_jmp_buf -- cgit v1.2.3