diff options
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 19 | ||||
| -rw-r--r-- | clang/test/Driver/unknown-gcc-arch.c | 8 |
2 files changed, 15 insertions, 12 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index d8284040eb3..253a083109c 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1911,19 +1911,14 @@ static llvm::Triple computeTargetTriple(StringRef DefaultTargetTriple, return Target; // Handle pseudo-target flags '-m32' and '-m64'. - // FIXME: Should this information be in llvm::Triple? if (Arg *A = Args.getLastArg(options::OPT_m32, options::OPT_m64)) { - if (A->getOption().matches(options::OPT_m32)) { - if (Target.getArch() == llvm::Triple::x86_64) - Target.setArch(llvm::Triple::x86); - if (Target.getArch() == llvm::Triple::ppc64) - Target.setArch(llvm::Triple::ppc); - } else { - if (Target.getArch() == llvm::Triple::x86) - Target.setArch(llvm::Triple::x86_64); - if (Target.getArch() == llvm::Triple::ppc) - Target.setArch(llvm::Triple::ppc64); - } + llvm::Triple::ArchType AT; + if (A->getOption().matches(options::OPT_m32)) + AT = Target.get32BitArchVariant().getArch(); + else + AT = Target.get64BitArchVariant().getArch(); + if (AT != llvm::Triple::UnknownArch) + Target.setArch(AT); } return Target; diff --git a/clang/test/Driver/unknown-gcc-arch.c b/clang/test/Driver/unknown-gcc-arch.c index 184443b08cb..dd2c96ac8b8 100644 --- a/clang/test/Driver/unknown-gcc-arch.c +++ b/clang/test/Driver/unknown-gcc-arch.c @@ -30,3 +30,11 @@ // RUN: %clang -target powerpc-unknown-unknown -c -x assembler %s -### -m64 2>&1 \ // RUN: | FileCheck -check-prefix=PPC-M64 %s // PPC-M64: {{.*as.*-a64}} + +// RUN: %clang -target sparc64-unknown-unknown -no-integrated-as -c -x assembler %s -### -m32 2>&1 \ +// RUN: | FileCheck -check-prefix=SPARCV8 %s +// SPARCV8: {{.*as.*-32}} + +// RUN: %clang -target sparc-unknown-unknown -no-integrated-as -c -x assembler %s -### -m64 2>&1 \ +// RUN: | FileCheck -check-prefix=SPARCV9 %s +// SPARCV9: {{.*as.*-64}} |
