aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysdeps/mips/dl-machine.h12
-rw-r--r--sysdeps/mips/elf/start.S5
-rw-r--r--sysdeps/mips/mips64/add_n.S6
-rw-r--r--sysdeps/mips/mips64/bsd-_setjmp.S6
-rw-r--r--sysdeps/mips/mips64/lshift.S6
-rw-r--r--sysdeps/mips/mips64/mul_1.S6
-rw-r--r--sysdeps/mips/mips64/rshift.S6
-rw-r--r--sysdeps/mips/mips64/setjmp.S6
-rw-r--r--sysdeps/mips/mips64/sub_n.S6
-rw-r--r--sysdeps/mips/mips64/submul_1.S6
10 files changed, 31 insertions, 34 deletions
diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index de5df0831b..a67eface5b 100644
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -218,7 +218,7 @@ int _dl_mips_gnu_objects = 1; \
/* This is called from assembly stubs below which the compiler can't see. */ \
static ElfW(Addr) \
__dl_runtime_resolve (ElfW(Word), ElfW(Word), ElfW(Addr), ElfW(Addr)) \
- __attribute__ ((unused)); \
+ __attribute__ ((unused)); \
\
static ElfW(Addr) \
__dl_runtime_resolve (ElfW(Word) sym_index, \
@@ -274,7 +274,7 @@ __dl_runtime_resolve (ElfW(Word) sym_index, \
/* We already found the symbol. The module (and therefore its load \
address) is also known. */ \
value = l->l_addr + sym->st_value; \
- \
+ \
/* Apply the relocation with that value. */ \
*(got + local_gotno + sym_index - gotsym) = value; \
\
@@ -297,7 +297,7 @@ _dl_runtime_resolve:\n \
.cpload $25\n \
.set reorder\n \
# Save slot call pc.\n \
- move $2, $31\n \
+ move $2, $31\n \
# Save arguments and sp value in stack.\n \
subu $29, 40\n \
.cprestore 32\n \
@@ -468,11 +468,9 @@ elf_machine_got_rel (struct link_map *map, int lazy)
ElfW(Addr) *got;
ElfW(Sym) *sym;
int i, n, symidx;
-#ifndef RTLD_BOOTSTRAP
- const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
-#endif
/* This function is loaded in dl-reloc as a nested function and can
- therefore access the variable scope from _dl_relocate_object. */
+ therefore access the variables scope and strtab from
+ _dl_relocate_object. */
#ifdef RTLD_BOOTSTRAP
# define RESOLVE_GOTSYM(sym,sym_index) 0
#else
diff --git a/sysdeps/mips/elf/start.S b/sysdeps/mips/elf/start.S
index b432953251..7fee4e71c3 100644
--- a/sysdeps/mips/elf/start.S
+++ b/sysdeps/mips/elf/start.S
@@ -51,7 +51,7 @@
char **argv, void (*init) (void), void (*fini) (void),
void (*rtld_fini) (void), void *stack_end)
*/
-#ifdef PIC
+#ifdef __PIC__
/* A macro to (re)initialize gp. We can get the run time address of 0f in
ra ($31) by blezal instruction. In this early phase, we can't save gp
in stack and .cprestore doesn't work properly. So we set gp by using
@@ -67,7 +67,7 @@
.text
.globl ENTRY_POINT
ENTRY_POINT:
-#ifdef PIC
+#ifdef __PIC__
SET_GP
#endif
move $31, $0
@@ -93,7 +93,6 @@ ENTRY_POINT:
sw $2, 20($29) /* rtld_fini */
sw $29, 24($29) /* stack_end */
jal __libc_start_main
-
hlt: b hlt /* Crash if somehow it does return. */
/* Define a symbol for the first piece of initialized data. */
diff --git a/sysdeps/mips/mips64/add_n.S b/sysdeps/mips/mips64/add_n.S
index ad93d9d081..1d3f7641e9 100644
--- a/sysdeps/mips/mips64/add_n.S
+++ b/sysdeps/mips/mips64/add_n.S
@@ -1,7 +1,7 @@
/* MIPS3 __mpn_add_n -- Add two limb vectors of the same length > 0 and
* store sum in a third limb vector.
*
- * Copyright (C) 1995 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 2000 Free Software Foundation, Inc.
*
* This file is part of the GNU MP Library.
*
@@ -30,7 +30,7 @@
* s2_ptr $6
* size $7
*/
-#ifdef PIC
+#ifdef __PIC__
.option pic2
#endif
.text
@@ -39,7 +39,7 @@
.ent __mpn_add_n
__mpn_add_n:
.set noreorder
-#ifdef PIC
+#ifdef __PIC__
.cpload t9
#endif
.set nomacro
diff --git a/sysdeps/mips/mips64/bsd-_setjmp.S b/sysdeps/mips/mips64/bsd-_setjmp.S
index cd6ec3e196..7c70f5b0bf 100644
--- a/sysdeps/mips/mips64/bsd-_setjmp.S
+++ b/sysdeps/mips/mips64/bsd-_setjmp.S
@@ -1,5 +1,5 @@
/* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. MIPS64 version.
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -23,11 +23,11 @@
#include <sysdep.h>
-#ifdef PIC
+#ifdef __PIC__
.option pic2
#endif
ENTRY (_setjmp)
-#ifdef PIC
+#ifdef __PIC__
.cpload t9
#endif
dla t9, C_SYMBOL_NAME (__sigsetjmp)
diff --git a/sysdeps/mips/mips64/lshift.S b/sysdeps/mips/mips64/lshift.S
index ef403ec25f..37e8489fff 100644
--- a/sysdeps/mips/mips64/lshift.S
+++ b/sysdeps/mips/mips64/lshift.S
@@ -1,6 +1,6 @@
/* MIPS3 __mpn_lshift --
*
- * Copyright (C) 1995 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 2000 Free Software Foundation, Inc.
*
* This file is part of the GNU MP Library.
*
@@ -29,7 +29,7 @@
* cnt $7
*/
-#ifdef PIC
+#ifdef __PIC__
.option pic2
#endif
.text
@@ -38,7 +38,7 @@
.ent __mpn_lshift
__mpn_lshift:
.set noreorder
-#ifdef PIC
+#ifdef __PIC__
.cpload t9
#endif
.set nomacro
diff --git a/sysdeps/mips/mips64/mul_1.S b/sysdeps/mips/mips64/mul_1.S
index ef0cf36d75..61d06589a6 100644
--- a/sysdeps/mips/mips64/mul_1.S
+++ b/sysdeps/mips/mips64/mul_1.S
@@ -1,7 +1,7 @@
/* MIPS3 __mpn_mul_1 -- Multiply a limb vector with a single limb and
* store the product in a second limb vector.
*
- * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 2000 Free Software Foundation, Inc.
*
* This file is part of the GNU MP Library.
*
@@ -30,7 +30,7 @@
* s2_limb $7
*/
-#ifdef PIC
+#ifdef __PIC__
.option pic2
#endif
.text
@@ -39,7 +39,7 @@
.ent __mpn_mul_1
__mpn_mul_1:
.set noreorder
-#ifdef PIC
+#ifdef __PIC__
.cpload t9
#endif
.set nomacro
diff --git a/sysdeps/mips/mips64/rshift.S b/sysdeps/mips/mips64/rshift.S
index bc26f3f360..b013eedfb9 100644
--- a/sysdeps/mips/mips64/rshift.S
+++ b/sysdeps/mips/mips64/rshift.S
@@ -1,6 +1,6 @@
/* MIPS3 __mpn_rshift --
*
- * Copyright (C) 1995 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 2000 Free Software Foundation, Inc.
*
* This file is part of the GNU MP Library.
*
@@ -29,7 +29,7 @@
* cnt $7
*/
-#ifdef PIC
+#ifdef __PIC__
.option pic2
#endif
.text
@@ -38,7 +38,7 @@
.ent __mpn_rshift
__mpn_rshift:
.set noreorder
-#ifdef PIC
+#ifdef __PIC__
.cpload t9
#endif
.set nomacro
diff --git a/sysdeps/mips/mips64/setjmp.S b/sysdeps/mips/mips64/setjmp.S
index 74214297b8..127ab4298c 100644
--- a/sysdeps/mips/mips64/setjmp.S
+++ b/sysdeps/mips/mips64/setjmp.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -21,11 +21,11 @@
/* The function __sigsetjmp_aux saves all the registers, but it can't
reliably access the stack or frame pointers, so we pass them in as
extra arguments. */
-#ifdef PIC
+#ifdef __PIC__
.option pic2
#endif
ENTRY (__sigsetjmp)
-#ifdef PIC
+#ifdef __PIC__
.cpload t9
#endif
move a2, sp
diff --git a/sysdeps/mips/mips64/sub_n.S b/sysdeps/mips/mips64/sub_n.S
index bfcba95afa..16482f1166 100644
--- a/sysdeps/mips/mips64/sub_n.S
+++ b/sysdeps/mips/mips64/sub_n.S
@@ -1,7 +1,7 @@
/* MIPS3 __mpn_sub_n -- Subtract two limb vectors of the same length > 0 and
* store difference in a third limb vector.
*
- * Copyright (C) 1995 Free Software Foundation, Inc.
+ * Copyright (C) 1995, 2000 Free Software Foundation, Inc.
*
* This file is part of the GNU MP Library.
*
@@ -30,7 +30,7 @@
* size $7
*/
-#ifdef PIC
+#ifdef __PIC__
.option pic2
#endif
.text
@@ -39,7 +39,7 @@
.ent __mpn_sub_n
__mpn_sub_n:
.set noreorder
-#ifdef PIC
+#ifdef __PIC__
.cpload t9
#endif
.set nomacro
diff --git a/sysdeps/mips/mips64/submul_1.S b/sysdeps/mips/mips64/submul_1.S
index 66e634e102..5cb39ac5a6 100644
--- a/sysdeps/mips/mips64/submul_1.S
+++ b/sysdeps/mips/mips64/submul_1.S
@@ -1,7 +1,7 @@
/* MIPS3 __mpn_submul_1 -- Multiply a limb vector with a single limb and
* subtract the product from a second limb vector.
*
- * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
+ * Copyright (C) 1992, 1994, 1995, 2000 Free Software Foundation, Inc.
*
* This file is part of the GNU MP Library.
*
@@ -30,7 +30,7 @@
* s2_limb $7
*/
-#ifdef PIC
+#ifdef __PIC__
.option pic2
#endif
.text
@@ -39,7 +39,7 @@
.ent __mpn_submul_1
__mpn_submul_1:
.set noreorder
-#ifdef PIC
+#ifdef __PIC__
.cpload t9
#endif
.set nomacro
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-14 02:22:40 +0000