Skip to content

[Driver] Add -fandroid-pad-segment/-fno-android-pad-segment #77244

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
merged 3 commits into from
Jan 17, 2024
Merged

[Driver] Add -fandroid-pad-segment/-fno-android-pad-segment #77244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f475899
[𝘀𝗽𝗿] initial version
MaskRay Jan 7, 2024
aa9dde3
rebase
MaskRay Jan 12, 2024
32d2231
fix .o name in tests
MaskRay Jan 17, 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: 5 additions & 0 deletions clang/include/clang/Driver/Options.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6298,6 +6298,11 @@ def fno_sycl : Flag<["-"], "fno-sycl">,
Visibility<[ClangOption, CLOption]>,
Group<sycl_Group>, HelpText<"Disables SYCL kernels compilation for device">;

// OS-specific options
let Flags = [TargetSpecific] in {
defm android_pad_segment : BooleanFFlag<"android-pad-segment">, Group<f_Group>;
} // let Flags = [TargetSpecific]

//===----------------------------------------------------------------------===//
// FLangOption + NoXarchOption
//===----------------------------------------------------------------------===//
Expand Down
5 changes: 5 additions & 0 deletions clang/lib/Driver/ToolChains/Gnu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,11 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,

// Add crtfastmath.o if available and fast math is enabled.
ToolChain.addFastMathRuntimeIfAvailable(Args, CmdArgs);

if (isAndroid && Args.hasFlag(options::OPT_fandroid_pad_segment,
options::OPT_fno_android_pad_segment, false))
CmdArgs.push_back(
Args.MakeArgString(ToolChain.GetFilePath("crt_pad_segment.o")));
}

Args.addAllArgs(CmdArgs, {options::OPT_L, options::OPT_u});
Expand Down
Empty file added clang/test/Driver/Inputs/basic_android_tree/sysroot/usr/lib/crt_pad_segment.o
View file
Open in desktop
Empty file.
19 changes: 18 additions & 1 deletion clang/test/Driver/linux-ld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,24 @@
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PTHREAD-LINK %s
// CHECK-ANDROID-PTHREAD-LINK-NOT: argument unused during compilation: '-pthread'
//

/// Check -fandroid-pad-segment.
// RUN: %clang -### %s --target=aarch64-linux-android -rtlib=platform --unwindlib=platform \
// RUN: --gcc-toolchain="" --sysroot=%S/Inputs/basic_android_tree/sysroot \
// RUN: -fandroid-pad-segment 2>&1 | FileCheck --check-prefix=CHECK-ANDROID-PAD-PHDR %s
// CHECK-ANDROID-PAD-PHDR: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
// CHECK-ANDROID-PAD-PHDR: "[[SYSROOT]]/usr/lib/crtbegin_dynamic.o" "[[SYSROOT]]/usr/lib/crt_pad_segment.o"

// RUN: %clang -### %s --target=aarch64-linux-android -rtlib=platform --unwindlib=platform \
// RUN: --gcc-toolchain="" --sysroot=%S/Inputs/basic_android_tree/sysroot \
// RUN: -fandroid-pad-segment -fno-android-pad-segment 2>&1 | FileCheck --check-prefix=CHECK-NO-ANDROID-PAD-PHDR %s
// CHECK-NO-ANDROID-PAD-PHDR: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
// CHECK-NO-ANDROID-PAD-PHDR: "[[SYSROOT]]/usr/lib/crtbegin_dynamic.o"
// CHECK-NO-ANDROID-PAD-PHDR-NOT: crt_pad_segment.o"

// RUN: not %clang -### %s --target=aarch64-linux -fandroid-pad-segment 2>&1 | FileCheck --check-prefix=ERR-ANDROID-PAD-EHDR %s
// ERR-ANDROID-PAD-EHDR: error: unsupported option '-fandroid-pad-segment' for target 'aarch64-linux'

// Check linker invocation on a Debian LoongArch sysroot.
// RUN: %clang -### %s -no-pie 2>&1 \
// RUN: --target=loongarch64-linux-gnu -rtlib=platform --unwindlib=platform \
Expand Down