projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gz_open and gz_close were left in, even when BB_FEATURE_TAR_GZIP was disabled.
[oweals/busybox.git]
/
insmod.c
diff --git
a/insmod.c
b/insmod.c
index 5391c8804990d07983bd61ed5ffa68c4aec8339a..0a7cb1e4ab3156fd43d177fbca75a3b176e9e173 100644
(file)
--- a/
insmod.c
+++ b/
insmod.c
@@
-119,7
+119,7
@@
#ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1;
#ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1;
-#ident "$Id: insmod.c,v 1.5
1 2001/03/12 23:08:34 markw
Exp $"
+#ident "$Id: insmod.c,v 1.5
3 2001/03/22 19:01:16 andersen
Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels.
We do not use the kernel headers directly because we do not wish
/* This file contains the structures used by the 2.0 and 2.1 kernels.
We do not use the kernel headers directly because we do not wish
@@
-325,7
+325,7
@@
int delete_module(const char *);
#ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1;
#ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1;
-#ident "$Id: insmod.c,v 1.5
1 2001/03/12 23:08:34 markw
Exp $"
+#ident "$Id: insmod.c,v 1.5
3 2001/03/22 19:01:16 andersen
Exp $"
/* The relocatable object is manipulated using elfin types. */
/* The relocatable object is manipulated using elfin types. */
@@
-373,6
+373,15
@@
static const int MODUTILS_OBJ_H = 1;
#elif defined(__mips__)
#elif defined(__mips__)
+/* Account for ELF spec changes. */
+#ifndef EM_MIPS_RS3_LE
+#ifdef EM_MIPS_RS4_BE
+#define EM_MIPS_RS3_LE EM_MIPS_RS4_BE
+#else
+#define EM_MIPS_RS3_LE 10
+#endif
+#endif /* !EM_MIPS_RS3_LE */
+
#define MATCH_MACHINE(x) (x == EM_MIPS || x == EM_MIPS_RS3_LE)
#define SHT_RELM SHT_REL
#define Elf32_RelM Elf32_Rel
#define MATCH_MACHINE(x) (x == EM_MIPS || x == EM_MIPS_RS3_LE)
#define SHT_RELM SHT_REL
#define Elf32_RelM Elf32_Rel
@@
-714,8
+723,8
@@
unsigned long create_module(const char *name, size_t size)
#else
_syscall2(unsigned long, create_module, const char *, name, size_t, size)
#endif
#else
_syscall2(unsigned long, create_module, const char *, name, size_t, size)
#endif
-static char m_filename[BUFSIZ + 1]
= "\0"
;
-static char m_fullName[BUFSIZ + 1]
= "\0"
;
+static char m_filename[BUFSIZ + 1];
+static char m_fullName[BUFSIZ + 1];
/*======================================================================*/
/*======================================================================*/
@@
-793,7
+802,9
@@
arch_apply_relocation(struct obj_file *f,
ElfW(RelM) *rel, ElfW(Addr) v)
{
struct arch_file *ifile = (struct arch_file *) f;
ElfW(RelM) *rel, ElfW(Addr) v)
{
struct arch_file *ifile = (struct arch_file *) f;
+#if !(defined(__mips__))
struct arch_symbol *isym = (struct arch_symbol *) sym;
struct arch_symbol *isym = (struct arch_symbol *) sym;
+#endif
ElfW(Addr) *loc = (ElfW(Addr) *) (targsec->contents + rel->r_offset);
ElfW(Addr) dot = targsec->header.sh_addr + rel->r_offset;
ElfW(Addr) *loc = (ElfW(Addr) *) (targsec->contents + rel->r_offset);
ElfW(Addr) dot = targsec->header.sh_addr + rel->r_offset;