[Emacs-diffs] emacs-24 r117140: Fix port to 32-bit AIX.

[Paul Eggert]

------------------------------------------------------------
revno: 117140
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17540
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-05-21 22:00:39 -0700
message:
  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.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/unexaix.c                  unexaix.c-20091113204419-o5vbwnq5f7feedwu-147

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-05-18 22:41:22 +0000
+++ b/ChangeLog 2014-05-22 05:00:39 +0000
@@ -1,3 +1,9 @@
+2014-05-22  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * configure.ac (INSTALL_INFO):

=== modified file 'configure.ac'
--- a/configure.ac      2014-05-18 22:41:22 +0000
+++ b/configure.ac      2014-05-22 05:00:39 +0000
@@ -550,7 +550,7 @@
   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
   ;;
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-21 15:03:18 +0000
+++ b/src/ChangeLog     2014-05-22 05:00:39 +0000
@@ -1,3 +1,10 @@
+2014-05-22  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * xdisp.c (move_it_in_display_line_to): Avoid infinite recursion:

=== modified file 'src/unexaix.c'
--- a/src/unexaix.c     2014-01-01 07:43:34 +0000
+++ b/src/unexaix.c     2014-05-22 05:00:39 +0000
@@ -379,7 +379,7 @@
   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 @@
              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: