Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Glasgow Haskell Compiler
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Shayne Fletcher
Glasgow Haskell Compiler
Commits
66aa489f
Commit
66aa489f
authored
Sep 12, 2013
by
Jan Stolarek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add missing semicolon in rts/Linker.c (#8271)
And remove some trailing whitespaces from that file.
parent
75a9664a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
rts/Linker.c
rts/Linker.c
+8
-8
No files found.
rts/Linker.c
View file @
66aa489f
...
...
@@ -1705,7 +1705,7 @@ internal_dlsym(void *hdl, const char *symbol) {
return
v
;
}
}
v
=
dlsym
(
hdl
,
symbol
)
v
=
dlsym
(
hdl
,
symbol
)
;
RELEASE_LOCK
(
&
dl_mutex
);
return
v
;
}
...
...
@@ -5386,12 +5386,12 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
barf
(
"R_X86_64_GOTTPOFF relocation, but ALWAYS_PIC."
);
#else
/* determine the offset of S to the current thread's tls
area
area
XXX: Move this to the beginning of function */
struct
tls_info
ti
;
get_tls_area
(
0
,
&
ti
,
sizeof
(
ti
));
/* make entry in GOT that contains said offset */
StgInt64
gotEntry
=
(
StgInt64
)
&
makeSymbolExtra
(
oc
,
ELF_R_SYM
(
info
),
StgInt64
gotEntry
=
(
StgInt64
)
&
makeSymbolExtra
(
oc
,
ELF_R_SYM
(
info
),
(
S
-
(
Elf64_Addr
)(
ti
.
base
)))
->
addr
;
*
(
Elf64_Word
*
)
P
=
gotEntry
+
A
-
P
;
#endif
...
...
@@ -5533,7 +5533,7 @@ ocAllocateSymbolExtras_MachO(ObjectCode* oc)
IF_DEBUG
(
linker
,
debugBelch
(
"ocAllocateSymbolExtras_MachO: start
\n
"
));
for
(
i
=
0
;
i
<
header
->
ncmds
;
i
++
)
{
for
(
i
=
0
;
i
<
header
->
ncmds
;
i
++
)
{
if
(
lc
->
cmd
==
LC_SYMTAB
)
{
// Find out the first and last undefined external
...
...
@@ -5590,7 +5590,7 @@ ocAllocateSymbolExtras_MachO(ObjectCode* oc)
IF_DEBUG
(
linker
,
debugBelch
(
"ocAllocateSymbolExtras_MachO: start
\n
"
));
for
(
i
=
0
;
i
<
header
->
ncmds
;
i
++
)
{
for
(
i
=
0
;
i
<
header
->
ncmds
;
i
++
)
{
if
(
lc
->
cmd
==
LC_SYMTAB
)
{
// Just allocate one entry for every symbol
...
...
@@ -5865,7 +5865,7 @@ relocateSection(
" and should be defined in a section, but isn't!
\n
"
,
nm
);
}
}
value
=
(
uint64_t
)
&
makeSymbolExtra
(
oc
,
reloc
->
r_symbolnum
,
(
unsigned
long
)
addr
)
->
addr
;
type
=
X86_64_RELOC_SIGNED
;
...
...
@@ -6198,7 +6198,7 @@ relocateSection(
return
0
;
}
if
(
reloc
->
r_pcrel
)
{
if
(
reloc
->
r_pcrel
)
{
#ifdef powerpc_HOST_ARCH
// In the .o file, this should be a relative jump to NULL
// and we'll change it to a relative jump to the symbol
...
...
@@ -6372,7 +6372,7 @@ ocGetNames_MachO(ObjectCode* oc)
addSection
(
oc
,
SECTIONKIND_RWDATA
,
(
void
*
)
(
image
+
sections
[
i
].
offset
),
(
void
*
)
(
image
+
sections
[
i
].
offset
+
sections
[
i
].
size
));
}
}
else
if
(
!
strcmp
(
sections
[
i
].
sectname
,
"__data"
))
{
IF_DEBUG
(
linker
,
debugBelch
(
"ocGetNames_MachO: adding __data section
\n
"
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment