Author: Brad Smith Date: 2023-08-24T20:04:40-04:00 New Revision: e75f240a0432d827c28a5d77fad26a099ceb7a72
URL: https://github.com/llvm/llvm-project/commit/e75f240a0432d827c28a5d77fad26a099ceb7a72 DIFF: https://github.com/llvm/llvm-project/commit/e75f240a0432d827c28a5d77fad26a099ceb7a72.diff LOG: [Driver] Cleanup last vestiges of Minix / Contiki support Cleanup what is left after D158461. Reviewed by: MaskRay Differential Revision: Added: Modified: clang/docs/tools/clang-formatted-files.txt clang/lib/Driver/Driver.cpp clang/lib/Lex/InitHeaderSearch.cpp clang/test/Preprocessor/predefined-macros-no-warnings.c Removed: ################################################################################ diff --git a/clang/docs/tools/clang-formatted-files.txt b/clang/docs/tools/clang-formatted-files.txt index e22f01e8c150e1..caab83f49bb812 100644 --- a/clang/docs/tools/clang-formatted-files.txt +++ b/clang/docs/tools/clang-formatted-files.txt @@ -402,7 +402,6 @@ clang/lib/Driver/ToolChains/AVR.cpp clang/lib/Driver/ToolChains/AVR.h clang/lib/Driver/ToolChains/CloudABI.cpp clang/lib/Driver/ToolChains/CommonArgs.h -clang/lib/Driver/ToolChains/Contiki.cpp clang/lib/Driver/ToolChains/CrossWindows.h clang/lib/Driver/ToolChains/DragonFly.h clang/lib/Driver/ToolChains/FreeBSD.cpp @@ -416,7 +415,6 @@ clang/lib/Driver/ToolChains/Hurd.cpp clang/lib/Driver/ToolChains/Hurd.h clang/lib/Driver/ToolChains/InterfaceStubs.cpp clang/lib/Driver/ToolChains/InterfaceStubs.h -clang/lib/Driver/ToolChains/Minix.h clang/lib/Driver/ToolChains/MipsLinux.cpp clang/lib/Driver/ToolChains/MSP430.h clang/lib/Driver/ToolChains/PPCFreeBSD.cpp diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 03c54588d7d754..36066a41a81500 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -554,8 +554,7 @@ static llvm::Triple computeTargetTriple(const Driver &D, } // Skip further flag support on OSes which don't support '-m32' or '-m64'. - if (Target.getArch() == llvm::Triple::tce || - Target.getOS() == llvm::Triple::Minix) + if (Target.getArch() == llvm::Triple::tce) return Target; // On AIX, the env OBJECT_MODE may affect the resulting arch variant. diff --git a/clang/lib/Lex/InitHeaderSearch.cpp b/clang/lib/Lex/InitHeaderSearch.cpp index 4bfb722754f18d..61acf01f43562b 100644 --- a/clang/lib/Lex/InitHeaderSearch.cpp +++ b/clang/lib/Lex/InitHeaderSearch.cpp @@ -332,10 +332,6 @@ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths( case llvm::Triple::DragonFly: AddPath("/usr/include/c++/5.0", CXXSystem, false); break; - case llvm::Triple::Minix: - AddGnuCPlusPlusIncludePaths("/usr/gnu/include/c++/4.4.3", - "", "", "", triple); - break; default: break; } diff --git a/clang/test/Preprocessor/predefined-macros-no-warnings.c b/clang/test/Preprocessor/predefined-macros-no-warnings.c index 06f96ddc5a0b08..30d8dd17031f49 100644 --- a/clang/test/Preprocessor/predefined-macros-no-warnings.c +++ b/clang/test/Preprocessor/predefined-macros-no-warnings.c @@ -145,7 +145,6 @@ // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-freebsd // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-fuchsia // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-kfreebsd -// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-minix // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-solaris // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-win32-cygnus // RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-win32-gnu _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
