logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0003-Remove-need-for-size_t-size-check.patch (2446B)

    

  1. From a7120321640d03c0ec7444719366bec99add6542 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Wed, 1 Dec 2021 16:05:33 -0800
  4. Subject: [PATCH] Remove need for size_t size check
  6. ---
  7.  configure       | 33 ---------------------------------
  8.  configure.ac    |  1 -
  9.  util/regional.c |  8 +-------
  10.  3 files changed, 1 insertion(+), 41 deletions(-)
  12. diff --git a/configure b/configure
  13. index 9c33d22f..8b012048 100755
  14. --- a/configure
  15. +++ b/configure
  16. @@ -15163,39 +15163,6 @@ cat >>confdefs.h <<_ACEOF
  17.  _ACEOF
  18.  
  19.  
  20. -# The cast to long int works around a bug in the HP C Compiler
  21. -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  22. -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
  23. -# This bug is HP SR number 8606223364.
  24. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
  25. -$as_echo_n "checking size of size_t... " >&6; }
  26. -if ${ac_cv_sizeof_size_t+:} false; then :
  27. -  $as_echo_n "(cached) " >&6
  28. -else
  29. -  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
  30. -
  31. -else
  32. -  if test "$ac_cv_type_size_t" = yes; then
  33. -     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  34. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  35. -as_fn_error 77 "cannot compute sizeof (size_t)
  36. -See \`config.log' for more details" "$LINENO" 5; }
  37. -   else
  38. -     ac_cv_sizeof_size_t=0
  39. -   fi
  40. -fi
  41. -
  42. -fi
  43. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
  44. -$as_echo "$ac_cv_sizeof_size_t" >&6; }
  45. -
  46. -
  47. -
  48. -cat >>confdefs.h <<_ACEOF
  49. -#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
  50. -_ACEOF
  51. -
  52. -
  53.  
  54.  # add option to disable the evil rpath
  55.  
  56. diff --git a/configure.ac b/configure.ac
  57. index 9e15aee4..750e9bfd 100644
  58. --- a/configure.ac
  59. +++ b/configure.ac
  60. @@ -448,7 +448,6 @@ AC_INCLUDES_DEFAULT
  61.  # endif
  62.  #endif
  63.  ])
  64. -AC_CHECK_SIZEOF(size_t)
  65.  
  66.  # add option to disable the evil rpath
  67.  ACX_ARG_RPATH
  68. diff --git a/util/regional.c b/util/regional.c
  69. index 93e911c5..1c6629c3 100644
  70. --- a/util/regional.c
  71. +++ b/util/regional.c
  72. @@ -146,13 +146,7 @@ regional_alloc(struct regional *r, size_t size)
  73.  {
  74.  	size_t a;
  75.  	void *s;
  76. -	if(
  77. -#if SIZEOF_SIZE_T == 8
  78. -		(unsigned long long)size >= 0xffffffffffffff00ULL
  79. -#else
  80. -		(unsigned)size >= (unsigned)0xffffff00UL
  81. -#endif
  82. -		)
  83. +	if(size >= (size_t)-0x100)
  84.  		return NULL; /* protect against integer overflow in
  85.  			malloc and ALIGN_UP */
  86.  	a = ALIGN_UP(size, ALIGNMENT);
  87. -- 
  88. 2.34.1