rake-compiler-dock 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d6132fa4f1d2342d8e1ec3e9f2d7fce839026fc68771e2209169b38a61a6f1
-  data.tar.gz: 31f46ee396d58464bb0083897d4d3e954605ceed34cd3dbeed72d1459d978201
+  metadata.gz: 53dbaea874777b182361051f1c425df03d7223cde61a63bb60d6284593c0e273
+  data.tar.gz: a389f202249d9ee8415c5adc010030b6c6b026ed8127a77520c5f1b1f5a7831a
 SHA512:
-  metadata.gz: 22fe8a19f48c24d2ad0044b59ffdf5e5841d48aacbb8fb0f582be550ace9b2dc27e6b34df93638ff6024c59df172a8857a844f3c40a072a213e1d045c02e8127
-  data.tar.gz: dca8f2e0b2e18537a0f0c7eda39ff460c9470d60b0e7f19ac3108b58bb06119682f5cfc783563bf6b534ef12c159d2e9e62e38978dba415cb1f2d8580441097f
+  metadata.gz: 3f3397f9b5db932ae5a9370d80af39a30475ede7053049e4dd8aec035da1fe1e82d79a38127ea3d0232666ac1965927cc92fb1d03161754d93663ca5ccadf645
+  data.tar.gz: 02f7cedfbbcc5e13f51f9f428d4fade38de5bf6032dd28d3f1717a0f1315d8afee2d4bb6f92715bb609f165e2093d9469219db086b0842cdaffe7c81d3851eeb

data/.github/workflows/ci.yml

@@ -382,21 +382,27 @@ jobs:
       matrix:
         include:
           - from_image: amd64/centos
+            image_platform: linux/amd64
             platform: x86_64-linux # centos-8 ships ruby 2.5, rubygems won't recognize -gnu suffix
             dockerfile: centos
           - from_image: navikey/raspbian-bullseye
+            image_platform: linux/arm/v7
             platform: arm-linux # bullseye ships ruby 2.7, rubygems won't recognize -gnu suffix
             dockerfile: debian
           - from_image: arm64v8/ubuntu
+            image_platform: linux/aarch64
             platform: aarch64-linux # arm64v8 ships ruby 3.0, rubygems won't recognize -gnu suffix
             dockerfile: debian
           - from_image: i386/alpine
+            image_platform: linux/386
             platform: x86-linux-musl
             dockerfile: alpine
           - from_image: arm32v6/alpine
+            image_platform: linux/arm/v6
             platform: arm-linux-musl
             dockerfile: alpine
           - from_image: alpine
+            image_platform: linux/amd64
             platform: x86_64-linux-musl
             dockerfile: alpine
     runs-on: ubuntu-latest
@@ -409,6 +415,6 @@ jobs:
       - name: Build ${{ matrix.from_image }} image
         run: |
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          docker build --rm --build-arg from_image=${{ matrix.from_image }} -t ruby-test -f test/env/Dockerfile.${{ matrix.dockerfile }} .
+          docker build --rm --build-arg from_image=${{ matrix.from_image }} --platform=${{ matrix.image_platform }} -t ruby-test -f test/env/Dockerfile.${{ matrix.dockerfile }} .
       - name: Run tests
         run: docker run --rm -t --network=host -v `pwd`:/build ruby-test

data/.github/workflows/publish-images.yml

@@ -41,7 +41,8 @@ jobs:
         with:
           ruby-version: "3.1"
           bundler-cache: true
-      - id: rcd_config
+      - name: Generate docker image names
+        id: rcd_config
         run: |
           bundle exec ruby -e ' \
             require "rake_compiler_dock"; \
@@ -49,8 +50,11 @@ jobs:
             puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}})); \
             print "snapshot_name="; \
             puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}}), :version => %q(snapshot)); \
+            if %q(${{matrix.platform}}).end_with?("-gnu"); \
+              print "generic_linux_snapshot_name="; \
+              puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}}), :version => %q(snapshot)).chomp("-gnu"); \
+            end \
           ' | tee -a $GITHUB_OUTPUT
-
       - name: Build docker image
         env:
           RCD_DOCKER_BUILD: docker buildx build --cache-from=type=local,src=tmp/build-cache --cache-to=type=local,dest=tmp/build-cache-new --load
@@ -65,7 +69,13 @@ jobs:
           registry: ghcr.io
           username: ${{github.actor}}
           password: ${{secrets.GITHUB_TOKEN}}
-      - run: |
+      - name: Push the docker image
+        run: |
           docker images
           docker tag ${{steps.rcd_config.outputs.image_name}} ${{steps.rcd_config.outputs.snapshot_name}}
           docker push ${{steps.rcd_config.outputs.snapshot_name}}
+      - name: Push a generic linux image
+        if: ${{ steps.rcd_config.outputs.generic_linux_snapshot_name }}
+        run: |
+          docker tag ${{steps.rcd_config.outputs.image_name}} ${{steps.rcd_config.outputs.generic_linux_snapshot_name}}
+          docker push ${{steps.rcd_config.outputs.generic_linux_snapshot_name}}

data/Dockerfile.mri.erb

@@ -1,32 +1,14 @@
-<%
-image = case platform
-  when /x86_64-linux-gnu/ then "quay.io/pypa/manylinux2014_x86_64:latest@sha256:04bffb03cd21d7945c327f67745897adddeb1d6635d79ba98811e7526460f2e0"
-  when /x86-linux-gnu/ then "quay.io/pypa/manylinux2014_i686:latest@sha256:516a28921cf4d2544be8278764e3e5d33da0a4b4e26bbbb523a5702b96b329b0"
-  else "docker.io/library/ubuntu:20.04@sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d"
-end
-manylinux = !!(image =~ /manylinux/)
-%>
+<% image = "ubuntu:20.04" %>
 FROM <%= image %>
 
 ##
 ## Install required base packages for compiling ruby
 ##
-<% if manylinux %>
-RUN yum install -y sudo ruby less git wget curl autoconf libtool cmake gcc-c++ xz readline-devel sqlite-devel openssl-devel libffi-devel libyaml-devel
-
-## Prepare sudo
-RUN rm -f /usr/local/bin/sudo && \
-    groupadd -r sudo && \
-    echo "%sudo  ALL=(ALL)       ALL" >> /etc/sudoers
-
-<% else %>
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update && \
     apt-get install -y sudo wget curl git-core build-essential xz-utils unzip dirmngr && \
     apt-get install -y autoconf cmake pkg-config zlib1g-dev libreadline-dev libsqlite0-dev libssl-dev libyaml-dev libffi-dev && \
     rm -rf /var/lib/apt/lists/*
-<% end %>
-
 
 ##
 ##  install rbenv and ruby-build
@@ -68,23 +50,18 @@ RUN dpkg -i /debs/*.deb
 COPY build/mk_musl_cross.sh /tmp
 RUN /tmp/mk_musl_cross.sh <%= target %>
 
-<% elsif !manylinux %>
+<% else %>
 RUN apt-get -y update && \
     apt-get install -y <%
-if platform =~ /darwin/        %> clang python lzma-dev libxml2-dev libssl-dev libc++-10-dev <% end %><%
+if platform =~ /darwin/            %> clang python lzma-dev libxml2-dev libssl-dev libc++-10-dev <% end %><%
 if platform =~ /aarch64-linux-gnu/ %> gcc-aarch64-linux-gnu g++-aarch64-linux-gnu <% end %><%
 if platform =~ /arm-linux-gnu/     %> gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf <% end %><%
-if platform =~ /x86-mingw32/   %> gcc-mingw-w64-i686 g++-mingw-w64-i686 <% end %><%
-if platform =~ /x64-mingw32/   %> gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 <% end %> && \
+if platform =~ /x86-linux-gnu/     %> gcc-i686-linux-gnu g++-i686-linux-gnu <% end %><%
+if platform =~ /x86-mingw32/       %> gcc-mingw-w64-i686 g++-mingw-w64-i686 <% end %><%
+if platform =~ /x64-mingw32/       %> gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 <% end %> && \
     rm -rf /var/lib/apt/lists/*
 <% end %>
 
-<% if manylinux %>
-# Create dev tools x86-linux-*
-COPY build/mk_i686.rb /root/
-RUN /root/mk_i686.rb
-<% end %>
-
 <% if platform =~ /darwin/ %>
 COPY build/mk_osxcross.sh /tmp
 RUN /tmp/mk_osxcross.sh
@@ -133,7 +110,7 @@ RUN sudo mkdir -p /usr/local/rake-compiler && \
 xrubies_build_plan = if platform =~ /x64-mingw-ucrt/
   [
     # Rubyinstaller-3.1.0+ is platform x64-mingw-ucrt
-    ["3.3.0-rc1:3.2.0:3.1.0", "3.1.3"],
+    ["3.3.5:3.2.0:3.1.0", "3.1.3"],
   ]
 elsif platform =~ /x64-mingw32/
   [
@@ -144,7 +121,7 @@ elsif platform =~ /x64-mingw32/
 else
   [
     ["2.6.0:2.5.0:2.4.0", "2.5.9"],
-    ["3.3.0-rc1:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
+    ["3.3.5:3.2.0:3.1.0:3.0.0:2.7.0", "3.1.3"],
   ]
 end
 
@@ -171,7 +148,7 @@ RUN bash -c " \
 RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby.so | xargs rm
 RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby-static.a | while read f ; do cp $f `echo $f | sed s/-static//` ; done
 RUN find /usr/local/rake-compiler/ruby/*linux*/ -name libruby.a | while read f ; do ar t $f | xargs ar d $f ; done
-RUN find /usr/local/rake-compiler/ruby/*linux*/ -name mkmf.rb | while read f ; do sed -i ':a;N;$!ba;s/TRY_LINK = [^\n]*\n[^\n]*\n[^\n]*LOCAL_LIBS)/& -lruby-static -lpthread -lrt -ldl <% if platform =~ /x86/ %> -lcrypt <% end %>/' $f ; done
+RUN find /usr/local/rake-compiler/ruby/*linux*/ -name mkmf.rb | while read f ; do sed -i ':a;N;$!ba;s/TRY_LINK = [^\n]*\n[^\n]*\n[^\n]*LOCAL_LIBS)/& -lruby-static -lpthread -lrt -ldl <% if platform =~ /x86_64/ %> -lcrypt <% if platform !~ /musl/ %> -lz <% end %> <% end %>/' $f ; done
 <% end %>
 
 <% if platform =~ /mingw/ %>
@@ -221,24 +198,6 @@ RUN mv /opt/osxcross/target/bin/<%= target %>-strip /opt/osxcross/target/bin/<%=
     ln /root/strip_wrapper_codesign /opt/osxcross/target/bin/<%= target %>-strip
 <% end %>
 
-<% if manylinux %>
-# Enable modern compiler toolset of manylinux image
-RUN echo "export PATH=\$DEVTOOLSET_ROOTPATH/usr/bin:\$PATH" >> /etc/rubybashrc
-
-# Add prefixed versions of compiler tools
-RUN for f in addr2line gcc gcov-tool ranlib ar dwp gcc-ranlib nm readelf as elfedit gcc-ar gprof objcopy size c++filt g++ gcov ld objdump strings cpp gcc-nm strip ; do ln -sf $DEVTOOLSET_ROOTPATH/usr/bin/$f $DEVTOOLSET_ROOTPATH/usr/bin/<%= target %>-$f ; done
-
-# Use builtin functions of newer gcc to avoid linker issues on Musl based Linux
-# TODO: remove in v1.6.0 once musl builds have been out for full minor release cycle, see 864be5b2
-COPY build/math_h.patch /root/
-RUN cd /usr/include/ && \
-    patch -p1 < /root/math_h.patch
-
-# Update pkg-config because the distro ships 0.27.1 which is old and has bugs and performance issues.
-COPY build/mk_pkg_config.sh /root/
-RUN /root/mk_pkg_config.sh
-<% end %>
-
 <% if platform =~ /arm64-darwin/ %>
 # Add a arm64 darwin target as alternative to aarch64
 RUN grep -E 'rbconfig-aarch64-darwin' /usr/local/rake-compiler/config.yml | sed 's/rbconfig-[a-z0-9_]*-darwin/rbconfig-<%= platform %>/' >> /usr/local/rake-compiler/config.yml
@@ -258,6 +217,6 @@ COPY build/sudoers /etc/sudoers.d/rake-compiler-dock
 
 RUN bash -c "rbenv global 3.1.3"
 
-ENV RUBY_CC_VERSION 3.3.0:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
+ENV RUBY_CC_VERSION=3.3.5:3.2.0:3.1.0:3.0.0:2.7.0:2.6.0:2.5.0:2.4.0
 
 CMD bash

data/History.md

@@ -1,5 +1,33 @@
 # `rake-compiler/rake-compiler-dock` Changelog
 
+## v1.6.0 / 2024-12-13
+
+### Notable changes
+
+#### Standardizing all Linux build images on Ubuntu
+
+In this release, we upgraded the base image for the `x86_64-linux-gnu` and `x86-linux-gnu` images from `manylinux2014` to `ubuntu:20.04`. (`manylinux2014` reached end-of-life earlier this year.) As a result, all of the build images are using the same base image, simplifying things considerably. (#122, #126) @flavorjones
+
+⚠ **Note** there are two important changes due to this upgrade:
+
+1. The minimum supported version of GLIBC for the `x86*-linux-gnu` images has increased from 2.17 to 2.29 for `x86_64` and `x86` architectures. (Note that GLIBC was already pinned to 2.29 for ARM architectures.)
+2. Precompiled gems built with the `x86*linux-gnu` images are less likely to be compatible with Musl systems, and may segfault.
+
+For (2) above, if you have been shipping a single `x86_64-linux` native gem for both GNU and Musl systems, **please make sure you test your gems on a Musl system before shipping them**. See the [actions workflow in flavorjones/ruby-c-extensions-explained](https://github.com/flavorjones/ruby-c-extensions-explained/blob/6619a0d94e627897838a79144704387db65a03bc/.github/workflows/precompiled.yml#L137) for an example of how to do this rigorously.
+
+
+### Ruby 3.3 support upgraded to `3.3.5`
+
+Update Ruby 3.3 support from 3.3.0-rc1 to 3.3.5. Note that the 3.3.x releases are not usable until 3.3.5 because of https://bugs.ruby-lang.org/issues/20088.
+
+⚠ **Note** that if you were specifying `3.3.0` in your `RUBY_CC_VERSION` environment variable, that string will must be updated to `3.3.5`.
+
+
+### Added
+
+- Add support for the `SOURCE_DATE_EPOCH` environment variable, which can be used to create reproducible builds. (#128) @segiddins
+
+
 ## 1.5.2 / 2024-07-30
 
 With CentOS 7 becoming EOL as of 2024-06-30, `yum` will no longer work in the `x86_64-linux-gnu` and

data/Rakefile

@@ -17,11 +17,11 @@ platforms = [
   ["arm64-darwin", "aarch64-apple-darwin"],
   ["x64-mingw-ucrt", "x86_64-w64-mingw32"],
   ["x64-mingw32", "x86_64-w64-mingw32"],
-  ["x86-linux-gnu", "i686-redhat-linux-gnu"],
+  ["x86-linux-gnu", "i686-linux-gnu"],
   ["x86-linux-musl", "i686-unknown-linux-musl"],
   ["x86-mingw32", "i686-w64-mingw32"],
   ["x86_64-darwin", "x86_64-apple-darwin"],
-  ["x86_64-linux-gnu", "x86_64-redhat-linux-gnu"],
+  ["x86_64-linux-gnu", "x86_64-linux-gnu"],
   ["x86_64-linux-musl", "x86_64-unknown-linux-musl"],
 ]
 

data/build/sudoers

@@ -1 +1 @@
-Defaults        env_keep += "http_proxy https_proxy ftp_proxy GEM_PRIVATE_KEY_PASSPHRASE RCD_HOST_RUBY_PLATFORM RCD_HOST_RUBY_VERSION RCD_IMAGE RUBY_CC_VERSION LD_LIBRARY_PATH DEVTOOLSET_ROOTPATH"
+Defaults        env_keep += "http_proxy https_proxy ftp_proxy GEM_PRIVATE_KEY_PASSPHRASE RCD_HOST_RUBY_PLATFORM RCD_HOST_RUBY_VERSION RCD_IMAGE RUBY_CC_VERSION LD_LIBRARY_PATH DEVTOOLSET_ROOTPATH SOURCE_DATE_EPOCH"

data/lib/rake_compiler_dock/starter.rb

@@ -66,6 +66,7 @@ module RakeCompilerDock
               "-e", "USER=#{user}",
               "-e", "GROUP=#{group}",
               "-e", "GEM_PRIVATE_KEY_PASSPHRASE",
+              "-e", "SOURCE_DATE_EPOCH",
               "-e", "ftp_proxy",
               "-e", "http_proxy",
               "-e", "https_proxy",

data/lib/rake_compiler_dock/version.rb

@@ -1,4 +1,4 @@
 module RakeCompilerDock
-  VERSION = "1.5.2"
-  IMAGE_VERSION = "1.5.2"
+  VERSION = "1.6.0"
+  IMAGE_VERSION = "1.6.0"
 end

data/test/test_environment_variables.rb

@@ -32,7 +32,7 @@ class TestEnvironmentVariables
     unless IS_JRUBY
       def test_RUBY_CC_VERSION
         df = File.read(File.expand_path("../../Dockerfile.mri.erb", __FILE__))
-        df =~ /^ENV RUBY_CC_VERSION\s+(.*)\s+$/
+        df =~ /^ENV RUBY_CC_VERSION=(.*)$/
         assert_equal $1, rcd_env['RUBY_CC_VERSION']
       end
 
@@ -75,6 +75,12 @@ class TestEnvironmentVariables
     def test_PWD
       assert_equal Dir.pwd, rcd_env['PWD']
     end
+
+    def test_SOURCE_DATE_EPOCH
+      cmd = "SOURCE_DATE_EPOCH=1234567890 " + invocation("echo \$SOURCE_DATE_EPOCH")
+      sde = %x(#{cmd}).strip
+      assert_equal "1234567890", sde
+    end
   end
 
   class AsIfContinuousIntegration < Test::Unit::TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler-dock
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Lars Kanis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-30 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,6 @@ files:
 - Rakefile
 - bin/rake-compiler-dock
 - build/gem_helper.rb
-- build/math_h.patch
 - build/mk_i686.rb
 - build/mk_musl_cross.sh
 - build/mk_osxcross.sh
@@ -141,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Easy to use and reliable cross compiler environment for building Windows

data/build/math_h.patch

@@ -1,189 +0,0 @@
---- centos7/math.h	2020-12-31 23:15:40.678843646 +0100
-+++ builtin/math.h	2022-03-16 21:35:13.086169875 +0100
-@@ -206,68 +206,142 @@
-       FP_NORMAL
-   };
- 
-+
-+/* Depending on the type of TG_ARG, call an appropriately suffixed
-+   version of FUNC with arguments (including parentheses) ARGS.
-+   Suffixed functions may not exist for long double if it has the same
-+   format as double, or for other types with the same format as float,
-+   double or long double.  The behavior is undefined if the argument
-+   does not have a real floating type.  The definition may use a
-+   conditional expression, so all suffixed versions of FUNC must
-+   return the same type (FUNC may include a cast if necessary rather
-+   than being a single identifier).  */
-+#ifdef __NO_LONG_DOUBLE_MATH
-+# if __HAVE_DISTINCT_FLOAT128
-+#  error "Distinct _Float128 without distinct long double not supported."
-+# endif
-+# define __MATH_TG(TG_ARG, FUNC, ARGS)					\
-+  (sizeof (TG_ARG) == sizeof (float) ? FUNC ## f ARGS : FUNC ARGS)
-+#elif __HAVE_DISTINCT_FLOAT128
-+# if __HAVE_GENERIC_SELECTION
-+#  if __HAVE_FLOATN_NOT_TYPEDEF && __HAVE_FLOAT32
-+#   define __MATH_TG_F32(FUNC, ARGS) _Float32: FUNC ## f ARGS,
-+#  else
-+#   define __MATH_TG_F32(FUNC, ARGS)
-+#  endif
-+#  if __HAVE_FLOATN_NOT_TYPEDEF && __HAVE_FLOAT64X
-+#   if __HAVE_FLOAT64X_LONG_DOUBLE
-+#    define __MATH_TG_F64X(FUNC, ARGS) _Float64x: FUNC ## l ARGS,
-+#   else
-+#    define __MATH_TG_F64X(FUNC, ARGS) _Float64x: FUNC ## f128 ARGS,
-+#   endif
-+#  else
-+#   define __MATH_TG_F64X(FUNC, ARGS)
-+#  endif
-+#  define __MATH_TG(TG_ARG, FUNC, ARGS)	\
-+     _Generic ((TG_ARG),			\
-+	       float: FUNC ## f ARGS,		\
-+	       __MATH_TG_F32 (FUNC, ARGS)	\
-+	       default: FUNC ARGS,		\
-+	       long double: FUNC ## l ARGS,	\
-+	       __MATH_TG_F64X (FUNC, ARGS)	\
-+	       _Float128: FUNC ## f128 ARGS)
-+# else
-+#  if __HAVE_FLOATN_NOT_TYPEDEF
-+#   error "Non-typedef _FloatN but no _Generic."
-+#  endif
-+#  define __MATH_TG(TG_ARG, FUNC, ARGS)					\
-+     __builtin_choose_expr						\
-+     (__builtin_types_compatible_p (__typeof (TG_ARG), float),		\
-+      FUNC ## f ARGS,							\
-+      __builtin_choose_expr						\
-+      (__builtin_types_compatible_p (__typeof (TG_ARG), double),	\
-+       FUNC ARGS,							\
-+       __builtin_choose_expr						\
-+       (__builtin_types_compatible_p (__typeof (TG_ARG), long double),	\
-+	FUNC ## l ARGS,							\
-+	FUNC ## f128 ARGS)))
-+# endif
-+#else
-+# define __MATH_TG(TG_ARG, FUNC, ARGS)		\
-+  (sizeof (TG_ARG) == sizeof (float)		\
-+   ? FUNC ## f ARGS				\
-+   : sizeof (TG_ARG) == sizeof (double)		\
-+   ? FUNC ARGS					\
-+   : FUNC ## l ARGS)
-+#endif
-+
- /* Return number of classification appropriate for X.  */
--# ifdef __NO_LONG_DOUBLE_MATH
--#  define fpclassify(x) \
--     (sizeof (x) == sizeof (float) ? __fpclassifyf (x) : __fpclassify (x))
--# else
--#  define fpclassify(x) \
--     (sizeof (x) == sizeof (float)					      \
--      ? __fpclassifyf (x)						      \
--      : sizeof (x) == sizeof (double)					      \
--      ? __fpclassify (x) : __fpclassifyl (x))
-+# if ((__GNUC_PREREQ (4,4) && !defined __SUPPORT_SNAN__)		      \
-+      )					      \
-+     && (!defined __OPTIMIZE_SIZE__ || defined __cplusplus)
-+     /* The check for __cplusplus allows the use of the builtin, even
-+	when optimization for size is on.  This is provided for
-+	libstdc++, only to let its configure test work when it is built
-+	with -Os.  No further use of this definition of fpclassify is
-+	expected in C++ mode, since libstdc++ provides its own version
-+	of fpclassify in cmath (which undefines fpclassify).  */
-+#  define fpclassify(x) __builtin_fpclassify (FP_NAN, FP_INFINITE,	      \
-+     FP_NORMAL, FP_SUBNORMAL, FP_ZERO, x)
-+# else
-+#  define fpclassify(x) __MATH_TG ((x), __fpclassify, (x))
- # endif
- 
- /* Return nonzero value if sign of X is negative.  */
--# ifdef __NO_LONG_DOUBLE_MATH
--#  define signbit(x) \
--     (sizeof (x) == sizeof (float) ? __signbitf (x) : __signbit (x))
--# else
--#  define signbit(x) \
--     (sizeof (x) == sizeof (float)					      \
--      ? __signbitf (x)							      \
--      : sizeof (x) == sizeof (double)					      \
--      ? __signbit (x) : __signbitl (x))
-+# if __GNUC_PREREQ (6,0)
-+#  define signbit(x) __builtin_signbit (x)
-+# elif defined __cplusplus
-+  /* In C++ mode, __MATH_TG cannot be used, because it relies on
-+     __builtin_types_compatible_p, which is a C-only builtin.
-+     The check for __cplusplus allows the use of the builtin instead of
-+     __MATH_TG. This is provided for libstdc++, only to let its configure
-+     test work. No further use of this definition of signbit is expected
-+     in C++ mode, since libstdc++ provides its own version of signbit
-+     in cmath (which undefines signbit). */
-+#  define signbit(x) __builtin_signbitl (x)
-+# elif __GNUC_PREREQ (4,0)
-+#  define signbit(x) __MATH_TG ((x), __builtin_signbit, (x))
-+# else
-+#  define signbit(x) __MATH_TG ((x), __signbit, (x))
- # endif
- 
- /* Return nonzero value if X is not +-Inf or NaN.  */
--# ifdef __NO_LONG_DOUBLE_MATH
--#  define isfinite(x) \
--     (sizeof (x) == sizeof (float) ? __finitef (x) : __finite (x))
--# else
--#  define isfinite(x) \
--     (sizeof (x) == sizeof (float)					      \
--      ? __finitef (x)							      \
--      : sizeof (x) == sizeof (double)					      \
--      ? __finite (x) : __finitel (x))
-+# if (__GNUC_PREREQ (4,4) && !defined __SUPPORT_SNAN__)
-+#  define isfinite(x) __builtin_isfinite (x)
-+# else
-+#  define isfinite(x) __MATH_TG ((x), __finite, (x))
- # endif
- 
- /* Return nonzero value if X is neither zero, subnormal, Inf, nor NaN.  */
--# define isnormal(x) (fpclassify (x) == FP_NORMAL)
-+# if (__GNUC_PREREQ (4,4) && !defined __SUPPORT_SNAN__)
-+#  define isnormal(x) __builtin_isnormal (x)
-+# else
-+#  define isnormal(x) (fpclassify (x) == FP_NORMAL)
-+# endif
- 
- /* Return nonzero value if X is a NaN.  We could use `fpclassify' but
-    we already have this functions `__isnan' and it is faster.  */
--# ifdef __NO_LONG_DOUBLE_MATH
--#  define isnan(x) \
--     (sizeof (x) == sizeof (float) ? __isnanf (x) : __isnan (x))
--# else
--#  define isnan(x) \
--     (sizeof (x) == sizeof (float)					      \
--      ? __isnanf (x)							      \
--      : sizeof (x) == sizeof (double)					      \
--      ? __isnan (x) : __isnanl (x))
-+# if (__GNUC_PREREQ (4,4) && !defined __SUPPORT_SNAN__)
-+#  define isnan(x) __builtin_isnan (x)
-+# else
-+#  define isnan(x) __MATH_TG ((x), __isnan, (x))
- # endif
- 
- /* Return nonzero value if X is positive or negative infinity.  */
--# ifdef __NO_LONG_DOUBLE_MATH
-+# if __HAVE_DISTINCT_FLOAT128 && !__GNUC_PREREQ (7,0) \
-+     && !defined __SUPPORT_SNAN__ && !defined __cplusplus
-+   /* Since __builtin_isinf_sign is broken for float128 before GCC 7.0,
-+      use the helper function, __isinff128, with older compilers.  This is
-+      only provided for C mode, because in C++ mode, GCC has no support
-+      for __builtin_types_compatible_p (and when in C++ mode, this macro is
-+      not used anyway, because libstdc++ headers undefine it).  */
- #  define isinf(x) \
--     (sizeof (x) == sizeof (float) ? __isinff (x) : __isinf (x))
-+    (__builtin_types_compatible_p (__typeof (x), _Float128) \
-+     ? __isinff128 (x) : __builtin_isinf_sign (x))
-+# elif (__GNUC_PREREQ (4,4) && !defined __SUPPORT_SNAN__)
-+#  define isinf(x) __builtin_isinf_sign (x)
- # else
--#  define isinf(x) \
--     (sizeof (x) == sizeof (float)					      \
--      ? __isinff (x)							      \
--      : sizeof (x) == sizeof (double)					      \
--      ? __isinf (x) : __isinfl (x))
-+#  define isinf(x) __MATH_TG ((x), __isinf, (x))
- # endif
- 
- /* Bitmasks for the math_errhandling macro.  */