comparison auto/cc/gcc @ 578:f3a9e57d2e17

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Mar 2010 21:27:17 +0300
parents 2da4537168f8
children
comparison
equal deleted inserted replaced
539:5f4de8cf0d9d 578:f3a9e57d2e17
49 49
50 #NGX_GCC_OPT="-O2" 50 #NGX_GCC_OPT="-O2"
51 #NGX_GCC_OPT="-Os" 51 #NGX_GCC_OPT="-Os"
52 NGX_GCC_OPT="-O" 52 NGX_GCC_OPT="-O"
53 53
54 CFLAGS="$CFLAGS $NGX_GCC_OPT"
55
56 #CFLAGS="$CFLAGS -fomit-frame-pointer" 54 #CFLAGS="$CFLAGS -fomit-frame-pointer"
57 55
58 case $CPU in 56 case $CPU in
59 pentium) 57 pentium)
60 # optimize for Pentium and Athlon 58 # optimize for Pentium and Athlon
88 86
89 sparc32) 87 sparc32)
90 # build 32-bit UltraSparc binary 88 # build 32-bit UltraSparc binary
91 CPU_OPT="-m32" 89 CPU_OPT="-m32"
92 CORE_LINK="$CORE_LINK -m32" 90 CORE_LINK="$CORE_LINK -m32"
93 CC_AUX_FLAGS="$CC_AUX_FLAGS -m32"
94 NGX_CPU_CACHE_LINE=64 91 NGX_CPU_CACHE_LINE=64
95 ;; 92 ;;
96 93
97 sparc64) 94 sparc64)
98 # build 64-bit UltraSparc binary 95 # build 64-bit UltraSparc binary
99 CPU_OPT="-m64" 96 CPU_OPT="-m64"
100 CORE_LINK="$CORE_LINK -m64" 97 CORE_LINK="$CORE_LINK -m64"
101 CC_AUX_FLAGS="$CC_AUX_FLAGS -m64"
102 NGX_CPU_CACHE_LINE=64 98 NGX_CPU_CACHE_LINE=64
103 ;; 99 ;;
104 100
105 ppc64) 101 ppc64)
106 # build 64-bit PowerPC binary 102 # build 64-bit PowerPC binary
107 CPU_OPT="-m64" 103 CPU_OPT="-m64"
108 CPU_OPT="$CPU_OPT -falign-functions=32 -falign-labels=32" 104 CPU_OPT="$CPU_OPT -falign-functions=32 -falign-labels=32"
109 CPU_OPT="$CPU_OPT -falign-loops=32 -falign-jumps=32" 105 CPU_OPT="$CPU_OPT -falign-loops=32 -falign-jumps=32"
110 CORE_LINK="$CORE_LINK -m64" 106 CORE_LINK="$CORE_LINK -m64"
111 CC_AUX_FLAGS="$CC_AUX_FLAGS -m64"
112 NGX_CPU_CACHE_LINE=128 107 NGX_CPU_CACHE_LINE=128
113 ;; 108 ;;
114 109
115 esac 110 esac
116 111
112 CC_AUX_FLAGS="$CC_AUX_FLAGS $CPU_OPT"
117 113
118 case "$NGX_GCC_VER" in 114 case "$NGX_GCC_VER" in
119 2.7*) 115 2.7*)
120 # batch build 116 # batch build
121 CPU_OPT= 117 CPU_OPT=