Skip to content

Move sanitize, visibility and inlinesvisibility to shared table. #2255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samsinsane merged 2 commits into from
Sep 24, 2024
Merged

Move sanitize, visibility and inlinesvisibility to shared table. #2255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d363e35
Move sanitize, visibility and inlinesvisibility to shared table.
alex-rass-88 Sep 23, 2024
73d36f4
Update tests and clang toolchain
alex-rass-88 Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/tools/clang.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@
symbols = gcc.shared.symbols,
unsignedchar = gcc.shared.unsignedchar,
omitframepointer = gcc.shared.omitframepointer,
compileas = gcc.shared.compileas
compileas = gcc.shared.compileas,
sanitize = gcc.shared.sanitize,
visibility = gcc.shared.visibility,
inlinesvisibility = gcc.shared.inlinesvisibility
}

clang.cflags = table.merge(gcc.cflags, {
Expand Down
24 changes: 12 additions & 12 deletions src/tools/gcc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,18 @@
["C++"] = "-x c++",
["Objective-C"] = "-x objective-c",
["Objective-C++"] = "-x objective-c++",
},
sanitize = {
Address = "-fsanitize=address",
},
visibility = {
Default = "-fvisibility=default",
Hidden = "-fvisibility=hidden",
Internal = "-fvisibility=internal",
Protected = "-fvisibility=protected",
},
inlinesvisibility = {
Hidden = "-fvisibility-inlines-hidden"
}
}

Expand Down Expand Up @@ -230,18 +242,6 @@
},
rtti = {
Off = "-fno-rtti"
},
sanitize = {
Address = "-fsanitize=address",
},
visibility = {
Default = "-fvisibility=default",
Hidden = "-fvisibility=hidden",
Internal = "-fvisibility=internal",
Protected = "-fvisibility=protected",
},
inlinesvisibility = {
Hidden = "-fvisibility-inlines-hidden"
}
}

Expand Down
11 changes: 6 additions & 5 deletions tests/tools/test_gcc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@
sanitize { "Address" }
prepare()
test.contains({ "-fsanitize=address" }, gcc.getcxxflags(cfg))
test.contains({ "-fsanitize=address" }, gcc.getcflags(cfg))
test.contains({ "-fsanitize=address" }, gcc.getldflags(cfg))
end

Expand Down Expand Up @@ -1083,28 +1084,28 @@
function suite.cxxflags_onVisibilityDefault()
visibility "Default"
prepare()
test.excludes({ "-fvisibility=default" }, gcc.getcflags(cfg))
test.contains({ "-fvisibility=default" }, gcc.getcflags(cfg))
test.contains({ "-fvisibility=default" }, gcc.getcxxflags(cfg))
end

function suite.cxxflags_onVisibilityHidden()
visibility "Hidden"
prepare()
test.excludes({ "-fvisibility=hidden" }, gcc.getcflags(cfg))
test.contains({ "-fvisibility=hidden" }, gcc.getcflags(cfg))
test.contains({ "-fvisibility=hidden" }, gcc.getcxxflags(cfg))
end

function suite.cxxflags_onVisibilityInternal()
visibility "Internal"
prepare()
test.excludes({ "-fvisibility=internal" }, gcc.getcflags(cfg))
test.contains({ "-fvisibility=internal" }, gcc.getcflags(cfg))
test.contains({ "-fvisibility=internal" }, gcc.getcxxflags(cfg))
end

function suite.cxxflags_onVisibilityProtected()
visibility "Protected"
prepare()
test.excludes({ "-fvisibility=protected" }, gcc.getcflags(cfg))
test.contains({ "-fvisibility=protected" }, gcc.getcflags(cfg))
test.contains({ "-fvisibility=protected" }, gcc.getcxxflags(cfg))
end

Expand All @@ -1122,7 +1123,7 @@
function suite.cxxflags_onInlinesVisibilityHidden()
inlinesvisibility "Hidden"
prepare()
test.excludes({ "-fvisibility-inlines-hidden" }, gcc.getcflags(cfg))
test.contains({ "-fvisibility-inlines-hidden" }, gcc.getcflags(cfg))
test.contains({ "-fvisibility-inlines-hidden" }, gcc.getcxxflags(cfg))
end

Expand Down