Support recent versions of Ubuntu

[sylvestre.ledru]

Summary

On Ubuntu i386, unlike Debian, the TargetArch has been renamed for i585 or i686 depending on the
arch. This patch enables compiler-rt to build on these archs.

[samsonov]

So, after this change you will build libclang_rt.i386.a on i586 or i686. Will it be properly picked up by the Clang driver?

make/platform/clang_linux.mk

22

Update a comment

24

Please keep this list sorted.

38

Can you use call contains here as well?

[sylvestre.ledru]

Implement Alexey requests

[sylvestre.ledru]

. Will it be properly picked up by the Clang driver?

Seems not. I will have a look.

[samsonov]

In D13091#252555, @sylvestre.ledru wrote:

. Will it be properly picked up by the Clang driver?

Seems not. I will have a look.

OK, please report here then. I'm afraid Clang on i586 would look for the runtime with "i586" in its name, not "i386".

[sylvestre.ledru]

moved to cmake!

make/platform/clang_linux.mk

CompilerTargetTriple := $(shell \
   LANG=C $(CC) -v 2>&1 | grep 'Target:' | cut -d' ' -f2)
 ifeq ($(CompilerTargetTriple),)
 $(error "unable to infer compiler target triple for $(CC)")
 endif
 
 # Only define configs if we detected a linux target.
 ifneq ($(findstring -linux-,$(CompilerTargetTriple)),)
 
-# Define configs only if arch in triple is i386 or x86_64
+# Define configs only if arch in triple is i386, i585, i686 or x86_64
 CompilerTargetArch := $(firstword $(subst -, ,$(CompilerTargetTriple)))
-ifeq ($(call contains,i386 x86_64,$(CompilerTargetArch)),true)
+ifeq ($(call contains,i386 i586 i686 x86_64,$(CompilerTargetArch)),true)
 
 # TryCompile compiler source flags
 # Returns exit code of running a compiler invocation.
 TryCompile = \
   $(shell \
     cflags=""; \
     for flag in $(3); do \
       cflags="$$cflags $$flag"; \
     done; \
     $(1) $$cflags $(2) -o /dev/null > /dev/null 2> /dev/null ; \
     echo $$?)
 
 test_source = $(ProjSrcRoot)/make/platform/clang_linux_test_input.c
-ifeq ($(CompilerTargetArch),i386)
+ifeq ($(call contains,i386 i586 i686,$(CompilerTargetArch)),true)
   SupportedArches := i386
   ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0)
     SupportedArches += x86_64
   endif
 else
   SupportedArches := x86_64
   ifeq ($(call TryCompile,$(CC),$(test_source),-m32),0)
     SupportedArches += i386