Skip to content
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

Jump to bottom

Remove raspi-2 -fno-exception hack. #1490

Merged
merged 2 commits into from
Sep 12, 2023
Merged

Remove raspi-2 -fno-exception hack. #1490

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
eab93e3
Remove exception configs and raspi-2 hack for it.
y4vor Sep 6, 2023
a03195d
Merge branch 'youtube:main' into no_exception
y4vor Sep 11, 2023
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
3 changes: 0 additions & 3 deletions build/config/compiler/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1899,11 +1899,8 @@ config("no_exceptions") {
defines = [ "_HAS_EXCEPTIONS=0" ]
}
} else {
# This hack ensures raspi does not compile anything with -fno-exceptions.
if (!defined(enable_exceptions_override) || !enable_exceptions_override) {
cflags_cc = [ "-fno-exceptions" ]
cflags_objcc = cflags_cc
}
}
}

Expand Down
6 changes: 1 addition & 5 deletions starboard/nplb/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,7 @@ target(gtest_target_type, "nplb") {
"window_get_size_test.cc",
]

configs += [
"//build/config/compiler:exceptions",
"//starboard/build/config:starboard_implementation",
]
configs -= [ "//build/config/compiler:no_exceptions" ]
configs += [ "//starboard/build/config:starboard_implementation" ]

deps = [
"//starboard",
Expand Down
3 changes: 0 additions & 3 deletions starboard/raspi/shared/platform_configuration/configuration.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ if (current_toolchain == default_toolchain &&
speed_config_path = "//starboard/raspi/shared/platform_configuration:speed"
size_config_path = "//starboard/raspi/shared/platform_configuration:size"

# TODO(b/219073252): Enable -fno-exceptions and don't mix it with -fexceptions.
enable_exceptions_override = true

v8_enable_webassembly = true

is_raspi = true
Expand Down
16 changes: 10 additions & 6 deletions third_party/llvm-project/libcxxabi/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ config("cxxabi_config") {
"-std=c++17",
"-nostdinc++",
"-fPIC",
"-fexceptions",
"-frtti",
"-Werror=return-type",
"-fvisibility-inlines-hidden",
Expand Down Expand Up @@ -65,11 +64,19 @@ static_library("cxxabi") {
"src/cxa_aux_runtime.cpp",
"src/cxa_default_handlers.cpp",
"src/cxa_demangle.cpp",
"src/cxa_exception.cpp",

# Requires exception support
andrewsavage1 marked this conversation as resolved.
Show resolved Hide resolved
#"src/cxa_exception.cpp",

"src/cxa_exception_storage.cpp",

"src/cxa_guard.cpp",
"src/cxa_handlers.cpp",
"src/cxa_personality.cpp",
"src/cxa_noexception.cpp",

# Requires exception support
#"src/cxa_personality.cpp",

"src/cxa_vector.cpp",
"src/cxa_virtual.cpp",
"src/fallback_malloc.cpp",
Expand All @@ -79,9 +86,6 @@ static_library("cxxabi") {
"src/stdlib_stdexcept.cpp",
"src/stdlib_typeinfo.cpp",

# src/cxa_noexception.cpp is omitted because this file breaks the build and
# we utilize exception handling.

# src/cxa_thread_atexit.cpp is unneeded. It introduces
# "__cxa_thread_atexit_impl" as an API leak.
]
Expand Down
Loading