$NetBSD: patch-ag,v 1.9 2023/02/22 07:44:55 wiz Exp $ Add __ppc64__ and __arm__ Recognize __sun as well as sun Add __ia64__ Also recognize __sparc__ apparently now needed for gcc49 on solaris sparc to avoid -M /usr/lib/ld/map.noexdata which in does not work on SPARC --- Imake.cf.orig 2023-02-22 02:28:43.000000000 +0000 +++ Imake.cf @@ -25,14 +25,19 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # define MacroIncludeFile # define MacroFile darwin.cf # define DarwinArchitecture -# ifdef __ppc__ +# if defined __ppc__ || defined __ppc64__ # define PpcDarwinArchitecture # undef __ppc__ +# undef __ppc64__ # endif # ifdef __i386__ # define i386DarwinArchitecture # undef __i386__ # endif +# ifdef __aarch64__ +# define aarch64DarwinArchitecture +# undef __aarch64__ +# endif # ifdef __x86_64__ # define x86_64DarwinArchitecture # undef __x86_64__ @@ -259,6 +264,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # define AMD64Architecture # undef __x86_64__ # endif +# ifdef __ia64__ +# define ia64Architecture +# undef __ia64__ +# endif #endif /* NetBSD */ /* Systems based on kernel of NetBSD */ @@ -356,7 +365,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # endif #endif /* AMOEBA */ -#ifdef sun +#if defined(sun) || defined(__sun) # define MacroIncludeFile # define MacroFile sun.cf # ifdef SVR4 @@ -367,6 +376,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # undef sparc # define SparcArchitecture # endif +# ifdef __sparc__ +# undef __sparc__ +# define SparcArchitecture +# endif # ifdef __sparcv9 # undef __sparcv9 # define Sparc64Architecture