From 15e556e027767e2441cc8f22f3262c6850f4b2c7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 26 Jan 2023 17:27:48 +0100 Subject: [PATCH] Remove vestiges of PowerPC support It may still be supported for wxGTK, but we don't need to do anything special for it, so we don't need to define __POWERPC__, which was never used anyhow, neither. --- build/cmake/setup.h.in | 3 --- configure | 32 ------------------------------ configure.in | 15 -------------- docs/doxygen/mainpages/const_cpp.h | 2 +- include/wx/platform.h | 6 ------ setup.h.in | 3 --- setup.h_vms | 3 --- 7 files changed, 1 insertion(+), 63 deletions(-) diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in index e12dfd0773..4d72d1c2cd 100644 --- a/build/cmake/setup.h.in +++ b/build/cmake/setup.h.in @@ -84,9 +84,6 @@ /* NanoX (with wxX11) */ #cmakedefine01 wxUSE_NANOX -/* PowerPC Darwin & Mac OS X */ -#cmakedefine __POWERPC__ 1 - /* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */ #undef __Point__ diff --git a/configure b/configure index bf0de527e4..5e6c28e03b 100755 --- a/configure +++ b/configure @@ -23100,38 +23100,6 @@ if test "x$USE_AIX" = "x1"; then CPPFLAGS="-D_LINUX_SOURCE_COMPAT $CPPFLAGS" fi -case "${host}" in - powerpc-*-darwin* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if __POWERPC__ is already defined" >&5 -$as_echo_n "checking if __POWERPC__ is already defined... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __POWERPC__ - choke me for lack of PowerPC -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - $as_echo "#define __POWERPC__ 1" >>confdefs.h - - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; -esac - case "${host}" in *-*-darwin* ) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CoreFoundation/CFBase.h is usable" >&5 diff --git a/configure.in b/configure.in index 5a7a6ad6b5..c3cde0bdb4 100644 --- a/configure.in +++ b/configure.in @@ -1426,21 +1426,6 @@ if test "x$USE_AIX" = "x1"; then CPPFLAGS="-D_LINUX_SOURCE_COMPAT $CPPFLAGS" fi -dnl This case is for PowerPC OS X vs. everything else -case "${host}" in - powerpc-*-darwin* ) - AC_MSG_CHECKING([if __POWERPC__ is already defined]) - AC_TRY_COMPILE([],[#ifndef __POWERPC__ - choke me for lack of PowerPC -#endif -], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]) - AC_DEFINE(__POWERPC__) - ]) - ;; -esac - dnl This case is for OS X vs. everything else case "${host}" in *-*-darwin* ) diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h index d85a8e318e..e4d14e37e4 100644 --- a/docs/doxygen/mainpages/const_cpp.h +++ b/docs/doxygen/mainpages/const_cpp.h @@ -110,7 +110,7 @@ compiler used. @itemdef{\__ALPHA__, DEC Alpha architecture} @itemdef{\__INTEL__, Intel i386 or compatible} @itemdef{\__IA64__, Intel 64 bit architecture} -@itemdef{\__POWERPC__, Motorola Power PC} +@itemdef{\__POWERPC__, Motorola Power PC (not supported any longer)} @endDefList diff --git a/include/wx/platform.h b/include/wx/platform.h index 10c3fffcc5..46be8f1de1 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -183,12 +183,6 @@ #endif #endif /* ia64 */ -#if defined(_M_MPPC) || defined(__PPC__) || defined(__ppc__) - #ifndef __POWERPC__ - #define __POWERPC__ - #endif -#endif /* alpha */ - #if defined(_M_ALPHA) || defined(__AXP__) #ifndef __ALPHA__ #define __ALPHA__ diff --git a/setup.h.in b/setup.h.in index c7aaebff26..e59f61057f 100644 --- a/setup.h.in +++ b/setup.h.in @@ -87,9 +87,6 @@ /* NanoX (with wxX11) */ #define wxUSE_NANOX 0 -/* PowerPC Darwin & Mac OS X */ -#undef __POWERPC__ - /* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */ #undef __Point__ diff --git a/setup.h_vms b/setup.h_vms index d8a88bb5ea..18865b99f8 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -128,9 +128,6 @@ typedef pid_t GPid; /* NanoX (with wxX11) */ #define wxUSE_NANOX 0 -/* PowerPC Darwin & Mac OS X */ -#undef __POWERPC__ - /* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */ #undef __Point__