Lines 1-9
Link Here
|
1 |
|
1 |
--- Makefile.defs.orig Wed Jan 11 03:55:58 2006 |
2 |
$FreeBSD: ports/net/ser/files/patch-Makefile.defs,v 1.7 2005/07/08 16:15:11 sobomax Exp $ |
2 |
+++ Makefile.defs Thu Mar 2 19:08:17 2006 |
3 |
|
3 |
@@ -169,10 +169,11 @@ |
4 |
--- Makefile.defs.orig |
|
|
5 |
+++ Makefile.defs |
6 |
@@ -151,10 +151,11 @@ |
7 |
INSTALL-TOUCH = touch # used to create the file first (good to |
4 |
INSTALL-TOUCH = touch # used to create the file first (good to |
8 |
# make solaris install work) |
5 |
# make solaris install work) |
9 |
INSTALL-CFG = $(INSTALL) -m 644 |
6 |
INSTALL-CFG = $(INSTALL) -m 644 |
Lines 19-25
Link Here
|
19 |
|
16 |
|
20 |
#set some vars from the environment (and not make builtins) |
17 |
#set some vars from the environment (and not make builtins) |
21 |
CC := $(shell echo "$${CC}") |
18 |
CC := $(shell echo "$${CC}") |
22 |
@@ -444,8 +445,8 @@ |
19 |
@@ -464,8 +465,8 @@ |
23 |
found_lock_method=yes |
20 |
found_lock_method=yes |
24 |
endif |
21 |
endif |
25 |
|
22 |
|
Lines 30-53
Link Here
|
30 |
# setting CFLAGS |
27 |
# setting CFLAGS |
31 |
ifeq ($(mode), release) |
28 |
ifeq ($(mode), release) |
32 |
#if i386 |
29 |
#if i386 |
33 |
@@ -453,14 +454,13 @@ |
30 |
@@ -473,15 +474,14 @@ |
34 |
# if gcc |
31 |
# if gcc |
35 |
ifeq ($(CC_NAME), gcc) |
32 |
ifeq ($(CC_NAME), gcc) |
36 |
#common stuff |
33 |
#common stuff |
37 |
- CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) \ |
34 |
- CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) \ |
38 |
+ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \ |
35 |
+ CFLAGS=-funroll-loops -Wcast-align $(PROFILE) \ |
39 |
-Wall |
36 |
-Wall |
40 |
#if gcc 3.4+ |
37 |
#if gcc 4.0+ |
41 |
ifeq ($(CC_SHORTVER), 3.4) |
38 |
ifeq ($(CC_SHORTVER), 4.x) |
42 |
CPU ?= athlon |
39 |
CPU ?= athlon64 |
43 |
CFLAGS+=-minline-all-stringops -malign-double \ |
40 |
CFLAGS+=-minline-all-stringops -malign-double \ |
44 |
- -falign-loops \ |
41 |
-falign-loops \ |
|
|
42 |
- -ftree-vectorize \ |
45 |
- -mtune=$(CPU) |
43 |
- -mtune=$(CPU) |
46 |
+ -falign-loops |
44 |
+ -ftree-vectorize |
47 |
else |
45 |
else |
48 |
#if gcc 3.0+ |
46 |
#if gcc 3.4+ |
49 |
ifeq ($(CC_SHORTVER), 3.0) |
47 |
ifeq ($(CC_SHORTVER), 3.4) |
50 |
@@ -486,7 +486,7 @@ |
48 |
@@ -515,7 +515,7 @@ |
51 |
|
49 |
|
52 |
else # CC_NAME, gcc |
50 |
else # CC_NAME, gcc |
53 |
ifeq ($(CC_NAME), icc) |
51 |
ifeq ($(CC_NAME), icc) |
Lines 56-71
Link Here
|
56 |
-tpp6 -xK #-openmp #optimize for PIII |
54 |
-tpp6 -xK #-openmp #optimize for PIII |
57 |
# -prefetch doesn't seem to work |
55 |
# -prefetch doesn't seem to work |
58 |
#( ty to inline acroos files, unroll loops,prefetch, |
56 |
#( ty to inline acroos files, unroll loops,prefetch, |
59 |
@@ -504,7 +504,7 @@ |
57 |
@@ -533,7 +533,7 @@ |
60 |
# if gcc |
58 |
# if gcc |
61 |
ifeq ($(CC_NAME), gcc) |
59 |
ifeq ($(CC_NAME), gcc) |
62 |
#common stuff |
60 |
#common stuff |
63 |
- CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) \ |
61 |
- CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) \ |
64 |
+ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \ |
62 |
+ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \ |
65 |
-Wall |
63 |
-Wall |
66 |
#if gcc 3.4 |
64 |
#if gcc 4.0+ |
67 |
ifeq ($(CC_SHORTVER), 3.4) |
65 |
ifeq ($(CC_SHORTVER), 4.x) |
68 |
@@ -537,7 +537,7 @@ |
66 |
@@ -575,7 +575,7 @@ |
69 |
|
67 |
|
70 |
else # CC_NAME, gcc |
68 |
else # CC_NAME, gcc |
71 |
ifeq ($(CC_NAME), icc) |
69 |
ifeq ($(CC_NAME), icc) |
Lines 74-80
Link Here
|
74 |
-tpp6 -xK #-openmp #optimize for PIII |
72 |
-tpp6 -xK #-openmp #optimize for PIII |
75 |
# -prefetch doesn't seem to work |
73 |
# -prefetch doesn't seem to work |
76 |
#( ty to inline acroos files, unroll loops,prefetch, |
74 |
#( ty to inline acroos files, unroll loops,prefetch, |
77 |
@@ -555,7 +555,7 @@ |
75 |
@@ -593,7 +593,7 @@ |
78 |
#if gcc |
76 |
#if gcc |
79 |
ifeq ($(CC_NAME), gcc) |
77 |
ifeq ($(CC_NAME), gcc) |
80 |
#common stuff |
78 |
#common stuff |
Lines 83-116
Link Here
|
83 |
-Wall\ |
81 |
-Wall\ |
84 |
#-Wcast-align \ |
82 |
#-Wcast-align \ |
85 |
#-Wmissing-prototypes |
83 |
#-Wmissing-prototypes |
86 |
@@ -620,7 +620,7 @@ |
84 |
@@ -667,7 +667,7 @@ |
87 |
# if gcc |
85 |
# if gcc |
88 |
ifeq ($(CC_NAME), gcc) |
86 |
ifeq ($(CC_NAME), gcc) |
89 |
#common stuff |
87 |
#common stuff |
90 |
- CFLAGS=-O9 -funroll-loops -Wcast-align $(PROFILE) \ |
88 |
- CFLAGS=-O9 -funroll-loops -Wcast-align $(PROFILE) \ |
91 |
+ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \ |
89 |
+ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \ |
92 |
-Wall |
90 |
-Wall |
93 |
#if gcc 3.4+ |
91 |
#if gcc 4.x+ |
94 |
ifeq ($(CC_SHORTVER), 3.4) |
92 |
ifeq ($(CC_SHORTVER), 4.x) |
95 |
@@ -656,7 +656,7 @@ |
93 |
@@ -709,7 +709,7 @@ |
96 |
# if gcc |
94 |
# if gcc |
97 |
ifeq ($(CC_NAME), gcc) |
95 |
ifeq ($(CC_NAME), gcc) |
98 |
#common stuff |
96 |
#common stuff |
99 |
- CFLAGS=-O9 -funroll-loops -Wcast-align $(PROFILE) \ |
97 |
- CFLAGS=-O9 -funroll-loops -Wcast-align $(PROFILE) \ |
100 |
+ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \ |
98 |
+ CFLAGS+=-funroll-loops -Wcast-align $(PROFILE) \ |
101 |
-Wall |
99 |
-Wall |
102 |
#if gcc 3.4+ |
100 |
#if gcc 4.0+ |
103 |
ifeq ($(CC_SHORTVER), 3.4) |
101 |
ifeq ($(CC_SHORTVER), 4.x) |
104 |
@@ -692,7 +692,7 @@ |
102 |
@@ -751,7 +751,7 @@ |
105 |
# if gcc |
103 |
# if gcc |
106 |
ifeq ($(CC_NAME), gcc) |
104 |
ifeq ($(CC_NAME), gcc) |
107 |
#common stuff |
105 |
#common stuff |
108 |
- CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) \ |
106 |
- CFLAGS= -mips2 -O9 -funroll-loops $(PROFILE) \ |
109 |
+ CFLAGS+= -mips2 -funroll-loops $(PROFILE) \ |
107 |
+ CFLAGS+= -mips2 -funroll-loops $(PROFILE) \ |
110 |
-Wall |
108 |
-Wall |
111 |
#if gcc 3.4+ |
109 |
#if gcc 4.0+ |
112 |
ifeq ($(CC_SHORTVER), 3.4) |
110 |
ifeq ($(CC_SHORTVER), 4.x) |
113 |
@@ -856,7 +856,7 @@ |
111 |
@@ -932,7 +932,7 @@ |
114 |
# -andrei |
112 |
# -andrei |
115 |
else #mode,release |
113 |
else #mode,release |
116 |
ifeq ($(CC_NAME), gcc) |
114 |
ifeq ($(CC_NAME), gcc) |
Lines 119-125
Link Here
|
119 |
ifeq ($(ARCH), sparc64) |
117 |
ifeq ($(ARCH), sparc64) |
120 |
CFLAGS+= -mcpu=ultrasparc |
118 |
CFLAGS+= -mcpu=ultrasparc |
121 |
endif |
119 |
endif |
122 |
@@ -871,12 +871,12 @@ |
120 |
@@ -947,12 +947,12 @@ |
123 |
endif |
121 |
endif |
124 |
endif |
122 |
endif |
125 |
ifeq ($(CC_NAME), icc) |
123 |
ifeq ($(CC_NAME), icc) |
Lines 134-140
Link Here
|
134 |
LDFLAGS+=-g $(PROFILE) |
132 |
LDFLAGS+=-g $(PROFILE) |
135 |
MOD_LDFLAGS=-G $(LDFLAGS) |
133 |
MOD_LDFLAGS=-G $(LDFLAGS) |
136 |
endif |
134 |
endif |
137 |
@@ -958,7 +958,7 @@ |
135 |
@@ -1034,7 +1034,7 @@ |
138 |
found_lock_method=yes |
136 |
found_lock_method=yes |
139 |
LIBS= -pthread -lfl #dlopen is in libc |
137 |
LIBS= -pthread -lfl #dlopen is in libc |
140 |
else |
138 |
else |