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
10e4c496
Commit
10e4c496
authored
7 years ago
by
Vivek Das Mohapatra
Browse files
Options
Downloads
Patches
Plain Diff
Formatting cleanups in generated stub library code.
parent
88a06cf4
No related branches found
No related tags found
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
generate-stublib.sh
+5
-3
5 additions, 3 deletions
generate-stublib.sh
with
5 additions
and
3 deletions
generate-stublib.sh
+
5
−
3
View file @
10e4c496
...
@@ -60,7 +60,8 @@ static char *prefix;
...
@@ -60,7 +60,8 @@ static char *prefix;
static void *dso;
static void *dso;
// should we exclude libpthread here?
// should we exclude libpthread here?
// in any case, these are DSOs we do _not_ want to isolate
// in any case, these are DSOs we do _not_ want to isolate
static const char *exclude[] = { // MUST NOT be pulled from the capsule prefixed filesystem tree:
static const char *exclude[] = { // MUST NOT be pulled from the capsule
// prefixed filesystem tree:
"libc.so.6",
"libc.so.6",
"libpthread.so.0",
"libpthread.so.0",
"libpthread-2.19.so",
"libpthread-2.19.so",
...
@@ -78,8 +79,9 @@ static void *_dlopen (const char *filename, int flag)
...
@@ -78,8 +79,9 @@ static void *_dlopen (const char *filename, int flag)
{
{
if( flag & RTLD_GLOBAL )
if( flag & RTLD_GLOBAL )
{
{
fprintf (stderr, "Warning: libcapsule dlopen wrapper cannot pass "
fprintf( stderr, "Warning: libcapsule dlopen wrapper cannot pass "
"RTLD_GLOBAL to underlying dlmopen(%s...) call
\\
n", filename );
"RTLD_GLOBAL to underlying dlmopen(%s...) call
\\
n",
filename );
flag = (flag & ~RTLD_GLOBAL) & 0xfffff;
flag = (flag & ~RTLD_GLOBAL) & 0xfffff;
}
}
return capsule_shim_dlopen( symbol_ns, prefix, exclude, filename, flag );
return capsule_shim_dlopen( symbol_ns, prefix, exclude, filename, flag );
...
...
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