diff options
| author | Richard M. Stallman | 1997-06-11 01:13:32 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-06-11 01:13:32 +0000 |
| commit | 54dfb86c80686afe1ae7e84946ccd55ec8246640 (patch) | |
| tree | 94e7852895e41cb44844b93dc1e4a1ef4d73eff9 /src | |
| parent | 95fa03b4fbecbca16f7807eed51d4c2c98fdbbe9 (diff) | |
| download | emacs-54dfb86c80686afe1ae7e84946ccd55ec8246640.tar.gz emacs-54dfb86c80686afe1ae7e84946ccd55ec8246640.zip | |
(unexec): Call update_dynamic_symbols unconditionally.
(update_dynamic_symbols): Define unconditionally, but do nothing
if __linux__or __NetBSD__.
Diffstat (limited to 'src')
| -rw-r--r-- | src/unexalpha.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/unexalpha.c b/src/unexalpha.c index 6fe97e6e1b3..c0d3b359b62 100644 --- a/src/unexalpha.c +++ b/src/unexalpha.c | |||
| @@ -398,9 +398,8 @@ unexec (new_name, a_name, data_start, bss_start, entry_address) | |||
| 398 | stat.st_size - ohdr.fhdr.f_symptr - cbHDRR, | 398 | stat.st_size - ohdr.fhdr.f_symptr - cbHDRR, |
| 399 | "writing symbol table of %s", new_name); | 399 | "writing symbol table of %s", new_name); |
| 400 | 400 | ||
| 401 | #ifndef __linux__ | 401 | |
| 402 | update_dynamic_symbols (oldptr, new_name, new, nhdr.aout); | 402 | update_dynamic_symbols (oldptr, new_name, new, nhdr.aout); |
| 403 | #endif | ||
| 404 | 403 | ||
| 405 | #undef symhdr | 404 | #undef symhdr |
| 406 | 405 | ||
| @@ -415,15 +414,14 @@ unexec (new_name, a_name, data_start, bss_start, entry_address) | |||
| 415 | 414 | ||
| 416 | 415 | ||
| 417 | 416 | ||
| 418 | |||
| 419 | #ifndef __linux__ | ||
| 420 | |||
| 421 | update_dynamic_symbols (old, new_name, new, aout) | 417 | update_dynamic_symbols (old, new_name, new, aout) |
| 422 | char *old; /* Pointer to old executable */ | 418 | char *old; /* Pointer to old executable */ |
| 423 | char *new_name; /* Name of new executable */ | 419 | char *new_name; /* Name of new executable */ |
| 424 | int new; /* File descriptor for new executable */ | 420 | int new; /* File descriptor for new executable */ |
| 425 | struct aouthdr aout; /* a.out info from the file header */ | 421 | struct aouthdr aout; /* a.out info from the file header */ |
| 426 | { | 422 | { |
| 423 | #if !defined (__linux__) && !defined (__NetBSD__) | ||
| 424 | |||
| 427 | typedef struct dynrel_info { | 425 | typedef struct dynrel_info { |
| 428 | char * addr; | 426 | char * addr; |
| 429 | unsigned type:8; | 427 | unsigned type:8; |
| @@ -492,10 +490,9 @@ update_dynamic_symbols (old, new_name, new, aout) | |||
| 492 | 490 | ||
| 493 | } | 491 | } |
| 494 | 492 | ||
| 493 | #endif /* not __linux__ and not __NetBSD__ */ | ||
| 495 | } | 494 | } |
| 496 | 495 | ||
| 497 | #endif /* !__linux__ */ | ||
| 498 | |||
| 499 | 496 | ||
| 500 | /* | 497 | /* |
| 501 | * mark_x | 498 | * mark_x |