Author: Jake Egan Date: 2021-05-25T15:07:40-04:00 New Revision: 5bc644aeca8fc6a734308d81781935de26ea4cde
URL: https://github.com/llvm/llvm-project/commit/5bc644aeca8fc6a734308d81781935de26ea4cde DIFF: https://github.com/llvm/llvm-project/commit/5bc644aeca8fc6a734308d81781935de26ea4cde.diff LOG: Revert "[AIX] Avoid structor alias; die before bad alias codegen" Avoiding structor alias is no longer needed because AIX now has an alias implementation here: https://reviews.llvm.org/D83252. This reverts commit b116ded57da3530e661f871f4191c59cd9e091cd. Reviewed By: jasonliu Differential Revision: https://reviews.llvm.org/D102724 Added: Modified: clang/lib/Driver/ToolChains/Clang.cpp clang/test/Driver/aix-constructor-alias.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 677e2b635354..6ded23b316c8 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -5028,10 +5028,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, // Enable -mconstructor-aliases except on darwin, where we have to work around // a linker bug (see <rdar://problem/7651567>), and CUDA/AMDGPU device code, - // where aliases aren't supported. Similarly, aliases aren't yet supported - // for AIX. - if (!RawTriple.isOSDarwin() && !RawTriple.isNVPTX() && - !RawTriple.isAMDGPU() && !RawTriple.isOSAIX()) + // where aliases aren't supported. + if (!RawTriple.isOSDarwin() && !RawTriple.isNVPTX() && !RawTriple.isAMDGPU()) CmdArgs.push_back("-mconstructor-aliases"); // Darwin's kernel doesn't support guard variables; just die if we diff --git a/clang/test/Driver/aix-constructor-alias.c b/clang/test/Driver/aix-constructor-alias.c index 18c5f5b5b877..0f53dee2be67 100644 --- a/clang/test/Driver/aix-constructor-alias.c +++ b/clang/test/Driver/aix-constructor-alias.c @@ -1,7 +1,7 @@ -// Check that we don't pass -mconstructor-aliases when compiling for AIX. +// Check that we pass -mconstructor-aliases when compiling for AIX. // RUN: %clang -### -target powerpc-ibm-aix7.1.0.0 %s -c -o %t.o 2>&1 \ // RUN: | FileCheck %s // RUN: %clang -### -target powerpc64-ibm-aix7.1.0.0 %s -c -o %t.o 2>&1 \ // RUN: | FileCheck %s -// CHECK-NOT: "-mconstructor-aliases" +// CHECK: "-mconstructor-aliases" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits