|
 |
385abae |
Description: <short summary of the patch>
|
|
|
385abae |
TODO: Put a short summary on the line above and replace this paragraph
|
|
|
385abae |
with a longer explanation of this change. Complete the meta-information
|
|
|
385abae |
with other relevant fields (see below for details). To make it easier, the
|
|
|
385abae |
information below has been extracted from the changelog. Adjust it or drop
|
|
|
385abae |
it.
|
|
|
385abae |
.
|
|
|
385abae |
gcl (2.6.12-25) unstable; urgency=medium
|
|
|
385abae |
.
|
|
|
385abae |
* Version_2_6_13pre31, kfreebsd and mips64 FTBFS fix
|
|
|
385abae |
Author: Camm Maguire <camm@debian.org>
|
|
|
385abae |
|
|
|
385abae |
---
|
|
|
385abae |
The information above should follow the Patch Tagging Guidelines, please
|
|
|
385abae |
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
|
|
|
385abae |
are templates for supplementary fields that you might want to add:
|
|
|
385abae |
|
|
|
385abae |
Origin: <vendor|upstream|other>, <url of original patch>
|
|
|
385abae |
Bug: <url in upstream bugtracker>
|
|
|
385abae |
Bug-Debian: https://bugs.debian.org/<bugnumber>
|
|
|
385abae |
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
|
|
|
385abae |
Forwarded: <no|not-needed|url proving that it has been forwarded>
|
|
|
385abae |
Reviewed-By: <name and email of someone who approved the patch>
|
|
|
385abae |
Last-Update: <YYYY-MM-DD>
|
|
|
385abae |
|
|
|
385abae |
--- gcl-2.6.12.orig/h/elf64_mips_reloc.h
|
|
|
385abae |
+++ gcl-2.6.12/h/elf64_mips_reloc.h
|
|
|
385abae |
@@ -1,6 +1,7 @@
|
|
|
385abae |
case R_MIPS_JALR:
|
|
|
385abae |
break;
|
|
|
385abae |
case R_MIPS_64:
|
|
|
385abae |
+ if (ELF_R_FTYPE(r->r_info)==R_MIPS_GPREL32) s-=(ul)got;
|
|
|
385abae |
add_val(where,~0L,s+a);
|
|
|
385abae |
break;
|
|
|
385abae |
case R_MIPS_GPREL32:
|
|
|
385abae |
--- gcl-2.6.12.orig/h/elf64_mips_reloc_special.h
|
|
|
385abae |
+++ gcl-2.6.12/h/elf64_mips_reloc_special.h
|
|
|
385abae |
@@ -3,7 +3,7 @@ static ul ggot,ggote; static Rela *hr;
|
|
|
385abae |
#undef ELF_R_SYM
|
|
|
385abae |
#define ELF_R_SYM(a_) (a_&0xffffffff)
|
|
|
385abae |
#undef ELF_R_TYPE
|
|
|
385abae |
-#define ELF_R_TYPE(a_) (((a_>>40)&0xff) ? ((a_>>40)&0xff) : ((a_>>56)&0xff))
|
|
|
385abae |
+#define ELF_R_TYPE(a_) (((a_>>40)&0xff) ? ((a_>>40)&0xff) : (((a_>>48)&0xff) ? ((a_>>48)&0xff) : ((a_>>56)&0xff)))
|
|
|
385abae |
#define ELF_R_FTYPE(a_) ((a_>>56)&0xff)
|
|
|
385abae |
|
|
|
385abae |
typedef struct {
|
|
|
385abae |
--- gcl-2.6.12.orig/o/main.c
|
|
|
385abae |
+++ gcl-2.6.12/o/main.c
|
|
|
385abae |
@@ -179,7 +179,7 @@ get_phys_pages_no_malloc(char n) {
|
|
|
385abae |
|
|
|
385abae |
}
|
|
|
385abae |
|
|
|
385abae |
-#elif defined(__sun__)
|
|
|
385abae |
+#elif defined(__sun__) || defined(__GNU__)
|
|
|
385abae |
|
|
|
385abae |
static ufixnum
|
|
|
385abae |
get_phys_pages_no_malloc(char n) {
|