Revert "[Fuchsia] Stack analysis flags for runtimes" (#192515)
Reverts llvm/llvm-project#175677 We noticed using -fexperimental-call-graph-section with Control Flow Integrity causes link failures in certain situations. Reverting this change that sets the call graph section flag until we investigate the root cause of the problem and handle it in the compiler well.
This commit is contained in:
committed by
GitHub
parent
9931b7830f
commit
bec1019d14
@@ -205,7 +205,7 @@ if(FUCHSIA_SDK)
|
||||
set(FUCHSIA_x86_64-unknown-fuchsia_NAME x64)
|
||||
set(FUCHSIA_riscv64-unknown-fuchsia_NAME riscv64)
|
||||
foreach(target i386-unknown-fuchsia;x86_64-unknown-fuchsia;aarch64-unknown-fuchsia;arm-unknown-fuchsia;riscv64-unknown-fuchsia)
|
||||
set(FUCHSIA_${target}_COMPILER_FLAGS "--target=${target} -I${FUCHSIA_SDK}/pkg/sync/include -I${FUCHSIA_SDK}/pkg/fdio/include -fstack-size-section -fexperimental-call-graph-section")
|
||||
set(FUCHSIA_${target}_COMPILER_FLAGS "--target=${target} -I${FUCHSIA_SDK}/pkg/sync/include -I${FUCHSIA_SDK}/pkg/fdio/include")
|
||||
set(FUCHSIA_${target}_LINKER_FLAGS "-L${FUCHSIA_SDK}/arch/${FUCHSIA_${target}_NAME}/lib")
|
||||
set(FUCHSIA_${target}_SYSROOT "${FUCHSIA_SDK}/arch/${FUCHSIA_${target}_NAME}/sysroot")
|
||||
endforeach()
|
||||
@@ -325,7 +325,7 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv7em-none-eabi;armv8m.main-n
|
||||
if(${target} STREQUAL "armv8.1m.main-none-eabi")
|
||||
set(BUILTINS_${target}_CMAKE_${lang}_local_flags "${BUILTINS_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=hard -march=armv8.1-m.main+mve.fp+fp.dp -mcpu=cortex-m55")
|
||||
endif()
|
||||
set(BUILTINS_${target}_CMAKE_${lang}_FLAGS "${BUILTINS_${target}_CMAKE_${lang}_local_flags} -fstack-size-section -fexperimental-call-graph-section" CACHE STRING "")
|
||||
set(BUILTINS_${target}_CMAKE_${lang}_FLAGS "${BUILTINS_${target}_CMAKE_${lang}_local_flags}" CACHE STRING "")
|
||||
endforeach()
|
||||
foreach(type SHARED;MODULE;EXE)
|
||||
set(BUILTINS_${target}_CMAKE_${type}_LINKER_FLAGS "-fuse-ld=lld" CACHE STRING "")
|
||||
@@ -351,7 +351,7 @@ foreach(target armv6m-none-eabi;armv7m-none-eabi;armv7em-none-eabi;armv8m.main-n
|
||||
if(${target} STREQUAL "armv8.1m.main-none-eabi")
|
||||
set(RUNTIMES_${target}_CMAKE_${lang}_local_flags "${RUNTIMES_${target}_CMAKE_${lang}_local_flags} -mfloat-abi=hard -march=armv8.1-m.main+mve.fp+fp.dp -mcpu=cortex-m55")
|
||||
endif()
|
||||
set(RUNTIMES_${target}_CMAKE_${lang}_FLAGS "${RUNTIMES_${target}_CMAKE_${lang}_local_flags} -fstack-size-section -fexperimental-call-graph-section" CACHE STRING "")
|
||||
set(RUNTIMES_${target}_CMAKE_${lang}_FLAGS "${RUNTIMES_${target}_CMAKE_${lang}_local_flags}" CACHE STRING "")
|
||||
endforeach()
|
||||
foreach(type SHARED;MODULE;EXE)
|
||||
set(RUNTIMES_${target}_CMAKE_${type}_LINKER_FLAGS "-fuse-ld=lld" CACHE STRING "")
|
||||
@@ -393,7 +393,7 @@ foreach(target riscv32-unknown-elf)
|
||||
set(BUILTINS_${target}_CMAKE_SYSROOT "" CACHE STRING "")
|
||||
set(BUILTINS_${target}_CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "")
|
||||
foreach(lang C;CXX;ASM)
|
||||
set(BUILTINS_${target}_CMAKE_${lang}_FLAGS "--target=${target} -march=rv32imafc -mabi=ilp32f -fstack-size-section -fexperimental-call-graph-section" CACHE STRING "")
|
||||
set(BUILTINS_${target}_CMAKE_${lang}_FLAGS "--target=${target} -march=rv32imafc -mabi=ilp32f" CACHE STRING "")
|
||||
endforeach()
|
||||
foreach(type SHARED;MODULE;EXE)
|
||||
set(BUILTINS_${target}_CMAKE_${type}_LINKER_FLAGS "-fuse-ld=lld" CACHE STRING "")
|
||||
@@ -409,7 +409,7 @@ foreach(target riscv32-unknown-elf)
|
||||
foreach(lang C;CXX;ASM)
|
||||
# TODO: The preprocessor defines workaround various issues in libc and libc++ integration.
|
||||
# These should be addressed and removed over time.
|
||||
set(RUNTIMES_${target}_CMAKE_${lang}_FLAGS "--target=${target} -march=rv32imafc -mabi=ilp32f -Wno-atomic-alignment -fstack-size-section -fexperimental-call-graph-section" CACHE STRING "")
|
||||
set(RUNTIMES_${target}_CMAKE_${lang}_FLAGS "--target=${target} -march=rv32imafc -mabi=ilp32f -Wno-atomic-alignment" CACHE STRING "")
|
||||
endforeach()
|
||||
foreach(type SHARED;MODULE;EXE)
|
||||
set(RUNTIMES_${target}_CMAKE_${type}_LINKER_FLAGS "-fuse-ld=lld" CACHE STRING "")
|
||||
|
||||
Reference in New Issue
Block a user