~ubuntu-branches/ubuntu/trusty/grub2/trusty-updates

« back to all changes in this revision

Viewing changes to grub-core/kern/x86_64/dl.c

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2013-12-26 00:52:47 UTC
  • mto: (17.6.37 experimental)
  • mto: This revision was merged to the branch mainline in revision 184.
  • Revision ID: package-import@ubuntu.com-20131226005247-dalaa9te0g0d49kd
Tags: upstream-2.02~beta2
ImportĀ upstreamĀ versionĀ 2.02~beta2

Show diffs side-by-side

added added

removed removed

Lines of Context:
80
80
          }
81
81
          break;
82
82
 
 
83
        case R_X86_64_PC64:
 
84
          {
 
85
            *addr64 += rel->r_addend + sym->st_value -
 
86
              (Elf64_Xword) seg->addr - rel->r_offset;
 
87
          }
 
88
          break;
 
89
 
83
90
        case R_X86_64_32:
84
91
          {
85
92
            grub_uint64_t value = *addr32 + rel->r_addend + sym->st_value;