... | ... |
@@ -8,7 +8,7 @@ |
8 | 8 |
VERSION = 0 |
9 | 9 |
PATCHLEVEL = 8 |
10 | 10 |
SUBLEVEL = 7 |
11 |
-EXTRAVERSION = -6-unstable |
|
11 |
+EXTRAVERSION = -7-ipaq |
|
12 | 12 |
|
13 | 13 |
RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) |
14 | 14 |
OS = $(shell uname -s) |
... | ... |
@@ -84,9 +84,10 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \ |
84 | 84 |
-DF_MALLOC -DUSE_SYNONIM\ |
85 | 85 |
-DSHM_MEM -DSHM_MMAP \ |
86 | 86 |
-DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 \ |
87 |
- -DWAIT -DNEW_HNAME -DNOISY_REPLIES -DBOGDAN_TRIFLE \ |
|
87 |
+ -DWAIT -DNEW_HNAME \ |
|
88 | 88 |
-DSILENT_FR \ |
89 | 89 |
-DNO_DEBUG \ |
90 |
+ #-DNOISY_REPLIES \ |
|
90 | 91 |
#-DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=0 \ |
91 | 92 |
#-DNOSMP \ |
92 | 93 |
#-DEXTRA_DEBUG |
... | ... |
@@ -168,6 +169,11 @@ ifeq ($(CC_NAME), gcc) |
168 | 169 |
endif |
169 | 170 |
endif |
170 | 171 |
|
172 |
+ifeq ($(ARCH), armv4l) |
|
173 |
+ DEFS+= -DFAST_LOCK |
|
174 |
+endif |
|
175 |
+ |
|
176 |
+ |
|
171 | 177 |
|
172 | 178 |
# setting CFLAGS |
173 | 179 |
ifeq ($(mode), release) |
... | ... |
@@ -54,7 +54,7 @@ inline static int tsl(fl_lock_t* lock) |
54 | 54 |
: "=r"(val) : "r"(lock):"memory" |
55 | 55 |
); |
56 | 56 |
|
57 |
-#elif defined __armv4l |
|
57 |
+#elif defined __arm__ |
|
58 | 58 |
asm volatile( |
59 | 59 |
"# here \n\t" |
60 | 60 |
"swpb %0, %1, [%2] \n\t" |
... | ... |
@@ -108,7 +108,7 @@ inline static void release_lock(fl_lock_t* lock) |
108 | 108 |
: "r" (lock) |
109 | 109 |
: "memory" |
110 | 110 |
); |
111 |
-#elif defined __armv4l |
|
111 |
+#elif defined __arm__ |
|
112 | 112 |
asm volatile( |
113 | 113 |
" str %0, [%1] \n\r" |
114 | 114 |
: /*no outputs*/ |