diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf index e9e944ec3..b9587ddc7 100644 --- a/cde/config/cf/Imake.cf +++ b/cde/config/cf/Imake.cf @@ -79,7 +79,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $ # undef amd64 # endif # if defined(__arm__) -# define Arm32Architecture +# define ARMArchitecture # undef __arm__ # if defined(zaurus) # undef zaurus @@ -474,14 +474,19 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $ # define AMD64Architecture # endif # endif -# if defined(__arm__) -# undef __arm__ +# if defined(__arm__) || defined(__arm32__) # define ARMArchitecture +# undef __arm__ +# undef __arm32__ # endif # if defined(__sparc__) || defined(sparc) # define SparcArchitecture # undef sparc # endif +# if defined(__aarch64__) +# define AArch64Architecture +# undef __aarch64__ +# endif #endif /* linux */ #if defined(sequent) || defined(_SEQUENT_) diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf index 15136b8d1..a93176ad4 100644 --- a/cde/config/cf/linux.cf +++ b/cde/config/cf/linux.cf @@ -238,6 +238,16 @@ TIRPCINC = # endif #endif /* AMD64Architecture */ +#ifdef AArch64Architecture +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing +# endif +# define LinuxMachineDefines -D__aarch64__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +#endif /* AArch64Architecture */ + + #ifdef PpcArchitecture # ifndef OptimizedCDebugFlags # define OptimizedCDebugFlags DefaultGcc2i386Opt diff --git a/cde/programs/dtksh/ksh93/src/cmd/pax/format.c b/cde/programs/dtksh/ksh93/src/cmd/pax/format.c index 4ac96eab5..5422ac8b3 100644 --- a/cde/programs/dtksh/ksh93/src/cmd/pax/format.c +++ b/cde/programs/dtksh/ksh93/src/cmd/pax/format.c @@ -90,6 +90,11 @@ #define __VA_START__(p,a) va_start(p) #endif #endif + +#if defined(__linux__) +#include +#endif + #include "pax.h" #include "options.h" diff --git a/cde/programs/dtksh/ksh93/src/cmd/pax/misc.c b/cde/programs/dtksh/ksh93/src/cmd/pax/misc.c index ac06fc143..edffb0d19 100644 --- a/cde/programs/dtksh/ksh93/src/cmd/pax/misc.c +++ b/cde/programs/dtksh/ksh93/src/cmd/pax/misc.c @@ -90,6 +90,11 @@ #define __VA_START__(p,a) va_start(p) #endif #endif + +#if defined(__linux__) +#include +#endif + #include "pax.h" #include "options.h" diff --git a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmtdev.c b/cde/programs/dtksh/ksh93/src/lib/libast/string/fmtdev.c index b3d862e52..3ec25edc6 100644 --- a/cde/programs/dtksh/ksh93/src/lib/libast/string/fmtdev.c +++ b/cde/programs/dtksh/ksh93/src/lib/libast/string/fmtdev.c @@ -90,6 +90,11 @@ #define __VA_START__(p,a) va_start(p) #endif #endif + +#if defined(__linux__) +#include +#endif + #include #include #include