imake/config changes to support more processors, including AMD64 (x86_64)

- also some rework of linux.cf
  - only allow ELF systems
  - use -pipe
  - add some more defines
  - get rid of some of the ancient (libc5/linux 1) support.  Really,
    don't expect CDE to build right on such old systems.
This commit is contained in:
Jon Trulson
2012-06-18 19:50:44 -06:00
parent 4e041a3135
commit 81b0818361
4 changed files with 174 additions and 44 deletions

View File

@@ -56,6 +56,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define UseElfFormat YES
#else
#define UseElfFormat NO
#error "Only ELF format is supported on linux"
#endif
#endif
#define BuildLibPathVar LD_LIBRARY_PATH
@@ -84,30 +85,13 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define NeedWidePrototypes NO
#define SetTtyGroup YES
#if UseElfFormat
#if OSMajorVersion == 1 && OSMinorVersion < 2
#define CcCmd gcc -b i486-linuxelf
#define CplusplusCmd g++ -b i486-linuxelf
#define AsCmd /usr/i486-linuxelf/bin/as
#define LdCmd ld -m elf_i386
#else
#define CcCmd gcc
#define CplusplusCmd g++
#define CcCmd gcc -pipe
#define CplusplusCmd g++ -pipe -fpermissive
#define AsCmd as
#define LdCmd ld
#endif
#define AsmDefines -D__ELF__
#else
#define CcCmd gcc
#if OSMajorVersion == 1 && OSMinorVersion > 1
#define AsCmd /usr/i486-linuxaout/bin/as
#define LdCmd ld -m i386linux
#else
#define AsCmd as
#define LdCmd ld
#endif
#define AsmDefines -DUSE_GAS -U__ELF__
#endif
#define MkdirHierCmd mkdir -p
#define CppCmd /lib/cpp
#if OSMajorVersion >= 2
@@ -132,37 +116,52 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#endif
#if LinuxCLibMajorVersion < 6
#define LinuxSourceDefines -D_POSIX_SOURCE \
# define LinuxSourceDefines -D_POSIX_SOURCE \
-D_BSD_SOURCE -D_SVID_SOURCE LinuxLocaleDefines
#ifndef HasLibCrypt
# define HasLibCrypt NO
#endif
#else
#define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \
-D_POSIX_SOURCE \
-D_BSD_SOURCE -D_SVID_SOURCE
#define HasPosixThreads YES
#define ThreadedX YES
#define HasThreadSafeAPI YES
#define ThreadsLibraries -lpthread
#define SystemMTDefines -D_REENTRANT
#ifndef HasLibCrypt
# define HasLibCrypt YES
#endif
#endif
# ifndef HasLibCrypt
# define HasLibCrypt NO
# endif
XCOMM This is needed for CDE currently
#define CplusplusStandardDefines StandardDefines -fpermissive
#else
# define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \
-D_POSIX_SOURCE \
-D_BSD_SOURCE -D_SVID_SOURCE -D_XOPEN_SOURCE \
-D__NO_STRING_INLINES -D__NO_MATH_INLINES \
LinuxLocaleDefines
# define HasPosixThreads YES
# define ThreadedX YES
# define HasThreadSafeAPI YES
# define ThreadsLibraries -lpthread
# define SystemMTDefines -D_REENTRANT
# ifndef HasLibCrypt
# define HasLibCrypt YES
# endif
#endif
#ifdef i386Architecture
#define OptimizedCDebugFlags DefaultGcc2i386Opt
#define LinuxMachineDefines -D__i386__
/* For DtHelp TIFF processing routines. */
#define LSBBitOrder YES
#if UseElfFormat
#define HasPlugin YES
#define VendorHasX11R6_3libXext YES /* XC or XFree86 3.3.1 */
#endif
#endif /* i386Architecture */
#ifdef AMD64Architecture
#define OptimizedCDebugFlags DefaultGcc2i386Opt
#define LinuxMachineDefines -D__x86_64__
/* For DtHelp TIFF processing routines. */
#define LSBBitOrder YES
#if UseElfFormat
#define HasPlugin YES
#define VendorHasX11R6_3libXext YES /* XC or XFree86 3.3.1 */
#endif
#endif /* AMD64Architecture */
#ifdef AlphaArchitecture
#define OptimizedCDebugFlags -O2
#define LinuxMachineDefines -D__alpha__
@@ -171,13 +170,16 @@ XCOMM This is needed for CDE currently
#ifdef Mc68020Architecture
#define OptimizedCDebugFlags -O2
#define LinuxMachineDefines -D__mc68000__
#define StandardCppDefines -traditional StandardDefines
#define StandardCppDefines -traditional
#endif /* Mc68020Architecture */
#define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines
#define ConnectionFlags -DUNIXCONN -DTCPCONN
XCOMM This is needed for CDE currently
#define CplusplusStandardDefines StandardDefines
/* Some of these man page defaults are overriden in the above OS sections */
#ifndef ManSuffix
# define ManSuffix 1x