Merge commit 'fd36cf6bf6524247a8ff6788c028836fe7d9fd20'

* commit 'fd36cf6bf6524247a8ff6788c028836fe7d9fd20':
  configure: Factorize check_64_bit()

Merged-by: James Almer <jamrial@gmail.com>

diff --cc configure
index 760aae59f0e798167c616ae228ccda042488fc57,ed930e6cd461c5dfa4636be91732ed4f4b959f39..99c53d482ae6b38db70de131e3d56bc52ac8524d
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -4895,10 -3804,7 +4895,10 @@@ case "$arch" i
          enabled shared && enable_weak pic
      ;;
      x86)
-         check_64bit x86_32 x86_64 'sizeof(void *) > 4'
+         check_64bit x86_32 x86_64
 +        # Treat x32 as x64 for now. Note it also needs pic if shared
 +        test "$subarch" = "x86_32" && check_cpp_condition stddef.h 'defined(__x86_64__)' &&
 +            subarch=x86_64 && enable x86_64 && disable x86_32
          if enabled x86_64; then
              enabled shared && enable_weak pic
              objformat=elf64