external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

linux.cf: use -fno-strict-aliasing, define DefaultGcc2i386Opt, use indenting to improve readability

Browse source
This commit is contained in:
Jon Trulson 2012-10-01 19:27:36 -06:00
parent de61ffa637
commit cc5544354f
1 changed files with 56 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

107
cde/config/cf/linux.cf
View file

@ -6,16 +6,16 @@ XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess $
#define TopXInclude -isystem$(TOP)/imports/x11/include #define TopXInclude -isystem$(TOP)/imports/x11/include
#ifndef OSName #ifndef OSName
#define OSName DefaultOSName # define OSName DefaultOSName
#endif #endif
#ifndef OSMajorVersion #ifndef OSMajorVersion
#define OSMajorVersion DefaultOSMajorVersion # define OSMajorVersion DefaultOSMajorVersion
#endif #endif
#ifndef OSMinorVersion #ifndef OSMinorVersion
#define OSMinorVersion DefaultOSMinorVersion # define OSMinorVersion DefaultOSMinorVersion
#endif #endif
#ifndef OSTeenyVersion #ifndef OSTeenyVersion
#define OSTeenyVersion DefaultOSTeenyVersion # define OSTeenyVersion DefaultOSTeenyVersion
#endif #endif
#ifndef LinuxDistribution #ifndef LinuxDistribution
@ -40,16 +40,16 @@ XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess $
*/ */
#endif #endif
#ifndef LinuxCLibMajorVersion #ifndef LinuxCLibMajorVersion
#define LinuxCLibMajorVersion DefaultLinuxCLibMajorVersion # define LinuxCLibMajorVersion DefaultLinuxCLibMajorVersion
#endif #endif
#ifndef LinuxCLibMinorVersion #ifndef LinuxCLibMinorVersion
#define LinuxCLibMinorVersion DefaultLinuxCLibMinorVersion # define LinuxCLibMinorVersion DefaultLinuxCLibMinorVersion
#endif #endif
#ifndef LinuxCLibTeenyVersion #ifndef LinuxCLibTeenyVersion
#define LinuxCLibTeenyVersion DefaultLinuxCLibTeenyVersion # define LinuxCLibTeenyVersion DefaultLinuxCLibTeenyVersion
#endif #endif
#ifndef LinuxBinUtilsMajorVersion #ifndef LinuxBinUtilsMajorVersion
#define LinuxBinUtilsMajorVersion DefaultLinuxBinUtilsMajorVersion # define LinuxBinUtilsMajorVersion DefaultLinuxBinUtilsMajorVersion
#endif #endif
XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
@ -57,13 +57,14 @@ XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeeny
XCOMM binutils: (LinuxBinUtilsMajorVersion) XCOMM binutils: (LinuxBinUtilsMajorVersion)
#ifndef UseElfFormat #ifndef UseElfFormat
#if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 1) # if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 1)
#define UseElfFormat YES # define UseElfFormat YES
#else # else
#define UseElfFormat NO # define UseElfFormat NO
#error "Only ELF format is supported on linux" # error "Only ELF format is supported on linux"
#endif # endif
#endif #endif
#define BuildLibPathVar LD_LIBRARY_PATH #define BuildLibPathVar LD_LIBRARY_PATH
#define HasGcc YES #define HasGcc YES
#define HasGcc2 YES #define HasGcc2 YES
@ -76,7 +77,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define HasShm YES #define HasShm YES
#define HasSockets YES #define HasSockets YES
#if (LinuxDistribution == LinuxRedHat) #if (LinuxDistribution == LinuxRedHat)
#define HasZlib YES # define HasZlib YES
#endif #endif
#define AvoidNullMakeCommand YES #define AvoidNullMakeCommand YES
@ -101,9 +102,9 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define MkdirHierCmd mkdir -p #define MkdirHierCmd mkdir -p
#define CppCmd /lib/cpp #define CppCmd /lib/cpp
#if OSMajorVersion >= 2 #if OSMajorVersion >= 2
#define YaccCmd yacc # define YaccCmd yacc
#else #else
#define YaccCmd bison -y # define YaccCmd bison -y
#endif #endif
#define LexCmd flex -l #define LexCmd flex -l
#define LexLib -lfl #define LexLib -lfl
@ -133,6 +134,10 @@ TIRPCLIB = -ltirpc
TIRPCLIB = TIRPCLIB =
#endif #endif
#if !defined(DefaultGcc2i386Opt)
# define DefaultGcc2i386Opt -O2 -fno-strict-aliasing
#endif
#if LinuxCLibMajorVersion < 6 #if LinuxCLibMajorVersion < 6
# define LinuxSourceDefines -D_POSIX_SOURCE \ # define LinuxSourceDefines -D_POSIX_SOURCE \
-D_BSD_SOURCE -D_SVID_SOURCE LinuxLocaleDefines -D_BSD_SOURCE -D_SVID_SOURCE LinuxLocaleDefines
@ -157,66 +162,66 @@ TIRPCLIB =
#endif #endif
#ifdef SparcArchitecture #ifdef SparcArchitecture
#define LinuxMachineDefines -Dsparc # define LinuxMachineDefines -Dsparc
#if UseElfFormat # if UseElfFormat
#define HasPlugin YES # define HasPlugin YES
#define VendorHasX11R6_3libXext YES /* XC or XFree86 3.3.1 */ # define VendorHasX11R6_3libXext YES /* XC or XFree86 3.3.1 */
#endif # endif
#endif /* SparcArchitecture */ #endif /* SparcArchitecture */
#ifdef ARMArchitecture #ifdef ARMArchitecture
#define LinuxMachineDefines -D__arm__ # define LinuxMachineDefines -D__arm__
#define LSBBitOrder YES # define LSBBitOrder YES
#if UseElfFormat # if UseElfFormat
#define HasPlugin YES # define HasPlugin YES
#define VendorHasX11R6_3libXext YES /* XC or XFree86 3.3.1 */ # define VendorHasX11R6_3libXext YES /* XC or XFree86 3.3.1 */
#endif # endif
#endif /* ARMArchitecture */ #endif /* ARMArchitecture */
#ifdef i386Architecture #ifdef i386Architecture
#define OptimizedCDebugFlags DefaultGcc2i386Opt # define OptimizedCDebugFlags DefaultGcc2i386Opt
#define LinuxMachineDefines -D__i386__ # define LinuxMachineDefines -D__i386__
/* For DtHelp TIFF processing routines. */ /* For DtHelp TIFF processing routines. */
#define LSBBitOrder YES # define LSBBitOrder YES
#if UseElfFormat # if UseElfFormat
#define HasPlugin YES # define HasPlugin YES
#define VendorHasX11R6_3libXext YES /* XC or XFree86 3.3.1 */ # define VendorHasX11R6_3libXext YES /* XC or XFree86 3.3.1 */
#endif # endif
/* add this to void screenfuls of warnings from makedepend */ /* add this to void screenfuls of warnings from makedepend */
#define DependFlags -I/usr/include/i386-linux-gnu # define DependFlags -I/usr/include/i386-linux-gnu
#endif /* i386Architecture */ #endif /* i386Architecture */
#ifdef AMD64Architecture #ifdef AMD64Architecture
#define OptimizedCDebugFlags DefaultGcc2i386Opt # define OptimizedCDebugFlags DefaultGcc2i386Opt
#define LinuxMachineDefines -D__x86_64__ # define LinuxMachineDefines -D__x86_64__
/* For DtHelp TIFF processing routines. */ /* For DtHelp TIFF processing routines. */
#define LSBBitOrder YES # define LSBBitOrder YES
#if UseElfFormat # if UseElfFormat
#define HasPlugin YES # define HasPlugin YES
#define VendorHasX11R6_3libXext YES /* XC or XFree86 3.3.1 */ # define VendorHasX11R6_3libXext YES /* XC or XFree86 3.3.1 */
#endif # endif
/* add this to void screenfuls of warnings from makedepend */ /* add this to void screenfuls of warnings from makedepend */
#define DependFlags -I/usr/include/x86_64-linux-gnu # define DependFlags -I/usr/include/x86_64-linux-gnu
#endif /* AMD64Architecture */ #endif /* AMD64Architecture */
#ifdef PpcArchitecture #ifdef PpcArchitecture
#define OptimizedCDebugFlags -O2 # define OptimizedCDebugFlags DefaultGcc2i386Opt
#define LinuxMachineDefines -D__powerpc__ # define LinuxMachineDefines -D__powerpc__
#endif /* PpcArchitecture */ #endif /* PpcArchitecture */
#ifdef AlphaArchitecture #ifdef AlphaArchitecture
#define OptimizedCDebugFlags -O2 # define OptimizedCDebugFlags DefaultGcc2i386Opt
#define LinuxMachineDefines -D__alpha__ # define LinuxMachineDefines -D__alpha__
#endif /* AlphaArchitecture */ #endif /* AlphaArchitecture */
#ifdef Mc68020Architecture #ifdef Mc68020Architecture
#define OptimizedCDebugFlags -O2 # define OptimizedCDebugFlags DefaultGcc2i386Opt
#define LinuxMachineDefines -D__mc68000__ # define LinuxMachineDefines -D__mc68000__
#define StandardCppDefines -traditional # define StandardCppDefines -traditional
#endif /* Mc68020Architecture */ #endif /* Mc68020Architecture */
#define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines #define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines