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 /modutils/insmod.c | |
parent | 06d4ec2a4b96ca793a0de124be7dc655378343a1 (diff) | |
download | busybox-w32-16451a07b44773af945b52324c5c2a5c25b4e228.tar.gz busybox-w32-16451a07b44773af945b52324c5c2a5c25b4e228.tar.bz2 busybox-w32-16451a07b44773af945b52324c5c2a5c25b4e228.zip |
Only use R_68K_GOTOFF if it is defined
Diffstat (limited to 'modutils/insmod.c')
-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); | |||
281 | #ifndef MODUTILS_MODULE_H | 281 | #ifndef MODUTILS_MODULE_H |
282 | static const int MODUTILS_MODULE_H = 1; | 282 | static const int MODUTILS_MODULE_H = 1; |
283 | 283 | ||
284 | #ident "$Id: insmod.c,v 1.113 2004/03/15 08:28:47 andersen Exp $" | 284 | #ident "$Id: insmod.c,v 1.114 2004/03/19 12:16:18 andersen Exp $" |
285 | 285 | ||
286 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 286 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
287 | We do not use the kernel headers directly because we do not wish | 287 | We do not use the kernel headers directly because we do not wish |
@@ -502,7 +502,7 @@ int delete_module(const char *); | |||
502 | #ifndef MODUTILS_OBJ_H | 502 | #ifndef MODUTILS_OBJ_H |
503 | static const int MODUTILS_OBJ_H = 1; | 503 | static const int MODUTILS_OBJ_H = 1; |
504 | 504 | ||
505 | #ident "$Id: insmod.c,v 1.113 2004/03/15 08:28:47 andersen Exp $" | 505 | #ident "$Id: insmod.c,v 1.114 2004/03/19 12:16:18 andersen Exp $" |
506 | 506 | ||
507 | /* The relocatable object is manipulated using elfin types. */ | 507 | /* The relocatable object is manipulated using elfin types. */ |
508 | 508 | ||
@@ -1083,10 +1083,12 @@ arch_apply_relocation(struct obj_file *f, | |||
1083 | case R_68K_GOT32: | 1083 | case R_68K_GOT32: |
1084 | goto bb_use_got; | 1084 | goto bb_use_got; |
1085 | 1085 | ||
1086 | #ifdef R_68K_GOTOFF | ||
1086 | case R_68K_GOTOFF: | 1087 | case R_68K_GOTOFF: |
1087 | assert(got != 0); | 1088 | assert(got != 0); |
1088 | *loc += v - got; | 1089 | *loc += v - got; |
1089 | break; | 1090 | break; |
1091 | #endif | ||
1090 | 1092 | ||
1091 | #elif defined(__mips__) | 1093 | #elif defined(__mips__) |
1092 | 1094 | ||
@@ -1568,9 +1570,11 @@ static void arch_create_got(struct obj_file *f) | |||
1568 | got_allocate = 1; | 1570 | got_allocate = 1; |
1569 | break; | 1571 | break; |
1570 | 1572 | ||
1573 | #ifdef R_68K_GOTOFF | ||
1571 | case R_68K_GOTOFF: | 1574 | case R_68K_GOTOFF: |
1572 | got_needed = 1; | 1575 | got_needed = 1; |
1573 | continue; | 1576 | continue; |
1577 | #endif | ||
1574 | 1578 | ||
1575 | #elif defined(__sh__) | 1579 | #elif defined(__sh__) |
1576 | case R_SH_GOT32: | 1580 | case R_SH_GOT32: |