Skip to content

angora_clang: check if file is assembly code #74

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 1 commit into from
Sep 4, 2019
Merged

angora_clang: check if file is assembly code #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 23 additions & 2 deletions llvm_mode/compiler/angora_clang.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,21 @@ static void check_type(char *name) {
}
}

static u8 check_if_assembler(u32 argc, const char **argv) {
/* Check if a file with an assembler extension ("s" or "S") appears in argv */

while (--argc) {
u8 *cur = *(++argv);

const u8 *ext = strrchr(cur, '.');
if (ext && (!strcmp(ext + 1, "s") || !strcmp(ext + 1, "S"))) {
return 1;
}
}

return 0;
}

static void add_angora_pass() {
if (clang_type != CLANG_DFSAN_TYPE) {
cc_params[cc_par_cnt++] = "-Xclang";
Expand Down Expand Up @@ -182,6 +197,7 @@ static void add_dfsan_pass() {
static void edit_params(u32 argc, char **argv) {

u8 fortify_set = 0, asan_set = 0, x_set = 0, maybe_linking = 1, bit_mode = 0;
u8 maybe_assembler = 0;
u8 *name;

cc_params = ck_alloc((argc + 128) * sizeof(u8 *));
Expand All @@ -200,6 +216,9 @@ static void edit_params(u32 argc, char **argv) {
u8 *alt_cc = getenv("ANGORA_CC");
cc_params[0] = alt_cc ? alt_cc : (u8 *)"clang";
}

maybe_assembler = check_if_assembler(argc, argv);

/* Detect stray -v calls from ./configure scripts. */
if (argc == 1 && !strcmp(argv[1], "-v"))
maybe_linking = 0;
Expand Down Expand Up @@ -236,8 +255,10 @@ static void edit_params(u32 argc, char **argv) {
cc_params[cc_par_cnt++] = cur;
}

add_angora_pass();
add_dfsan_pass();
if (!maybe_assembler) {
add_angora_pass();
add_dfsan_pass();
}

cc_params[cc_par_cnt++] = "-pie";
cc_params[cc_par_cnt++] = "-fpic";
Expand Down