diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-03-19 12:16:18 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-03-19 12:16:18 +0000 |
| commit | 16451a07b44773af945b52324c5c2a5c25b4e228 (patch) | |
| tree | fb870d58c9d9e2910312c30c7fd1521ce69517fd | |
| parent | 06d4ec2a4b96ca793a0de124be7dc655378343a1 (diff) | |
| download | busybox-16451a07b44773af945b52324c5c2a5c25b4e228.tar.gz | |
Only use R_68K_GOTOFF if it is defined
| -rw-r--r-- | modutils/insmod.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index eaa425f5d..da475c968 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -281,7 +281,7 @@ extern int insmod_ng_main( int argc, char **argv); #ifndef MODUTILS_MODULE_H static const int MODUTILS_MODULE_H = 1; -#ident "$Id: insmod.c,v 1.113 2004/03/15 08:28:47 andersen Exp $" +#ident "$Id: insmod.c,v 1.114 2004/03/19 12:16:18 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 @@ -502,7 +502,7 @@ int delete_module(const char *); #ifndef MODUTILS_OBJ_H static const int MODUTILS_OBJ_H = 1; -#ident "$Id: insmod.c,v 1.113 2004/03/15 08:28:47 andersen Exp $" +#ident "$Id: insmod.c,v 1.114 2004/03/19 12:16:18 andersen Exp $" /* The relocatable object is manipulated using elfin types. */ @@ -1083,10 +1083,12 @@ arch_apply_relocation(struct obj_file *f, case R_68K_GOT32: goto bb_use_got; +#ifdef R_68K_GOTOFF case R_68K_GOTOFF: assert(got != 0); *loc += v - got; break; +#endif #elif defined(__mips__) @@ -1568,9 +1570,11 @@ static void arch_create_got(struct obj_file *f) got_allocate = 1; break; +#ifdef R_68K_GOTOFF case R_68K_GOTOFF: got_needed = 1; continue; +#endif #elif defined(__sh__) case R_SH_GOT32: |