Drop darwin-i386(-cc) targets from Configurations

Fixes #18515

Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
MergeDate: Tue Jan 20 12:12:43 2026
(Merged from https://github.com/openssl/openssl/pull/29653)

diff --git a/CHANGES.md b/CHANGES.md
index 3d01712f13485e5c398e0473621a80e1e0700aa8..056f2b3427719570db22ca690b1ac0c22269b75d 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -109,6 +109,10 @@ OpenSSL 4.0
 
    *David von Oheimb*
 
+ * Drop darwin-i386(-cc) targets from Configurations.
+
+   *Daniel Kubec*
+
  * Added `-hmac-env` and `-hmac-stdin` options to openssl-dgst.
 
    *Igor Ustinov*

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 92b3923e40fcc24d14f6ea6e7d256fd5a83b50c3..793283ee152b5c86a13d2eaeb3d5af758c2e13e1 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1885,16 +1885,6 @@ my %targets = (
         asm_arch         => 'ppc64',
         perlasm_scheme   => "osx64",
     },
-    "darwin-i386-cc" => { inherit_from => [ "darwin-i386" ] }, # Historic alias
-    "darwin-i386" => {
-        inherit_from     => [ "darwin-common" ],
-        CFLAGS           => add(picker(release => "-fomit-frame-pointer")),
-        cflags           => add("-arch i386"),
-        lib_cppflags     => add("-DL_ENDIAN"),
-        bn_ops           => "BN_LLONG RC4_INT",
-        asm_arch         => 'x86',
-        perlasm_scheme   => "macosx",
-    },
     "darwin64-x86_64-cc" => { inherit_from => [ "darwin64-x86_64" ] }, # Historic alias
     "darwin64-x86_64" => {
         inherit_from     => [ "darwin-common" ],

diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm
index c4e556a5bdcce39f3aecd1ab5d21db5a20406be4..00e01cbb2dee963339ab43ae2f5ab3314af4c903 100755 (executable)
--- a/util/perl/OpenSSL/config.pm
+++ b/util/perl/OpenSSL/config.pm
@@ -524,22 +524,6 @@ EOF
             return { target => "darwin-ppc" };
         }
       ],
-      [ 'i.86-apple-darwin.*',
-        sub {
-            my $KERNEL_BITS = $ENV{KERNEL_BITS} // '';
-            my $ISA64 = `sysctl -n hw.optional.x86_64 2>/dev/null`;
-            if ( $ISA64 == 1 && $KERNEL_BITS eq '' ) {
-                print <<EOF;
-WARNING! To build 64-bit package, do this:
-         KERNEL_BITS=64 $WHERE/Configure [options...]
-EOF
-                maybe_abort();
-            }
-            return { target => "darwin64-x86_64" }
-                if $ISA64 == 1 && $KERNEL_BITS eq '64';
-            return { target => "darwin-i386" };
-        }
-      ],
       [ 'x86_64-apple-darwin.*',
         sub {
             my $KERNEL_BITS = $ENV{KERNEL_BITS} // '';
@@ -551,13 +535,6 @@ EOF
                     return { target => "darwin64-x86_64" };
                 }
             }
-            return { target => "darwin-i386" } if $KERNEL_BITS eq '32';
-
-            print <<EOF;
-WARNING! To build 32-bit package, do this:
-         KERNEL_BITS=32 $WHERE/Configure [options...]
-EOF
-            maybe_abort();
             return { target => "darwin64-x86_64" };
         }
       ],