thr3ads.net - llvm dev - [LLVMdev] [RFC PATCH] X32 ABI support for Clang/compiler-rt (compiler-rt patch) [Aug 2013]

If this information is useful, please help other people find it:
Share via:

Steven Newbury

2013-Aug-22 06:09 UTC

[LLVMdev] [RFC PATCH] X32 ABI support for Clang/compiler-rt (compiler-rt patch)

X32 support patch for compiler-rt.  Applies against current trunk.

--- projects/compiler-rt/make/platform/clang_linux.mk~	2013-08-21
06:27:38.000000000 +0000
+++ projects/compiler-rt/make/platform/clang_linux.mk	2013-08-21
11:16:55.891621025 +0000
@@ -41,7 +41,18 @@
     SupportedArches += x86_64
   endif
 else
-  SupportedArches := x86_64
+  # x86-64 arch has two ABIs 64 bit x86-64 and 32 bit x32
+  ifeq ($(lastword $(subst -gnu, ,$(CompilerTargetTriple))),x32)
+    SupportedArches := x32
+    ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0)
+      SupportedArches += x86_64
+    endif
+  else
+    SupportedArches := x86_64
+    ifeq ($(call TryCompile,$(CC),$(test_source),-mx32),0)
+      SupportedArches += x32
+    endif
+  endif
   ifeq ($(call TryCompile,$(CC),$(test_source),-m32),0)
     SupportedArches += i386
   endif
@@ -74,6 +85,22 @@
 Arch.lsan-x86_64 := x86_64
 endif
 
+# Build runtime libraries for x32.
+ifeq ($(call contains,$(SupportedArches),x32),true)
+Configs += full-x32 profile-x32 san-x32 asan-x32 tsan-x32 \
+           msan-x32 ubsan-x32 ubsan_cxx-x32 dfsan-x32 lsan-x32
+Arch.full-x32 := x32
+Arch.profile-x32 := x32
+Arch.san-x32 := x32
+Arch.asan-x32 := x32
+Arch.tsan-x32 := x32
+Arch.msan-x32 := x32
+Arch.ubsan-x32 := x32
+Arch.ubsan_cxx-x32 := x32
+Arch.dfsan-x32 := x32
+Arch.lsan-x32 := x32
+endif
+
 ifneq ($(LLVM_ANDROID_TOOLCHAIN_DIR),)
 Configs += asan-arm-android
 Arch.asan-arm-android := arm-android
@@ -89,22 +116,33 @@
 
 CFLAGS.full-i386 := $(CFLAGS) -m32
 CFLAGS.full-x86_64 := $(CFLAGS) -m64
+CFLAGS.full-x32 := $(CFLAGS) -mx32
 CFLAGS.profile-i386 := $(CFLAGS) -m32
 CFLAGS.profile-x86_64 := $(CFLAGS) -m64
+CFLAGS.profile-x32 := $(CFLAGS) -mx32
 CFLAGS.san-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS) -fno-rtti
 CFLAGS.san-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
+CFLAGS.san-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS) -fno-rtti
 CFLAGS.asan-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS) -fno-rtti \
                     -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
 CFLAGS.asan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti \
                     -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
+CFLAGS.asan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS) -fno-rtti \
+                    -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
 CFLAGS.tsan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
+CFLAGS.tsan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS) -fno-rtti
 CFLAGS.msan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
+CFLAGS.msan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS) -fno-rtti
 CFLAGS.ubsan-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS) -fno-rtti
 CFLAGS.ubsan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
+CFLAGS.ubsan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS) -fno-rtti
 CFLAGS.ubsan_cxx-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS)
 CFLAGS.ubsan_cxx-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS)
+CFLAGS.ubsan_cxx-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS)
 CFLAGS.dfsan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS)
+CFLAGS.dfsan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS)
 CFLAGS.lsan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS)
+CFLAGS.lsan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS)
 
 SHARED_LIBRARY.asan-arm-android := 1
 ANDROID_COMMON_FLAGS := -target arm-linux-androideabi \
@@ -120,30 +158,45 @@
 # enough support to build the sanitizers or profile runtimes.
 CFLAGS.full-i386 += --sysroot=$(ProjSrcRoot)/SDKs/linux
 CFLAGS.full-x86_64 += --sysroot=$(ProjSrcRoot)/SDKs/linux
+CFLAGS.full-x32 += --sysroot=$(ProjSrcRoot)/SDKs/linux
 
 FUNCTIONS.full-i386 := $(CommonFunctions) $(ArchFunctions.i386)
 FUNCTIONS.full-x86_64 := $(CommonFunctions) $(ArchFunctions.x86_64)
+FUNCTIONS.full-x32 := $(CommonFunctions) $(ArchFunctions.x32)
 FUNCTIONS.profile-i386 := GCDAProfiling
 FUNCTIONS.profile-x86_64 := GCDAProfiling
+FUNCTIONS.profile-x32 := GCDAProfiling
 FUNCTIONS.san-i386 := $(SanitizerCommonFunctions)
 FUNCTIONS.san-x86_64 := $(SanitizerCommonFunctions)
+FUNCTIONS.san-x32 := $(SanitizerCommonFunctions)
 FUNCTIONS.asan-i386 := $(AsanFunctions) $(InterceptionFunctions) \
                                         $(SanitizerCommonFunctions)
 FUNCTIONS.asan-x86_64 := $(AsanFunctions) $(InterceptionFunctions) \
                          $(SanitizerCommonFunctions)
$(LsanCommonFunctions)
+FUNCTIONS.asan-x32 := $(AsanFunctions) $(InterceptionFunctions) \
+                         $(SanitizerCommonFunctions)
$(LsanCommonFunctions)
 FUNCTIONS.asan-arm-android := $(AsanFunctions) $(InterceptionFunctions)
\
                                           $(SanitizerCommonFunctions)
 FUNCTIONS.tsan-x86_64 := $(TsanFunctions) $(InterceptionFunctions) \
                                           $(SanitizerCommonFunctions)
+FUNCTIONS.tsan-x32 := $(TsanFunctions) $(InterceptionFunctions) \
+                                          $(SanitizerCommonFunctions)
 FUNCTIONS.msan-x86_64 := $(MsanFunctions) $(InterceptionFunctions) \
                                           $(SanitizerCommonFunctions)
+FUNCTIONS.msan-x32 := $(MsanFunctions) $(InterceptionFunctions) \
+                                          $(SanitizerCommonFunctions)
 FUNCTIONS.ubsan-i386 := $(UbsanFunctions)
 FUNCTIONS.ubsan-x86_64 := $(UbsanFunctions)
+FUNCTIONS.ubsan-x32 := $(UbsanFunctions)
 FUNCTIONS.ubsan_cxx-i386 := $(UbsanCXXFunctions)
 FUNCTIONS.ubsan_cxx-x86_64 := $(UbsanCXXFunctions)
+FUNCTIONS.ubsan_cxx-x32 := $(UbsanCXXFunctions)
 FUNCTIONS.dfsan-x86_64 := $(DfsanFunctions) $(SanitizerCommonFunctions)
+FUNCTIONS.dfsan-x32 := $(DfsanFunctions) $(SanitizerCommonFunctions)
 FUNCTIONS.lsan-x86_64 := $(LsanFunctions) $(InterceptionFunctions) \
                                           $(SanitizerCommonFunctions)
+FUNCTIONS.lsan-x32 := $(LsanFunctions) $(InterceptionFunctions) \
+                                          $(SanitizerCommonFunctions)
 
 # Always use optimized variants.
 OPTIMIZED := 1
--- tools/clang/runtime/compiler-rt/Makefile.orig	2013-08-21
16:20:43.915932247 +0000
+++ tools/clang/runtime/compiler-rt/Makefile	2013-08-21
17:03:15.856154519 +0000
@@ -96,29 +96,66 @@
     $(1) $$cflags $(2) -o /dev/null > /dev/null 2> /dev/null ; \
     echo $$?)
 
-# We try to build 32-bit runtimes both on 32-bit hosts and 64-bit
hosts.
-Runtime32BitConfigs = \
+# We try to build x86 runtimes both on x86 hosts and 64-bit hosts.
+Runtimex86Configs = \
 	full-i386.a profile-i386.a san-i386.a asan-i386.a ubsan-i386.a \
 	ubsan_cxx-i386.a
 
+Runtime64BitConfigs = \
+	full-x86_64.a profile-x86_64.a san-x86_64.a asan-x86_64.a \
+	tsan-x86_64.a msan-x86_64.a ubsan-x86_64.a ubsan_cxx-x86_64.a \
+	dfsan-x86_64.a lsan-x86_64.a
+
+Runtimex32Configs += \
+	full-x32.a profile-x32.a san-x32.a asan-x32.a \
+	tsan-x32.a msan-x32.a ubsan-x32.a ubsan_cxx-x32.a \
+	dfsan-x32.a lsan-x32.a
+
+
 # We currently only try to generate runtime libraries on x86.
 ifeq ($(ARCH),x86)
-RuntimeLibrary.linux.Configs += $(Runtime32BitConfigs)
+RuntimeLibrary.linux.Configs += $(Runtimex86Configs)
+
+ifneq ($(LLVM_ANDROID_TOOLCHAIN_DIR),)
+RuntimeLibrary.linux.Configs += asan-arm-android.so
+endif
 endif
 
 ifeq ($(ARCH),x86_64)
-RuntimeLibrary.linux.Configs += \
-	full-x86_64.a profile-x86_64.a san-x86_64.a asan-x86_64.a \
-	tsan-x86_64.a msan-x86_64.a ubsan-x86_64.a ubsan_cxx-x86_64.a \
-	dfsan-x86_64.a lsan-x86_64.a
-# We need to build 32-bit ASan/UBsan libraries on 64-bit platform, and
add them
+CompilerTargetTriple := $(shell \
+	$(CC) -v 2>&1 | grep 'Target:' | cut -d' ' -f2)
+ifeq ($(CompilerTargetTriple),)
+$(error "unable to infer compiler target triple for $(CC)")
+endif
+ifeq ($(lastword $(subst -gnu, ,$(CompilerTargetTriple))),x32)
+ARCH=x32
+RuntimeLibrary.linux.Configs += $(Runtimex32Configs)
+# We need to build x86 ASan/UBsan libraries on x32 platform, and add
them
 # to the list of runtime libraries to make
-# "clang -fsanitize=(address|undefined) -m32" work.
-# We check that Clang can produce working 32-bit binaries by compiling
a simple
+# "clang -fsanitize=(address|undefined) -m32/-m64" work.
+# We check that Clang can produce working 32/64-bit binaries by
compiling a simple
 # executable.
 test_source
$(LLVM_SRC_ROOT)/tools/clang/runtime/compiler-rt/clang_linux_test_input.c
+ifeq ($(call TryCompile,$(ToolDir)/clang,$(test_source),-m64),0)
+RuntimeLibrary.linux.Configs += $(Runtime64BitConfigs)
+endif
 ifeq ($(call TryCompile,$(ToolDir)/clang,$(test_source),-m32),0)
-RuntimeLibrary.linux.Configs += $(Runtime32BitConfigs)
+RuntimeLibrary.linux.Configs += $(Runtimex86Configs)
+endif
+else
+RuntimeLibrary.linux.Configs += $(Runtime64BitConfigs)
+# We need to build x86/x32 ASan/UBsan libraries on 64-bit platform, and
add them
+# to the list of runtime libraries to make
+# "clang -fsanitize=(address|undefined) -m32/-mx32" work.
+# We check that Clang can produce working x86 binaries by compiling a
simple
+# executable.
+test_source
$(LLVM_SRC_ROOT)/tools/clang/runtime/compiler-rt/clang_linux_test_input.c
+ifeq ($(call TryCompile,$(ToolDir)/clang,$(test_source),-m32),0)
+RuntimeLibrary.linux.Configs += $(Runtimex86Configs)
+endif
+ifeq ($(call TryCompile,$(ToolDir)/clang,$(test_source),-mx32),0)
+RuntimeLibrary.linux.Configs += $(Runtimex32Configs)
+endif
 endif
 ifneq ($(LLVM_ANDROID_TOOLCHAIN_DIR),)
 RuntimeLibrary.linux.Configs += asan-arm-android.so

Alexey Samsonov

2013-Aug-22 07:27 UTC

head link

[LLVMdev] [RFC PATCH] X32 ABI support for Clang/compiler-rt (compiler-rt patch)

Hi Steven,

This looks interesting and raises a number of questions :)

1) Does applying this patch actually bring working sanitizers to x32
platform?
That is, after you build the clang, does "clang -fsanitize=whatever
foo.c"
compile/link/run with expected results?
I doubt that, as there is some platform-specific code in all the
sanitizers, and many of them heavily depend
on the address space layout. Porting TSan and MSan to 32-bit address space
is especially hard, and we don't plan
to do this anytime soon. I think it makes sense to build only the libraries
that are expected to work on a given arch.

2) If we're stepping on the path of porting some sanitizers to x32, it
would be great to
setup a buildbot, make our tests pass cleanly, and make this bot public to
catch regressions.
Do you have plans for that? Running sanitizer test suites also leads us
to...

3) Do you plan to add support for building sanitizers on x32 to CMake build
system? It would
make sense (and, in fact, I would start from there), as our testsuite can
be run only in CMake builds.

On Thu, Aug 22, 2013 at 10:09 AM, Steven Newbury <steve at
snewbury.org.uk>wrote:
> X32 support patch for compiler-rt.  Applies against current trunk.
>
> --- projects/compiler-rt/make/platform/clang_linux.mk~  2013-08-21
> 06:27:38.000000000 +0000
> +++ projects/compiler-rt/make/platform/clang_linux.mk   2013-08-21
> 11:16:55.891621025 +0000
> @@ -41,7 +41,18 @@
>      SupportedArches += x86_64
>    endif
>  else
> -  SupportedArches := x86_64
> +  # x86-64 arch has two ABIs 64 bit x86-64 and 32 bit x32
> +  ifeq ($(lastword $(subst -gnu, ,$(CompilerTargetTriple))),x32)
> +    SupportedArches := x32
> +    ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0)
> +      SupportedArches += x86_64
> +    endif
> +  else
> +    SupportedArches := x86_64
> +    ifeq ($(call TryCompile,$(CC),$(test_source),-mx32),0)
> +      SupportedArches += x32
> +    endif
> +  endif
>    ifeq ($(call TryCompile,$(CC),$(test_source),-m32),0)
>      SupportedArches += i386
>    endif
> @@ -74,6 +85,22 @@
>  Arch.lsan-x86_64 := x86_64
>  endif
>
> +# Build runtime libraries for x32.
> +ifeq ($(call contains,$(SupportedArches),x32),true)
> +Configs += full-x32 profile-x32 san-x32 asan-x32 tsan-x32 \
> +           msan-x32 ubsan-x32 ubsan_cxx-x32 dfsan-x32 lsan-x32
> +Arch.full-x32 := x32
> +Arch.profile-x32 := x32
> +Arch.san-x32 := x32
> +Arch.asan-x32 := x32
> +Arch.tsan-x32 := x32
> +Arch.msan-x32 := x32
> +Arch.ubsan-x32 := x32
> +Arch.ubsan_cxx-x32 := x32
> +Arch.dfsan-x32 := x32
> +Arch.lsan-x32 := x32
> +endif
> +
>  ifneq ($(LLVM_ANDROID_TOOLCHAIN_DIR),)
>  Configs += asan-arm-android
>  Arch.asan-arm-android := arm-android
> @@ -89,22 +116,33 @@
>
>  CFLAGS.full-i386 := $(CFLAGS) -m32
>  CFLAGS.full-x86_64 := $(CFLAGS) -m64
> +CFLAGS.full-x32 := $(CFLAGS) -mx32
>  CFLAGS.profile-i386 := $(CFLAGS) -m32
>  CFLAGS.profile-x86_64 := $(CFLAGS) -m64
> +CFLAGS.profile-x32 := $(CFLAGS) -mx32
>  CFLAGS.san-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS) -fno-rtti
>  CFLAGS.san-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
> +CFLAGS.san-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS) -fno-rtti
>  CFLAGS.asan-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS) -fno-rtti \
>                      -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
>  CFLAGS.asan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti \
>                      -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
> +CFLAGS.asan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS) -fno-rtti \
> +                    -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
>  CFLAGS.tsan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
> +CFLAGS.tsan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS) -fno-rtti
>  CFLAGS.msan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
> +CFLAGS.msan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS) -fno-rtti
>  CFLAGS.ubsan-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS) -fno-rtti
>  CFLAGS.ubsan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS) -fno-rtti
> +CFLAGS.ubsan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS) -fno-rtti
>  CFLAGS.ubsan_cxx-i386 := $(CFLAGS) -m32 $(SANITIZER_CFLAGS)
>  CFLAGS.ubsan_cxx-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS)
> +CFLAGS.ubsan_cxx-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS)
>  CFLAGS.dfsan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS)
> +CFLAGS.dfsan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS)
>  CFLAGS.lsan-x86_64 := $(CFLAGS) -m64 $(SANITIZER_CFLAGS)
> +CFLAGS.lsan-x32 := $(CFLAGS) -mx32 $(SANITIZER_CFLAGS)
>
>  SHARED_LIBRARY.asan-arm-android := 1
>  ANDROID_COMMON_FLAGS := -target arm-linux-androideabi \
> @@ -120,30 +158,45 @@
>  # enough support to build the sanitizers or profile runtimes.
>  CFLAGS.full-i386 += --sysroot=$(ProjSrcRoot)/SDKs/linux
>  CFLAGS.full-x86_64 += --sysroot=$(ProjSrcRoot)/SDKs/linux
> +CFLAGS.full-x32 += --sysroot=$(ProjSrcRoot)/SDKs/linux
>
>  FUNCTIONS.full-i386 := $(CommonFunctions) $(ArchFunctions.i386)
>  FUNCTIONS.full-x86_64 := $(CommonFunctions) $(ArchFunctions.x86_64)
> +FUNCTIONS.full-x32 := $(CommonFunctions) $(ArchFunctions.x32)
>  FUNCTIONS.profile-i386 := GCDAProfiling
>  FUNCTIONS.profile-x86_64 := GCDAProfiling
> +FUNCTIONS.profile-x32 := GCDAProfiling
>  FUNCTIONS.san-i386 := $(SanitizerCommonFunctions)
>  FUNCTIONS.san-x86_64 := $(SanitizerCommonFunctions)
> +FUNCTIONS.san-x32 := $(SanitizerCommonFunctions)
>  FUNCTIONS.asan-i386 := $(AsanFunctions) $(InterceptionFunctions) \
>                                          $(SanitizerCommonFunctions)
>  FUNCTIONS.asan-x86_64 := $(AsanFunctions) $(InterceptionFunctions) \
>                           $(SanitizerCommonFunctions)
> $(LsanCommonFunctions)
> +FUNCTIONS.asan-x32 := $(AsanFunctions) $(InterceptionFunctions) \
> +                         $(SanitizerCommonFunctions)
> $(LsanCommonFunctions)
>  FUNCTIONS.asan-arm-android := $(AsanFunctions) $(InterceptionFunctions)
> \
>                                            $(SanitizerCommonFunctions)
>  FUNCTIONS.tsan-x86_64 := $(TsanFunctions) $(InterceptionFunctions) \
>                                            $(SanitizerCommonFunctions)
> +FUNCTIONS.tsan-x32 := $(TsanFunctions) $(InterceptionFunctions) \
> +                                          $(SanitizerCommonFunctions)
>  FUNCTIONS.msan-x86_64 := $(MsanFunctions) $(InterceptionFunctions) \
>                                            $(SanitizerCommonFunctions)
> +FUNCTIONS.msan-x32 := $(MsanFunctions) $(InterceptionFunctions) \
> +                                          $(SanitizerCommonFunctions)
>  FUNCTIONS.ubsan-i386 := $(UbsanFunctions)
>  FUNCTIONS.ubsan-x86_64 := $(UbsanFunctions)
> +FUNCTIONS.ubsan-x32 := $(UbsanFunctions)
>  FUNCTIONS.ubsan_cxx-i386 := $(UbsanCXXFunctions)
>  FUNCTIONS.ubsan_cxx-x86_64 := $(UbsanCXXFunctions)
> +FUNCTIONS.ubsan_cxx-x32 := $(UbsanCXXFunctions)
>  FUNCTIONS.dfsan-x86_64 := $(DfsanFunctions) $(SanitizerCommonFunctions)
> +FUNCTIONS.dfsan-x32 := $(DfsanFunctions) $(SanitizerCommonFunctions)
>  FUNCTIONS.lsan-x86_64 := $(LsanFunctions) $(InterceptionFunctions) \
>                                            $(SanitizerCommonFunctions)
> +FUNCTIONS.lsan-x32 := $(LsanFunctions) $(InterceptionFunctions) \
> +                                          $(SanitizerCommonFunctions)
>
>  # Always use optimized variants.
>  OPTIMIZED := 1
> --- tools/clang/runtime/compiler-rt/Makefile.orig       2013-08-21
> 16:20:43.915932247 +0000
> +++ tools/clang/runtime/compiler-rt/Makefile    2013-08-21
> 17:03:15.856154519 +0000
> @@ -96,29 +96,66 @@
>      $(1) $$cflags $(2) -o /dev/null > /dev/null 2> /dev/null ; \
>      echo $$?)
>
> -# We try to build 32-bit runtimes both on 32-bit hosts and 64-bit
> hosts.
> -Runtime32BitConfigs = \
> +# We try to build x86 runtimes both on x86 hosts and 64-bit hosts.
> +Runtimex86Configs = \
>         full-i386.a profile-i386.a san-i386.a asan-i386.a ubsan-i386.a \
>         ubsan_cxx-i386.a
>
> +Runtime64BitConfigs = \
> +       full-x86_64.a profile-x86_64.a san-x86_64.a asan-x86_64.a \
> +       tsan-x86_64.a msan-x86_64.a ubsan-x86_64.a ubsan_cxx-x86_64.a \
> +       dfsan-x86_64.a lsan-x86_64.a
> +
> +Runtimex32Configs += \
> +       full-x32.a profile-x32.a san-x32.a asan-x32.a \
> +       tsan-x32.a msan-x32.a ubsan-x32.a ubsan_cxx-x32.a \
> +       dfsan-x32.a lsan-x32.a
> +
> +
>  # We currently only try to generate runtime libraries on x86.
>  ifeq ($(ARCH),x86)
> -RuntimeLibrary.linux.Configs += $(Runtime32BitConfigs)
> +RuntimeLibrary.linux.Configs += $(Runtimex86Configs)
> +
> +ifneq ($(LLVM_ANDROID_TOOLCHAIN_DIR),)
> +RuntimeLibrary.linux.Configs += asan-arm-android.so
> +endif
>  endif
>
>  ifeq ($(ARCH),x86_64)
> -RuntimeLibrary.linux.Configs += \
> -       full-x86_64.a profile-x86_64.a san-x86_64.a asan-x86_64.a \
> -       tsan-x86_64.a msan-x86_64.a ubsan-x86_64.a ubsan_cxx-x86_64.a \
> -       dfsan-x86_64.a lsan-x86_64.a
> -# We need to build 32-bit ASan/UBsan libraries on 64-bit platform, and
> add them
> +CompilerTargetTriple := $(shell \
> +       $(CC) -v 2>&1 | grep 'Target:' | cut -d' '
-f2)
> +ifeq ($(CompilerTargetTriple),)
> +$(error "unable to infer compiler target triple for $(CC)")
> +endif
> +ifeq ($(lastword $(subst -gnu, ,$(CompilerTargetTriple))),x32)
> +ARCH=x32
> +RuntimeLibrary.linux.Configs += $(Runtimex32Configs)
> +# We need to build x86 ASan/UBsan libraries on x32 platform, and add
> them
>  # to the list of runtime libraries to make
> -# "clang -fsanitize=(address|undefined) -m32" work.
> -# We check that Clang can produce working 32-bit binaries by compiling
> a simple
> +# "clang -fsanitize=(address|undefined) -m32/-m64" work.
> +# We check that Clang can produce working 32/64-bit binaries by
> compiling a simple
>  # executable.
>  test_source >
$(LLVM_SRC_ROOT)/tools/clang/runtime/compiler-rt/clang_linux_test_input.c
> +ifeq ($(call TryCompile,$(ToolDir)/clang,$(test_source),-m64),0)
> +RuntimeLibrary.linux.Configs += $(Runtime64BitConfigs)
> +endif
>  ifeq ($(call TryCompile,$(ToolDir)/clang,$(test_source),-m32),0)
> -RuntimeLibrary.linux.Configs += $(Runtime32BitConfigs)
> +RuntimeLibrary.linux.Configs += $(Runtimex86Configs)
> +endif
> +else
> +RuntimeLibrary.linux.Configs += $(Runtime64BitConfigs)
> +# We need to build x86/x32 ASan/UBsan libraries on 64-bit platform, and
> add them
> +# to the list of runtime libraries to make
> +# "clang -fsanitize=(address|undefined) -m32/-mx32" work.
> +# We check that Clang can produce working x86 binaries by compiling a
> simple
> +# executable.
> +test_source >
$(LLVM_SRC_ROOT)/tools/clang/runtime/compiler-rt/clang_linux_test_input.c
> +ifeq ($(call TryCompile,$(ToolDir)/clang,$(test_source),-m32),0)
> +RuntimeLibrary.linux.Configs += $(Runtimex86Configs)
> +endif
> +ifeq ($(call TryCompile,$(ToolDir)/clang,$(test_source),-mx32),0)
> +RuntimeLibrary.linux.Configs += $(Runtimex32Configs)
> +endif
>  endif
>  ifneq ($(LLVM_ANDROID_TOOLCHAIN_DIR),)
>  RuntimeLibrary.linux.Configs += asan-arm-android.so
>
>
> _______________________________________________
> LLVM Developers mailing list
> LLVMdev at cs.uiuc.edu         http://llvm.cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev
>


-- 
Alexey Samsonov, MSK
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.llvm.org/pipermail/llvm-dev/attachments/20130822/ddc8e76c/attachment.html>

Steven Newbury

2013-Aug-22 07:39 UTC

head link

[LLVMdev] [RFC PATCH] X32 ABI support for Clang/compiler-rt (compiler-rt patch)

On Thu, 2013-08-22 at 11:27 +0400, Alexey Samsonov
wrote:> Hi Steven,
> 
> This looks interesting and raises a number of questions :)
> 
> 1) Does applying this patch actually bring working sanitizers to x32
> platform?
> That is, after you build the clang, does "clang -fsanitize=whatever
foo.c"
> compile/link/run with expected results?
> I doubt that, as there is some platform-specific code in all the
> sanitizers, and many of them heavily depend
> on the address space layout. Porting TSan and MSan to 32-bit address space
> is especially hard, and we don't plan
> to do this anytime soon. I think it makes sense to build only the libraries
> that are expected to work on a given arch.
> I should have made clear this is very much a WIP. I expect to have make
an effort to port compiler-rt, but first I need to be able to generate
elf32_x86_64 objects with Clang.  I confess, my method of porting code
to x32 so far has consisted of trying to build existing code and
modifying what breaks, or disabling features where inapplicable.  I
haven't studied the code well enough to understand and predict where I'm
going to have make modification in advance.  It's worked so far with
most things I've attempted but LLVM/Clang/compiler-rt is an order of
magnitude more complex than anything else I've poked at.  The biggest
success I've had so far with this method is porting of Mozilla
Spidermonkey/js17.
> 2) If we're stepping on the path of porting some sanitizers to x32, it
> would be great to
> setup a buildbot, make our tests pass cleanly, and make this bot public to
> catch regressions.
> Do you have plans for that? Running sanitizer test suites also leads us
> to...
> I'm new to llvm/clang, I'm going to have to take guidance from others.
> 3) Do you plan to add support for building sanitizers on x32 to CMake build
> system? It would
> make sense (and, in fact, I would start from there), as our testsuite can
> be run only in CMake builds.
> I can do so, (locally switch to cmake) I have a little experience with
cmake so I should be able to figure it out.  From my distro point of
view, the plan on Gentoo is to switch to CMake for the LLVM/Clang
ebuild, but it hasn't happened yet.  Perhaps this could be expedited, I
can contact the package maintainer.

Reasonably Related Threads

Search for more maybe matching threads

llvm dev - Aug 2013 - [LLVMdev] [RFC PATCH] X32 ABI support for Clang/compiler-rt (compiler-rt patch)

[LLVMdev] [RFC PATCH] X32 ABI support for Clang/compiler-rt (compiler-rt patch)

[LLVMdev] [RFC PATCH] X32 ABI support for Clang/compiler-rt (compiler-rt patch)

[LLVMdev] [RFC PATCH] X32 ABI support for Clang/compiler-rt (compiler-rt patch)

Reasonably Related Threads