Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
llvm-epi-0.8
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Roger Ferrer
llvm-epi-0.8
Commits
2c3991ac
Commit
2c3991ac
authored
14 years ago
by
Mikhail Glushenkov
Browse files
Options
Downloads
Patches
Plain Diff
GetDLLSuffix: Remove the leading dot from LTDL_SHLIB_EXT.
This allows using GetDLLSuffix() with appendSuffix(). llvm-svn: 118051
parent
f26f4a05
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
llvm/lib/Linker/Linker.cpp
+1
-1
1 addition, 1 deletion
llvm/lib/Linker/Linker.cpp
llvm/lib/System/Path.cpp
+1
-1
1 addition, 1 deletion
llvm/lib/System/Path.cpp
llvm/tools/llvm-ld/llvm-ld.cpp
+1
-1
1 addition, 1 deletion
llvm/tools/llvm-ld/llvm-ld.cpp
with
3 additions
and
3 deletions
llvm/lib/Linker/Linker.cpp
+
1
−
1
View file @
2c3991ac
...
@@ -133,7 +133,7 @@ static inline sys::Path IsLibrary(StringRef Name,
...
@@ -133,7 +133,7 @@ static inline sys::Path IsLibrary(StringRef Name,
// Try the libX.so (or .dylib) form
// Try the libX.so (or .dylib) form
FullPath
.
eraseSuffix
();
FullPath
.
eraseSuffix
();
FullPath
.
appendSuffix
(
&
(
LTDL_SHLIB_EXT
[
1
]
));
FullPath
.
appendSuffix
(
sys
::
Path
::
GetDLLSuffix
(
));
if
(
FullPath
.
isDynamicLibrary
())
// Native shared library?
if
(
FullPath
.
isDynamicLibrary
())
// Native shared library?
return
FullPath
;
return
FullPath
;
if
(
FullPath
.
isBitcodeFile
())
// .so file containing bitcode?
if
(
FullPath
.
isBitcodeFile
())
// .so file containing bitcode?
...
...
This diff is collapsed.
Click to expand it.
llvm/lib/System/Path.cpp
+
1
−
1
View file @
2c3991ac
...
@@ -192,7 +192,7 @@ Path::FindLibrary(std::string& name) {
...
@@ -192,7 +192,7 @@ Path::FindLibrary(std::string& name) {
}
}
StringRef
Path
::
GetDLLSuffix
()
{
StringRef
Path
::
GetDLLSuffix
()
{
return
LTDL_SHLIB_EXT
;
return
&
(
LTDL_SHLIB_EXT
[
1
])
;
}
}
bool
bool
...
...
This diff is collapsed.
Click to expand it.
llvm/tools/llvm-ld/llvm-ld.cpp
+
1
−
1
View file @
2c3991ac
...
@@ -455,7 +455,7 @@ static void EmitShellScript(char **argv, Module *M) {
...
@@ -455,7 +455,7 @@ static void EmitShellScript(char **argv, Module *M) {
E
=
LibPaths
.
end
();
P
!=
E
;
++
P
)
{
E
=
LibPaths
.
end
();
P
!=
E
;
++
P
)
{
FullLibraryPath
=
*
P
;
FullLibraryPath
=
*
P
;
FullLibraryPath
.
appendComponent
(
"lib"
+
*
i
);
FullLibraryPath
.
appendComponent
(
"lib"
+
*
i
);
FullLibraryPath
.
appendSuffix
(
&
(
LTDL_SHLIB_EXT
[
1
]
));
FullLibraryPath
.
appendSuffix
(
sys
::
Path
::
GetDLLSuffix
(
));
if
(
!
FullLibraryPath
.
isEmpty
())
{
if
(
!
FullLibraryPath
.
isEmpty
())
{
if
(
!
FullLibraryPath
.
isDynamicLibrary
())
{
if
(
!
FullLibraryPath
.
isDynamicLibrary
())
{
// Not a native shared library; mark as invalid
// Not a native shared library; mark as invalid
...
...
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