From 9c552d27ee03ad485c2d36827e73bea75faee5e1 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 27 Apr 2021 12:41:18 -0700 Subject: [PATCH] hurd: Fix i386 research path f26341840253 ("[Driver] Gnu.cpp: remove obsoleted i386 triple detection from end-of-life distribution versions") dropped the i686-gnu gcc path, but GNU/Hurd's gcc is actually using it, and not i386. This fixes the gcc path and update the tests to reflect it. Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D101317 --- clang/lib/Driver/ToolChains/Gnu.cpp | 2 +- .../usr/{i386-gnu => i686-gnu}/bin/as | 0 .../usr/{i386-gnu => i686-gnu}/bin/ld | 0 .../usr/{i386-gnu => i686-gnu}/lib/.keep | 0 .../usr/lib/gcc/i686-gnu}/4.6.0/crtbegin.o | 0 .../usr/lib/gcc/i686-gnu}/4.6.0/crtbegin.o | 0 .../gcc/{i386-gnu => i686-gnu}/4.6.0/crtbeginS.o | 0 .../gcc/{i386-gnu => i686-gnu}/4.6.0/crtbeginT.o | 0 clang/test/Driver/hurd.c | 24 +++++++++++----------- 9 files changed, 13 insertions(+), 13 deletions(-) rename clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/{i386-gnu => i686-gnu}/bin/as (100%) rename clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/{i386-gnu => i686-gnu}/bin/ld (100%) rename clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/{i386-gnu => i686-gnu}/lib/.keep (100%) rename clang/test/Driver/Inputs/{basic_hurd_tree/usr/lib/gcc/i386-gnu => basic_cross_hurd_tree/usr/lib/gcc/i686-gnu}/4.6.0/crtbegin.o (100%) rename clang/test/Driver/Inputs/{basic_cross_hurd_tree/usr/lib/gcc/i386-gnu => basic_hurd_tree/usr/lib/gcc/i686-gnu}/4.6.0/crtbegin.o (100%) rename clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/{i386-gnu => i686-gnu}/4.6.0/crtbeginS.o (100%) rename clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/{i386-gnu => i686-gnu}/4.6.0/crtbeginT.o (100%) diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index 245c023..386edb7 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -2115,7 +2115,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( "i686-pc-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux", "i386-redhat-linux", "i586-suse-linux", "i686-montavista-linux", - "i686-linux-android", "i386-gnu", + "i686-linux-android", "i686-gnu", }; static const char *const M68kLibDirs[] = {"/lib"}; diff --git a/clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i386-gnu/bin/as b/clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i686-gnu/bin/as similarity index 100% rename from clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i386-gnu/bin/as rename to clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i686-gnu/bin/as diff --git a/clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i386-gnu/bin/ld b/clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i686-gnu/bin/ld similarity index 100% rename from clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i386-gnu/bin/ld rename to clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i686-gnu/bin/ld diff --git a/clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i386-gnu/lib/.keep b/clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i686-gnu/lib/.keep similarity index 100% rename from clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i386-gnu/lib/.keep rename to clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/i686-gnu/lib/.keep diff --git a/clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0/crtbegin.o b/clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0/crtbegin.o similarity index 100% rename from clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0/crtbegin.o rename to clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0/crtbegin.o diff --git a/clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0/crtbegin.o b/clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0/crtbegin.o similarity index 100% rename from clang/test/Driver/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0/crtbegin.o rename to clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0/crtbegin.o diff --git a/clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0/crtbeginS.o b/clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0/crtbeginS.o similarity index 100% rename from clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0/crtbeginS.o rename to clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0/crtbeginS.o diff --git a/clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0/crtbeginT.o b/clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0/crtbeginT.o similarity index 100% rename from clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0/crtbeginT.o rename to clang/test/Driver/Inputs/basic_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0/crtbeginT.o diff --git a/clang/test/Driver/hurd.c b/clang/test/Driver/hurd.c index 7dbbe92..a9573f4 100644 --- a/clang/test/Driver/hurd.c +++ b/clang/test/Driver/hurd.c @@ -1,5 +1,5 @@ // RUN: %clang -no-canonical-prefixes %s -### 2>&1 \ -// RUN: --target=i386-pc-gnu \ +// RUN: --target=i686-pc-hurd-gnu \ // RUN: --sysroot=%S/Inputs/basic_hurd_tree \ // RUN: | FileCheck --check-prefix=CHECK %s // CHECK-NOT: warning: @@ -11,7 +11,7 @@ // CHECK: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" // CHECK: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" // CHECK: "-dynamic-linker" "/lib/ld.so" -// CHECK: "{{.*}}/usr/lib/gcc/i386-gnu/4.6.0{{/|\\\\}}crtbegin.o" +// CHECK: "{{.*}}/usr/lib/gcc/i686-gnu/4.6.0{{/|\\\\}}crtbegin.o" // CHECK: "-L[[SYSROOT]]/lib/i386-gnu" // CHECK: "-L[[SYSROOT]]/lib/../lib32" // CHECK: "-L[[SYSROOT]]/usr/lib/i386-gnu" @@ -20,7 +20,7 @@ // CHECK: "-L[[SYSROOT]]/usr/lib" // RUN: %clang -no-canonical-prefixes %s -### 2>&1 \ -// RUN: --target=i386-pc-gnu -static \ +// RUN: --target=i686-pc-hurd-gnu -static \ // RUN: --sysroot=%S/Inputs/basic_hurd_tree \ // RUN: | FileCheck --check-prefix=CHECK-STATIC %s // CHECK-STATIC-NOT: warning: @@ -33,7 +33,7 @@ // CHECK-STATIC: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" // CHECK-STATIC: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" // CHECK-STATIC: "-static" -// CHECK-STATIC: "{{.*}}/usr/lib/gcc/i386-gnu/4.6.0{{/|\\\\}}crtbeginT.o" +// CHECK-STATIC: "{{.*}}/usr/lib/gcc/i686-gnu/4.6.0{{/|\\\\}}crtbeginT.o" // CHECK-STATIC: "-L[[SYSROOT]]/lib/i386-gnu" // CHECK-STATIC: "-L[[SYSROOT]]/lib/../lib32" // CHECK-STATIC: "-L[[SYSROOT]]/usr/lib/i386-gnu" @@ -42,7 +42,7 @@ // CHECK-STATIC: "-L[[SYSROOT]]/usr/lib" // RUN: %clang -no-canonical-prefixes %s -### 2>&1 \ -// RUN: --target=i386-pc-gnu -shared \ +// RUN: --target=i686-pc-hurd-gnu -shared \ // RUN: --sysroot=%S/Inputs/basic_hurd_tree \ // RUN: | FileCheck --check-prefix=CHECK-SHARED %s // CHECK-SHARED-NOT: warning: @@ -53,7 +53,7 @@ // CHECK-SHARED: "-internal-externc-isystem" "[[SYSROOT]]/include" // CHECK-SHARED: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" // CHECK-SHARED: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]" -// CHECK-SHARED: "{{.*}}/usr/lib/gcc/i386-gnu/4.6.0{{/|\\\\}}crtbeginS.o" +// CHECK-SHARED: "{{.*}}/usr/lib/gcc/i686-gnu/4.6.0{{/|\\\\}}crtbeginS.o" // CHECK-SHARED: "-L[[SYSROOT]]/lib/i386-gnu" // CHECK-SHARED: "-L[[SYSROOT]]/lib/../lib32" // CHECK-SHARED: "-L[[SYSROOT]]/usr/lib/i386-gnu" @@ -63,11 +63,11 @@ // RUN: %clang -### -o %t %s 2>&1 -no-integrated-as -fuse-ld=ld \ // RUN: --gcc-toolchain=%S/Inputs/basic_cross_hurd_tree/usr \ -// RUN: --target=i386-pc-gnu \ +// RUN: --target=i686-pc-hurd-gnu \ // RUN: | FileCheck --check-prefix=CHECK-CROSS %s // CHECK-CROSS-NOT: warning: -// CHECK-CROSS: "-cc1" "-triple" "i386-pc-hurd-gnu" -// CHECK-CROSS: "{{.*}}/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0/../../../../i386-gnu/bin{{/|\\\\}}as" "--32" -// CHECK-CROSS: "{{.*}}/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0/../../../../i386-gnu/bin{{/|\\\\}}ld" {{.*}} "-m" "elf_i386" -// CHECK-CROSS: "{{.*}}/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0{{/|\\\\}}crtbegin.o" -// CHECK-CROSS: "-L{{.*}}/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i386-gnu/4.6.0/../../../../i386-gnu/lib" +// CHECK-CROSS: "-cc1" "-triple" "i686-pc-hurd-gnu" +// CHECK-CROSS: "{{.*}}/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0/../../../../i686-gnu/bin{{/|\\\\}}as" "--32" +// CHECK-CROSS: "{{.*}}/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0/../../../../i686-gnu/bin{{/|\\\\}}ld" {{.*}} "-m" "elf_i386" +// CHECK-CROSS: "{{.*}}/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0{{/|\\\\}}crtbegin.o" +// CHECK-CROSS: "-L{{.*}}/Inputs/basic_cross_hurd_tree/usr/lib/gcc/i686-gnu/4.6.0/../../../../i686-gnu/lib" -- 2.7.4