From 6df46f7665072941af4e15db0c590b92d91031c8 Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Wed, 11 Apr 2018 14:20:37 +0000 Subject: [PATCH] [Driver] Don't forward -m[no-]unaligned-access options to GCC when assembling/linking Differential Revision: https://reviews.llvm.org/D45092 llvm-svn: 329810 --- clang/lib/Driver/ToolChains/Gnu.cpp | 7 +++++++ clang/test/Driver/gcc_forward.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index a50e5bd..f70e5a5 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -85,6 +85,13 @@ void tools::gcc::Common::ConstructJob(Compilation &C, const JobAction &JA, A->getOption().matches(options::OPT_W_Group)) continue; + // Don't forward -mno-unaligned-access since GCC doesn't understand + // it and because it doesn't affect the assembly or link steps. + if ((isa(JA) || isa(JA)) && + (A->getOption().matches(options::OPT_munaligned_access) || + A->getOption().matches(options::OPT_mno_unaligned_access))) + continue; + A->render(Args, CmdArgs); } } diff --git a/clang/test/Driver/gcc_forward.c b/clang/test/Driver/gcc_forward.c index d28e432b..f75b1c7 100644 --- a/clang/test/Driver/gcc_forward.c +++ b/clang/test/Driver/gcc_forward.c @@ -34,3 +34,9 @@ // RUN: | FileCheck --check-prefix=CHECK-ASM %s // CHECK-ASM: as // CHECK-ASM-NOT: "-g" + +// Check that we're not forwarding -mno-unaligned-access. +// RUN: %clang -target aarch64-none-elf -mno-unaligned-access %s -### 2>&1 \ +// RUN: | FileCheck --check-prefix=CHECK-ARM %s +// CHECK-ARM: gcc{{[^"]*}}" +// CHECK-ARM-NOT: -mno-unaligned-access -- 2.7.4