Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
steam-runtime-tools
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
steamrt
steam-runtime-tools
Commits
047bf284
Commit
047bf284
authored
7 years ago
by
Vivek Das Mohapatra
Browse files
Options
Downloads
Patches
Plain Diff
Implement/document the i386 relocations we need
parent
85d92577
No related branches found
No related tags found
1 merge request
!311
Build capsule-capture-libs from a bundled copy of libcapsule
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
utils/process-pt-dynamic.c
+10
-6
10 additions, 6 deletions
utils/process-pt-dynamic.c
with
10 additions
and
6 deletions
utils/process-pt-dynamic.c
+
10
−
6
View file @
047bf284
...
@@ -351,11 +351,13 @@ process_dt_rela (const void *start,
...
@@ -351,11 +351,13 @@ process_dt_rela (const void *start,
switch
(
chr
)
switch
(
chr
)
{
{
void
*
slot
;
void
*
slot
;
// details at: https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI
// case R_386_JMP_SLOT: // these are secretly the same:
// case R_386_32: // These are the same as their 64 counterparts
// case R_386_GLOB_DAT: // see /glibc-x.y/elf/elf.h
// case R_386_JMP_SLOT:
case
R_X86_64_64
:
case
R_X86_64_GLOB_DAT
:
case
R_X86_64_GLOB_DAT
:
case
R_X86_64_JUMP_SLOT
:
case
R_X86_64_JUMP_SLOT
:
case
R_X86_64_64
:
slot
=
addr
(
base
,
entry
->
r_offset
,
entry
->
r_addend
);
slot
=
addr
(
base
,
entry
->
r_offset
,
entry
->
r_addend
);
DEBUG
(
DEBUG_ELF
,
DEBUG
(
DEBUG_ELF
,
"%s: %p ← { offset: %"
FMT_ADDR
"; addend: %"
FMT_SIZE
" }"
,
"%s: %p ← { offset: %"
FMT_ADDR
"; addend: %"
FMT_SIZE
" }"
,
...
@@ -518,11 +520,13 @@ process_dt_rel (const void *start,
...
@@ -518,11 +520,13 @@ process_dt_rel (const void *start,
switch
(
chr
)
switch
(
chr
)
{
{
void
*
slot
;
void
*
slot
;
// details at: https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI
// case R_386_JMP_SLOT: secretly the same
// case R_386_32: // These are the same as their 64 counterparts
// case R_386_GLOB_DAT: // see /glibc-x.y/elf/elf.h
// case R_386_JMP_SLOT:
case
R_X86_64_64
:
case
R_X86_64_GLOB_DAT
:
case
R_X86_64_GLOB_DAT
:
case
R_X86_64_JUMP_SLOT
:
case
R_X86_64_JUMP_SLOT
:
case
R_X86_64_64
:
slot
=
addr
(
base
,
entry
->
r_offset
,
0
);
slot
=
addr
(
base
,
entry
->
r_offset
,
0
);
DEBUG
(
DEBUG_ELF
,
DEBUG
(
DEBUG_ELF
,
"%s: %p ← { offset: %"
FMT_ADDR
"; addend: n/a }"
,
"%s: %p ← { offset: %"
FMT_ADDR
"; addend: n/a }"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment