[PATCH] D103080: [CMake] Ignore arm_*.h for non-ARM build

[lin.sun via Phabricator via cfe-commits]

sunlin created this revision.
Herald added subscribers: kristof.beyls, mgorny.
sunlin requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Copy the arm_*.h files only "ARM" is in build targets.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D103080

Files:
  clang/lib/Headers/CMakeLists.txt


Index: clang/lib/Headers/CMakeLists.txt
===
--- clang/lib/Headers/CMakeLists.txt
+++ clang/lib/Headers/CMakeLists.txt
@@ -3,10 +3,6 @@
   altivec.h
   ammintrin.h
   amxintrin.h
-  arm_acle.h
-  arm_cmse.h
-  armintr.h
-  arm64intr.h
   avx2intrin.h
   avx512bf16intrin.h
   avx512bwintrin.h
@@ -138,6 +134,15 @@
   xtestintrin.h
   )
 
+if ("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
+  set(files ${files}
+  arm_acle.h
+  arm_cmse.h
+  armintr.h
+  arm64intr.h
+  )
+endif()
+
 set(cuda_wrapper_files
   cuda_wrappers/algorithm
   cuda_wrappers/complex
@@ -196,19 +201,21 @@
   copy_header_to_output_dir(${CMAKE_CURRENT_SOURCE_DIR} ${f})
 endforeach( f )
 
-# Generate header files and copy them to the build directory
-# Generate arm_neon.h
-clang_generate_header(-gen-arm-neon arm_neon.td arm_neon.h)
-# Generate arm_fp16.h
-clang_generate_header(-gen-arm-fp16 arm_fp16.td arm_fp16.h)
-# Generate arm_sve.h
-clang_generate_header(-gen-arm-sve-header arm_sve.td arm_sve.h)
-# Generate arm_bf16.h
-clang_generate_header(-gen-arm-bf16 arm_bf16.td arm_bf16.h)
-# Generate arm_mve.h
-clang_generate_header(-gen-arm-mve-header arm_mve.td arm_mve.h)
-# Generate arm_cde.h
-clang_generate_header(-gen-arm-cde-header arm_cde.td arm_cde.h)
+if ("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
+  # Generate header files and copy them to the build directory
+  # Generate arm_neon.h
+  clang_generate_header(-gen-arm-neon arm_neon.td arm_neon.h)
+  # Generate arm_fp16.h
+  clang_generate_header(-gen-arm-fp16 arm_fp16.td arm_fp16.h)
+  # Generate arm_sve.h
+  clang_generate_header(-gen-arm-sve-header arm_sve.td arm_sve.h)
+  # Generate arm_bf16.h
+  clang_generate_header(-gen-arm-bf16 arm_bf16.td arm_bf16.h)
+  # Generate arm_mve.h
+  clang_generate_header(-gen-arm-mve-header arm_mve.td arm_mve.h)
+  # Generate arm_cde.h
+  clang_generate_header(-gen-arm-cde-header arm_cde.td arm_cde.h)
+endif()
 # Generate riscv_vector.h
 clang_generate_header(-gen-riscv-vector-header riscv_vector.td riscv_vector.h)
 


Index: clang/lib/Headers/CMakeLists.txt
===
--- clang/lib/Headers/CMakeLists.txt
+++ clang/lib/Headers/CMakeLists.txt
@@ -3,10 +3,6 @@
   altivec.h
   ammintrin.h
   amxintrin.h
-  arm_acle.h
-  arm_cmse.h
-  armintr.h
-  arm64intr.h
   avx2intrin.h
   avx512bf16intrin.h
   avx512bwintrin.h
@@ -138,6 +134,15 @@
   xtestintrin.h
   )
 
+if ("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
+  set(files ${files}
+  arm_acle.h
+  arm_cmse.h
+  armintr.h
+  arm64intr.h
+  )
+endif()
+
 set(cuda_wrapper_files
   cuda_wrappers/algorithm
   cuda_wrappers/complex
@@ -196,19 +201,21 @@
   copy_header_to_output_dir(${CMAKE_CURRENT_SOURCE_DIR} ${f})
 endforeach( f )
 
-# Generate header files and copy them to the build directory
-# Generate arm_neon.h
-clang_generate_header(-gen-arm-neon arm_neon.td arm_neon.h)
-# Generate arm_fp16.h
-clang_generate_header(-gen-arm-fp16 arm_fp16.td arm_fp16.h)
-# Generate arm_sve.h
-clang_generate_header(-gen-arm-sve-header arm_sve.td arm_sve.h)
-# Generate arm_bf16.h
-clang_generate_header(-gen-arm-bf16 arm_bf16.td arm_bf16.h)
-# Generate arm_mve.h
-clang_generate_header(-gen-arm-mve-header arm_mve.td arm_mve.h)
-# Generate arm_cde.h
-clang_generate_header(-gen-arm-cde-header arm_cde.td arm_cde.h)
+if ("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
+  # Generate header files and copy them to the build directory
+  # Generate arm_neon.h
+  clang_generate_header(-gen-arm-neon arm_neon.td arm_neon.h)
+  # Generate arm_fp16.h
+  clang_generate_header(-gen-arm-fp16 arm_fp16.td arm_fp16.h)
+  # Generate arm_sve.h
+  clang_generate_header(-gen-arm-sve-header arm_sve.td arm_sve.h)
+  # Generate arm_bf16.h
+  clang_generate_header(-gen-arm-bf16 arm_bf16.td arm_bf16.h)
+  # Generate arm_mve.h
+  clang_generate_header(-gen-arm-mve-header arm_mve.td arm_mve.h)
+  # Generate arm_cde.h
+  clang_generate_header(-gen-arm-cde-header arm_cde.td arm_cde.h)
+endif()
 # Generate riscv_vector.h
 clang_generate_header(-gen-riscv-vector-header riscv_vector.td riscv_vector.h)
 
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D103080: [CMake] Ignore arm_*.h for non-ARM build

[lin.sun via Phabricator via cfe-commits]

sunlin added a comment.

Hi @kristof.beyls The  original `lib/clang/12.0.1/include` is about total ~10M, 
and the `arm*.h` take about ~5M. Ignore these unused header files will save the 
developers who work on the low storage device.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D103080/new/

https://reviews.llvm.org/D103080

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D103080: [CMake] Ignore arm_*.h for non-ARM build

[lin.sun via Phabricator via cfe-commits]

sunlin added a comment.

Yes, a CMake option is a good idea for this. 
I'll update this change to add a new CMake option for who don't want all the 
headers (default OFF to follow exist behavior) .


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D103080/new/

https://reviews.llvm.org/D103080

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D108286: [clang][Driver][Linux] fix regression issue when define LIBCXX_LIBDIR_SUFFIX=64

[lin.sun via Phabricator via cfe-commits]

sunlin created this revision.
Herald added a subscriber: mgorny.
sunlin requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

Clang failed to compile c++ when LIBCXX_LIBDIR_SUFFIX=64 is defeined for the lib
path "../lib64" are not be included.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D108286

Files:
  clang/lib/Driver/ToolChains/Linux.cpp
  clang/lib/Headers/CMakeLists.txt


Index: clang/lib/Headers/CMakeLists.txt
===
--- clang/lib/Headers/CMakeLists.txt
+++ clang/lib/Headers/CMakeLists.txt
@@ -3,10 +3,6 @@
   altivec.h
   ammintrin.h
   amxintrin.h
-  arm_acle.h
-  arm_cmse.h
-  armintr.h
-  arm64intr.h
   avx2intrin.h
   avx512bf16intrin.h
   avx512bwintrin.h
@@ -143,6 +139,15 @@
   xtestintrin.h
   )
 
+if ("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
+  set(files ${files}
+  arm_acle.h
+  arm_cmse.h
+  armintr.h
+  arm64intr.h
+  )
+endif()
+
 set(cuda_wrapper_files
   cuda_wrappers/algorithm
   cuda_wrappers/complex
@@ -201,19 +206,21 @@
   copy_header_to_output_dir(${CMAKE_CURRENT_SOURCE_DIR} ${f})
 endforeach( f )
 
-# Generate header files and copy them to the build directory
-# Generate arm_neon.h
-clang_generate_header(-gen-arm-neon arm_neon.td arm_neon.h)
-# Generate arm_fp16.h
-clang_generate_header(-gen-arm-fp16 arm_fp16.td arm_fp16.h)
-# Generate arm_sve.h
-clang_generate_header(-gen-arm-sve-header arm_sve.td arm_sve.h)
-# Generate arm_bf16.h
-clang_generate_header(-gen-arm-bf16 arm_bf16.td arm_bf16.h)
-# Generate arm_mve.h
-clang_generate_header(-gen-arm-mve-header arm_mve.td arm_mve.h)
-# Generate arm_cde.h
-clang_generate_header(-gen-arm-cde-header arm_cde.td arm_cde.h)
+if ("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
+  # Generate header files and copy them to the build directory
+  # Generate arm_neon.h
+  clang_generate_header(-gen-arm-neon arm_neon.td arm_neon.h)
+  # Generate arm_fp16.h
+  clang_generate_header(-gen-arm-fp16 arm_fp16.td arm_fp16.h)
+  # Generate arm_sve.h
+  clang_generate_header(-gen-arm-sve-header arm_sve.td arm_sve.h)
+  # Generate arm_bf16.h
+  clang_generate_header(-gen-arm-bf16 arm_bf16.td arm_bf16.h)
+  # Generate arm_mve.h
+  clang_generate_header(-gen-arm-mve-header arm_mve.td arm_mve.h)
+  # Generate arm_cde.h
+  clang_generate_header(-gen-arm-cde-header arm_cde.td arm_cde.h)
+endif()
 # Generate riscv_vector.h
 clang_generate_header(-gen-riscv-vector-header riscv_vector.td riscv_vector.h)
 
Index: clang/lib/Driver/ToolChains/Linux.cpp
===
--- clang/lib/Driver/ToolChains/Linux.cpp
+++ clang/lib/Driver/ToolChains/Linux.cpp
@@ -303,8 +303,10 @@
   // searched.
   // FIXME: It's not clear whether we should use the driver's installed
   // directory ('Dir' below) or the ResourceDir.
-  if (StringRef(D.Dir).startswith(SysRoot))
+  if (StringRef(D.Dir).startswith(SysRoot)) {
 addPathIfExists(D, D.Dir + "/../lib", Paths);
+addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths);
+  }
 
   addPathIfExists(D, SysRoot + "/lib", Paths);
   addPathIfExists(D, SysRoot + "/usr/lib", Paths);


Index: clang/lib/Headers/CMakeLists.txt
===
--- clang/lib/Headers/CMakeLists.txt
+++ clang/lib/Headers/CMakeLists.txt
@@ -3,10 +3,6 @@
   altivec.h
   ammintrin.h
   amxintrin.h
-  arm_acle.h
-  arm_cmse.h
-  armintr.h
-  arm64intr.h
   avx2intrin.h
   avx512bf16intrin.h
   avx512bwintrin.h
@@ -143,6 +139,15 @@
   xtestintrin.h
   )
 
+if ("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
+  set(files ${files}
+  arm_acle.h
+  arm_cmse.h
+  armintr.h
+  arm64intr.h
+  )
+endif()
+
 set(cuda_wrapper_files
   cuda_wrappers/algorithm
   cuda_wrappers/complex
@@ -201,19 +206,21 @@
   copy_header_to_output_dir(${CMAKE_CURRENT_SOURCE_DIR} ${f})
 endforeach( f )
 
-# Generate header files and copy them to the build directory
-# Generate arm_neon.h
-clang_generate_header(-gen-arm-neon arm_neon.td arm_neon.h)
-# Generate arm_fp16.h
-clang_generate_header(-gen-arm-fp16 arm_fp16.td arm_fp16.h)
-# Generate arm_sve.h
-clang_generate_header(-gen-arm-sve-header arm_sve.td arm_sve.h)
-# Generate arm_bf16.h
-clang_generate_header(-gen-arm-bf16 arm_bf16.td arm_bf16.h)
-# Generate arm_mve.h
-clang_generate_header(-gen-arm-mve-header arm_mve.td arm_mve.h)
-# Generate arm_cde.h
-clang_generate_header(-gen-arm-cde-header arm_cde.td arm_cde.h)
+if ("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
+  # Generate header files and copy them to the build directory
+  # Generate arm_neon.h
+  clang_generate_header(-gen-arm-neon arm_neon.td arm_neon.h)
+  # Generate arm_fp16.h
+  clang_generate_header(-gen-arm-fp16 arm_fp16.td arm_fp16.h)
+  # Generate arm_sve.h
+  clang_generate_header(-gen-arm-sve-header arm_sve.td arm_sve.h)
+  # Generate arm_bf16.h
+  clang_generate_header(-gen-arm-bf16 arm_bf16.td arm_bf16.h)
+  # Generate arm_mve.h
+  clang_generate_header(-gen-arm-mve-header 

[PATCH] D108286: [clang][Driver][Linux] fix regression issue when define LIBCXX_LIBDIR_SUFFIX=64

[lin.sun via Phabricator via cfe-commits]

sunlin updated this revision to Diff 367167.
sunlin added a comment.

[clang][Driver][Linux] fix regression issue when define LIBCXX_LIBDIR_SUFFIX=64

remove unrelated files


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D108286/new/

https://reviews.llvm.org/D108286

Files:
  clang/lib/Driver/ToolChains/Linux.cpp


Index: clang/lib/Driver/ToolChains/Linux.cpp
===
--- clang/lib/Driver/ToolChains/Linux.cpp
+++ clang/lib/Driver/ToolChains/Linux.cpp
@@ -303,8 +303,10 @@
   // searched.
   // FIXME: It's not clear whether we should use the driver's installed
   // directory ('Dir' below) or the ResourceDir.
-  if (StringRef(D.Dir).startswith(SysRoot))
+  if (StringRef(D.Dir).startswith(SysRoot)) {
 addPathIfExists(D, D.Dir + "/../lib", Paths);
+addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths);
+  }
 
   addPathIfExists(D, SysRoot + "/lib", Paths);
   addPathIfExists(D, SysRoot + "/usr/lib", Paths);


Index: clang/lib/Driver/ToolChains/Linux.cpp
===
--- clang/lib/Driver/ToolChains/Linux.cpp
+++ clang/lib/Driver/ToolChains/Linux.cpp
@@ -303,8 +303,10 @@
   // searched.
   // FIXME: It's not clear whether we should use the driver's installed
   // directory ('Dir' below) or the ResourceDir.
-  if (StringRef(D.Dir).startswith(SysRoot))
+  if (StringRef(D.Dir).startswith(SysRoot)) {
 addPathIfExists(D, D.Dir + "/../lib", Paths);
+addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths);
+  }
 
   addPathIfExists(D, SysRoot + "/lib", Paths);
   addPathIfExists(D, SysRoot + "/usr/lib", Paths);
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D108286: [clang][Driver][Linux] fix regression issue when define LIBCXX_LIBDIR_SUFFIX=64

[lin.sun via Phabricator via cfe-commits]

sunlin added a subscriber: MaskRay.
sunlin added a comment.

Hi @MaskRay  Please help to review this change.

I compiled clang with  "-DLLVM_LIBDIR_SUFFIX=64"  "-DLIBCXX_LIBDIR_SUFFIX=64" 
"-DLIBCXXABI_LIBDIR_SUFFIX=64" and the clang 12 work as expected.
But after I turn to clang 13, it's failed to comiple the cpp  for can not find 
"-lc++".

After debuging the clang, I find the "../lib64" is not in the libraries path 
list in clang 13.0. 
Here is the key line in clang 12:
https://github.com/llvm/llvm-project/blob/fed41342a82f5a3a9201819a82bf7a48313e296b/clang/lib/Driver/ToolChains/Linux.cpp#L309

This patch can resolve the regression issue.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D108286/new/

https://reviews.llvm.org/D108286

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D108286: [clang][Driver][Linux] fix regression issue when define LIBCXX_LIBDIR_SUFFIX=64

[lin.sun via Phabricator via cfe-commits]

sunlin added a comment.

In D108286#2952511 , @MaskRay wrote:

> Please provide more information: the platform name and the output of `g++ 
> empty.cc '-###' |& sed -E 's/ "?-[LiIr]/\n&/g'`
>
> Note that there is a FIXME. It's unclear why your platform needs the specific 
> rule.

The root cause is clang13 lost the ".../lib64" in  LIBRARY_PATH conparing to 
clang12 source code.
This patch is try to add the line back from clang 12 
https://github.com/llvm/llvm-project/blob/fed41342a82f5a3a9201819a82bf7a48313e296b/clang/lib/Driver/ToolChains/Linux.cpp#L309.

Anyway, the g++ output are list as below.
$ g++ empty.cc '-###' |& sed -E 's/ "?-[LiIr]/\n&/g'
Using built-in specs.
COLLECT_GCC=g++
COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.8.5/lto-wrapper
Target: x86_64-redhat-linux
Configured with: ../configure --prefix=/usr --mandir=/usr/share/man 
--infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla 
--enable-bootstrap --enable-shared --enable-threads=posix 
--enable-checking=release --with-system-zlib --enable-__cxa_atexit 
--disable-libunwind-exceptions --enable-gnu-unique-object 
--enable-linker-build-id --with-linker-hash-style=gnu 
--enable-languages=c,c++,objc,obj-c++,java,fortran,ada,go,lto --enable-plugin 
--enable-initfini-array --disable-libgcj 
--with-isl=/builddir/build/BUILD/gcc-4.8.5-20150702/obj-x86_64-redhat-linux/isl-install
 
--with-cloog=/builddir/build/BUILD/gcc-4.8.5-20150702/obj-x86_64-redhat-linux/cloog-install
 --enable-gnu-indirect-function --with-tune=generic --with-arch_32=x86-64 
--build=x86_64-redhat-linux
Thread model: posix
gcc version 4.8.5 20150623 (Red Hat 4.8.5-44) (GCC)
COLLECT_GCC_OPTIONS='-shared-libgcc' '-mtune=generic' '-march=x86-64'
 /usr/libexec/gcc/x86_64-redhat-linux/4.8.5/cc1plus -quiet -D_GNU_SOURCE 
empty.cc -quiet -dumpbase empty.cc "-mtune=generic" "-march=x86-64" -auxbase 
empty -o /tmp/ccaC9lqH.s
COLLECT_GCC_OPTIONS='-shared-libgcc' '-mtune=generic' '-march=x86-64'
 as --64 -o /tmp/cctILs46.o /tmp/ccaC9lqH.s
COMPILER_PATH=/usr/libexec/gcc/x86_64-redhat-linux/4.8.5/:/usr/libexec/gcc/x86_64-redhat-linux/4.8.5/:/usr/libexec/gcc/x86_64-redhat-linux/:/usr/lib/gcc/x86_64-redhat-linux/4.8.5/:/usr/lib/gcc/x86_64-redhat-linux/
LIBRARY_PATH=/usr/lib/gcc/x86_64-redhat-linux/4.8.5/:/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/:/lib/../lib64/:/usr/lib/../lib64/:/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../:/lib/:/usr/lib/
COLLECT_GCC_OPTIONS='-shared-libgcc' '-mtune=generic' '-march=x86-64'
 /usr/libexec/gcc/x86_64-redhat-linux/4.8.5/collect2 --build-id --no-add-needed 
--eh-frame-hdr "--hash-style=gnu" -m elf_x86_64 -dynamic-linker 
/lib64/ld-linux-x86-64.so.2 
/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/crt1.o 
/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/crti.o 
/usr/lib/gcc/x86_64-redhat-linux/4.8.5/crtbegin.o
 -L/usr/lib/gcc/x86_64-redhat-linux/4.8.5
 -L/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64
 -L/lib/../lib64
 -L/usr/lib/../lib64
 -L/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../.. /tmp/cctILs46.o "-lstdc++" 
-lm -lgcc_s -lgcc -lc -lgcc_s -lgcc 
/usr/lib/gcc/x86_64-redhat-linux/4.8.5/crtend.o 
/usr/lib/gcc/x86_64-redhat-linux/4.8.5/../../../../lib64/crtn.o


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D108286/new/

https://reviews.llvm.org/D108286

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D108286: [clang][Driver][Linux] fix regression issue when define LIBCXX_LIBDIR_SUFFIX=64

[lin.sun via Phabricator via cfe-commits]

sunlin added inline comments.



Comment at: clang/lib/Driver/ToolChains/Linux.cpp:307
+  if (StringRef(D.Dir).startswith(SysRoot)) {
 addPathIfExists(D, D.Dir + "/../lib", Paths);
+addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths);

MaskRay wrote:
> Is `D.Dir + "/../lib"` still needed?
Yes, it's still usefull. When running the clang from compiled folder (eg: 
`.../build.debug/bin/clang`), it will try to access the 
`.../build.debug/bin/../lib`.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D108286/new/

https://reviews.llvm.org/D108286

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D108286: [clang][Driver][Linux] fix regression issue when define LIBCXX_LIBDIR_SUFFIX=64

[lin.sun via Phabricator via cfe-commits]

sunlin added a comment.

@MaskRay Any more questions for this line change? Thanks : )


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D108286/new/

https://reviews.llvm.org/D108286

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D108286: [clang][Driver][Linux] fix regression issue when define LIBCXX_LIBDIR_SUFFIX=64

[lin.sun via Phabricator via cfe-commits]

sunlin added inline comments.



Comment at: clang/lib/Driver/ToolChains/Linux.cpp:308
 addPathIfExists(D, D.Dir + "/../lib", Paths);
+addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths);
+  }

MaskRay wrote:
> Add `if (OSLibDir != "lib")`
thumbs up.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D108286/new/

https://reviews.llvm.org/D108286

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D108286: [clang][Driver][Linux] fix regression issue when define LIBCXX_LIBDIR_SUFFIX=64

[lin.sun via Phabricator via cfe-commits]

sunlin updated this revision to Diff 368812.
sunlin added a comment.

Update for do not add duplicate path


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D108286/new/

https://reviews.llvm.org/D108286

Files:
  clang/lib/Driver/ToolChains/Linux.cpp


Index: clang/lib/Driver/ToolChains/Linux.cpp
===
--- clang/lib/Driver/ToolChains/Linux.cpp
+++ clang/lib/Driver/ToolChains/Linux.cpp
@@ -303,8 +303,12 @@
   // searched.
   // FIXME: It's not clear whether we should use the driver's installed
   // directory ('Dir' below) or the ResourceDir.
-  if (StringRef(D.Dir).startswith(SysRoot))
+  if (StringRef(D.Dir).startswith(SysRoot)) {
 addPathIfExists(D, D.Dir + "/../lib", Paths);
+if (OSLibDir != "lib") {
+  addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths);
+}
+  }
 
   addPathIfExists(D, SysRoot + "/lib", Paths);
   addPathIfExists(D, SysRoot + "/usr/lib", Paths);


Index: clang/lib/Driver/ToolChains/Linux.cpp
===
--- clang/lib/Driver/ToolChains/Linux.cpp
+++ clang/lib/Driver/ToolChains/Linux.cpp
@@ -303,8 +303,12 @@
   // searched.
   // FIXME: It's not clear whether we should use the driver's installed
   // directory ('Dir' below) or the ResourceDir.
-  if (StringRef(D.Dir).startswith(SysRoot))
+  if (StringRef(D.Dir).startswith(SysRoot)) {
 addPathIfExists(D, D.Dir + "/../lib", Paths);
+if (OSLibDir != "lib") {
+  addPathIfExists(D, D.Dir + "/../" + OSLibDir, Paths);
+}
+  }
 
   addPathIfExists(D, SysRoot + "/lib", Paths);
   addPathIfExists(D, SysRoot + "/usr/lib", Paths);
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D108286: [clang][Driver][Linux] fix regression issue when define LIBCXX_LIBDIR_SUFFIX=64

[lin.sun via Phabricator via cfe-commits]

sunlin marked an inline comment as done.
sunlin added a comment.

Hi @MaskRay , 
The patch is updated as your comment. 
Please review again. Thanks.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D108286/new/

https://reviews.llvm.org/D108286

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D108286: [clang][Driver][Linux] fix regression issue when define LIBCXX_LIBDIR_SUFFIX=64

[lin.sun via Phabricator via cfe-commits]

sunlin added a comment.

Thanks all of you!


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D108286/new/

https://reviews.llvm.org/D108286

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D103080: [CMake] Ignore arm_*.h for non-ARM build

[lin.sun via Phabricator via cfe-commits]

sunlin abandoned this revision.
sunlin added a comment.

Close it for ignore these headers from command line.

It is included from chain: "include/clang/Basic/TargetBuiltins.h" --> 
"clang/Basic/BuiltinsARM.def" --> "include/clang/Basic/arm_cde_builtins.inc"...


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D103080/new/

https://reviews.llvm.org/D103080

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits