fix libsanitizer build on sparc64 (32bit multilib)

Message ID 372ccbfd-9e0d-09ff-e67c-91c23d4103c5@ubuntu.com
State New
Headers show
Series
  • fix libsanitizer build on sparc64 (32bit multilib)
Related show

Commit Message

Matthias Klose May 31, 2018, 9:32 a.m.
The fix for PR85835 causes the build to fail on sparc64-linux-gnu in the 32bit
multilib.  Testing the attached patch in a multilib enabled sparc64 cross build.
 Ok for the trunk and branches if the build succeeds?

Matthias

2018-05-31  Matthias Klose  <doko@ubuntu.com>

        PR sanitizer/86012
        * sanitizer_common/sanitizer_platform_limits_posix.cc: Define
        SIZEOF_STRUCT_USTAT for 32bit sparc.

Comments

Jakub Jelinek May 31, 2018, 9:37 a.m. | #1
On Thu, May 31, 2018 at 11:32:50AM +0200, Matthias Klose wrote:
> The fix for PR85835 causes the build to fail on sparc64-linux-gnu in the 32bit

> multilib.  Testing the attached patch in a multilib enabled sparc64 cross build.

>  Ok for the trunk and branches if the build succeeds?

> 

> Matthias

> 

> 2018-05-31  Matthias Klose  <doko@ubuntu.com>

> 

>         PR sanitizer/86012

>         * sanitizer_common/sanitizer_platform_limits_posix.cc: Define

>         SIZEOF_STRUCT_USTAT for 32bit sparc.


Ok, though if you could also propagate it upstream, it would be appreciated.

> 2018-05-31  Matthias Klose  <doko@ubuntu.com>

> 

> 	PR sanitizer/86012

> 	* sanitizer_common/sanitizer_platform_limits_posix.cc: Define

> 	SIZEOF_STRUCT_USTAT for 32bit sparc.

> 

> --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc

> +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc

> @@ -256,7 +256,7 @@

>    || defined(__x86_64__)

>  #define SIZEOF_STRUCT_USTAT 32

>  #elif defined(__arm__) || defined(__i386__) || defined(__mips__) \

> -  || defined(__powerpc__) || defined(__s390__)

> +  || defined(__powerpc__) || defined(__s390__) || defined(__sparc__)

>  #define SIZEOF_STRUCT_USTAT 20

>  #else

>  #error Unknown size of struct ustat


	Jakub

Patch


libsanitizer/

2018-05-31  Matthias Klose  <doko@ubuntu.com>

	PR sanitizer/86012
	* sanitizer_common/sanitizer_platform_limits_posix.cc: Define
	SIZEOF_STRUCT_USTAT for 32bit sparc.

--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -256,7 +256,7 @@ 
   || defined(__x86_64__)
 #define SIZEOF_STRUCT_USTAT 32
 #elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
-  || defined(__powerpc__) || defined(__s390__)
+  || defined(__powerpc__) || defined(__s390__) || defined(__sparc__)
 #define SIZEOF_STRUCT_USTAT 20
 #else
 #error Unknown size of struct ustat