diff options
| author | Pavel Roskin <proski@gnu.org> | 2000-09-28 20:52:55 +0000 |
|---|---|---|
| committer | Pavel Roskin <proski@gnu.org> | 2000-09-28 20:52:55 +0000 |
| commit | 43f3e6114c175a838161bfb547f469ecdb600c87 (patch) | |
| tree | 2e0952a6b77d9acbcc232345489ef116fab7eab0 /insmod.c | |
| parent | 8d369e98a5f0fb7612b3d09ff889394bf7ec4f5c (diff) | |
| download | busybox-w32-43f3e6114c175a838161bfb547f469ecdb600c87.tar.gz busybox-w32-43f3e6114c175a838161bfb547f469ecdb600c87.tar.bz2 busybox-w32-43f3e6114c175a838161bfb547f469ecdb600c87.zip | |
Fixes to allow compilation on systems with glibc 2.1.92
Diffstat (limited to 'insmod.c')
| -rw-r--r-- | insmod.c | 9 |
1 files changed, 7 insertions, 2 deletions
| @@ -77,7 +77,7 @@ | |||
| 77 | #ifndef MODUTILS_MODULE_H | 77 | #ifndef MODUTILS_MODULE_H |
| 78 | #define MODUTILS_MODULE_H 1 | 78 | #define MODUTILS_MODULE_H 1 |
| 79 | 79 | ||
| 80 | #ident "$Id: insmod.c,v 1.25 2000/09/25 21:45:58 andersen Exp $" | 80 | #ident "$Id: insmod.c,v 1.26 2000/09/28 20:52:55 proski Exp $" |
| 81 | 81 | ||
| 82 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 82 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
| 83 | We do not use the kernel headers directly because we do not wish | 83 | We do not use the kernel headers directly because we do not wish |
| @@ -283,7 +283,7 @@ int delete_module(const char *); | |||
| 283 | #ifndef MODUTILS_OBJ_H | 283 | #ifndef MODUTILS_OBJ_H |
| 284 | #define MODUTILS_OBJ_H 1 | 284 | #define MODUTILS_OBJ_H 1 |
| 285 | 285 | ||
| 286 | #ident "$Id: insmod.c,v 1.25 2000/09/25 21:45:58 andersen Exp $" | 286 | #ident "$Id: insmod.c,v 1.26 2000/09/28 20:52:55 proski Exp $" |
| 287 | 287 | ||
| 288 | /* The relocatable object is manipulated using elfin types. */ | 288 | /* The relocatable object is manipulated using elfin types. */ |
| 289 | 289 | ||
| @@ -323,7 +323,12 @@ int delete_module(const char *); | |||
| 323 | /* this is the previous behavior, but it does result in | 323 | /* this is the previous behavior, but it does result in |
| 324 | insmod.c being broken on anything except i386 */ | 324 | insmod.c being broken on anything except i386 */ |
| 325 | 325 | ||
| 326 | #ifndef EM_486 | ||
| 327 | #define MATCH_MACHINE(x) (x == EM_386) | ||
| 328 | #else | ||
| 326 | #define MATCH_MACHINE(x) (x == EM_386 || x == EM_486) | 329 | #define MATCH_MACHINE(x) (x == EM_386 || x == EM_486) |
| 330 | #endif | ||
| 331 | |||
| 327 | #define SHT_RELM SHT_REL | 332 | #define SHT_RELM SHT_REL |
| 328 | #define Elf32_RelM Elf32_Rel | 333 | #define Elf32_RelM Elf32_Rel |
| 329 | 334 | ||