maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Implement -m32 and -m64 with llvm::Triple functions. 

Don't repeat the 32 <-> 64 architecture mapping incompletely.

llvm-svn: 198943
This commit is contained in:
Jakob Stoklund Olesen 2014-01-10 15:25:23 +00:00
parent 9f1d619c07
commit 0e38aade94
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clang/lib/Driver/Driver.cpp
View File

@ -1911,19 +1911,14 @@ static llvm::Triple computeTargetTriple(StringRef DefaultTargetTriple,
return Target; return Target;
// Handle pseudo-target flags '-m32' and '-m64'. // 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 (Arg *A = Args.getLastArg(options::OPT_m32, options::OPT_m64)) {
if (A->getOption().matches(options::OPT_m32)) { llvm::Triple::ArchType AT;
if (Target.getArch() == llvm::Triple::x86_64) if (A->getOption().matches(options::OPT_m32))
Target.setArch(llvm::Triple::x86); AT = Target.get32BitArchVariant().getArch();
if (Target.getArch() == llvm::Triple::ppc64) else
Target.setArch(llvm::Triple::ppc); AT = Target.get64BitArchVariant().getArch();
} else { if (AT != llvm::Triple::UnknownArch)
if (Target.getArch() == llvm::Triple::x86) Target.setArch(AT);
Target.setArch(llvm::Triple::x86_64);
if (Target.getArch() == llvm::Triple::ppc)
Target.setArch(llvm::Triple::ppc64);
}
} }
return Target; return Target;

8
clang/test/Driver/unknown-gcc-arch.c
View File

@ -30,3 +30,11 @@
// RUN: %clang -target powerpc-unknown-unknown -c -x assembler %s -### -m64 2>&1 \ // RUN: %clang -target powerpc-unknown-unknown -c -x assembler %s -### -m64 2>&1 \
// RUN: | FileCheck -check-prefix=PPC-M64 %s // RUN: | FileCheck -check-prefix=PPC-M64 %s
// PPC-M64: {{.*as.*-a64}} // 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}}