Removed references to vxworks because it is an unsupported platform

Fixes #26558

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26630)

diff --git a/CHANGES.md b/CHANGES.md
index 5ce0e7f2ec74e3ab3516bafa1c6931d28fce5a45..7f154176eb83c19f3c8a7b4abca28d89b8d1b3d6 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,6 +31,11 @@ OpenSSL 3.6
 
 ### Changes between 3.5 and 3.6 [xx XXX xxxx]
 
+ * The VxWorks platforms have been removed. These platforms were unadopted,
+   unmaintained and reported to be non-functional.
+
+   *Anthony Ioppolo*
+
  * Relax the path check in OpenSSL's 'file:' scheme implementation for
    OSSL_STORE.  Previously, when the 'file:' scheme is an explicit part
    of the URI, our implementation required an absolute path, such as

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 61ee0ce338f5249b9bd0c83c4d112a9ffe17c2bf..0701b733ecbba89a4771008fac02b409101ba4c6 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1960,109 +1960,6 @@ my %targets = (
         multilib         => "64",
     },
 
-##### VxWorks for various targets
-    "vxworks-ppc60x" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "ccppc",
-        CFLAGS           => "-O2 -Wall -fstrength-reduce",
-        cflags           => "-mrtp -mhard-float -mstrict-align -fno-implicit-fp -fno-builtin -fno-strict-aliasing",
-        cppflags         => combine("-D_REENTRANT -DPPC32_fp60x -DCPU=PPC32",
-                                    "_DTOOL_FAMILY=gnu -DTOOL=gnu",
-                                    "-I\$(WIND_BASE)/target/usr/h",
-                                    "-I\$(WIND_BASE)/target/usr/h/wrn/coreip"),
-        sys_id           => "VXWORKS",
-        lflags           => add("-L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/common"),
-        ex_libs          => add("-Wl,--defsym,__wrs_rtp_base=0xe0000000"),
-    },
-    "vxworks-ppcgen" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "ccppc",
-        CFLAGS           => "-O1 -Wall",
-        cflags           => "-mrtp -msoft-float -mstrict-align -fno-builtin -fno-strict-aliasing",
-        cppflags         => combine("-D_REENTRANT -DPPC32 -DCPU=PPC32",
-                                    "-DTOOL_FAMILY=gnu -DTOOL=gnu",
-                                    "-I\$(WIND_BASE)/target/usr/h",
-                                    "-I\$(WIND_BASE)/target/usr/h/wrn/coreip"),
-        sys_id           => "VXWORKS",
-        lflags           => add("-L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon"),
-        ex_libs          => add("-Wl,--defsym,__wrs_rtp_base=0xe0000000"),
-    },
-    "vxworks-ppc405" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "ccppc",
-        CFLAGS           => "-g",
-        cflags           => "-msoft-float -mlongcall",
-        cppflags         => combine("-D_REENTRANT -DPPC32 -DCPU=PPC405",
-                                    "-DTOOL_FAMILY=gnu -DTOOL=gnu",
-                                    "-I\$(WIND_BASE)/target/h"),
-        sys_id           => "VXWORKS",
-        lflags           => add("-r"),
-    },
-    "vxworks-ppc750" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "ccppc",
-        CFLAGS           => "-ansi -fvolatile -Wall \$(DEBUG_FLAG)",
-        cflags           => "-nostdinc -fno-builtin -fno-for-scope -fsigned-char -msoft-float -mlongcall",
-        cppflags         => combine("-DPPC750 -D_REENTRANT -DCPU=PPC604",
-                                    "-I\$(WIND_BASE)/target/h"),
-        sys_id           => "VXWORKS",
-        lflags           => add("-r"),
-    },
-    "vxworks-ppc750-debug" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "ccppc",
-        CFLAGS           => "-ansi -fvolatile -Wall -g",
-        cflags           => "-nostdinc -fno-builtin -fno-for-scope -fsigned-char -msoft-float -mlongcall",
-        cppflags         => combine("-DPPC750 -D_REENTRANT -DCPU=PPC604",
-                                    "-DPEDANTIC -DDEBUG",
-                                    "-I\$(WIND_BASE)/target/h"),
-        sys_id           => "VXWORKS",
-        lflags           => add("-r"),
-    },
-    "vxworks-ppc860" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "ccppc",
-        cflags           => "-nostdinc -msoft-float",
-        cppflags         => combine("-DCPU=PPC860 -DNO_STRINGS_H",
-                                    "-I\$(WIND_BASE)/target/h"),
-        sys_id           => "VXWORKS",
-        lflags           => add("-r"),
-    },
-    "vxworks-simlinux" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "ccpentium",
-        cflags           => "-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -fno-builtin -fno-defer-pop",
-        cppflags         => combine("-D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\"",
-                                    "-DL_ENDIAN -DCPU=SIMLINUX -DNO_STRINGS_H",
-                                    "-DTOOL_FAMILY=gnu -DTOOL=gnu",
-                                    "-DOPENSSL_NO_HW_PADLOCK",
-                                    "-I\$(WIND_BASE)/target/h",
-                                    "-I\$(WIND_BASE)/target/h/wrn/coreip"),
-        sys_id           => "VXWORKS",
-        lflags           => add("-r"),
-        ranlib           => "ranlibpentium",
-    },
-    "vxworks-mips" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "ccmips",
-        CFLAGS           => "-O -G 0",
-        cflags           => "-mrtp -mips2 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -msoft-float -mno-branch-likely -fno-builtin -fno-defer-pop",
-        cppflags         => combine("-D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\"",
-                                    "-DCPU=MIPS32 -DNO_STRINGS_H",
-                                    "-DTOOL_FAMILY=gnu -DTOOL=gnu",
-                                    "-DOPENSSL_NO_HW_PADLOCK",
-                                    threads("-D_REENTRANT"),
-                                    "-I\$(WIND_BASE)/target/h",
-                                    "-I\$(WIND_BASE)/target/h/wrn/coreip"),
-        sys_id           => "VXWORKS",
-        lflags           => add("-L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon"),
-        ex_libs          => add("-Wl,--defsym,__wrs_rtp_base=0xe0000000"),
-        thread_scheme    => "pthreads",
-        asm_arch         => 'mips32',
-        perlasm_scheme   => "o32",
-        ranlib           => "ranlibmips",
-    },
-
 #### uClinux
     "uClinux-dist" => {
         inherit_from     => [ "BASE_unix" ],

diff --git a/NEWS.md b/NEWS.md
index b27b7fb5acf6518f132b8107650ddbdc2d7f4fb3..57f20eeddfa2d66736897d3dd642eb5c8fd7b7b6 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -25,7 +25,10 @@ OpenSSL 3.5
 
 ### Major changes between OpenSSL 3.5 and OpenSSL 3.6 [under development]
 
-  * none
+This release incorporates the following potentially significant or incompatible
+changes:
+
+  * The VxWorks platforms have been removed.
 
 ### Major changes between OpenSSL 3.4 and OpenSSL 3.5 [under development]