Skip to content

Commit e75f240

Browse files
committed
[Driver] Cleanup last vestiges of Minix / Contiki support
Cleanup what is left after D158461. Reviewed by: MaskRay Differential Revision:
1 parent 053dd30 commit e75f240

File tree

4 files changed

+1
-9
lines changed

4 files changed

+1
-9
lines changed

clang/docs/tools/clang-formatted-files.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,6 @@ clang/lib/Driver/ToolChains/AVR.cpp
402402
clang/lib/Driver/ToolChains/AVR.h
403403
clang/lib/Driver/ToolChains/CloudABI.cpp
404404
clang/lib/Driver/ToolChains/CommonArgs.h
405-
clang/lib/Driver/ToolChains/Contiki.cpp
406405
clang/lib/Driver/ToolChains/CrossWindows.h
407406
clang/lib/Driver/ToolChains/DragonFly.h
408407
clang/lib/Driver/ToolChains/FreeBSD.cpp
@@ -416,7 +415,6 @@ clang/lib/Driver/ToolChains/Hurd.cpp
416415
clang/lib/Driver/ToolChains/Hurd.h
417416
clang/lib/Driver/ToolChains/InterfaceStubs.cpp
418417
clang/lib/Driver/ToolChains/InterfaceStubs.h
419-
clang/lib/Driver/ToolChains/Minix.h
420418
clang/lib/Driver/ToolChains/MipsLinux.cpp
421419
clang/lib/Driver/ToolChains/MSP430.h
422420
clang/lib/Driver/ToolChains/PPCFreeBSD.cpp

clang/lib/Driver/Driver.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,7 @@ static llvm::Triple computeTargetTriple(const Driver &D,
554554
}
555555

556556
// Skip further flag support on OSes which don't support '-m32' or '-m64'.
557-
if (Target.getArch() == llvm::Triple::tce ||
558-
Target.getOS() == llvm::Triple::Minix)
557+
if (Target.getArch() == llvm::Triple::tce)
559558
return Target;
560559

561560
// On AIX, the env OBJECT_MODE may affect the resulting arch variant.

clang/lib/Lex/InitHeaderSearch.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,6 @@ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths(
332332
case llvm::Triple::DragonFly:
333333
AddPath("/usr/include/c++/5.0", CXXSystem, false);
334334
break;
335-
case llvm::Triple::Minix:
336-
AddGnuCPlusPlusIncludePaths("/usr/gnu/include/c++/4.4.3",
337-
"", "", "", triple);
338-
break;
339335
default:
340336
break;
341337
}

clang/test/Preprocessor/predefined-macros-no-warnings.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-freebsd
146146
// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-fuchsia
147147
// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-kfreebsd
148-
// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-minix
149148
// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-solaris
150149
// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-win32-cygnus
151150
// RUN: %clang_cc1 %s -Eonly -Wsystem-headers -Werror -triple i686-win32-gnu

0 commit comments

Comments
 (0)