Although I don't think it helps for [62f56a61aca52db3], put back --enable-64bit and fat_32_64 functionality: It's probably too early to abandon 32-bit builds

2 files changed, 227 insertions, 51 deletions

diff --git a/unix/configure b/unix/configure
index 0d482ae..e2567ea 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6411,7 +6411,7 @@ fi
 	    LDFLAGS="$LDFLAGS -pthread"
 	    ;;
 	Darwin-*)
-	    CFLAGS_OPTIMIZE="-O2"
+	    CFLAGS_OPTIMIZE="-Os"
 	    SHLIB_CFLAGS="-fno-common"
 	    # To avoid discrepancies between what headers configure sees during
 	    # preprocessing tests and compiling tests, move any -isysroot and
@@ -6420,20 +6420,63 @@ fi
 		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
 		if ($i~/^(isysroot|mmacosx-version-min)/) print "-"$i}'`"
 	    CFLAGS="`echo " ${CFLAGS}" | \
-	    awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
-	    if (!($i~/^(isysroot|mmacosx-version-min)/)) print "-"$i}'`"
-	    case `arch` in
-		i386|x86_64)
-		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch x86_64 flag" >&5
+		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
+		if (!($i~/^(isysroot|mmacosx-version-min)/)) print "-"$i}'`"
+	    if test $do64bit = yes
+then :
+
+		case `arch` in
+		    ppc)
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch ppc64 flag" >&5
+printf %s "checking if compiler accepts -arch ppc64 flag... " >&6; }
+if test ${tcl_cv_cc_arch_ppc64+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+			    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  tcl_cv_cc_arch_ppc64=yes
+else $as_nop
+  tcl_cv_cc_arch_ppc64=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+			    CFLAGS=$hold_cflags
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_ppc64" >&5
+printf "%s\n" "$tcl_cv_cc_arch_ppc64" >&6; }
+			if test $tcl_cv_cc_arch_ppc64 = yes
+then :
+
+			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+			    do64bit_ok=yes
+
+fi;;
+		    i386|x86_64)
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch x86_64 flag" >&5
 printf %s "checking if compiler accepts -arch x86_64 flag... " >&6; }
 if test ${tcl_cv_cc_arch_x86_64+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
 
-			hold_cflags=$CFLAGS
-			CFLAGS="$CFLAGS -arch x86_64"
-			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch x86_64"
+			    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6452,27 +6495,28 @@ else $as_nop
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-			CFLAGS=$hold_cflags
+			    CFLAGS=$hold_cflags
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_x86_64" >&5
 printf "%s\n" "$tcl_cv_cc_arch_x86_64" >&6; }
-		    if test $tcl_cv_cc_arch_x86_64 = yes
+			if test $tcl_cv_cc_arch_x86_64 = yes
 then :
 
-			CFLAGS="$CFLAGS -arch x86_64"
+			    CFLAGS="$CFLAGS -arch x86_64"
+			    do64bit_ok=yes
 
 fi;;
-		arm64|arm64e)
-		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch arm64e flag" >&5
+		    arm64|arm64e)
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch arm64e flag" >&5
 printf %s "checking if compiler accepts -arch arm64e flag... " >&6; }
 if test ${tcl_cv_cc_arch_arm64e+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
 
-			hold_cflags=$CFLAGS
-			CFLAGS="$CFLAGS -arch arm64e"
-			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch arm64e"
+			    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6491,20 +6535,33 @@ else $as_nop
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-			CFLAGS=$hold_cflags
+			    CFLAGS=$hold_cflags
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_arm64e" >&5
 printf "%s\n" "$tcl_cv_cc_arch_arm64e" >&6; }
-		    if test $tcl_cv_cc_arch_arm64e = yes
+			if test $tcl_cv_cc_arch_arm64e = yes
 then :
 
-			CFLAGS="$CFLAGS -arch arm64e"
+			    CFLAGS="$CFLAGS -arch arm64e"
+			    do64bit_ok=yes
 
 fi;;
-		*)
-		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5
+		    *)
+			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5
 printf "%s\n" "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;};;
-	    esac
+		esac
+
+else $as_nop
+
+		# Check for combined 32-bit and 64-bit fat build
+		if echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64|arm64e) ' \
+		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '
+then :
+
+		    fat_32_64=yes
+fi
+
+fi
 	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS}'
 	    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ld accepts -single_module flag" >&5
 printf %s "checking if ld accepts -single_module flag... " >&6; }
@@ -6626,6 +6683,17 @@ then :
 else $as_nop
 
 		    hold_libs=$LIBS
+		    if test "$fat_32_64" = yes
+then :
+
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    # On Tiger there is no 64-bit CF, so remove 64-bit
+			    # archs from CFLAGS et al. while testing for
+			    # presence of CF. 64-bit CF is disabled in
+			    # tclUnixPort.h if necessary.
+			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
+			done
+fi
 		    LIBS="$LIBS -framework CoreFoundation"
 		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6646,6 +6714,13 @@ else $as_nop
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
+		    if test "$fat_32_64" = yes
+then :
+
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval $v'="$hold_'$v'"'
+		        done
+fi
 		    LIBS=$hold_libs
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_lib_corefoundation" >&5
@@ -6661,6 +6736,55 @@ printf "%s\n" "#define HAVE_COREFOUNDATION 1" >>confdefs.h
 else $as_nop
   tcl_corefoundation=no
 fi
+		if test "$fat_32_64" = yes -a $tcl_corefoundation = yes
+then :
+
+		    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit CoreFoundation" >&5
+printf %s "checking for 64-bit CoreFoundation... " >&6; }
+if test ${tcl_cv_lib_corefoundation_64+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
+			done
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CoreFoundation.h>
+int
+main (void)
+{
+CFBundleRef b = CFBundleGetMainBundle();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  tcl_cv_lib_corefoundation_64=yes
+else $as_nop
+  tcl_cv_lib_corefoundation_64=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval $v'="$hold_'$v'"'
+			done
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_lib_corefoundation_64" >&5
+printf "%s\n" "$tcl_cv_lib_corefoundation_64" >&6; }
+		    if test $tcl_cv_lib_corefoundation_64 = no
+then :
+
+
+printf "%s\n" "#define NO_COREFOUNDATION_64 1" >>confdefs.h
+
+                        LDFLAGS="$LDFLAGS -Wl,-no_arch_warnings"
+
+fi
+
+fi
 
 fi
 	    ;;
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index c02465f0..3730343 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1378,34 +1378,55 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
 		if ([$]i~/^(isysroot|mmacosx-version-min)/) print "-"[$]i}'`"
 	    CFLAGS="`echo " ${CFLAGS}" | \
-	    awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
-	    if (!([$]i~/^(isysroot|mmacosx-version-min)/)) print "-"[$]i}'`"
-	    case `arch` in
-		i386|x86_64)
-		    AC_CACHE_CHECK([if compiler accepts -arch x86_64 flag],
-			    tcl_cv_cc_arch_x86_64, [
-			hold_cflags=$CFLAGS
-			CFLAGS="$CFLAGS -arch x86_64"
-			AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-				[tcl_cv_cc_arch_x86_64=yes],[tcl_cv_cc_arch_x86_64=no])
-			CFLAGS=$hold_cflags])
-		    AS_IF([test $tcl_cv_cc_arch_x86_64 = yes], [
-			CFLAGS="$CFLAGS -arch x86_64"
-		    ]);;
-		arm64|arm64e)
-		    AC_CACHE_CHECK([if compiler accepts -arch arm64e flag],
-			    tcl_cv_cc_arch_arm64e, [
-			hold_cflags=$CFLAGS
-			CFLAGS="$CFLAGS -arch arm64e"
-			AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-				[tcl_cv_cc_arch_arm64e=yes],[tcl_cv_cc_arch_arm64e=no])
-			CFLAGS=$hold_cflags])
-		    AS_IF([test $tcl_cv_cc_arch_arm64e = yes], [
-			CFLAGS="$CFLAGS -arch arm64e"
-		    ]);;
-		*)
-		    AC_MSG_WARN([Don't know how enable 64-bit on architecture `arch`]);;
-	    esac
+		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
+		if (!([$]i~/^(isysroot|mmacosx-version-min)/)) print "-"[$]i}'`"
+	    AS_IF([test $do64bit = yes], [
+		case `arch` in
+		    ppc)
+			AC_CACHE_CHECK([if compiler accepts -arch ppc64 flag],
+				tcl_cv_cc_arch_ppc64, [
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+			    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+				    [tcl_cv_cc_arch_ppc64=yes],[tcl_cv_cc_arch_ppc64=no])
+			    CFLAGS=$hold_cflags])
+			AS_IF([test $tcl_cv_cc_arch_ppc64 = yes], [
+			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+			    do64bit_ok=yes
+			]);;
+		    i386|x86_64)
+			AC_CACHE_CHECK([if compiler accepts -arch x86_64 flag],
+				tcl_cv_cc_arch_x86_64, [
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch x86_64"
+			    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+				    [tcl_cv_cc_arch_x86_64=yes],[tcl_cv_cc_arch_x86_64=no])
+			    CFLAGS=$hold_cflags])
+			AS_IF([test $tcl_cv_cc_arch_x86_64 = yes], [
+			    CFLAGS="$CFLAGS -arch x86_64"
+			    do64bit_ok=yes
+			]);;
+		    arm64|arm64e)
+			AC_CACHE_CHECK([if compiler accepts -arch arm64e flag],
+				tcl_cv_cc_arch_arm64e, [
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch arm64e"
+			    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+				    [tcl_cv_cc_arch_arm64e=yes],[tcl_cv_cc_arch_arm64e=no])
+			    CFLAGS=$hold_cflags])
+			AS_IF([test $tcl_cv_cc_arch_arm64e = yes], [
+			    CFLAGS="$CFLAGS -arch arm64e"
+			    do64bit_ok=yes
+			]);;
+		    *)
+			AC_MSG_WARN([Don't know how enable 64-bit on architecture `arch`]);;
+		esac
+	    ], [
+		# Check for combined 32-bit and 64-bit fat build
+		AS_IF([echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64|arm64e) ' \
+		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '], [
+		    fat_32_64=yes])
+	    ])
 	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS}'
 	    AC_CACHE_CHECK([if ld accepts -single_module flag], tcl_cv_ld_single_module, [
 		hold_ldflags=$LDFLAGS
@@ -1452,17 +1473,48 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		AC_CACHE_CHECK([for CoreFoundation.framework],
 			tcl_cv_lib_corefoundation, [
 		    hold_libs=$LIBS
+		    AS_IF([test "$fat_32_64" = yes], [
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    # On Tiger there is no 64-bit CF, so remove 64-bit
+			    # archs from CFLAGS et al. while testing for
+			    # presence of CF. 64-bit CF is disabled in
+			    # tclUnixPort.h if necessary.
+			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
+			done])
 		    LIBS="$LIBS -framework CoreFoundation"
 		    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <CoreFoundation/CoreFoundation.h>]],
 			[[CFBundleRef b = CFBundleGetMainBundle();]])],
 			[tcl_cv_lib_corefoundation=yes],
 			[tcl_cv_lib_corefoundation=no])
+		    AS_IF([test "$fat_32_64" = yes], [
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval $v'="$hold_'$v'"'
+		        done])
 		    LIBS=$hold_libs])
 		AS_IF([test $tcl_cv_lib_corefoundation = yes], [
 		    LIBS="$LIBS -framework CoreFoundation"
 		    AC_DEFINE(HAVE_COREFOUNDATION, 1,
 			[Do we have access to Darwin CoreFoundation.framework?])
 		], [tcl_corefoundation=no])
+		AS_IF([test "$fat_32_64" = yes -a $tcl_corefoundation = yes],[
+		    AC_CACHE_CHECK([for 64-bit CoreFoundation],
+			    tcl_cv_lib_corefoundation_64, [
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
+			done
+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <CoreFoundation/CoreFoundation.h>]],
+			    [[CFBundleRef b = CFBundleGetMainBundle();]])],
+			    [tcl_cv_lib_corefoundation_64=yes],
+			    [tcl_cv_lib_corefoundation_64=no])
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval $v'="$hold_'$v'"'
+			done])
+		    AS_IF([test $tcl_cv_lib_corefoundation_64 = no], [
+			AC_DEFINE(NO_COREFOUNDATION_64, 1,
+			    [Is Darwin CoreFoundation unavailable for 64-bit?])
+                        LDFLAGS="$LDFLAGS -Wl,-no_arch_warnings"
+		    ])
+		])
 	    ])
 	    ;;
 	OS/390-*)