mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-23 18:47:57 +00:00
Fix port to 32-bit AIX.
* configure.ac (opsys): On Power Architecture, treat release 7 of AIX like releases 5 and 6. * src/unexaix.c (copy_text_and_data): Don't add text_scnptr to ptr twice. _text already includes this offset. (unrelocate_symbols): Don't cast 64-bit integer to pointer. Fixes: debbugs:17540
This commit is contained in:
parent
fb4ca8417a
commit
4f4ec76fd6
@ -1,3 +1,9 @@
|
||||
2014-05-22 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Fix port to 32-bit AIX (Bug#17540).
|
||||
* configure.ac (opsys): On Power Architecture, treat release 7 of
|
||||
AIX like releases 5 and 6.
|
||||
|
||||
2014-05-18 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* configure.ac (INSTALL_INFO):
|
||||
|
@ -550,7 +550,7 @@ case "${canonical}" in
|
||||
rs6000-ibm-aix[56]* )
|
||||
opsys=aix4-2
|
||||
;;
|
||||
powerpc-ibm-aix[56]* )
|
||||
powerpc-ibm-aix[5-9]* | powerpc-ibm-aix[1-9][0-9]* )
|
||||
opsys=aix4-2
|
||||
;;
|
||||
|
||||
|
@ -1,3 +1,10 @@
|
||||
2014-05-22 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Fix port to 32-bit AIX (Bug#17540).
|
||||
* unexaix.c (copy_text_and_data): Don't add text_scnptr to ptr
|
||||
twice. _text already includes this offset.
|
||||
(unrelocate_symbols): Don't cast 64-bit integer to pointer.
|
||||
|
||||
2014-05-21 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* xdisp.c (move_it_in_display_line_to): Avoid infinite recursion:
|
||||
|
@ -379,7 +379,7 @@ copy_text_and_data (int new)
|
||||
char *ptr;
|
||||
|
||||
lseek (new, text_scnptr, SEEK_SET);
|
||||
ptr = _text + text_scnptr;
|
||||
ptr = _text;
|
||||
end = ptr + f_ohdr.tsize;
|
||||
write_segment (new, ptr, end);
|
||||
|
||||
@ -606,7 +606,7 @@ unrelocate_symbols (int new, int a_out,
|
||||
PERROR (a_name);
|
||||
}
|
||||
|
||||
p = (int *) (ldrel.l_vaddr + d_reloc);
|
||||
p = (int *) (intptr_t) (ldrel.l_vaddr + d_reloc);
|
||||
|
||||
switch (ldrel.l_symndx) {
|
||||
case SYMNDX_TEXT:
|
||||
|
Loading…
Reference in New Issue
Block a user