Changeset 13189


Ignore:
Timestamp:
Nov 11, 2009, 1:19:21 AM (10 years ago)
Author:
gz
Message:

Merge r13180 (fix for newer oprofile)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/library/elf.lisp

    r13179 r13189  
    312312      (fd-read fd shdr (record-length #+64-bit-target :<E>lf64_<S>hdr
    313313                                      #+32-bit-target :<E>lf32_<S>hdr))
     314      ;; On 64-bit platforms, the section data precedes the image
     315      ;; header; on 32-bit platforms, the image header and image
     316      ;; section table precede the image data for the first (static)
     317      ;; section.  With alignment, the header/section headers are
     318      ;; one 4K page, and the static section size is 8K ...
    314319      (setf (pref shdr #+64-bit-target :<E>lf64_<S>hdr.sh_offset
    315320                  #+32-bit-target :<E>lf32_<S>hdr.sh_offset)
    316             (+ #x2000 (logandc2 (+ eof 4095) 4095))) ; #x2000 for nilreg-area
     321            (+ #+32-bit-target #x1000 #+64-bit-target 0  #x2000 (logandc2 (+ eof 4095) 4095)))
     322      (setf (pref shdr #+64-bit-target :<E>lf64_<S>hdr.sh_type
     323                  #+32-bit-target :<E>lf32_<S>hdr.sh_type)
     324            #$SHT_PROGBITS)
    317325      (fd-lseek fd pos #$SEEK_SET)
    318326      (fd-write fd shdr (record-length #+64-bit-target :<E>lf64_<S>hdr
Note: See TracChangeset for help on using the changeset viewer.