Imanol-Mikel Barba Sabariego / smartcities · Commits

Commit 08c7da6d2bf3796d2af1861b8b8e80f914a54fc7

Authored by Ferràn Quer i Guerrero
1 parent 7b319cf9

--no commit message

Inline Side-by-side
Showing 61 changed files with 46005 additions and 64065 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 29 of 61 files are displayed.

Project/applications/smartcities/.dep/chcond.o.d
  View file @08c7da6
1 build/obj/chcond.o: ../..//os/kernel/src/chcond.c \ 1 build/obj/chcond.o: ../..//os/kernel/src/chcond.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chcond.o: ../..//os/kernel/src/chcond.c \ @@ -27,11 +27,11 @@ build/obj/chcond.o: ../..//os/kernel/src/chcond.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chcore.o.d
  View file @08c7da6
1 build/obj/chcore.o: ../..//os/ports/GCC/ARMCMx/chcore.c \ 1 build/obj/chcore.o: ../..//os/ports/GCC/ARMCMx/chcore.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chcore.o: ../..//os/ports/GCC/ARMCMx/chcore.c \ @@ -27,11 +27,11 @@ build/obj/chcore.o: ../..//os/ports/GCC/ARMCMx/chcore.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chcore_v7m.o.d
  View file @08c7da6
1 build/obj/chcore_v7m.o: ../..//os/ports/GCC/ARMCMx/chcore_v7m.c \ 1 build/obj/chcore_v7m.o: ../..//os/ports/GCC/ARMCMx/chcore_v7m.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chcore_v7m.o: ../..//os/ports/GCC/ARMCMx/chcore_v7m.c \ @@ -27,11 +27,11 @@ build/obj/chcore_v7m.o: ../..//os/ports/GCC/ARMCMx/chcore_v7m.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chdebug.o.d
  View file @08c7da6
1 build/obj/chdebug.o: ../..//os/kernel/src/chdebug.c \ 1 build/obj/chdebug.o: ../..//os/kernel/src/chdebug.c \
2 ../..//econais/libwismart.h ../..//os/kernel/include/ch.h \ 2 ../..//econais/libwismart.h ../..//os/kernel/include/ch.h \
3 ../..//econais/inc/STM32F1/chconf.h ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//econais/inc/STM32F1/chconf.h ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -20,28 +20,28 @@ build/obj/chdebug.o: ../..//os/kernel/src/chdebug.c \ @@ -20,28 +20,28 @@ build/obj/chdebug.o: ../..//os/kernel/src/chdebug.c \
20 ../..//os/kernel/include/chinline.h ../..//os/kernel/include/chqueues.h \ 20 ../..//os/kernel/include/chinline.h ../..//os/kernel/include/chqueues.h \
21 ../..//os/kernel/include/chstreams.h ../..//os/kernel/include/chioch.h \ 21 ../..//os/kernel/include/chstreams.h ../..//os/kernel/include/chioch.h \
22 ../..//os/kernel/include/chfiles.h ../..//os/kernel/include/chdebug.h \ 22 ../..//os/kernel/include/chfiles.h ../..//os/kernel/include/chdebug.h \
23 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdio.h \  
24 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \  
25 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/newlib.h \  
26 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h \  
27 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h \  
28 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h \  
29 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdarg.h \  
30 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h \  
31 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \  
32 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h \  
33 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h \  
34 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h \  
35 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h \  
36 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h \  
37 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h \  
38 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/stdio.h \  
39 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/string.h \  
40 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h \  
41 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h \  
42 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h \  
43 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h \  
44 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/alloca.h \ 23 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdio.h \
  24 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \
  25 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/newlib.h \
  26 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h \
  27 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h \
  28 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h \
  29 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdarg.h \
  30 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h \
  31 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \
  32 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h \
  33 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h \
  34 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h \
  35 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h \
  36 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h \
  37 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h \
  38 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/stdio.h \
  39 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/string.h \
  40 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h \
  41 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h \
  42 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h \
  43 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h \
  44 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/alloca.h \
45 ../..//econais/libwismart_mcu.h 45 ../..//econais/libwismart_mcu.h
46 46
47 ../..//econais/libwismart.h: 47 ../..//econais/libwismart.h:
@@ -52,11 +52,11 @@ build/obj/chdebug.o: ../..//os/kernel/src/chdebug.c \ @@ -52,11 +52,11 @@ build/obj/chdebug.o: ../..//os/kernel/src/chdebug.c \
52 52
53 ../..//os/ports/GCC/ARMCMx/chtypes.h: 53 ../..//os/ports/GCC/ARMCMx/chtypes.h:
54 54
55 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 55 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
56 56
57 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 57 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
58 58
59 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 59 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
60 60
61 ../..//os/kernel/include/chlists.h: 61 ../..//os/kernel/include/chlists.h:
62 62
@@ -112,48 +112,48 @@ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: @@ -112,48 +112,48 @@ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
112 112
113 ../..//os/kernel/include/chdebug.h: 113 ../..//os/kernel/include/chdebug.h:
114 114
115 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdio.h: 115 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdio.h:
116 116
117 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h: 117 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
118 118
119 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/newlib.h: 119 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/newlib.h:
120 120
121 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h: 121 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h:
122 122
123 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h: 123 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h:
124 124
125 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h: 125 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h:
126 126
127 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdarg.h: 127 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdarg.h:
128 128
129 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h: 129 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h:
130 130
131 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h: 131 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
132 132
133 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h: 133 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h:
134 134
135 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h: 135 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h:
136 136
137 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h: 137 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h:
138 138
139 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h: 139 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h:
140 140
141 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h: 141 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h:
142 142
143 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h: 143 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h:
144 144
145 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/stdio.h: 145 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/stdio.h:
146 146
147 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/string.h: 147 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/string.h:
148 148
149 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h: 149 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h:
150 150
151 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h: 151 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h:
152 152
153 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h: 153 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h:
154 154
155 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h: 155 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h:
156 156
157 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/alloca.h: 157 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/alloca.h:
158 158
159 ../..//econais/libwismart_mcu.h: 159 ../..//econais/libwismart_mcu.h:
Project/applications/smartcities/.dep/chdynamic.o.d
  View file @08c7da6
1 build/obj/chdynamic.o: ../..//os/kernel/src/chdynamic.c \ 1 build/obj/chdynamic.o: ../..//os/kernel/src/chdynamic.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chdynamic.o: ../..//os/kernel/src/chdynamic.c \ @@ -27,11 +27,11 @@ build/obj/chdynamic.o: ../..//os/kernel/src/chdynamic.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chevents.o.d
  View file @08c7da6
1 build/obj/chevents.o: ../..//os/kernel/src/chevents.c \ 1 build/obj/chevents.o: ../..//os/kernel/src/chevents.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chevents.o: ../..//os/kernel/src/chevents.c \ @@ -27,11 +27,11 @@ build/obj/chevents.o: ../..//os/kernel/src/chevents.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chheap.o.d
  View file @08c7da6
1 build/obj/chheap.o: ../..//os/kernel/src/chheap.c \ 1 build/obj/chheap.o: ../..//os/kernel/src/chheap.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chheap.o: ../..//os/kernel/src/chheap.c \ @@ -27,11 +27,11 @@ build/obj/chheap.o: ../..//os/kernel/src/chheap.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chlists.o.d
  View file @08c7da6
1 build/obj/chlists.o: ../..//os/kernel/src/chlists.c \ 1 build/obj/chlists.o: ../..//os/kernel/src/chlists.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chlists.o: ../..//os/kernel/src/chlists.c \ @@ -27,11 +27,11 @@ build/obj/chlists.o: ../..//os/kernel/src/chlists.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chmboxes.o.d
  View file @08c7da6
1 build/obj/chmboxes.o: ../..//os/kernel/src/chmboxes.c \ 1 build/obj/chmboxes.o: ../..//os/kernel/src/chmboxes.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chmboxes.o: ../..//os/kernel/src/chmboxes.c \ @@ -27,11 +27,11 @@ build/obj/chmboxes.o: ../..//os/kernel/src/chmboxes.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chmemcore.o.d
  View file @08c7da6
1 build/obj/chmemcore.o: ../..//os/kernel/src/chmemcore.c \ 1 build/obj/chmemcore.o: ../..//os/kernel/src/chmemcore.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chmemcore.o: ../..//os/kernel/src/chmemcore.c \ @@ -27,11 +27,11 @@ build/obj/chmemcore.o: ../..//os/kernel/src/chmemcore.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chmempools.o.d
  View file @08c7da6
1 build/obj/chmempools.o: ../..//os/kernel/src/chmempools.c \ 1 build/obj/chmempools.o: ../..//os/kernel/src/chmempools.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chmempools.o: ../..//os/kernel/src/chmempools.c \ @@ -27,11 +27,11 @@ build/obj/chmempools.o: ../..//os/kernel/src/chmempools.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chmsg.o.d
  View file @08c7da6
1 build/obj/chmsg.o: ../..//os/kernel/src/chmsg.c \ 1 build/obj/chmsg.o: ../..//os/kernel/src/chmsg.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chmsg.o: ../..//os/kernel/src/chmsg.c \ @@ -27,11 +27,11 @@ build/obj/chmsg.o: ../..//os/kernel/src/chmsg.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chmtx.o.d
  View file @08c7da6
1 build/obj/chmtx.o: ../..//os/kernel/src/chmtx.c \ 1 build/obj/chmtx.o: ../..//os/kernel/src/chmtx.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chmtx.o: ../..//os/kernel/src/chmtx.c \ @@ -27,11 +27,11 @@ build/obj/chmtx.o: ../..//os/kernel/src/chmtx.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chqueues.o.d
  View file @08c7da6
1 build/obj/chqueues.o: ../..//os/kernel/src/chqueues.c \ 1 build/obj/chqueues.o: ../..//os/kernel/src/chqueues.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chqueues.o: ../..//os/kernel/src/chqueues.c \ @@ -27,11 +27,11 @@ build/obj/chqueues.o: ../..//os/kernel/src/chqueues.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chregistry.o.d
  View file @08c7da6
1 build/obj/chregistry.o: ../..//os/kernel/src/chregistry.c \ 1 build/obj/chregistry.o: ../..//os/kernel/src/chregistry.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chregistry.o: ../..//os/kernel/src/chregistry.c \ @@ -27,11 +27,11 @@ build/obj/chregistry.o: ../..//os/kernel/src/chregistry.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chschd.o.d
  View file @08c7da6
1 build/obj/chschd.o: ../..//os/kernel/src/chschd.c \ 1 build/obj/chschd.o: ../..//os/kernel/src/chschd.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chschd.o: ../..//os/kernel/src/chschd.c \ @@ -27,11 +27,11 @@ build/obj/chschd.o: ../..//os/kernel/src/chschd.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chsem.o.d
  View file @08c7da6
1 build/obj/chsem.o: ../..//os/kernel/src/chsem.c \ 1 build/obj/chsem.o: ../..//os/kernel/src/chsem.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chsem.o: ../..//os/kernel/src/chsem.c \ @@ -27,11 +27,11 @@ build/obj/chsem.o: ../..//os/kernel/src/chsem.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chsys.o.d
  View file @08c7da6
1 build/obj/chsys.o: ../..//os/kernel/src/chsys.c \ 1 build/obj/chsys.o: ../..//os/kernel/src/chsys.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chsys.o: ../..//os/kernel/src/chsys.c \ @@ -27,11 +27,11 @@ build/obj/chsys.o: ../..//os/kernel/src/chsys.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chthreads.o.d
  View file @08c7da6
1 build/obj/chthreads.o: ../..//os/kernel/src/chthreads.c \ 1 build/obj/chthreads.o: ../..//os/kernel/src/chthreads.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chthreads.o: ../..//os/kernel/src/chthreads.c \ @@ -27,11 +27,11 @@ build/obj/chthreads.o: ../..//os/kernel/src/chthreads.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/chvt.o.d
  View file @08c7da6
1 build/obj/chvt.o: ../..//os/kernel/src/chvt.c \ 1 build/obj/chvt.o: ../..//os/kernel/src/chvt.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/chvt.o: ../..//os/kernel/src/chvt.c \ @@ -27,11 +27,11 @@ build/obj/chvt.o: ../..//os/kernel/src/chvt.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/crt0.o.d
  View file @08c7da6
1 build/obj/crt0.o: ../..//os/ports/GCC/ARMCMx/crt0.c \ 1 build/obj/crt0.o: ../..//os/ports/GCC/ARMCMx/crt0.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/crt0.o: ../..//os/ports/GCC/ARMCMx/crt0.c \ @@ -27,11 +27,11 @@ build/obj/crt0.o: ../..//os/ports/GCC/ARMCMx/crt0.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/.dep/evtimer.o.d
  View file @08c7da6
1 build/obj/evtimer.o: ../..//os/various/evtimer.c \ 1 build/obj/evtimer.o: ../..//os/various/evtimer.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -28,11 +28,11 @@ build/obj/evtimer.o: ../..//os/various/evtimer.c \ @@ -28,11 +28,11 @@ build/obj/evtimer.o: ../..//os/various/evtimer.c \
28 28
29 ../..//os/ports/GCC/ARMCMx/chtypes.h: 29 ../..//os/ports/GCC/ARMCMx/chtypes.h:
30 30
31 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 31 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
32 32
33 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 33 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
34 34
35 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 35 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
36 36
37 ../..//os/kernel/include/chlists.h: 37 ../..//os/kernel/include/chlists.h:
38 38
Project/applications/smartcities/.dep/main.o.d
  View file @08c7da6
@@ -83,7 +83,8 @@ build/obj/main.o: main.c ../..//econais/libwismart.h \ @@ -83,7 +83,8 @@ build/obj/main.o: main.c ../..//econais/libwismart.h \
83 ../..//externalModules/lwip_v141/src/include/lwip/sys.h \ 83 ../..//externalModules/lwip_v141/src/include/lwip/sys.h \
84 ../..//externalModules/lwip_v141/port/arch/sys_arch.h \ 84 ../..//externalModules/lwip_v141/port/arch/sys_arch.h \
85 ../..//externalModules/lwip_v141/src/include/lwip/api.h \ 85 ../..//externalModules/lwip_v141/src/include/lwip/api.h \
86 - ../..//externalModules/lwip_v141/src/include/lwip/netbuf.h 86 + ../..//externalModules/lwip_v141/src/include/lwip/netbuf.h \
  87 + include/callbacks.h
87 88
88 ../..//econais/libwismart.h: 89 ../..//econais/libwismart.h:
89 90
@@ -282,3 +283,5 @@ include/httpClient.h: @@ -282,3 +283,5 @@ include/httpClient.h:
282 ../..//externalModules/lwip_v141/src/include/lwip/api.h: 283 ../..//externalModules/lwip_v141/src/include/lwip/api.h:
283 284
284 ../..//externalModules/lwip_v141/src/include/lwip/netbuf.h: 285 ../..//externalModules/lwip_v141/src/include/lwip/netbuf.h:
  286 +
  287 +include/callbacks.h:
Project/applications/smartcities/.dep/nvic.o.d
  View file @08c7da6
1 build/obj/nvic.o: ../..//os/ports/common/ARMCMx/nvic.c \ 1 build/obj/nvic.o: ../..//os/ports/common/ARMCMx/nvic.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -28,11 +28,11 @@ build/obj/nvic.o: ../..//os/ports/common/ARMCMx/nvic.c \ @@ -28,11 +28,11 @@ build/obj/nvic.o: ../..//os/ports/common/ARMCMx/nvic.c \
28 28
29 ../..//os/ports/GCC/ARMCMx/chtypes.h: 29 ../..//os/ports/GCC/ARMCMx/chtypes.h:
30 30
31 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 31 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
32 32
33 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 33 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
34 34
35 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 35 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
36 36
37 ../..//os/kernel/include/chlists.h: 37 ../..//os/kernel/include/chlists.h:
38 38
Project/applications/smartcities/.dep/syscalls.o.d
  View file @08c7da6
1 build/obj/syscalls.o: ../..//os/various/syscalls.c \ 1 build/obj/syscalls.o: ../..//os/various/syscalls.c \
2 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h \  
3 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h \  
4 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \  
5 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/newlib.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h \  
7 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h \  
8 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
9 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h \  
10 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \  
11 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h \  
12 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h \  
13 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h \  
14 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h \  
15 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h \  
16 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/alloca.h \  
17 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/errno.h \  
18 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/errno.h \  
19 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/string.h \  
20 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h \  
21 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h \  
22 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/stat.h \  
23 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/time.h \  
24 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/time.h \  
25 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h \  
26 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h \ 2 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h \
  3 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h \
  4 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \
  5 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/newlib.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h \
  7 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h \
  8 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  9 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h \
  10 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h \
  11 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h \
  12 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h \
  13 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h \
  14 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h \
  15 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h \
  16 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/alloca.h \
  17 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/errno.h \
  18 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/errno.h \
  19 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/string.h \
  20 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h \
  21 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h \
  22 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/stat.h \
  23 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/time.h \
  24 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/time.h \
  25 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h \
  26 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h \
27 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 27 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
28 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 28 ../..//os/ports/GCC/ARMCMx/chtypes.h \
29 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
30 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 29 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  30 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
31 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 31 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
32 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 32 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
33 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 33 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -45,55 +45,55 @@ build/obj/syscalls.o: ../..//os/various/syscalls.c \ @@ -45,55 +45,55 @@ build/obj/syscalls.o: ../..//os/various/syscalls.c \
45 ../..//os/kernel/include/chstreams.h ../..//os/kernel/include/chioch.h \ 45 ../..//os/kernel/include/chstreams.h ../..//os/kernel/include/chioch.h \
46 ../..//os/kernel/include/chfiles.h ../..//os/kernel/include/chdebug.h 46 ../..//os/kernel/include/chfiles.h ../..//os/kernel/include/chdebug.h
47 47
48 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h: 48 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h:
49 49
50 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h: 50 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h:
51 51
52 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h: 52 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
53 53
54 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/newlib.h: 54 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/newlib.h:
55 55
56 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h: 56 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h:
57 57
58 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h: 58 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h:
59 59
60 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 60 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
61 61
62 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h: 62 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h:
63 63
64 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h: 64 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
65 65
66 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h: 66 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h:
67 67
68 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h: 68 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h:
69 69
70 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h: 70 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h:
71 71
72 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h: 72 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h:
73 73
74 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h: 74 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h:
75 75
76 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/alloca.h: 76 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/alloca.h:
77 77
78 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/errno.h: 78 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/errno.h:
79 79
80 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/errno.h: 80 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/errno.h:
81 81
82 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/string.h: 82 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/string.h:
83 83
84 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h: 84 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h:
85 85
86 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h: 86 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h:
87 87
88 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/stat.h: 88 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/stat.h:
89 89
90 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/time.h: 90 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/time.h:
91 91
92 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/time.h: 92 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/time.h:
93 93
94 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h: 94 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h:
95 95
96 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h: 96 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h:
97 97
98 ../..//os/kernel/include/ch.h: 98 ../..//os/kernel/include/ch.h:
99 99
@@ -101,9 +101,9 @@ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h: @@ -101,9 +101,9 @@ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h:
101 101
102 ../..//os/ports/GCC/ARMCMx/chtypes.h: 102 ../..//os/ports/GCC/ARMCMx/chtypes.h:
103 103
104 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 104 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
105 105
106 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 106 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
107 107
108 ../..//os/kernel/include/chlists.h: 108 ../..//os/kernel/include/chlists.h:
109 109
Project/applications/smartcities/.dep/vectors.o.d
  View file @08c7da6
1 build/obj/vectors.o: ../..//os/ports/GCC/ARMCMx/STM32F1xx/vectors.c \ 1 build/obj/vectors.o: ../..//os/ports/GCC/ARMCMx/STM32F1xx/vectors.c \
2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \ 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 ../..//os/ports/GCC/ARMCMx/chtypes.h \ 3 ../..//os/ports/GCC/ARMCMx/chtypes.h \
4 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \  
5 - c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \  
6 - c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \ 4 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h \
  5 + c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h \
  6 + c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h \
7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \ 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \ 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \ 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
@@ -27,11 +27,11 @@ build/obj/vectors.o: ../..//os/ports/GCC/ARMCMx/STM32F1xx/vectors.c \ @@ -27,11 +27,11 @@ build/obj/vectors.o: ../..//os/ports/GCC/ARMCMx/STM32F1xx/vectors.c \
27 27
28 ../..//os/ports/GCC/ARMCMx/chtypes.h: 28 ../..//os/ports/GCC/ARMCMx/chtypes.h:
29 29
30 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h: 30 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
31 31
32 -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h: 32 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
33 33
34 -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h: 34 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
35 35
36 ../..//os/kernel/include/chlists.h: 36 ../..//os/kernel/include/chlists.h:
37 37
Project/applications/smartcities/Makefile
  View file @08c7da6
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 SDK_ROOT = ../../ 10 SDK_ROOT = ../../
11 PROJECT_OUT = smartcities 11 PROJECT_OUT = smartcities
12 12
13 -USER_SRC = main.c httpClient.c callbacks.c 13 +USER_SRC = main.c httpClient.c
14 USER_INCDIR = include/ 14 USER_INCDIR = include/
15 15
16 # if you need to add build Defines options add to USER_DEFS define 16 # if you need to add build Defines options add to USER_DEFS define
Project/applications/smartcities/build/lst/chcond.lst
  View file @08c7da6
1 -<<<<<<< .mine  
2 -ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 1  
3 -=======  
4 -ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1  
5 ->>>>>>> .r35 1 +ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 1
6 2
7 3
8 1 .syntax unified 4 1 .syntax unified
@@ -62,11 +58,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -62,11 +58,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
62 53 @ frame_needed = 0, uses_anonymous_args = 0 58 53 @ frame_needed = 0, uses_anonymous_args = 0
63 54 .LVL1: 59 54 .LVL1:
64 55 0000 08B5 push {r3, lr} 60 55 0000 08B5 push {r3, lr}
65 -<<<<<<< .mine  
66 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 2  
67 -=======  
68 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 2  
69 ->>>>>>> .r35 61 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 2
70 62
71 63
72 56 .LCFI0: 64 56 .LCFI0:
@@ -126,11 +118,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -126,11 +118,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
126 110 .LFB9: 118 110 .LFB9:
127 111 .loc 1 94 0 119 111 .loc 1 94 0
128 112 .cfi_startproc 120 112 .cfi_startproc
129 -<<<<<<< .mine  
130 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 3  
131 -=======  
132 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 3  
133 ->>>>>>> .r35 121 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 3
134 122
135 123
136 113 @ args = 0, pretend = 0, frame = 0 124 113 @ args = 0, pretend = 0, frame = 0
@@ -190,11 +178,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -190,11 +178,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
190 166 .cfi_offset 4, -12 178 166 .cfi_offset 4, -12
191 167 .cfi_offset 5, -8 179 167 .cfi_offset 5, -8
192 168 .cfi_offset 14, -4 180 168 .cfi_offset 14, -4
193 -<<<<<<< .mine  
194 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 4  
195 -=======  
196 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 4  
197 ->>>>>>> .r35 181 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 4
198 182
199 183
200 169 .loc 1 129 0 184 169 .loc 1 129 0
@@ -254,11 +238,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -254,11 +238,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
254 220 .cfi_offset 14, -4 238 220 .cfi_offset 14, -4
255 221 .loc 1 112 0 239 221 .loc 1 112 0
256 222 @ 112 "../..//os/kernel/src/chcond.c" 1 240 222 @ 112 "../..//os/kernel/src/chcond.c" 1
257 -<<<<<<< .mine  
258 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 5  
259 -=======  
260 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 5  
261 ->>>>>>> .r35 241 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 5
262 242
263 243
264 223 0002 72B6 cpsid i 244 223 0002 72B6 cpsid i
@@ -318,11 +298,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -318,11 +298,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
318 277 000e 0746 mov r7, r0 298 277 000e 0746 mov r7, r0
319 278 .LVL21: 299 278 .LVL21:
320 279 .loc 1 196 0 300 279 .loc 1 196 0
321 -<<<<<<< .mine  
322 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 6  
323 -=======  
324 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 6  
325 ->>>>>>> .r35 301 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 6
326 302
327 303
328 280 0010 6562 str r5, [r4, #36] 304 280 0010 6562 str r5, [r4, #36]
@@ -382,11 +358,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -382,11 +358,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
382 334 0042 EFE7 b .L17 358 334 0042 EFE7 b .L17
383 335 .L23: 359 335 .L23:
384 336 .align 2 360 336 .align 2
385 -<<<<<<< .mine  
386 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 7  
387 -=======  
388 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 7  
389 ->>>>>>> .r35 361 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 7
390 362
391 363
392 337 .L22: 364 337 .L22:
@@ -446,11 +418,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -446,11 +418,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
446 390 .loc 1 270 0 418 390 .loc 1 270 0
447 391 .cfi_startproc 419 391 .cfi_startproc
448 392 @ args = 0, pretend = 0, frame = 0 420 392 @ args = 0, pretend = 0, frame = 0
449 -<<<<<<< .mine  
450 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 8  
451 -=======  
452 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 8  
453 ->>>>>>> .r35 421 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 8
454 422
455 423
456 393 @ frame_needed = 0, uses_anonymous_args = 0 424 393 @ frame_needed = 0, uses_anonymous_args = 0
@@ -510,11 +478,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -510,11 +478,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
510 447 .LBE26: 478 447 .LBE26:
511 448 .LBE28: 479 448 .LBE28:
512 449 .loc 1 283 0 480 449 .loc 1 283 0
513 -<<<<<<< .mine  
514 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 9  
515 -=======  
516 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 9  
517 ->>>>>>> .r35 481 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 9
518 482
519 483
520 450 002c 4146 mov r1, r8 484 450 002c 4146 mov r1, r8
@@ -574,11 +538,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -574,11 +538,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
574 504 @ 236 "../..//os/kernel/src/chcond.c" 1 538 504 @ 236 "../..//os/kernel/src/chcond.c" 1
575 505 0002 72B6 cpsid i 539 505 0002 72B6 cpsid i
576 506 @ 0 "" 2 540 506 @ 0 "" 2
577 -<<<<<<< .mine  
578 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 10  
579 -=======  
580 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 10  
581 ->>>>>>> .r35 541 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 10
582 542
583 543
584 507 .loc 1 237 0 544 507 .loc 1 237 0
@@ -597,7 +557,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -597,7 +557,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
597 520 .size chCondWaitTimeout, .-chCondWaitTimeout 557 520 .size chCondWaitTimeout, .-chCondWaitTimeout
598 521 000c AFF30080 .text 558 521 000c AFF30080 .text
599 522 .Letext0: 559 522 .Letext0:
600 - 523 .file 3 "c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h" 560 + 523 .file 3 "c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h"
601 524 .file 4 "../..//os/ports/GCC/ARMCMx/chtypes.h" 561 524 .file 4 "../..//os/ports/GCC/ARMCMx/chtypes.h"
602 525 .file 5 "../..//os/kernel/include/chlists.h" 562 525 .file 5 "../..//os/kernel/include/chlists.h"
603 526 .file 6 "../..//os/kernel/include/chthreads.h" 563 526 .file 6 "../..//os/kernel/include/chthreads.h"
@@ -612,19 +572,10 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -612,19 +572,10 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
612 535 0006 00000000 .4byte .Ldebug_abbrev0 572 535 0006 00000000 .4byte .Ldebug_abbrev0
613 536 000a 04 .byte 0x4 573 536 000a 04 .byte 0x4
614 537 000b 01 .uleb128 0x1 574 537 000b 01 .uleb128 0x1
615 -<<<<<<< .mine  
616 538 000c 0C020000 .4byte .LASF78 575 538 000c 0C020000 .4byte .LASF78
617 -=======  
618 - 538 000c 06020000 .4byte .LASF78  
619 ->>>>>>> .r35  
620 539 0010 01 .byte 0x1 576 539 0010 01 .byte 0x1
621 -<<<<<<< .mine  
622 540 0011 7C030000 .4byte .LASF79 577 540 0011 7C030000 .4byte .LASF79
623 541 0015 06000000 .4byte .LASF80 578 541 0015 06000000 .4byte .LASF80
624 -=======  
625 - 540 0011 76030000 .4byte .LASF79  
626 - 541 0015 A7000000 .4byte .LASF80  
627 ->>>>>>> .r35  
628 542 0019 A0000000 .4byte .Ldebug_ranges0+0xa0 579 542 0019 A0000000 .4byte .Ldebug_ranges0+0xa0
629 543 001d 00000000 .4byte 0 580 543 001d 00000000 .4byte 0
630 544 0021 00000000 .4byte 0 581 544 0021 00000000 .4byte 0
@@ -636,61 +587,33 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -636,61 +587,33 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
636 550 0030 03 .uleb128 0x3 587 550 0030 03 .uleb128 0x3
637 551 0031 04 .byte 0x4 588 551 0031 04 .byte 0x4
638 552 0032 07 .byte 0x7 589 552 0032 07 .byte 0x7
639 -<<<<<<< .mine  
640 553 0033 5E010000 .4byte .LASF0 590 553 0033 5E010000 .4byte .LASF0
641 -=======  
642 - 553 0033 58010000 .4byte .LASF0  
643 ->>>>>>> .r35  
644 554 0037 03 .uleb128 0x3 591 554 0037 03 .uleb128 0x3
645 555 0038 01 .byte 0x1 592 555 0038 01 .byte 0x1
646 556 0039 06 .byte 0x6 593 556 0039 06 .byte 0x6
647 557 003a D3000000 .4byte .LASF1 594 557 003a D3000000 .4byte .LASF1
648 558 003e 04 .uleb128 0x4 595 558 003e 04 .uleb128 0x4
649 -<<<<<<< .mine  
650 559 003f 74030000 .4byte .LASF5 596 559 003f 74030000 .4byte .LASF5
651 -=======  
652 - 559 003f 6E030000 .4byte .LASF5  
653 ->>>>>>> .r35  
654 560 0043 03 .byte 0x3 597 560 0043 03 .byte 0x3
655 561 0044 2A .byte 0x2a 598 561 0044 2A .byte 0x2a
656 562 0045 49000000 .4byte 0x49 599 562 0045 49000000 .4byte 0x49
657 563 0049 03 .uleb128 0x3 600 563 0049 03 .uleb128 0x3
658 -<<<<<<< .mine  
659 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 11  
660 -=======  
661 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 11  
662 ->>>>>>> .r35 601 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 11
663 602
664 603
665 564 004a 01 .byte 0x1 604 564 004a 01 .byte 0x1
666 565 004b 08 .byte 0x8 605 565 004b 08 .byte 0x8
667 -<<<<<<< .mine  
668 566 004c 67020000 .4byte .LASF2 606 566 004c 67020000 .4byte .LASF2
669 -=======  
670 - 566 004c 61020000 .4byte .LASF2  
671 ->>>>>>> .r35  
672 567 0050 03 .uleb128 0x3 607 567 0050 03 .uleb128 0x3
673 568 0051 02 .byte 0x2 608 568 0051 02 .byte 0x2
674 569 0052 05 .byte 0x5 609 569 0052 05 .byte 0x5
675 -<<<<<<< .mine  
676 570 0053 7F020000 .4byte .LASF3 610 570 0053 7F020000 .4byte .LASF3
677 -=======  
678 - 570 0053 79020000 .4byte .LASF3  
679 ->>>>>>> .r35  
680 571 0057 03 .uleb128 0x3 611 571 0057 03 .uleb128 0x3
681 572 0058 02 .byte 0x2 612 572 0058 02 .byte 0x2
682 573 0059 07 .byte 0x7 613 573 0059 07 .byte 0x7
683 -<<<<<<< .mine  
684 574 005a 85010000 .4byte .LASF4 614 574 005a 85010000 .4byte .LASF4
685 -=======  
686 - 574 005a 7F010000 .4byte .LASF4  
687 ->>>>>>> .r35  
688 575 005e 04 .uleb128 0x4 615 575 005e 04 .uleb128 0x4
689 -<<<<<<< .mine  
690 576 005f 5F020000 .4byte .LASF6 616 576 005f 5F020000 .4byte .LASF6
691 -=======  
692 - 576 005f 59020000 .4byte .LASF6  
693 ->>>>>>> .r35  
694 577 0063 03 .byte 0x3 617 577 0063 03 .byte 0x3
695 578 0064 4F .byte 0x4f 618 578 0064 4F .byte 0x4f
696 579 0065 69000000 .4byte 0x69 619 579 0065 69000000 .4byte 0x69
@@ -699,22 +622,14 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -699,22 +622,14 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
699 582 006b 05 .byte 0x5 622 582 006b 05 .byte 0x5
700 583 006c F7000000 .4byte .LASF7 623 583 006c F7000000 .4byte .LASF7
701 584 0070 04 .uleb128 0x4 624 584 0070 04 .uleb128 0x4
702 -<<<<<<< .mine  
703 585 0071 D6020000 .4byte .LASF8 625 585 0071 D6020000 .4byte .LASF8
704 -=======  
705 - 585 0071 D0020000 .4byte .LASF8  
706 ->>>>>>> .r35  
707 586 0075 03 .byte 0x3 626 586 0075 03 .byte 0x3
708 587 0076 50 .byte 0x50 627 587 0076 50 .byte 0x50
709 588 0077 7B000000 .4byte 0x7b 628 588 0077 7B000000 .4byte 0x7b
710 589 007b 03 .uleb128 0x3 629 589 007b 03 .uleb128 0x3
711 590 007c 04 .byte 0x4 630 590 007c 04 .byte 0x4
712 591 007d 07 .byte 0x7 631 591 007d 07 .byte 0x7
713 -<<<<<<< .mine  
714 592 007e 6B010000 .4byte .LASF9 632 592 007e 6B010000 .4byte .LASF9
715 -=======  
716 - 592 007e 65010000 .4byte .LASF9  
717 ->>>>>>> .r35  
718 593 0082 03 .uleb128 0x3 633 593 0082 03 .uleb128 0x3
719 594 0083 08 .byte 0x8 634 594 0083 08 .byte 0x8
720 595 0084 05 .byte 0x5 635 595 0084 05 .byte 0x5
@@ -724,11 +639,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -724,11 +639,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
724 599 008b 07 .byte 0x7 639 599 008b 07 .byte 0x7
725 600 008c 8D000000 .4byte .LASF11 640 600 008c 8D000000 .4byte .LASF11
726 601 0090 04 .uleb128 0x4 641 601 0090 04 .uleb128 0x4
727 -<<<<<<< .mine  
728 602 0091 AA010000 .4byte .LASF12 642 602 0091 AA010000 .4byte .LASF12
729 -=======  
730 - 602 0091 A4010000 .4byte .LASF12  
731 ->>>>>>> .r35  
732 603 0095 04 .byte 0x4 643 603 0095 04 .byte 0x4
733 604 0096 2F .byte 0x2f 644 604 0096 2F .byte 0x2f
734 605 0097 3E000000 .4byte 0x3e 645 605 0097 3E000000 .4byte 0x3e
@@ -738,91 +649,51 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -738,91 +649,51 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
738 609 00a1 30 .byte 0x30 649 609 00a1 30 .byte 0x30
739 610 00a2 3E000000 .4byte 0x3e 650 610 00a2 3E000000 .4byte 0x3e
740 611 00a6 04 .uleb128 0x4 651 611 00a6 04 .uleb128 0x4
741 -<<<<<<< .mine  
742 612 00a7 3A020000 .4byte .LASF14 652 612 00a7 3A020000 .4byte .LASF14
743 -=======  
744 - 612 00a7 34020000 .4byte .LASF14  
745 ->>>>>>> .r35  
746 613 00ab 04 .byte 0x4 653 613 00ab 04 .byte 0x4
747 614 00ac 31 .byte 0x31 654 614 00ac 31 .byte 0x31
748 615 00ad 3E000000 .4byte 0x3e 655 615 00ad 3E000000 .4byte 0x3e
749 616 00b1 04 .uleb128 0x4 656 616 00b1 04 .uleb128 0x4
750 -<<<<<<< .mine  
751 617 00b2 49020000 .4byte .LASF15 657 617 00b2 49020000 .4byte .LASF15
752 -=======  
753 - 617 00b2 43020000 .4byte .LASF15  
754 ->>>>>>> .r35  
755 618 00b6 04 .byte 0x4 658 618 00b6 04 .byte 0x4
756 619 00b7 32 .byte 0x32 659 619 00b7 32 .byte 0x32
757 620 00b8 70000000 .4byte 0x70 660 620 00b8 70000000 .4byte 0x70
758 -<<<<<<< .mine  
759 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 12  
760 -=======  
761 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 12  
762 ->>>>>>> .r35 661 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 12
763 662
764 663
765 621 00bc 04 .uleb128 0x4 664 621 00bc 04 .uleb128 0x4
766 -<<<<<<< .mine  
767 622 00bd 98010000 .4byte .LASF16 665 622 00bd 98010000 .4byte .LASF16
768 -=======  
769 - 622 00bd 92010000 .4byte .LASF16  
770 ->>>>>>> .r35  
771 623 00c1 04 .byte 0x4 666 623 00c1 04 .byte 0x4
772 624 00c2 33 .byte 0x33 667 624 00c2 33 .byte 0x33
773 625 00c3 5E000000 .4byte 0x5e 668 625 00c3 5E000000 .4byte 0x5e
774 626 00c7 04 .uleb128 0x4 669 626 00c7 04 .uleb128 0x4
775 -<<<<<<< .mine  
776 627 00c8 BE010000 .4byte .LASF17 670 627 00c8 BE010000 .4byte .LASF17
777 -=======  
778 - 627 00c8 B8010000 .4byte .LASF17  
779 ->>>>>>> .r35  
780 628 00cc 04 .byte 0x4 671 628 00cc 04 .byte 0x4
781 629 00cd 35 .byte 0x35 672 629 00cd 35 .byte 0x35
782 630 00ce 70000000 .4byte 0x70 673 630 00ce 70000000 .4byte 0x70
783 631 00d2 04 .uleb128 0x4 674 631 00d2 04 .uleb128 0x4
784 -<<<<<<< .mine  
785 632 00d3 17030000 .4byte .LASF18 675 632 00d3 17030000 .4byte .LASF18
786 -=======  
787 - 632 00d3 11030000 .4byte .LASF18  
788 ->>>>>>> .r35  
789 633 00d7 04 .byte 0x4 676 633 00d7 04 .byte 0x4
790 634 00d8 36 .byte 0x36 677 634 00d8 36 .byte 0x36
791 635 00d9 70000000 .4byte 0x70 678 635 00d9 70000000 .4byte 0x70
792 636 00dd 04 .uleb128 0x4 679 636 00dd 04 .uleb128 0x4
793 -<<<<<<< .mine  
794 637 00de 4B010000 .4byte .LASF19 680 637 00de 4B010000 .4byte .LASF19
795 -=======  
796 - 637 00de 45010000 .4byte .LASF19  
797 ->>>>>>> .r35  
798 638 00e2 04 .byte 0x4 681 638 00e2 04 .byte 0x4
799 639 00e3 37 .byte 0x37 682 639 00e3 37 .byte 0x37
800 640 00e4 5E000000 .4byte 0x5e 683 640 00e4 5E000000 .4byte 0x5e
801 641 00e8 04 .uleb128 0x4 684 641 00e8 04 .uleb128 0x4
802 -<<<<<<< .mine  
803 642 00e9 AE020000 .4byte .LASF20 685 642 00e9 AE020000 .4byte .LASF20
804 -=======  
805 - 642 00e9 A8020000 .4byte .LASF20  
806 ->>>>>>> .r35  
807 643 00ed 05 .byte 0x5 686 643 00ed 05 .byte 0x5
808 644 00ee 2A .byte 0x2a 687 644 00ee 2A .byte 0x2a
809 645 00ef F3000000 .4byte 0xf3 688 645 00ef F3000000 .4byte 0xf3
810 646 00f3 05 .uleb128 0x5 689 646 00f3 05 .uleb128 0x5
811 -<<<<<<< .mine  
812 647 00f4 AE020000 .4byte .LASF20 690 647 00f4 AE020000 .4byte .LASF20
813 -=======  
814 - 647 00f4 A8020000 .4byte .LASF20  
815 ->>>>>>> .r35  
816 648 00f8 48 .byte 0x48 691 648 00f8 48 .byte 0x48
817 649 00f9 06 .byte 0x6 692 649 00f9 06 .byte 0x6
818 650 00fa 5E .byte 0x5e 693 650 00fa 5E .byte 0x5e
819 651 00fb 0A020000 .4byte 0x20a 694 651 00fb 0A020000 .4byte 0x20a
820 652 00ff 06 .uleb128 0x6 695 652 00ff 06 .uleb128 0x6
821 -<<<<<<< .mine  
822 653 0100 9F020000 .4byte .LASF21 696 653 0100 9F020000 .4byte .LASF21
823 -=======  
824 - 653 0100 99020000 .4byte .LASF21  
825 ->>>>>>> .r35  
826 654 0104 06 .byte 0x6 697 654 0104 06 .byte 0x6
827 655 0105 5F .byte 0x5f 698 655 0105 5F .byte 0x5f
828 656 0106 2F020000 .4byte 0x22f 699 656 0106 2F020000 .4byte 0x22f
@@ -830,11 +701,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -830,11 +701,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
830 658 010b 23 .byte 0x23 701 658 010b 23 .byte 0x23
831 659 010c 00 .uleb128 0 702 659 010c 00 .uleb128 0
832 660 010d 06 .uleb128 0x6 703 660 010d 06 .uleb128 0x6
833 -<<<<<<< .mine  
834 661 010e 42020000 .4byte .LASF22 704 661 010e 42020000 .4byte .LASF22
835 -=======  
836 - 661 010e 3C020000 .4byte .LASF22  
837 ->>>>>>> .r35  
838 662 0112 06 .byte 0x6 705 662 0112 06 .byte 0x6
839 663 0113 61 .byte 0x61 706 663 0113 61 .byte 0x61
840 664 0114 2F020000 .4byte 0x22f 707 664 0114 2F020000 .4byte 0x22f
@@ -850,13 +717,8 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -850,13 +717,8 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
850 674 0127 23 .byte 0x23 717 674 0127 23 .byte 0x23
851 675 0128 08 .uleb128 0x8 718 675 0128 08 .uleb128 0x8
852 676 0129 06 .uleb128 0x6 719 676 0129 06 .uleb128 0x6
853 -<<<<<<< .mine  
854 677 012a E1030000 .4byte .LASF24 720 677 012a E1030000 .4byte .LASF24
855 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 13  
856 -=======  
857 - 677 012a DB030000 .4byte .LASF24  
858 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 13  
859 ->>>>>>> .r35 721 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 13
860 722
861 723
862 678 012e 06 .byte 0x6 724 678 012e 06 .byte 0x6
@@ -874,11 +736,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -874,11 +736,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
874 690 0143 23 .byte 0x23 736 690 0143 23 .byte 0x23
875 691 0144 10 .uleb128 0x10 737 691 0144 10 .uleb128 0x10
876 692 0145 06 .uleb128 0x6 738 692 0145 06 .uleb128 0x6
877 -<<<<<<< .mine  
878 693 0146 EC010000 .4byte .LASF26 739 693 0146 EC010000 .4byte .LASF26
879 -=======  
880 - 693 0146 E6010000 .4byte .LASF26  
881 ->>>>>>> .r35  
882 694 014a 06 .byte 0x6 740 694 014a 06 .byte 0x6
883 695 014b 67 .byte 0x67 741 695 014b 67 .byte 0x67
884 696 014c 2F020000 .4byte 0x22f 742 696 014c 2F020000 .4byte 0x22f
@@ -886,11 +744,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -886,11 +744,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
886 698 0151 23 .byte 0x23 744 698 0151 23 .byte 0x23
887 699 0152 14 .uleb128 0x14 745 699 0152 14 .uleb128 0x14
888 700 0153 06 .uleb128 0x6 746 700 0153 06 .uleb128 0x6
889 -<<<<<<< .mine  
890 701 0154 A1030000 .4byte .LASF27 747 701 0154 A1030000 .4byte .LASF27
891 -=======  
892 - 701 0154 9B030000 .4byte .LASF27  
893 ->>>>>>> .r35  
894 702 0158 06 .byte 0x6 748 702 0158 06 .byte 0x6
895 703 0159 6E .byte 0x6e 749 703 0159 6E .byte 0x6e
896 704 015a 44040000 .4byte 0x444 750 704 015a 44040000 .4byte 0x444
@@ -898,11 +752,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -898,11 +752,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
898 706 015f 23 .byte 0x23 752 706 015f 23 .byte 0x23
899 707 0160 18 .uleb128 0x18 753 707 0160 18 .uleb128 0x18
900 708 0161 06 .uleb128 0x6 754 708 0161 06 .uleb128 0x6
901 -<<<<<<< .mine  
902 709 0162 89020000 .4byte .LASF28 755 709 0162 89020000 .4byte .LASF28
903 -=======  
904 - 709 0162 83020000 .4byte .LASF28  
905 ->>>>>>> .r35  
906 710 0166 06 .byte 0x6 756 710 0166 06 .byte 0x6
907 711 0167 79 .byte 0x79 757 711 0167 79 .byte 0x79
908 712 0168 9B000000 .4byte 0x9b 758 712 0168 9B000000 .4byte 0x9b
@@ -910,11 +760,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -910,11 +760,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
910 714 016d 23 .byte 0x23 760 714 016d 23 .byte 0x23
911 715 016e 1C .uleb128 0x1c 761 715 016e 1C .uleb128 0x1c
912 716 016f 06 .uleb128 0x6 762 716 016f 06 .uleb128 0x6
913 -<<<<<<< .mine  
914 717 0170 A6020000 .4byte .LASF29 763 717 0170 A6020000 .4byte .LASF29
915 -=======  
916 - 717 0170 A0020000 .4byte .LASF29  
917 ->>>>>>> .r35  
918 718 0174 06 .byte 0x6 764 718 0174 06 .byte 0x6
919 719 0175 7D .byte 0x7d 765 719 0175 7D .byte 0x7d
920 720 0176 90000000 .4byte 0x90 766 720 0176 90000000 .4byte 0x90
@@ -922,11 +768,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -922,11 +768,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
922 722 017b 23 .byte 0x23 768 722 017b 23 .byte 0x23
923 723 017c 1D .uleb128 0x1d 769 723 017c 1D .uleb128 0x1d
924 724 017d 06 .uleb128 0x6 770 724 017d 06 .uleb128 0x6
925 -<<<<<<< .mine  
926 725 017e 5D030000 .4byte .LASF30 771 725 017e 5D030000 .4byte .LASF30
927 -=======  
928 - 725 017e 57030000 .4byte .LASF30  
929 ->>>>>>> .r35  
930 726 0182 06 .byte 0x6 772 726 0182 06 .byte 0x6
931 727 0183 82 .byte 0x82 773 727 0183 82 .byte 0x82
932 728 0184 A6000000 .4byte 0xa6 774 728 0184 A6000000 .4byte 0xa6
@@ -934,17 +776,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -934,17 +776,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
934 730 0189 23 .byte 0x23 776 730 0189 23 .byte 0x23
935 731 018a 1E .uleb128 0x1e 777 731 018a 1E .uleb128 0x1e
936 732 018b 06 .uleb128 0x6 778 732 018b 06 .uleb128 0x6
937 -<<<<<<< .mine  
938 733 018c 37030000 .4byte .LASF31 779 733 018c 37030000 .4byte .LASF31
939 -=======  
940 - 733 018c 31030000 .4byte .LASF31  
941 ->>>>>>> .r35  
942 734 0190 06 .byte 0x6 780 734 0190 06 .byte 0x6
943 -<<<<<<< .mine  
944 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 14  
945 -=======  
946 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 14  
947 ->>>>>>> .r35 781 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 14
948 782
949 783
950 735 0191 89 .byte 0x89 784 735 0191 89 .byte 0x89
@@ -961,11 +795,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -961,11 +795,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
961 746 01a5 23 .byte 0x23 795 746 01a5 23 .byte 0x23
962 747 01a6 24 .uleb128 0x24 796 747 01a6 24 .uleb128 0x24
963 748 01a7 06 .uleb128 0x6 797 748 01a7 06 .uleb128 0x6
964 -<<<<<<< .mine  
965 749 01a8 E7030000 .4byte .LASF32 798 749 01a8 E7030000 .4byte .LASF32
966 -=======  
967 - 749 01a8 E1030000 .4byte .LASF32  
968 ->>>>>>> .r35  
969 750 01ac 06 .byte 0x6 799 750 01ac 06 .byte 0x6
970 751 01ad B3 .byte 0xb3 800 751 01ad B3 .byte 0xb3
971 752 01ae 57020000 .4byte 0x257 801 752 01ae 57020000 .4byte 0x257
@@ -973,11 +803,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -973,11 +803,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
973 754 01b3 23 .byte 0x23 803 754 01b3 23 .byte 0x23
974 755 01b4 28 .uleb128 0x28 804 755 01b4 28 .uleb128 0x28
975 756 01b5 06 .uleb128 0x6 805 756 01b5 06 .uleb128 0x6
976 -<<<<<<< .mine  
977 757 01b6 45030000 .4byte .LASF33 806 757 01b6 45030000 .4byte .LASF33
978 -=======  
979 - 757 01b6 3F030000 .4byte .LASF33  
980 ->>>>>>> .r35  
981 758 01ba 06 .byte 0x6 807 758 01ba 06 .byte 0x6
982 759 01bb B9 .byte 0xb9 808 759 01bb B9 .byte 0xb9
983 760 01bc 35020000 .4byte 0x235 809 760 01bc 35020000 .4byte 0x235
@@ -993,11 +819,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -993,11 +819,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
993 770 01cf 23 .byte 0x23 819 770 01cf 23 .byte 0x23
994 771 01d0 34 .uleb128 0x34 820 771 01d0 34 .uleb128 0x34
995 772 01d1 06 .uleb128 0x6 821 772 01d1 06 .uleb128 0x6
996 -<<<<<<< .mine  
997 773 01d2 CB020000 .4byte .LASF35 822 773 01d2 CB020000 .4byte .LASF35
998 -=======  
999 - 773 01d2 C5020000 .4byte .LASF35  
1000 ->>>>>>> .r35  
1001 774 01d6 06 .byte 0x6 823 774 01d6 06 .byte 0x6
1002 775 01d7 C3 .byte 0xc3 824 775 01d7 C3 .byte 0xc3
1003 776 01d8 C7000000 .4byte 0xc7 825 776 01d8 C7000000 .4byte 0xc7
@@ -1005,11 +827,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1005,11 +827,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1005 778 01dd 23 .byte 0x23 827 778 01dd 23 .byte 0x23
1006 779 01de 38 .uleb128 0x38 828 779 01de 38 .uleb128 0x38
1007 780 01df 06 .uleb128 0x6 829 780 01df 06 .uleb128 0x6
1008 -<<<<<<< .mine  
1009 781 01e0 75020000 .4byte .LASF36 830 781 01e0 75020000 .4byte .LASF36
1010 -=======  
1011 - 781 01e0 6F020000 .4byte .LASF36  
1012 ->>>>>>> .r35  
1013 782 01e4 06 .byte 0x6 831 782 01e4 06 .byte 0x6
1014 783 01e5 CA .byte 0xca 832 783 01e5 CA .byte 0xca
1015 784 01e6 56040000 .4byte 0x456 833 784 01e6 56040000 .4byte 0x456
@@ -1017,18 +835,10 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1017,18 +835,10 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1017 786 01eb 23 .byte 0x23 835 786 01eb 23 .byte 0x23
1018 787 01ec 3C .uleb128 0x3c 836 787 01ec 3C .uleb128 0x3c
1019 788 01ed 06 .uleb128 0x6 837 788 01ed 06 .uleb128 0x6
1020 -<<<<<<< .mine  
1021 789 01ee 21030000 .4byte .LASF37 838 789 01ee 21030000 .4byte .LASF37
1022 -=======  
1023 - 789 01ee 1B030000 .4byte .LASF37  
1024 ->>>>>>> .r35  
1025 790 01f2 06 .byte 0x6 839 790 01f2 06 .byte 0x6
1026 791 01f3 CE .byte 0xce 840 791 01f3 CE .byte 0xce
1027 -<<<<<<< .mine  
1028 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 15  
1029 -=======  
1030 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 15  
1031 ->>>>>>> .r35 841 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 15
1032 842
1033 843
1034 792 01f4 B1000000 .4byte 0xb1 844 792 01f4 B1000000 .4byte 0xb1
@@ -1050,11 +860,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1050,11 +860,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1050 808 020d 61 .byte 0x61 860 808 020d 61 .byte 0x61
1051 809 020e 2F020000 .4byte 0x22f 861 809 020e 2F020000 .4byte 0x22f
1052 810 0212 06 .uleb128 0x6 862 810 0212 06 .uleb128 0x6
1053 -<<<<<<< .mine  
1054 811 0213 9F020000 .4byte .LASF21 863 811 0213 9F020000 .4byte .LASF21
1055 -=======  
1056 - 811 0213 99020000 .4byte .LASF21  
1057 ->>>>>>> .r35  
1058 812 0217 05 .byte 0x5 864 812 0217 05 .byte 0x5
1059 813 0218 62 .byte 0x62 865 813 0218 62 .byte 0x62
1060 814 0219 2F020000 .4byte 0x22f 866 814 0219 2F020000 .4byte 0x22f
@@ -1062,11 +868,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1062,11 +868,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1062 816 021e 23 .byte 0x23 868 816 021e 23 .byte 0x23
1063 817 021f 00 .uleb128 0 869 817 021f 00 .uleb128 0
1064 818 0220 06 .uleb128 0x6 870 818 0220 06 .uleb128 0x6
1065 -<<<<<<< .mine  
1066 819 0221 42020000 .4byte .LASF22 871 819 0221 42020000 .4byte .LASF22
1067 -=======  
1068 - 819 0221 3C020000 .4byte .LASF22  
1069 ->>>>>>> .r35  
1070 820 0225 05 .byte 0x5 872 820 0225 05 .byte 0x5
1071 821 0226 64 .byte 0x64 873 821 0226 64 .byte 0x64
1072 822 0227 2F020000 .4byte 0x22f 874 822 0227 2F020000 .4byte 0x22f
@@ -1078,11 +880,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1078,11 +880,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1078 828 0230 04 .byte 0x4 880 828 0230 04 .byte 0x4
1079 829 0231 E8000000 .4byte 0xe8 881 829 0231 E8000000 .4byte 0xe8
1080 830 0235 04 .uleb128 0x4 882 830 0235 04 .uleb128 0x4
1081 -<<<<<<< .mine  
1082 831 0236 FA010000 .4byte .LASF39 883 831 0236 FA010000 .4byte .LASF39
1083 -=======  
1084 - 831 0236 F4010000 .4byte .LASF39  
1085 ->>>>>>> .r35  
1086 832 023a 05 .byte 0x5 884 832 023a 05 .byte 0x5
1087 833 023b 66 .byte 0x66 885 833 023b 66 .byte 0x66
1088 834 023c 0A020000 .4byte 0x20a 886 834 023c 0A020000 .4byte 0x20a
@@ -1092,11 +890,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1092,11 +890,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1092 838 0243 6B .byte 0x6b 890 838 0243 6B .byte 0x6b
1093 839 0244 57020000 .4byte 0x257 891 839 0244 57020000 .4byte 0x257
1094 840 0248 06 .uleb128 0x6 892 840 0248 06 .uleb128 0x6
1095 -<<<<<<< .mine  
1096 841 0249 9F020000 .4byte .LASF21 893 841 0249 9F020000 .4byte .LASF21
1097 -=======  
1098 - 841 0249 99020000 .4byte .LASF21  
1099 ->>>>>>> .r35  
1100 842 024d 05 .byte 0x5 894 842 024d 05 .byte 0x5
1101 843 024e 6D .byte 0x6d 895 843 024e 6D .byte 0x6d
1102 844 024f 2F020000 .4byte 0x22f 896 844 024f 2F020000 .4byte 0x22f
@@ -1104,39 +898,23 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1104,39 +898,23 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1104 846 0254 23 .byte 0x23 898 846 0254 23 .byte 0x23
1105 847 0255 00 .uleb128 0 899 847 0255 00 .uleb128 0
1106 848 0256 00 .byte 0 900 848 0256 00 .byte 0
1107 -<<<<<<< .mine  
1108 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 16  
1109 -=======  
1110 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 16  
1111 ->>>>>>> .r35 901 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 16
1112 902
1113 903
1114 849 0257 04 .uleb128 0x4 904 849 0257 04 .uleb128 0x4
1115 -<<<<<<< .mine  
1116 850 0258 B2010000 .4byte .LASF40 905 850 0258 B2010000 .4byte .LASF40
1117 -=======  
1118 - 850 0258 AC010000 .4byte .LASF40  
1119 ->>>>>>> .r35  
1120 851 025c 05 .byte 0x5 906 851 025c 05 .byte 0x5
1121 852 025d 70 .byte 0x70 907 852 025d 70 .byte 0x70
1122 853 025e 40020000 .4byte 0x240 908 853 025e 40020000 .4byte 0x240
1123 854 0262 04 .uleb128 0x4 909 854 0262 04 .uleb128 0x4
1124 -<<<<<<< .mine  
1125 855 0263 35010000 .4byte .LASF41 910 855 0263 35010000 .4byte .LASF41
1126 -=======  
1127 - 855 0263 2F010000 .4byte .LASF41  
1128 ->>>>>>> .r35  
1129 856 0267 07 .byte 0x7 911 856 0267 07 .byte 0x7
1130 857 0268 D7 .byte 0xd7 912 857 0268 D7 .byte 0xd7
1131 858 0269 6D020000 .4byte 0x26d 913 858 0269 6D020000 .4byte 0x26d
1132 859 026d 0A .uleb128 0xa 914 859 026d 0A .uleb128 0xa
1133 860 026e 04 .byte 0x4 915 860 026e 04 .byte 0x4
1134 861 026f 05 .uleb128 0x5 916 861 026f 05 .uleb128 0x5
1135 -<<<<<<< .mine  
1136 862 0270 3E030000 .4byte .LASF42 917 862 0270 3E030000 .4byte .LASF42
1137 -=======  
1138 - 862 0270 38030000 .4byte .LASF42  
1139 ->>>>>>> .r35  
1140 863 0274 24 .byte 0x24 918 863 0274 24 .byte 0x24
1141 864 0275 07 .byte 0x7 919 864 0275 07 .byte 0x7
1142 865 0276 FE .byte 0xfe 920 865 0276 FE .byte 0xfe
@@ -1180,11 +958,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1180,11 +958,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1180 903 02ba 62020000 .4byte 0x262 958 903 02ba 62020000 .4byte 0x262
1181 904 02be 02 .byte 0x2 959 904 02be 02 .byte 0x2
1182 905 02bf 23 .byte 0x23 960 905 02bf 23 .byte 0x23
1183 -<<<<<<< .mine  
1184 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 17  
1185 -=======  
1186 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 17  
1187 ->>>>>>> .r35 961 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 17
1188 962
1189 963
1190 906 02c0 10 .uleb128 0x10 964 906 02c0 10 .uleb128 0x10
@@ -1222,11 +996,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1222,11 +996,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1222 938 02fa 20 .uleb128 0x20 996 938 02fa 20 .uleb128 0x20
1223 939 02fb 00 .byte 0 997 939 02fb 00 .byte 0
1224 940 02fc 0C .uleb128 0xc 998 940 02fc 0C .uleb128 0xc
1225 -<<<<<<< .mine  
1226 941 02fd 7D010000 .4byte .LASF43 999 941 02fd 7D010000 .4byte .LASF43
1227 -=======  
1228 - 941 02fd 77010000 .4byte .LASF43  
1229 ->>>>>>> .r35  
1230 942 0301 04 .byte 0x4 1000 942 0301 04 .byte 0x4
1231 943 0302 07 .byte 0x7 1001 943 0302 07 .byte 0x7
1232 944 0303 2301 .2byte 0x123 1002 944 0303 2301 .2byte 0x123
@@ -1246,17 +1016,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1246,17 +1016,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1246 958 031f 03 .uleb128 0x3 1016 958 031f 03 .uleb128 0x3
1247 959 0320 04 .byte 0x4 1017 959 0320 04 .byte 0x4
1248 960 0321 07 .byte 0x7 1018 960 0321 07 .byte 0x7
1249 -<<<<<<< .mine  
1250 961 0322 D0010000 .4byte .LASF44 1019 961 0322 D0010000 .4byte .LASF44
1251 -=======  
1252 - 961 0322 CA010000 .4byte .LASF44  
1253 ->>>>>>> .r35  
1254 962 0326 0D .uleb128 0xd 1020 962 0326 0D .uleb128 0xd
1255 -<<<<<<< .mine  
1256 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 18  
1257 -=======  
1258 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 18  
1259 ->>>>>>> .r35 1021 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 18
1260 1022
1261 1023
1262 963 0327 D2000000 .4byte 0xd2 1024 963 0327 D2000000 .4byte 0xd2
@@ -1266,11 +1028,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1266,11 +1028,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1266 967 032e 5E .byte 0x5e 1028 967 032e 5E .byte 0x5e
1267 968 032f 96030000 .4byte 0x396 1029 968 032f 96030000 .4byte 0x396
1268 969 0333 06 .uleb128 0x6 1030 969 0333 06 .uleb128 0x6
1269 -<<<<<<< .mine  
1270 970 0334 DF020000 .4byte .LASF45 1031 970 0334 DF020000 .4byte .LASF45
1271 -=======  
1272 - 970 0334 D9020000 .4byte .LASF45  
1273 ->>>>>>> .r35  
1274 971 0338 08 .byte 0x8 1032 971 0338 08 .byte 0x8
1275 972 0339 5F .byte 0x5f 1033 972 0339 5F .byte 0x5f
1276 973 033a 35020000 .4byte 0x235 1034 973 033a 35020000 .4byte 0x235
@@ -1278,11 +1036,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1278,11 +1036,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1278 975 033f 23 .byte 0x23 1036 975 033f 23 .byte 0x23
1279 976 0340 00 .uleb128 0 1037 976 0340 00 .uleb128 0
1280 977 0341 06 .uleb128 0x6 1038 977 0341 06 .uleb128 0x6
1281 -<<<<<<< .mine  
1282 978 0342 91020000 .4byte .LASF46 1039 978 0342 91020000 .4byte .LASF46
1283 -=======  
1284 - 978 0342 8B020000 .4byte .LASF46  
1285 ->>>>>>> .r35  
1286 979 0346 08 .byte 0x8 1040 979 0346 08 .byte 0x8
1287 980 0347 60 .byte 0x60 1041 980 0347 60 .byte 0x60
1288 981 0348 B1000000 .4byte 0xb1 1042 981 0348 B1000000 .4byte 0xb1
@@ -1290,11 +1044,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1290,11 +1044,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1290 983 034d 23 .byte 0x23 1044 983 034d 23 .byte 0x23
1291 984 034e 08 .uleb128 0x8 1045 984 034e 08 .uleb128 0x8
1292 985 034f 06 .uleb128 0x6 1046 985 034f 06 .uleb128 0x6
1293 -<<<<<<< .mine  
1294 986 0350 F4010000 .4byte .LASF47 1047 986 0350 F4010000 .4byte .LASF47
1295 -=======  
1296 - 986 0350 EE010000 .4byte .LASF47  
1297 ->>>>>>> .r35  
1298 987 0354 08 .byte 0x8 1048 987 0354 08 .byte 0x8
1299 988 0355 62 .byte 0x62 1049 988 0355 62 .byte 0x62
1300 989 0356 FC020000 .4byte 0x2fc 1050 989 0356 FC020000 .4byte 0x2fc
@@ -1302,11 +1052,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1302,11 +1052,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1302 991 035b 23 .byte 0x23 1052 991 035b 23 .byte 0x23
1303 992 035c 0C .uleb128 0xc 1053 992 035c 0C .uleb128 0xc
1304 993 035d 06 .uleb128 0x6 1054 993 035d 06 .uleb128 0x6
1305 -<<<<<<< .mine  
1306 994 035e 2D010000 .4byte .LASF48 1055 994 035e 2D010000 .4byte .LASF48
1307 -=======  
1308 - 994 035e 27010000 .4byte .LASF48  
1309 ->>>>>>> .r35  
1310 995 0362 08 .byte 0x8 1056 995 0362 08 .byte 0x8
1311 996 0363 65 .byte 0x65 1057 996 0363 65 .byte 0x65
1312 997 0364 2F020000 .4byte 0x22f 1058 997 0364 2F020000 .4byte 0x22f
@@ -1314,11 +1060,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1314,11 +1060,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1314 999 0369 23 .byte 0x23 1060 999 0369 23 .byte 0x23
1315 1000 036a 10 .uleb128 0x10 1061 1000 036a 10 .uleb128 0x10
1316 1001 036b 06 .uleb128 0x6 1062 1001 036b 06 .uleb128 0x6
1317 -<<<<<<< .mine  
1318 1002 036c 22020000 .4byte .LASF49 1063 1002 036c 22020000 .4byte .LASF49
1319 -=======  
1320 - 1002 036c 1C020000 .4byte .LASF49  
1321 ->>>>>>> .r35  
1322 1003 0370 08 .byte 0x8 1064 1003 0370 08 .byte 0x8
1323 1004 0371 66 .byte 0x66 1065 1004 0371 66 .byte 0x66
1324 1005 0372 2F020000 .4byte 0x22f 1066 1005 0372 2F020000 .4byte 0x22f
@@ -1326,11 +1068,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1326,11 +1068,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1326 1007 0377 23 .byte 0x23 1068 1007 0377 23 .byte 0x23
1327 1008 0378 14 .uleb128 0x14 1069 1008 0378 14 .uleb128 0x14
1328 1009 0379 06 .uleb128 0x6 1070 1009 0379 06 .uleb128 0x6
1329 -<<<<<<< .mine  
1330 1010 037a CF030000 .4byte .LASF50 1071 1010 037a CF030000 .4byte .LASF50
1331 -=======  
1332 - 1010 037a C9030000 .4byte .LASF50  
1333 ->>>>>>> .r35  
1334 1011 037e 08 .byte 0x8 1072 1011 037e 08 .byte 0x8
1335 1012 037f 6A .byte 0x6a 1073 1012 037f 6A .byte 0x6a
1336 1013 0380 DD000000 .4byte 0xdd 1074 1013 0380 DD000000 .4byte 0xdd
@@ -1338,17 +1076,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1338,17 +1076,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1338 1015 0385 23 .byte 0x23 1076 1015 0385 23 .byte 0x23
1339 1016 0386 18 .uleb128 0x18 1077 1016 0386 18 .uleb128 0x18
1340 1017 0387 06 .uleb128 0x6 1078 1017 0387 06 .uleb128 0x6
1341 -<<<<<<< .mine  
1342 1018 0388 18020000 .4byte .LASF51 1079 1018 0388 18020000 .4byte .LASF51
1343 -=======  
1344 - 1018 0388 12020000 .4byte .LASF51  
1345 ->>>>>>> .r35  
1346 1019 038c 08 .byte 0x8 1080 1019 038c 08 .byte 0x8
1347 -<<<<<<< .mine  
1348 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 19  
1349 -=======  
1350 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 19  
1351 ->>>>>>> .r35 1081 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 19
1352 1082
1353 1083
1354 1020 038d 6C .byte 0x6c 1084 1020 038d 6C .byte 0x6c
@@ -1358,20 +1088,12 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1358,20 +1088,12 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1358 1024 0394 1C .uleb128 0x1c 1088 1024 0394 1C .uleb128 0x1c
1359 1025 0395 00 .byte 0 1089 1025 0395 00 .byte 0
1360 1026 0396 04 .uleb128 0x4 1090 1026 0396 04 .uleb128 0x4
1361 -<<<<<<< .mine  
1362 1027 0397 64030000 .4byte .LASF52 1091 1027 0397 64030000 .4byte .LASF52
1363 -=======  
1364 - 1027 0397 5E030000 .4byte .LASF52  
1365 ->>>>>>> .r35  
1366 1028 039b 08 .byte 0x8 1092 1028 039b 08 .byte 0x8
1367 1029 039c 6E .byte 0x6e 1093 1029 039c 6E .byte 0x6e
1368 1030 039d 2B030000 .4byte 0x32b 1094 1030 039d 2B030000 .4byte 0x32b
1369 1031 03a1 05 .uleb128 0x5 1095 1031 03a1 05 .uleb128 0x5
1370 -<<<<<<< .mine  
1371 1032 03a2 CA010000 .4byte .LASF53 1096 1032 03a2 CA010000 .4byte .LASF53
1372 -=======  
1373 - 1032 03a2 C4010000 .4byte .LASF53  
1374 ->>>>>>> .r35  
1375 1033 03a6 10 .byte 0x10 1097 1033 03a6 10 .byte 0x10
1376 1034 03a7 09 .byte 0x9 1098 1034 03a7 09 .byte 0x9
1377 1035 03a8 2C .byte 0x2c 1099 1035 03a8 2C .byte 0x2c
@@ -1385,11 +1107,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1385,11 +1107,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1385 1043 03b9 23 .byte 0x23 1107 1043 03b9 23 .byte 0x23
1386 1044 03ba 00 .uleb128 0 1108 1044 03ba 00 .uleb128 0
1387 1045 03bb 06 .uleb128 0x6 1109 1045 03bb 06 .uleb128 0x6
1388 -<<<<<<< .mine  
1389 1046 03bc D9030000 .4byte .LASF55 1110 1046 03bc D9030000 .4byte .LASF55
1390 -=======  
1391 - 1046 03bc D3030000 .4byte .LASF55  
1392 ->>>>>>> .r35  
1393 1047 03c0 09 .byte 0x9 1111 1047 03c0 09 .byte 0x9
1394 1048 03c1 2F .byte 0x2f 1112 1048 03c1 2F .byte 0x2f
1395 1049 03c2 2F020000 .4byte 0x22f 1113 1049 03c2 2F020000 .4byte 0x22f
@@ -1397,11 +1115,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1397,11 +1115,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1397 1051 03c7 23 .byte 0x23 1115 1051 03c7 23 .byte 0x23
1398 1052 03c8 08 .uleb128 0x8 1116 1052 03c8 08 .uleb128 0x8
1399 1053 03c9 06 .uleb128 0x6 1117 1053 03c9 06 .uleb128 0x6
1400 -<<<<<<< .mine  
1401 1054 03ca 10030000 .4byte .LASF56 1118 1054 03ca 10030000 .4byte .LASF56
1402 -=======  
1403 - 1054 03ca 0A030000 .4byte .LASF56  
1404 ->>>>>>> .r35  
1405 1055 03ce 09 .byte 0x9 1119 1055 03ce 09 .byte 0x9
1406 1056 03cf 31 .byte 0x31 1120 1056 03cf 31 .byte 0x31
1407 1057 03d0 D8030000 .4byte 0x3d8 1121 1057 03d0 D8030000 .4byte 0x3d8
@@ -1413,11 +1127,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1413,11 +1127,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1413 1063 03d9 04 .byte 0x4 1127 1063 03d9 04 .byte 0x4
1414 1064 03da A1030000 .4byte 0x3a1 1128 1064 03da A1030000 .4byte 0x3a1
1415 1065 03de 04 .uleb128 0x4 1129 1065 03de 04 .uleb128 0x4
1416 -<<<<<<< .mine  
1417 1066 03df CA010000 .4byte .LASF53 1130 1066 03df CA010000 .4byte .LASF53
1418 -=======  
1419 - 1066 03df C4010000 .4byte .LASF53  
1420 ->>>>>>> .r35  
1421 1067 03e3 09 .byte 0x9 1131 1067 03e3 09 .byte 0x9
1422 1068 03e4 33 .byte 0x33 1132 1068 03e4 33 .byte 0x33
1423 1069 03e5 A1030000 .4byte 0x3a1 1133 1069 03e5 A1030000 .4byte 0x3a1
@@ -1428,18 +1138,10 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1428,18 +1138,10 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1428 1074 03f0 36 .byte 0x36 1138 1074 03f0 36 .byte 0x36
1429 1075 03f1 04040000 .4byte 0x404 1139 1075 03f1 04040000 .4byte 0x404
1430 1076 03f5 06 .uleb128 0x6 1140 1076 03f5 06 .uleb128 0x6
1431 -<<<<<<< .mine  
1432 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 20  
1433 -=======  
1434 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 20  
1435 ->>>>>>> .r35 1141 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 20
1436 1142
1437 1143
1438 -<<<<<<< .mine  
1439 1077 03f6 B5020000 .4byte .LASF58 1144 1077 03f6 B5020000 .4byte .LASF58
1440 -=======  
1441 - 1077 03f6 AF020000 .4byte .LASF58  
1442 ->>>>>>> .r35  
1443 1078 03fa 0A .byte 0xa 1145 1078 03fa 0A .byte 0xa
1444 1079 03fb 37 .byte 0x37 1146 1079 03fb 37 .byte 0x37
1445 1080 03fc 35020000 .4byte 0x235 1147 1080 03fc 35020000 .4byte 0x235
@@ -1468,20 +1170,12 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1468,20 +1170,12 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1468 1103 0428 9E .byte 0x9e 1170 1103 0428 9E .byte 0x9e
1469 1104 0429 BC000000 .4byte 0xbc 1171 1104 0429 BC000000 .4byte 0xbc
1470 1105 042d 0F .uleb128 0xf 1172 1105 042d 0F .uleb128 0xf
1471 -<<<<<<< .mine  
1472 1106 042e 9A030000 .4byte .LASF61 1173 1106 042e 9A030000 .4byte .LASF61
1473 -=======  
1474 - 1106 042e 94030000 .4byte .LASF61  
1475 ->>>>>>> .r35  
1476 1107 0432 06 .byte 0x6 1174 1107 0432 06 .byte 0x6
1477 1108 0433 A5 .byte 0xa5 1175 1108 0433 A5 .byte 0xa5
1478 1109 0434 6D020000 .4byte 0x26d 1176 1109 0434 6D020000 .4byte 0x26d
1479 1110 0438 0F .uleb128 0xf 1177 1110 0438 0F .uleb128 0xf
1480 -<<<<<<< .mine  
1481 1111 0439 98020000 .4byte .LASF62 1178 1111 0439 98020000 .4byte .LASF62
1482 -=======  
1483 - 1111 0439 92020000 .4byte .LASF62  
1484 ->>>>>>> .r35  
1485 1112 043d 06 .byte 0x6 1179 1112 043d 06 .byte 0x6
1486 1113 043e AC .byte 0xac 1180 1113 043e AC .byte 0xac
1487 1114 043f C7000000 .4byte 0xc7 1181 1114 043f C7000000 .4byte 0xc7
@@ -1494,29 +1188,17 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1494,29 +1188,17 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1494 1121 044f 03 .uleb128 0x3 1188 1121 044f 03 .uleb128 0x3
1495 1122 0450 01 .byte 0x1 1189 1122 0450 01 .byte 0x1
1496 1123 0451 08 .byte 0x8 1190 1123 0451 08 .byte 0x8
1497 -<<<<<<< .mine  
1498 1124 0452 F3020000 .4byte .LASF63 1191 1124 0452 F3020000 .4byte .LASF63
1499 -=======  
1500 - 1124 0452 ED020000 .4byte .LASF63  
1501 ->>>>>>> .r35  
1502 1125 0456 09 .uleb128 0x9 1192 1125 0456 09 .uleb128 0x9
1503 1126 0457 04 .byte 0x4 1193 1126 0457 04 .byte 0x4
1504 1127 0458 DE030000 .4byte 0x3de 1194 1127 0458 DE030000 .4byte 0x3de
1505 1128 045c 11 .uleb128 0x11 1195 1128 045c 11 .uleb128 0x11
1506 -<<<<<<< .mine  
1507 1129 045d F8020000 .4byte .LASF81 1196 1129 045d F8020000 .4byte .LASF81
1508 -=======  
1509 - 1129 045d F2020000 .4byte .LASF81  
1510 ->>>>>>> .r35  
1511 1130 0461 02 .byte 0x2 1197 1130 0461 02 .byte 0x2
1512 1131 0462 3B .byte 0x3b 1198 1131 0462 3B .byte 0x3b
1513 1132 0463 01 .byte 0x1 1199 1132 0463 01 .byte 0x1
1514 1133 0464 2F020000 .4byte 0x22f 1200 1133 0464 2F020000 .4byte 0x22f
1515 -<<<<<<< .mine  
1516 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 21  
1517 -=======  
1518 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 21  
1519 ->>>>>>> .r35 1201 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 21
1520 1202
1521 1203
1522 1134 0468 03 .byte 0x3 1204 1134 0468 03 .byte 0x3
@@ -1536,11 +1218,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1536,11 +1218,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1536 1148 0484 04 .byte 0x4 1218 1148 0484 04 .byte 0x4
1537 1149 0485 35020000 .4byte 0x235 1219 1149 0485 35020000 .4byte 0x235
1538 1150 0489 14 .uleb128 0x14 1220 1150 0489 14 .uleb128 0x14
1539 -<<<<<<< .mine  
1540 1151 048a 9E010000 .4byte .LASF82 1221 1151 048a 9E010000 .4byte .LASF82
1541 -=======  
1542 - 1151 048a 98010000 .4byte .LASF82  
1543 ->>>>>>> .r35  
1544 1152 048e 02 .byte 0x2 1222 1152 048e 02 .byte 0x2
1545 1153 048f 29 .byte 0x29 1223 1153 048f 29 .byte 0x29
1546 1154 0490 01 .byte 0x1 1224 1154 0490 01 .byte 0x1
@@ -1580,11 +1258,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1580,11 +1258,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1580 1188 04d3 01 .byte 0x1 1258 1188 04d3 01 .byte 0x1
1581 1189 04d4 3B .byte 0x3b 1259 1189 04d4 3B .byte 0x3b
1582 1190 04d5 DC040000 .4byte 0x4dc 1260 1190 04d5 DC040000 .4byte 0x4dc
1583 -<<<<<<< .mine  
1584 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 22  
1585 -=======  
1586 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 22  
1587 ->>>>>>> .r35 1261 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 22
1588 1262
1589 1263
1590 1191 04d9 01 .byte 0x1 1264 1191 04d9 01 .byte 0x1
@@ -1595,11 +1269,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1595,11 +1269,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1595 1196 04de 04040000 .4byte 0x404 1269 1196 04de 04040000 .4byte 0x404
1596 1197 04e2 17 .uleb128 0x17 1270 1197 04e2 17 .uleb128 0x17
1597 1198 04e3 01 .byte 0x1 1271 1198 04e3 01 .byte 0x1
1598 -<<<<<<< .mine  
1599 1199 04e4 3E010000 .4byte .LASF65 1272 1199 04e4 3E010000 .4byte .LASF65
1600 -=======  
1601 - 1199 04e4 38010000 .4byte .LASF65  
1602 ->>>>>>> .r35  
1603 1200 04e8 01 .byte 0x1 1273 1200 04e8 01 .byte 0x1
1604 1201 04e9 49 .byte 0x49 1274 1201 04e9 49 .byte 0x49
1605 1202 04ea 01 .byte 0x1 1275 1202 04ea 01 .byte 0x1
@@ -1643,20 +1313,12 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1643,20 +1313,12 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1643 1240 0545 00 .byte 0 1313 1240 0545 00 .byte 0
1644 1241 0546 17 .uleb128 0x17 1314 1241 0546 17 .uleb128 0x17
1645 1242 0547 01 .byte 0x1 1315 1242 0547 01 .byte 0x1
1646 -<<<<<<< .mine  
1647 1243 0548 51020000 .4byte .LASF66 1316 1243 0548 51020000 .4byte .LASF66
1648 -=======  
1649 - 1243 0548 4B020000 .4byte .LASF66  
1650 ->>>>>>> .r35  
1651 1244 054c 01 .byte 0x1 1317 1244 054c 01 .byte 0x1
1652 1245 054d 5E .byte 0x5e 1318 1245 054d 5E .byte 0x5e
1653 1246 054e 01 .byte 0x1 1319 1246 054e 01 .byte 0x1
1654 1247 054f 00000000 .4byte .LFB9 1320 1247 054f 00000000 .4byte .LFB9
1655 -<<<<<<< .mine  
1656 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 23  
1657 -=======  
1658 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 23  
1659 ->>>>>>> .r35 1321 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 23
1660 1322
1661 1323
1662 1248 0553 1A000000 .4byte .LFE9 1324 1248 0553 1A000000 .4byte .LFE9
@@ -1716,11 +1378,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1716,11 +1378,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1716 1302 05de 8A .byte 0x8a 1378 1302 05de 8A .byte 0x8a
1717 1303 05df 00060000 .4byte 0x600 1379 1303 05df 00060000 .4byte 0x600
1718 1304 05e3 1A .uleb128 0x1a 1380 1304 05e3 1A .uleb128 0x1a
1719 -<<<<<<< .mine  
1720 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 24  
1721 -=======  
1722 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 24  
1723 ->>>>>>> .r35 1381 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 24
1724 1382
1725 1383
1726 1305 05e4 6D040000 .4byte 0x46d 1384 1305 05e4 6D040000 .4byte 0x46d
@@ -1739,11 +1397,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1739,11 +1397,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1739 1318 0609 00 .byte 0 1397 1318 0609 00 .byte 0
1740 1319 060a 17 .uleb128 0x17 1398 1319 060a 17 .uleb128 0x17
1741 1320 060b 01 .byte 0x1 1399 1320 060b 01 .byte 0x1
1742 -<<<<<<< .mine  
1743 1321 060c 2A020000 .4byte .LASF68 1400 1321 060c 2A020000 .4byte .LASF68
1744 -=======  
1745 - 1321 060c 24020000 .4byte .LASF68  
1746 ->>>>>>> .r35  
1747 1322 0610 01 .byte 0x1 1401 1322 0610 01 .byte 0x1
1748 1323 0611 6E .byte 0x6e 1402 1323 0611 6E .byte 0x6e
1749 1324 0612 01 .byte 0x1 1403 1324 0612 01 .byte 0x1
@@ -1776,11 +1430,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1776,11 +1430,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1776 1351 0650 00 .byte 0 1430 1351 0650 00 .byte 0
1777 1352 0651 23 .uleb128 0x23 1431 1352 0651 23 .uleb128 0x23
1778 1353 0652 01 .byte 0x1 1432 1353 0652 01 .byte 0x1
1779 -<<<<<<< .mine  
1780 1354 0653 04030000 .4byte .LASF69 1433 1354 0653 04030000 .4byte .LASF69
1781 -=======  
1782 - 1354 0653 FE020000 .4byte .LASF69  
1783 ->>>>>>> .r35  
1784 1355 0657 01 .byte 0x1 1434 1355 0657 01 .byte 0x1
1785 1356 0658 B8 .byte 0xb8 1435 1356 0658 B8 .byte 0xb8
1786 1357 0659 01 .byte 0x1 1436 1357 0659 01 .byte 0x1
@@ -1788,11 +1438,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1788,11 +1438,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1788 1359 065e 00000000 .4byte .LFB13 1438 1359 065e 00000000 .4byte .LFB13
1789 1360 0662 48000000 .4byte .LFE13 1439 1360 0662 48000000 .4byte .LFE13
1790 1361 0666 A5010000 .4byte .LLST14 1440 1361 0666 A5010000 .4byte .LLST14
1791 -<<<<<<< .mine  
1792 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 25  
1793 -=======  
1794 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 25  
1795 ->>>>>>> .r35 1441 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 25
1796 1442
1797 1443
1798 1362 066a 01 .byte 0x1 1444 1362 066a 01 .byte 0x1
@@ -1852,11 +1498,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1852,11 +1498,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1852 1416 06f2 1E .uleb128 0x1e 1498 1416 06f2 1E .uleb128 0x1e
1853 1417 06f3 01 .byte 0x1 1499 1417 06f3 01 .byte 0x1
1854 1418 06f4 50 .byte 0x50 1500 1418 06f4 50 .byte 0x50
1855 -<<<<<<< .mine  
1856 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 26  
1857 -=======  
1858 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 26  
1859 ->>>>>>> .r35 1501 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 26
1860 1502
1861 1503
1862 1419 06f5 01 .byte 0x1 1504 1419 06f5 01 .byte 0x1
@@ -1875,11 +1517,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1875,11 +1517,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1875 1432 0708 00 .byte 0 1517 1432 0708 00 .byte 0
1876 1433 0709 23 .uleb128 0x23 1518 1433 0709 23 .uleb128 0x23
1877 1434 070a 01 .byte 0x1 1519 1434 070a 01 .byte 0x1
1878 -<<<<<<< .mine  
1879 1435 070b 2C030000 .4byte .LASF70 1520 1435 070b 2C030000 .4byte .LASF70
1880 -=======  
1881 - 1435 070b 26030000 .4byte .LASF70  
1882 ->>>>>>> .r35  
1883 1436 070f 01 .byte 0x1 1521 1436 070f 01 .byte 0x1
1884 1437 0710 9E .byte 0x9e 1522 1437 0710 9E .byte 0x9e
1885 1438 0711 01 .byte 0x1 1523 1438 0711 01 .byte 0x1
@@ -1916,19 +1554,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1916,19 +1554,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1916 1469 0753 00 .byte 0 1554 1469 0753 00 .byte 0
1917 1470 0754 27 .uleb128 0x27 1555 1470 0754 27 .uleb128 0x27
1918 1471 0755 01 .byte 0x1 1556 1471 0755 01 .byte 0x1
1919 -<<<<<<< .mine  
1920 1472 0756 D9010000 .4byte .LASF71 1557 1472 0756 D9010000 .4byte .LASF71
1921 -=======  
1922 - 1472 0756 D3010000 .4byte .LASF71  
1923 ->>>>>>> .r35  
1924 1473 075a 01 .byte 0x1 1558 1473 075a 01 .byte 0x1
1925 1474 075b 0E01 .2byte 0x10e 1559 1474 075b 0E01 .2byte 0x10e
1926 1475 075d 01 .byte 0x1 1560 1475 075d 01 .byte 0x1
1927 -<<<<<<< .mine  
1928 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 27  
1929 -=======  
1930 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 27  
1931 ->>>>>>> .r35 1561 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 27
1932 1562
1933 1563
1934 1476 075e BC000000 .4byte 0xbc 1564 1476 075e BC000000 .4byte 0xbc
@@ -1944,11 +1574,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1944,11 +1574,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1944 1486 077a DC040000 .4byte 0x4dc 1574 1486 077a DC040000 .4byte 0x4dc
1945 1487 077e E5020000 .4byte .LLST24 1575 1487 077e E5020000 .4byte .LLST24
1946 1488 0782 29 .uleb128 0x29 1576 1488 0782 29 .uleb128 0x29
1947 -<<<<<<< .mine  
1948 1489 0783 07020000 .4byte .LASF72 1577 1489 0783 07020000 .4byte .LASF72
1949 -=======  
1950 - 1489 0783 01020000 .4byte .LASF72  
1951 ->>>>>>> .r35  
1952 1490 0787 01 .byte 0x1 1578 1490 0787 01 .byte 0x1
1953 1491 0788 0E01 .2byte 0x10e 1579 1491 0788 0E01 .2byte 0x10e
1954 1492 078a D2000000 .4byte 0xd2 1580 1492 078a D2000000 .4byte 0xd2
@@ -1992,11 +1618,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -1992,11 +1618,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1992 1530 07ee 22 .uleb128 0x22 1618 1530 07ee 22 .uleb128 0x22
1993 1531 07ef 36000000 .4byte .LVL38 1619 1531 07ef 36000000 .4byte .LVL38
1994 1532 07f3 F7080000 .4byte 0x8f7 1620 1532 07f3 F7080000 .4byte 0x8f7
1995 -<<<<<<< .mine  
1996 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 28  
1997 -=======  
1998 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 28  
1999 ->>>>>>> .r35 1621 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 28
2000 1622
2001 1623
2002 1533 07f7 07080000 .4byte 0x807 1624 1533 07f7 07080000 .4byte 0x807
@@ -2025,11 +1647,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2025,11 +1647,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2025 1556 0817 00 .byte 0 1647 1556 0817 00 .byte 0
2026 1557 0818 23 .uleb128 0x23 1648 1557 0818 23 .uleb128 0x23
2027 1558 0819 01 .byte 0x1 1649 1558 0819 01 .byte 0x1
2028 -<<<<<<< .mine  
2029 1559 081a A8030000 .4byte .LASF73 1650 1559 081a A8030000 .4byte .LASF73
2030 -=======  
2031 - 1559 081a A2030000 .4byte .LASF73  
2032 ->>>>>>> .r35  
2033 1560 081e 01 .byte 0x1 1651 1560 081e 01 .byte 0x1
2034 1561 081f E9 .byte 0xe9 1652 1561 081f E9 .byte 0xe9
2035 1562 0820 01 .byte 0x1 1653 1562 0820 01 .byte 0x1
@@ -2046,11 +1664,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2046,11 +1664,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2046 1573 083c DC040000 .4byte 0x4dc 1664 1573 083c DC040000 .4byte 0x4dc
2047 1574 0840 A3030000 .4byte .LLST31 1665 1574 0840 A3030000 .4byte .LLST31
2048 1575 0844 2C .uleb128 0x2c 1666 1575 0844 2C .uleb128 0x2c
2049 -<<<<<<< .mine  
2050 1576 0845 07020000 .4byte .LASF72 1667 1576 0845 07020000 .4byte .LASF72
2051 -=======  
2052 - 1576 0845 01020000 .4byte .LASF72  
2053 ->>>>>>> .r35  
2054 1577 0849 01 .byte 0x1 1668 1577 0849 01 .byte 0x1
2055 1578 084a E9 .byte 0xe9 1669 1578 084a E9 .byte 0xe9
2056 1579 084b D2000000 .4byte 0xd2 1670 1579 084b D2000000 .4byte 0xd2
@@ -2064,11 +1678,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2064,11 +1678,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2064 1587 085f 50 .byte 0x50 1678 1587 085f 50 .byte 0x50
2065 1588 0860 1D .uleb128 0x1d 1679 1588 0860 1D .uleb128 0x1d
2066 1589 0861 08000000 .4byte .LVL43 1680 1589 0861 08000000 .4byte .LVL43
2067 -<<<<<<< .mine  
2068 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 29  
2069 -=======  
2070 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 29  
2071 ->>>>>>> .r35 1681 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 29
2072 1682
2073 1683
2074 1590 0865 54070000 .4byte 0x754 1684 1590 0865 54070000 .4byte 0x754
@@ -2089,11 +1699,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2089,11 +1699,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2089 1605 0877 00 .byte 0 1699 1605 0877 00 .byte 0
2090 1606 0878 00 .byte 0 1700 1606 0878 00 .byte 0
2091 1607 0879 2D .uleb128 0x2d 1701 1607 0879 2D .uleb128 0x2d
2092 -<<<<<<< .mine  
2093 1608 087a 6E030000 .4byte .LASF83 1702 1608 087a 6E030000 .4byte .LASF83
2094 -=======  
2095 - 1608 087a 68030000 .4byte .LASF83  
2096 ->>>>>>> .r35  
2097 1609 087e 08 .byte 0x8 1703 1609 087e 08 .byte 0x8
2098 1610 087f 72 .byte 0x72 1704 1610 087f 72 .byte 0x72
2099 1611 0880 96030000 .4byte 0x396 1705 1611 0880 96030000 .4byte 0x396
@@ -2101,11 +1707,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2101,11 +1707,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2101 1613 0885 01 .byte 0x1 1707 1613 0885 01 .byte 0x1
2102 1614 0886 2E .uleb128 0x2e 1708 1614 0886 2E .uleb128 0x2e
2103 1615 0887 01 .byte 0x1 1709 1615 0887 01 .byte 0x1
2104 -<<<<<<< .mine  
2105 1616 0888 50030000 .4byte .LASF74 1710 1616 0888 50030000 .4byte .LASF74
2106 -=======  
2107 - 1616 0888 4A030000 .4byte .LASF74  
2108 ->>>>>>> .r35  
2109 1617 088c 08 .byte 0x8 1711 1617 088c 08 .byte 0x8
2110 1618 088d 9C .byte 0x9c 1712 1618 088d 9C .byte 0x9c
2111 1619 088e 01 .byte 0x1 1713 1619 088e 01 .byte 0x1
@@ -2118,11 +1720,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2118,11 +1720,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2118 1626 089e 00 .byte 0 1720 1626 089e 00 .byte 0
2119 1627 089f 30 .uleb128 0x30 1721 1627 089f 30 .uleb128 0x30
2120 1628 08a0 01 .byte 0x1 1722 1628 08a0 01 .byte 0x1
2121 -<<<<<<< .mine  
2122 1629 08a1 E7020000 .4byte .LASF84 1723 1629 08a1 E7020000 .4byte .LASF84
2123 -=======  
2124 - 1629 08a1 E1020000 .4byte .LASF84  
2125 ->>>>>>> .r35  
2126 1630 08a5 08 .byte 0x8 1724 1630 08a5 08 .byte 0x8
2127 1631 08a6 93 .byte 0x93 1725 1631 08a6 93 .byte 0x93
2128 1632 08a7 01 .byte 0x1 1726 1632 08a7 01 .byte 0x1
@@ -2134,29 +1732,17 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2134,29 +1732,17 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2134 1638 08b6 00 .byte 0 1732 1638 08b6 00 .byte 0
2135 1639 08b7 31 .uleb128 0x31 1733 1639 08b7 31 .uleb128 0x31
2136 1640 08b8 01 .byte 0x1 1734 1640 08b8 01 .byte 0x1
2137 -<<<<<<< .mine  
2138 1641 08b9 1C010000 .4byte .LASF85 1735 1641 08b9 1C010000 .4byte .LASF85
2139 -=======  
2140 - 1641 08b9 16010000 .4byte .LASF85  
2141 ->>>>>>> .r35  
2142 1642 08bd 08 .byte 0x8 1736 1642 08bd 08 .byte 0x8
2143 1643 08be 9F .byte 0x9f 1737 1643 08be 9F .byte 0x9f
2144 1644 08bf 01 .byte 0x1 1738 1644 08bf 01 .byte 0x1
2145 1645 08c0 01 .byte 0x1 1739 1645 08c0 01 .byte 0x1
2146 1646 08c1 32 .uleb128 0x32 1740 1646 08c1 32 .uleb128 0x32
2147 -<<<<<<< .mine  
2148 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 30  
2149 -=======  
2150 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 30  
2151 ->>>>>>> .r35 1741 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 30
2152 1742
2153 1743
2154 1647 08c2 01 .byte 0x1 1744 1647 08c2 01 .byte 0x1
2155 -<<<<<<< .mine  
2156 1648 08c3 51010000 .4byte .LASF86 1745 1648 08c3 51010000 .4byte .LASF86
2157 -=======  
2158 - 1648 08c3 4B010000 .4byte .LASF86  
2159 ->>>>>>> .r35  
2160 1649 08c7 09 .byte 0x9 1746 1649 08c7 09 .byte 0x9
2161 1650 08c8 3E .byte 0x3e 1747 1650 08c8 3E .byte 0x3e
2162 1651 08c9 01 .byte 0x1 1748 1651 08c9 01 .byte 0x1
@@ -2164,11 +1750,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2164,11 +1750,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2164 1653 08ce 01 .byte 0x1 1750 1653 08ce 01 .byte 0x1
2165 1654 08cf 2E .uleb128 0x2e 1751 1654 08cf 2E .uleb128 0x2e
2166 1655 08d0 01 .byte 0x1 1752 1655 08d0 01 .byte 0x1
2167 -<<<<<<< .mine  
2168 1656 08d1 BD020000 .4byte .LASF75 1753 1656 08d1 BD020000 .4byte .LASF75
2169 -=======  
2170 - 1656 08d1 B7020000 .4byte .LASF75  
2171 ->>>>>>> .r35  
2172 1657 08d5 08 .byte 0x8 1754 1657 08d5 08 .byte 0x8
2173 1658 08d6 96 .byte 0x96 1755 1658 08d6 96 .byte 0x96
2174 1659 08d7 01 .byte 0x1 1756 1659 08d7 01 .byte 0x1
@@ -2190,11 +1772,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2190,11 +1772,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2190 1675 08f6 00 .byte 0 1772 1675 08f6 00 .byte 0
2191 1676 08f7 33 .uleb128 0x33 1773 1676 08f7 33 .uleb128 0x33
2192 1677 08f8 01 .byte 0x1 1774 1677 08f8 01 .byte 0x1
2193 -<<<<<<< .mine  
2194 1678 08f9 BA030000 .4byte .LASF77 1775 1678 08f9 BA030000 .4byte .LASF77
2195 -=======  
2196 - 1678 08f9 B4030000 .4byte .LASF77  
2197 ->>>>>>> .r35  
2198 1679 08fd 08 .byte 0x8 1776 1679 08fd 08 .byte 0x8
2199 1680 08fe 99 .byte 0x99 1777 1680 08fe 99 .byte 0x99
2200 1681 08ff 01 .byte 0x1 1778 1681 08ff 01 .byte 0x1
@@ -2220,11 +1798,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2220,11 +1798,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2220 1701 0009 1B .uleb128 0x1b 1798 1701 0009 1B .uleb128 0x1b
2221 1702 000a 0E .uleb128 0xe 1799 1702 000a 0E .uleb128 0xe
2222 1703 000b 55 .uleb128 0x55 1800 1703 000b 55 .uleb128 0x55
2223 -<<<<<<< .mine  
2224 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 31  
2225 -=======  
2226 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 31  
2227 ->>>>>>> .r35 1801 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 31
2228 1802
2229 1803
2230 1704 000c 06 .uleb128 0x6 1804 1704 000c 06 .uleb128 0x6
@@ -2284,11 +1858,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2284,11 +1858,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2284 1758 0042 0B .uleb128 0xb 1858 1758 0042 0B .uleb128 0xb
2285 1759 0043 01 .uleb128 0x1 1859 1759 0043 01 .uleb128 0x1
2286 1760 0044 13 .uleb128 0x13 1860 1760 0044 13 .uleb128 0x13
2287 -<<<<<<< .mine  
2288 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 32  
2289 -=======  
2290 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 32  
2291 ->>>>>>> .r35 1861 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 32
2292 1862
2293 1863
2294 1761 0045 00 .byte 0 1864 1761 0045 00 .byte 0
@@ -2348,11 +1918,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2348,11 +1918,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2348 1815 007b 0A .uleb128 0xa 1918 1815 007b 0A .uleb128 0xa
2349 1816 007c 0F .uleb128 0xf 1919 1816 007c 0F .uleb128 0xf
2350 1817 007d 00 .byte 0 1920 1817 007d 00 .byte 0
2351 -<<<<<<< .mine  
2352 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 33  
2353 -=======  
2354 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 33  
2355 ->>>>>>> .r35 1921 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 33
2356 1922
2357 1923
2358 1818 007e 0B .uleb128 0xb 1924 1818 007e 0B .uleb128 0xb
@@ -2412,11 +1978,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2412,11 +1978,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2412 1872 00b4 0F .uleb128 0xf 1978 1872 00b4 0F .uleb128 0xf
2413 1873 00b5 0D .uleb128 0xd 1979 1873 00b5 0D .uleb128 0xd
2414 1874 00b6 00 .byte 0 1980 1874 00b6 00 .byte 0
2415 -<<<<<<< .mine  
2416 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 34  
2417 -=======  
2418 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 34  
2419 ->>>>>>> .r35 1981 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 34
2420 1982
2421 1983
2422 1875 00b7 03 .uleb128 0x3 1984 1875 00b7 03 .uleb128 0x3
@@ -2476,11 +2038,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2476,11 +2038,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2476 1929 00ed 3A .uleb128 0x3a 2038 1929 00ed 3A .uleb128 0x3a
2477 1930 00ee 0B .uleb128 0xb 2039 1930 00ee 0B .uleb128 0xb
2478 1931 00ef 3B .uleb128 0x3b 2040 1931 00ef 3B .uleb128 0x3b
2479 -<<<<<<< .mine  
2480 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 35  
2481 -=======  
2482 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 35  
2483 ->>>>>>> .r35 2041 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 35
2484 2042
2485 2043
2486 1932 00f0 0B .uleb128 0xb 2044 1932 00f0 0B .uleb128 0xb
@@ -2540,11 +2098,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2540,11 +2098,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2540 1986 0127 3B .uleb128 0x3b 2098 1986 0127 3B .uleb128 0x3b
2541 1987 0128 0B .uleb128 0xb 2099 1987 0128 0B .uleb128 0xb
2542 1988 0129 49 .uleb128 0x49 2100 1988 0129 49 .uleb128 0x49
2543 -<<<<<<< .mine  
2544 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 36  
2545 -=======  
2546 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 36  
2547 ->>>>>>> .r35 2101 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 36
2548 2102
2549 2103
2550 1989 012a 13 .uleb128 0x13 2104 1989 012a 13 .uleb128 0x13
@@ -2604,11 +2158,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2604,11 +2158,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2604 2043 0161 58 .uleb128 0x58 2158 2043 0161 58 .uleb128 0x58
2605 2044 0162 0B .uleb128 0xb 2159 2044 0162 0B .uleb128 0xb
2606 2045 0163 59 .uleb128 0x59 2160 2045 0163 59 .uleb128 0x59
2607 -<<<<<<< .mine  
2608 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 37  
2609 -=======  
2610 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 37  
2611 ->>>>>>> .r35 2161 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 37
2612 2162
2613 2163
2614 2046 0164 0B .uleb128 0xb 2164 2046 0164 0B .uleb128 0xb
@@ -2668,11 +2218,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2668,11 +2218,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2668 2100 019f 01 .uleb128 0x1 2218 2100 019f 01 .uleb128 0x1
2669 2101 01a0 12 .uleb128 0x12 2219 2101 01a0 12 .uleb128 0x12
2670 2102 01a1 01 .uleb128 0x1 2220 2102 01a1 01 .uleb128 0x1
2671 -<<<<<<< .mine  
2672 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 38  
2673 -=======  
2674 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 38  
2675 ->>>>>>> .r35 2221 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 38
2676 2222
2677 2223
2678 2103 01a2 58 .uleb128 0x58 2224 2103 01a2 58 .uleb128 0x58
@@ -2732,11 +2278,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2732,11 +2278,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2732 2157 01dc 12 .uleb128 0x12 2278 2157 01dc 12 .uleb128 0x12
2733 2158 01dd 01 .uleb128 0x1 2279 2158 01dd 01 .uleb128 0x1
2734 2159 01de 40 .uleb128 0x40 2280 2159 01de 40 .uleb128 0x40
2735 -<<<<<<< .mine  
2736 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 39  
2737 -=======  
2738 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 39  
2739 ->>>>>>> .r35 2281 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 39
2740 2282
2741 2283
2742 2160 01df 06 .uleb128 0x6 2284 2160 01df 06 .uleb128 0x6
@@ -2796,11 +2338,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2796,11 +2338,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2796 2214 0216 0B .uleb128 0xb 2338 2214 0216 0B .uleb128 0xb
2797 2215 0217 3B .uleb128 0x3b 2339 2215 0217 3B .uleb128 0x3b
2798 2216 0218 05 .uleb128 0x5 2340 2216 0218 05 .uleb128 0x5
2799 -<<<<<<< .mine  
2800 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 40  
2801 -=======  
2802 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 40  
2803 ->>>>>>> .r35 2341 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 40
2804 2342
2805 2343
2806 2217 0219 27 .uleb128 0x27 2344 2217 0219 27 .uleb128 0x27
@@ -2860,11 +2398,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2860,11 +2398,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2860 2271 0250 05 .uleb128 0x5 2398 2271 0250 05 .uleb128 0x5
2861 2272 0251 49 .uleb128 0x49 2399 2272 0251 49 .uleb128 0x49
2862 2273 0252 13 .uleb128 0x13 2400 2273 0252 13 .uleb128 0x13
2863 -<<<<<<< .mine  
2864 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 41  
2865 -=======  
2866 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 41  
2867 ->>>>>>> .r35 2401 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 41
2868 2402
2869 2403
2870 2274 0253 02 .uleb128 0x2 2404 2274 0253 02 .uleb128 0x2
@@ -2924,11 +2458,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2924,11 +2458,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2924 2328 0289 2E .uleb128 0x2e 2458 2328 0289 2E .uleb128 0x2e
2925 2329 028a 01 .byte 0x1 2459 2329 028a 01 .byte 0x1
2926 2330 028b 3F .uleb128 0x3f 2460 2330 028b 3F .uleb128 0x3f
2927 -<<<<<<< .mine  
2928 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 42  
2929 -=======  
2930 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 42  
2931 ->>>>>>> .r35 2461 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 42
2932 2462
2933 2463
2934 2331 028c 0C .uleb128 0xc 2464 2331 028c 0C .uleb128 0xc
@@ -2988,11 +2518,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -2988,11 +2518,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2988 2385 02c2 27 .uleb128 0x27 2518 2385 02c2 27 .uleb128 0x27
2989 2386 02c3 0C .uleb128 0xc 2519 2386 02c3 0C .uleb128 0xc
2990 2387 02c4 3C .uleb128 0x3c 2520 2387 02c4 3C .uleb128 0x3c
2991 -<<<<<<< .mine  
2992 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 43  
2993 -=======  
2994 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 43  
2995 ->>>>>>> .r35 2521 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 43
2996 2522
2997 2523
2998 2388 02c5 0C .uleb128 0xc 2524 2388 02c5 0C .uleb128 0xc
@@ -3052,11 +2578,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3052,11 +2578,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3052 2442 0017 08 .sleb128 8 2578 2442 0017 08 .sleb128 8
3053 2443 0018 00000000 .4byte 0 2579 2443 0018 00000000 .4byte 0
3054 2444 001c 00000000 .4byte 0 2580 2444 001c 00000000 .4byte 0
3055 -<<<<<<< .mine  
3056 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 44  
3057 -=======  
3058 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 44  
3059 ->>>>>>> .r35 2581 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 44
3060 2582
3061 2583
3062 2445 .LLST1: 2584 2445 .LLST1:
@@ -3116,11 +2638,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3116,11 +2638,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3116 2499 00a4 06000000 .4byte .LVL6 2638 2499 00a4 06000000 .4byte .LVL6
3117 2500 00a8 0100 .2byte 0x1 2639 2500 00a8 0100 .2byte 0x1
3118 2501 00aa 50 .byte 0x50 2640 2501 00aa 50 .byte 0x50
3119 -<<<<<<< .mine  
3120 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 45  
3121 -=======  
3122 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 45  
3123 ->>>>>>> .r35 2641 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 45
3124 2642
3125 2643
3126 2502 00ab 06000000 .4byte .LVL6 2644 2502 00ab 06000000 .4byte .LVL6
@@ -3180,11 +2698,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3180,11 +2698,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3180 2556 0133 0100 .2byte 0x1 2698 2556 0133 0100 .2byte 0x1
3181 2557 0135 54 .byte 0x54 2699 2557 0135 54 .byte 0x54
3182 2558 0136 00000000 .4byte 0 2700 2558 0136 00000000 .4byte 0
3183 -<<<<<<< .mine  
3184 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 46  
3185 -=======  
3186 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 46  
3187 ->>>>>>> .r35 2701 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 46
3188 2702
3189 2703
3190 2559 013a 00000000 .4byte 0 2704 2559 013a 00000000 .4byte 0
@@ -3244,11 +2758,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3244,11 +2758,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3244 2613 01c1 00000000 .4byte 0 2758 2613 01c1 00000000 .4byte 0
3245 2614 .LLST15: 2759 2614 .LLST15:
3246 2615 01c5 00000000 .4byte .LVL18 2760 2615 01c5 00000000 .4byte .LVL18
3247 -<<<<<<< .mine  
3248 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 47  
3249 -=======  
3250 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 47  
3251 ->>>>>>> .r35 2761 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 47
3252 2762
3253 2763
3254 2616 01c9 0B000000 .4byte .LVL20-1 2764 2616 01c9 0B000000 .4byte .LVL20-1
@@ -3308,11 +2818,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3308,11 +2818,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3308 2670 025b 10000000 .4byte .LVL21 2818 2670 025b 10000000 .4byte .LVL21
3309 2671 025f 16000000 .4byte .LVL22 2819 2671 025f 16000000 .4byte .LVL22
3310 2672 0263 0100 .2byte 0x1 2820 2672 0263 0100 .2byte 0x1
3311 -<<<<<<< .mine  
3312 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 48  
3313 -=======  
3314 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 48  
3315 ->>>>>>> .r35 2821 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 48
3316 2822
3317 2823
3318 2673 0265 55 .byte 0x55 2824 2673 0265 55 .byte 0x55
@@ -3372,11 +2878,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3372,11 +2878,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3372 2727 02ed 0100 .2byte 0x1 2878 2727 02ed 0100 .2byte 0x1
3373 2728 02ef 50 .byte 0x50 2879 2728 02ef 50 .byte 0x50
3374 2729 02f0 0B000000 .4byte .LVL33-1 2880 2729 02f0 0B000000 .4byte .LVL33-1
3375 -<<<<<<< .mine  
3376 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 49  
3377 -=======  
3378 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 49  
3379 ->>>>>>> .r35 2881 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 49
3380 2882
3381 2883
3382 2730 02f4 4C000000 .4byte .LFE15 2884 2730 02f4 4C000000 .4byte .LFE15
@@ -3436,11 +2938,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3436,11 +2938,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3436 2784 0387 02000000 .4byte .LCFI7 2938 2784 0387 02000000 .4byte .LCFI7
3437 2785 038b 0200 .2byte 0x2 2939 2785 038b 0200 .2byte 0x2
3438 2786 038d 7D .byte 0x7d 2940 2786 038d 7D .byte 0x7d
3439 -<<<<<<< .mine  
3440 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 50  
3441 -=======  
3442 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 50  
3443 ->>>>>>> .r35 2941 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 50
3444 2942
3445 2943
3446 2787 038e 00 .sleb128 0 2944 2787 038e 00 .sleb128 0
@@ -3500,11 +2998,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3500,11 +2998,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3500 2841 0038 00000000 .4byte .LFB13 2998 2841 0038 00000000 .4byte .LFB13
3501 2842 003c 48000000 .4byte .LFE13-.LFB13 2999 2842 003c 48000000 .4byte .LFE13-.LFB13
3502 2843 0040 00000000 .4byte .LFB12 3000 2843 0040 00000000 .4byte .LFB12
3503 -<<<<<<< .mine  
3504 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 51  
3505 -=======  
3506 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 51  
3507 ->>>>>>> .r35 3001 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 51
3508 3002
3509 3003
3510 2844 0044 0C000000 .4byte .LFE12-.LFB12 3004 2844 0044 0C000000 .4byte .LFE12-.LFB12
@@ -3564,11 +3058,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3564,11 +3058,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3564 2898 00b4 1A000000 .4byte .LFE9 3058 2898 00b4 1A000000 .4byte .LFE9
3565 2899 00b8 00000000 .4byte .LFB11 3059 2899 00b8 00000000 .4byte .LFB11
3566 2900 00bc 22000000 .4byte .LFE11 3060 2900 00bc 22000000 .4byte .LFE11
3567 -<<<<<<< .mine  
3568 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 52  
3569 -=======  
3570 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 52  
3571 ->>>>>>> .r35 3061 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 52
3572 3062
3573 3063
3574 2901 00c0 00000000 .4byte .LFB10 3064 2901 00c0 00000000 .4byte .LFB10
@@ -3585,15 +3075,14 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3585,15 +3075,14 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3585 2912 00ec 00000000 .4byte 0 3075 2912 00ec 00000000 .4byte 0
3586 2913 .section .debug_line,"",%progbits 3076 2913 .section .debug_line,"",%progbits
3587 2914 .Ldebug_line0: 3077 2914 .Ldebug_line0:
3588 - 2915 0000 53020000 .section .debug_str,"MS",%progbits,1  
3589 - 2915 02001A01 3078 + 2915 0000 4A020000 .section .debug_str,"MS",%progbits,1
  3079 + 2915 02001101
3590 2915 00000201 3080 2915 00000201
3591 2915 FB0E0D00 3081 2915 FB0E0D00
3592 2915 01010101 3082 2915 01010101
3593 2916 .LASF34: 3083 2916 .LASF34:
3594 2917 0000 705F6D73 .ascii "p_msg\000" 3084 2917 0000 705F6D73 .ascii "p_msg\000"
3595 2917 6700 3085 2917 6700
3596 -<<<<<<< .mine  
3597 2918 .LASF80: 3086 2918 .LASF80:
3598 2919 0006 433A5C44 .ascii "C:\\Documents and Settings\\Administrador\\Mis docu" 3087 2919 0006 433A5C44 .ascii "C:\\Documents and Settings\\Administrador\\Mis docu"
3599 2919 6F63756D 3088 2919 6F63756D
@@ -3629,48 +3118,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3629,48 +3118,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3629 2929 00 3118 2929 00
3630 2930 .LASF67: 3119 2930 .LASF67:
3631 2931 00ad 6368436F .ascii "chCondBroadcastI\000" 3120 2931 00ad 6368436F .ascii "chCondBroadcastI\000"
3632 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 53  
3633 -=======  
3634 - 2918 .LASF64:  
3635 - 2919 0006 6368436F .ascii "chCondInit\000"  
3636 - 2919 6E64496E  
3637 - 2919 697400  
3638 - 2920 .LASF59:  
3639 - 2921 0011 7264796D .ascii "rdymsg\000"  
3640 - 2921 736700  
3641 - 2922 .LASF11:  
3642 - 2923 0018 6C6F6E67 .ascii "long long unsigned int\000"  
3643 - 2923 206C6F6E  
3644 - 2923 6720756E  
3645 - 2923 7369676E  
3646 - 2923 65642069  
3647 - 2924 .LASF60:  
3648 - 2925 002f 65786974 .ascii "exitcode\000"  
3649 - 2925 636F6465  
3650 - 2925 00  
3651 - 2926 .LASF67:  
3652 - 2927 0038 6368436F .ascii "chCondBroadcastI\000"  
3653 - 2927 6E644272  
3654 - 2927 6F616463  
3655 - 2927 61737449  
3656 - 2927 00  
3657 - 2928 .LASF23:  
3658 - 2929 0049 705F7072 .ascii "p_prio\000"  
3659 - 2929 696F00  
3660 - 2930 .LASF10:  
3661 - 2931 0050 6C6F6E67 .ascii "long long int\000"  
3662 - 2931 206C6F6E  
3663 - 2931 6720696E  
3664 - 2931 7400  
3665 - 2932 .LASF1:  
3666 - 2933 005e 7369676E .ascii "signed char\000"  
3667 - 2933 65642063  
3668 - 2933 68617200  
3669 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 53  
3670 ->>>>>>> .r35 3121 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 53
3671 3122
3672 3123
3673 -<<<<<<< .mine  
3674 2931 6E644272 3124 2931 6E644272
3675 2931 6F616463 3125 2931 6F616463
3676 2931 61737449 3126 2931 61737449
@@ -3716,55 +3166,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3716,55 +3166,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3716 2953 68526573 3166 2953 68526573
3717 2953 63686564 3167 2953 63686564
3718 2953 756C6553 3168 2953 756C6553
3719 -=======  
3720 - 2934 .LASF38:  
3721 - 2935 006a 705F6D70 .ascii "p_mpool\000"  
3722 - 2935 6F6F6C00  
3723 - 2936 .LASF54:  
3724 - 2937 0072 6D5F7175 .ascii "m_queue\000"  
3725 - 2937 65756500  
3726 - 2938 .LASF57:  
3727 - 2939 007a 436F6E64 .ascii "CondVar\000"  
3728 - 2939 56617200  
3729 - 2940 .LASF7:  
3730 - 2941 0082 6C6F6E67 .ascii "long int\000"  
3731 - 2941 20696E74  
3732 - 2941 00  
3733 - 2942 .LASF13:  
3734 - 2943 008b 74737461 .ascii "tstate_t\000"  
3735 - 2943 74655F74  
3736 - 2943 00  
3737 - 2944 .LASF76:  
3738 - 2945 0094 63684D74 .ascii "chMtxLockS\000"  
3739 - 2945 784C6F63  
3740 - 2945 6B5300  
3741 - 2946 .LASF25:  
3742 - 2947 009f 705F6E65 .ascii "p_newer\000"  
3743 - 2947 77657200  
3744 - 2948 .LASF80:  
3745 - 2949 00a7 433A5C44 .ascii "C:\\Documents and Settings\\maria\\Mis documentos\\"  
3746 - 2949 6F63756D  
3747 - 2949 656E7473  
3748 - 2949 20616E64  
3749 - 2949 20536574  
3750 - 2950 00d6 756E695C .ascii "uni\\tercer\\Q2\\PAET\\Smartcities\\Project\\applic"  
3751 - 2950 74657263  
3752 - 2950 65725C51  
3753 - 2950 325C5041  
3754 - 2950 45545C53  
3755 - 2951 0103 6174696F .ascii "ations\\smartcities\000"  
3756 - 2951 6E735C73  
3757 - 2951 6D617274  
3758 - 2951 63697469  
3759 - 2951 657300  
3760 - 2952 .LASF85:  
3761 - 2953 0116 63685363 .ascii "chSchRescheduleS\000"  
3762 - 2953 68526573  
3763 - 2953 63686564  
3764 - 2953 756C6553  
3765 ->>>>>>> .r35  
3766 2953 00 3169 2953 00
3767 -<<<<<<< .mine  
3768 2954 .LASF48: 3170 2954 .LASF48:
3769 2955 012d 725F6E65 .ascii "r_newer\000" 3171 2955 012d 725F6E65 .ascii "r_newer\000"
3770 2955 77657200 3172 2955 77657200
@@ -3776,24 +3178,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3776,24 +3178,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3776 2959 013e 6368436F .ascii "chCondSignal\000" 3178 2959 013e 6368436F .ascii "chCondSignal\000"
3777 2959 6E645369 3179 2959 6E645369
3778 2959 676E616C 3180 2959 676E616C
3779 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 54  
3780 -=======  
3781 - 2954 .LASF48:  
3782 - 2955 0127 725F6E65 .ascii "r_newer\000"  
3783 - 2955 77657200  
3784 - 2956 .LASF41:  
3785 - 2957 012f 72656761 .ascii "regarm_t\000"  
3786 - 2957 726D5F74  
3787 - 2957 00  
3788 - 2958 .LASF65:  
3789 - 2959 0138 6368436F .ascii "chCondSignal\000"  
3790 - 2959 6E645369  
3791 - 2959 676E616C  
3792 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 54  
3793 ->>>>>>> .r35 3181 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 54
3794 3182
3795 3183
3796 -<<<<<<< .mine  
3797 2959 00 3184 2959 00
3798 2960 .LASF19: 3185 2960 .LASF19:
3799 2961 014b 636E745F .ascii "cnt_t\000" 3186 2961 014b 636E745F .ascii "cnt_t\000"
@@ -3851,70 +3238,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3851,70 +3238,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3851 2986 .LASF71: 3238 2986 .LASF71:
3852 2987 01d9 6368436F .ascii "chCondWaitTimeoutS\000" 3239 2987 01d9 6368436F .ascii "chCondWaitTimeoutS\000"
3853 2987 6E645761 3240 2987 6E645761
3854 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 55  
3855 -=======  
3856 - 2959 00  
3857 - 2960 .LASF19:  
3858 - 2961 0145 636E745F .ascii "cnt_t\000"  
3859 - 2961 7400  
3860 - 2962 .LASF86:  
3861 - 2963 014b 63684D74 .ascii "chMtxUnlockS\000"  
3862 - 2963 78556E6C  
3863 - 2963 6F636B53  
3864 - 2963 00  
3865 - 2964 .LASF0:  
3866 - 2965 0158 756E7369 .ascii "unsigned int\000"  
3867 - 2965 676E6564  
3868 - 2965 20696E74  
3869 - 2965 00  
3870 - 2966 .LASF9:  
3871 - 2967 0165 6C6F6E67 .ascii "long unsigned int\000"  
3872 - 2967 20756E73  
3873 - 2967 69676E65  
3874 - 2967 6420696E  
3875 - 2967 7400  
3876 - 2968 .LASF43:  
3877 - 2969 0177 636F6E74 .ascii "context\000"  
3878 - 2969 65787400  
3879 - 2970 .LASF4:  
3880 - 2971 017f 73686F72 .ascii "short unsigned int\000"  
3881 - 2971 7420756E  
3882 - 2971 7369676E  
3883 - 2971 65642069  
3884 - 2971 6E7400  
3885 - 2972 .LASF16:  
3886 - 2973 0192 6D73675F .ascii "msg_t\000"  
3887 - 2973 7400  
3888 - 2974 .LASF82:  
3889 - 2975 0198 7072696F .ascii "prio_insert\000"  
3890 - 2975 5F696E73  
3891 - 2975 65727400  
3892 - 2976 .LASF12:  
3893 - 2977 01a4 746D6F64 .ascii "tmode_t\000"  
3894 - 2977 655F7400  
3895 - 2978 .LASF40:  
3896 - 2979 01ac 54687265 .ascii "ThreadsList\000"  
3897 - 2979 6164734C  
3898 - 2979 69737400  
3899 - 2980 .LASF17:  
3900 - 2981 01b8 6576656E .ascii "eventmask_t\000"  
3901 - 2981 746D6173  
3902 - 2981 6B5F7400  
3903 - 2982 .LASF53:  
3904 - 2983 01c4 4D757465 .ascii "Mutex\000"  
3905 - 2983 7800  
3906 - 2984 .LASF44:  
3907 - 2985 01ca 73697A65 .ascii "sizetype\000"  
3908 - 2985 74797065  
3909 - 2985 00  
3910 - 2986 .LASF71:  
3911 - 2987 01d3 6368436F .ascii "chCondWaitTimeoutS\000"  
3912 - 2987 6E645761  
3913 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 55  
3914 ->>>>>>> .r35 3241 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 55
3915 3242
3916 3243
3917 -<<<<<<< .mine  
3918 2987 69745469 3244 2987 69745469
3919 2987 6D656F75 3245 2987 6D656F75
3920 2987 745300 3246 2987 745300
@@ -3972,70 +3298,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -3972,70 +3298,9 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3972 3015 7200 3298 3015 7200
3973 3016 .LASF36: 3299 3016 .LASF36:
3974 3017 0275 705F6D74 .ascii "p_mtxlist\000" 3300 3017 0275 705F6D74 .ascii "p_mtxlist\000"
3975 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 56  
3976 -=======  
3977 - 2987 69745469  
3978 - 2987 6D656F75  
3979 - 2987 745300  
3980 - 2988 .LASF26:  
3981 - 2989 01e6 705F6F6C .ascii "p_older\000"  
3982 - 2989 64657200  
3983 - 2990 .LASF47:  
3984 - 2991 01ee 725F6374 .ascii "r_ctx\000"  
3985 - 2991 7800  
3986 - 2992 .LASF39:  
3987 - 2993 01f4 54687265 .ascii "ThreadsQueue\000"  
3988 - 2993 61647351  
3989 - 2993 75657565  
3990 - 2993 00  
3991 - 2994 .LASF72:  
3992 - 2995 0201 74696D65 .ascii "time\000"  
3993 - 2995 00  
3994 - 2996 .LASF78:  
3995 - 2997 0206 474E5520 .ascii "GNU C 4.7.2\000"  
3996 - 2997 4320342E  
3997 - 2997 372E3200  
3998 - 2998 .LASF51:  
3999 - 2999 0212 725F6375 .ascii "r_current\000"  
4000 - 2999 7272656E  
4001 - 2999 7400  
4002 - 3000 .LASF49:  
4003 - 3001 021c 725F6F6C .ascii "r_older\000"  
4004 - 3001 64657200  
4005 - 3002 .LASF68:  
4006 - 3003 0224 6368436F .ascii "chCondBroadcast\000"  
4007 - 3003 6E644272  
4008 - 3003 6F616463  
4009 - 3003 61737400  
4010 - 3004 .LASF14:  
4011 - 3005 0234 74726566 .ascii "trefs_t\000"  
4012 - 3005 735F7400  
4013 - 3006 .LASF22:  
4014 - 3007 023c 705F7072 .ascii "p_prev\000"  
4015 - 3007 657600  
4016 - 3008 .LASF15:  
4017 - 3009 0243 74707269 .ascii "tprio_t\000"  
4018 - 3009 6F5F7400  
4019 - 3010 .LASF66:  
4020 - 3011 024b 6368436F .ascii "chCondSignalI\000"  
4021 - 3011 6E645369  
4022 - 3011 676E616C  
4023 - 3011 4900  
4024 - 3012 .LASF6:  
4025 - 3013 0259 696E7433 .ascii "int32_t\000"  
4026 - 3013 325F7400  
4027 - 3014 .LASF2:  
4028 - 3015 0261 756E7369 .ascii "unsigned char\000"  
4029 - 3015 676E6564  
4030 - 3015 20636861  
4031 - 3015 7200  
4032 - 3016 .LASF36:  
4033 - 3017 026f 705F6D74 .ascii "p_mtxlist\000"  
4034 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 56  
4035 ->>>>>>> .r35 3301 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 56
4036 3302
4037 3303
4038 -<<<<<<< .mine  
4039 3017 786C6973 3304 3017 786C6973
4040 3017 7400 3305 3017 7400
4041 3018 .LASF3: 3306 3018 .LASF3:
@@ -4057,349 +3322,159 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1 @@ -4057,349 +3322,159 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
4057 3028 .LASF29: 3322 3028 .LASF29:
4058 3029 02a6 705F666C .ascii "p_flags\000" 3323 3029 02a6 705F666C .ascii "p_flags\000"
4059 3029 61677300 3324 3029 61677300
4060 -=======  
4061 - 3017 786C6973  
4062 - 3017 7400  
4063 - 3018 .LASF3:  
4064 - 3019 0279 73686F72 .ascii "short int\000"  
4065 - 3019 7420696E  
4066 - 3019 7400  
4067 - 3020 .LASF28:  
4068 - 3021 0283 705F7374 .ascii "p_state\000"  
4069 - 3021 61746500  
4070 - 3022 .LASF46:  
4071 - 3023 028b 725F7072 .ascii "r_prio\000"  
4072 - 3023 696F00  
4073 - 3024 .LASF62:  
4074 - 3025 0292 65776D61 .ascii "ewmask\000"  
4075 - 3025 736B00  
4076 - 3026 .LASF21:  
4077 - 3027 0299 705F6E65 .ascii "p_next\000"  
4078 - 3027 787400  
4079 - 3028 .LASF29:  
4080 - 3029 02a0 705F666C .ascii "p_flags\000"  
4081 - 3029 61677300  
4082 ->>>>>>> .r35  
4083 3030 .LASF20: 3325 3030 .LASF20:
4084 -<<<<<<< .mine  
4085 3031 02ae 54687265 .ascii "Thread\000" 3326 3031 02ae 54687265 .ascii "Thread\000"
4086 -=======  
4087 - 3031 02a8 54687265 .ascii "Thread\000"  
4088 ->>>>>>> .r35  
4089 3031 616400 3327 3031 616400
4090 3032 .LASF58: 3328 3032 .LASF58:
4091 -<<<<<<< .mine  
4092 3033 02b5 635F7175 .ascii "c_queue\000" 3329 3033 02b5 635F7175 .ascii "c_queue\000"
4093 -=======  
4094 - 3033 02af 635F7175 .ascii "c_queue\000"  
4095 ->>>>>>> .r35  
4096 3033 65756500 3330 3033 65756500
4097 3034 .LASF75: 3331 3034 .LASF75:
4098 -<<<<<<< .mine  
4099 3035 02bd 63685363 .ascii "chSchGoSleepS\000" 3332 3035 02bd 63685363 .ascii "chSchGoSleepS\000"
4100 -=======  
4101 - 3035 02b7 63685363 .ascii "chSchGoSleepS\000"  
4102 ->>>>>>> .r35  
4103 3035 68476F53 3333 3035 68476F53
4104 3035 6C656570 3334 3035 6C656570
4105 3035 5300 3335 3035 5300
4106 3036 .LASF35: 3336 3036 .LASF35:
4107 -<<<<<<< .mine  
4108 3037 02cb 705F6570 .ascii "p_epending\000" 3337 3037 02cb 705F6570 .ascii "p_epending\000"
4109 -=======  
4110 - 3037 02c5 705F6570 .ascii "p_epending\000"  
4111 ->>>>>>> .r35  
4112 3037 656E6469 3338 3037 656E6469
4113 3037 6E6700 3339 3037 6E6700
4114 3038 .LASF8: 3340 3038 .LASF8:
4115 -<<<<<<< .mine  
4116 3039 02d6 75696E74 .ascii "uint32_t\000" 3341 3039 02d6 75696E74 .ascii "uint32_t\000"
4117 -=======  
4118 - 3039 02d0 75696E74 .ascii "uint32_t\000"  
4119 ->>>>>>> .r35  
4120 3039 33325F74 3342 3039 33325F74
4121 3039 00 3343 3039 00
4122 3040 .LASF45: 3344 3040 .LASF45:
4123 -<<<<<<< .mine  
4124 3041 02df 725F7175 .ascii "r_queue\000" 3345 3041 02df 725F7175 .ascii "r_queue\000"
4125 -=======  
4126 - 3041 02d9 725F7175 .ascii "r_queue\000"  
4127 ->>>>>>> .r35  
4128 3041 65756500 3346 3041 65756500
4129 3042 .LASF84: 3347 3042 .LASF84:
4130 -<<<<<<< .mine  
4131 3043 02e7 63685363 .ascii "chSchReadyI\000" 3348 3043 02e7 63685363 .ascii "chSchReadyI\000"
4132 -=======  
4133 - 3043 02e1 63685363 .ascii "chSchReadyI\000"  
4134 ->>>>>>> .r35  
4135 3043 68526561 3349 3043 68526561
4136 3043 64794900 3350 3043 64794900
4137 3044 .LASF63: 3351 3044 .LASF63:
4138 -<<<<<<< .mine  
4139 3045 02f3 63686172 .ascii "char\000" 3352 3045 02f3 63686172 .ascii "char\000"
4140 -=======  
4141 - 3045 02ed 63686172 .ascii "char\000"  
4142 ->>>>>>> .r35  
4143 3045 00 3353 3045 00
4144 3046 .LASF81: 3354 3046 .LASF81:
4145 -<<<<<<< .mine  
4146 3047 02f8 6669666F .ascii "fifo_remove\000" 3355 3047 02f8 6669666F .ascii "fifo_remove\000"
4147 -=======  
4148 - 3047 02f2 6669666F .ascii "fifo_remove\000"  
4149 ->>>>>>> .r35  
4150 3047 5F72656D 3356 3047 5F72656D
4151 3047 6F766500 3357 3047 6F766500
4152 3048 .LASF69: 3358 3048 .LASF69:
4153 -<<<<<<< .mine  
4154 3049 0304 6368436F .ascii "chCondWaitS\000" 3359 3049 0304 6368436F .ascii "chCondWaitS\000"
4155 -=======  
4156 - 3049 02fe 6368436F .ascii "chCondWaitS\000"  
4157 ->>>>>>> .r35  
4158 3049 6E645761 3360 3049 6E645761
4159 -<<<<<<< .mine  
4160 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 57 3361 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 57
4161 3362
4162 3363
4163 -=======  
4164 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 57  
4165 -  
4166 -  
4167 ->>>>>>> .r35  
4168 3049 69745300 3364 3049 69745300
4169 3050 .LASF56: 3365 3050 .LASF56:
4170 -<<<<<<< .mine  
4171 3051 0310 6D5F6E65 .ascii "m_next\000" 3366 3051 0310 6D5F6E65 .ascii "m_next\000"
4172 -=======  
4173 - 3051 030a 6D5F6E65 .ascii "m_next\000"  
4174 ->>>>>>> .r35  
4175 3051 787400 3367 3051 787400
4176 3052 .LASF18: 3368 3052 .LASF18:
4177 -<<<<<<< .mine  
4178 3053 0317 73797374 .ascii "systime_t\000" 3369 3053 0317 73797374 .ascii "systime_t\000"
4179 -=======  
4180 - 3053 0311 73797374 .ascii "systime_t\000"  
4181 ->>>>>>> .r35  
4182 3053 696D655F 3370 3053 696D655F
4183 3053 7400 3371 3053 7400
4184 3054 .LASF37: 3372 3054 .LASF37:
4185 -<<<<<<< .mine  
4186 3055 0321 705F7265 .ascii "p_realprio\000" 3373 3055 0321 705F7265 .ascii "p_realprio\000"
4187 -=======  
4188 - 3055 031b 705F7265 .ascii "p_realprio\000"  
4189 ->>>>>>> .r35  
4190 3055 616C7072 3374 3055 616C7072
4191 3055 696F00 3375 3055 696F00
4192 3056 .LASF70: 3376 3056 .LASF70:
4193 -<<<<<<< .mine  
4194 3057 032c 6368436F .ascii "chCondWait\000" 3377 3057 032c 6368436F .ascii "chCondWait\000"
4195 -=======  
4196 - 3057 0326 6368436F .ascii "chCondWait\000"  
4197 ->>>>>>> .r35  
4198 3057 6E645761 3378 3057 6E645761
4199 3057 697400 3379 3057 697400
4200 3058 .LASF31: 3380 3058 .LASF31:
4201 -<<<<<<< .mine  
4202 3059 0337 705F7469 .ascii "p_time\000" 3381 3059 0337 705F7469 .ascii "p_time\000"
4203 -=======  
4204 - 3059 0331 705F7469 .ascii "p_time\000"  
4205 ->>>>>>> .r35  
4206 3059 6D6500 3382 3059 6D6500
4207 3060 .LASF42: 3383 3060 .LASF42:
4208 -<<<<<<< .mine  
4209 3061 033e 696E7463 .ascii "intctx\000" 3384 3061 033e 696E7463 .ascii "intctx\000"
4210 -=======  
4211 - 3061 0338 696E7463 .ascii "intctx\000"  
4212 ->>>>>>> .r35  
4213 3061 747800 3385 3061 747800
4214 3062 .LASF33: 3386 3062 .LASF33:
4215 -<<<<<<< .mine  
4216 3063 0345 705F6D73 .ascii "p_msgqueue\000" 3387 3063 0345 705F6D73 .ascii "p_msgqueue\000"
4217 -=======  
4218 - 3063 033f 705F6D73 .ascii "p_msgqueue\000"  
4219 ->>>>>>> .r35  
4220 3063 67717565 3388 3063 67717565
4221 3063 756500 3389 3063 756500
4222 3064 .LASF74: 3390 3064 .LASF74:
4223 -<<<<<<< .mine  
4224 3065 0350 63685363 .ascii "chSchWakeupS\000" 3391 3065 0350 63685363 .ascii "chSchWakeupS\000"
4225 -=======  
4226 - 3065 034a 63685363 .ascii "chSchWakeupS\000"  
4227 ->>>>>>> .r35  
4228 3065 6857616B 3392 3065 6857616B
4229 3065 65757053 3393 3065 65757053
4230 3065 00 3394 3065 00
4231 3066 .LASF30: 3395 3066 .LASF30:
4232 -<<<<<<< .mine  
4233 3067 035d 705F7265 .ascii "p_refs\000" 3396 3067 035d 705F7265 .ascii "p_refs\000"
4234 -=======  
4235 - 3067 0357 705F7265 .ascii "p_refs\000"  
4236 ->>>>>>> .r35  
4237 3067 667300 3397 3067 667300
4238 3068 .LASF52: 3398 3068 .LASF52:
4239 -<<<<<<< .mine  
4240 3069 0364 52656164 .ascii "ReadyList\000" 3399 3069 0364 52656164 .ascii "ReadyList\000"
4241 -=======  
4242 - 3069 035e 52656164 .ascii "ReadyList\000"  
4243 ->>>>>>> .r35  
4244 3069 794C6973 3400 3069 794C6973
4245 3069 7400 3401 3069 7400
4246 3070 .LASF83: 3402 3070 .LASF83:
4247 -<<<<<<< .mine  
4248 3071 036e 726C6973 .ascii "rlist\000" 3403 3071 036e 726C6973 .ascii "rlist\000"
4249 -=======  
4250 - 3071 0368 726C6973 .ascii "rlist\000"  
4251 ->>>>>>> .r35  
4252 3071 7400 3404 3071 7400
4253 3072 .LASF5: 3405 3072 .LASF5:
4254 -<<<<<<< .mine  
4255 3073 0374 75696E74 .ascii "uint8_t\000" 3406 3073 0374 75696E74 .ascii "uint8_t\000"
4256 -=======  
4257 - 3073 036e 75696E74 .ascii "uint8_t\000"  
4258 ->>>>>>> .r35  
4259 3073 385F7400 3407 3073 385F7400
4260 3074 .LASF79: 3408 3074 .LASF79:
4261 -<<<<<<< .mine  
4262 3075 037c 2E2E2F2E .ascii "../..//os/kernel/src/chcond.c\000" 3409 3075 037c 2E2E2F2E .ascii "../..//os/kernel/src/chcond.c\000"
4263 -=======  
4264 - 3075 0376 2E2E2F2E .ascii "../..//os/kernel/src/chcond.c\000"  
4265 ->>>>>>> .r35  
4266 3075 2E2F2F6F 3410 3075 2E2F2F6F
4267 3075 732F6B65 3411 3075 732F6B65
4268 3075 726E656C 3412 3075 726E656C
4269 3075 2F737263 3413 3075 2F737263
4270 3076 .LASF61: 3414 3076 .LASF61:
4271 -<<<<<<< .mine  
4272 3077 039a 77746F62 .ascii "wtobjp\000" 3415 3077 039a 77746F62 .ascii "wtobjp\000"
4273 -=======  
4274 - 3077 0394 77746F62 .ascii "wtobjp\000"  
4275 ->>>>>>> .r35  
4276 3077 6A7000 3416 3077 6A7000
4277 3078 .LASF27: 3417 3078 .LASF27:
4278 -<<<<<<< .mine  
4279 3079 03a1 705F6E61 .ascii "p_name\000" 3418 3079 03a1 705F6E61 .ascii "p_name\000"
4280 -=======  
4281 - 3079 039b 705F6E61 .ascii "p_name\000"  
4282 ->>>>>>> .r35  
4283 3079 6D6500 3419 3079 6D6500
4284 3080 .LASF73: 3420 3080 .LASF73:
4285 -<<<<<<< .mine  
4286 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 58  
4287 -=======  
4288 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 58  
4289 ->>>>>>> .r35 3421 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 58
4290 3422
4291 3423
4292 -<<<<<<< .mine  
4293 3081 03a8 6368436F .ascii "chCondWaitTimeout\000" 3424 3081 03a8 6368436F .ascii "chCondWaitTimeout\000"
4294 3081 6E645761 3425 3081 6E645761
4295 -=======  
4296 - 3081 03a2 6368436F .ascii "chCondWaitTimeout\000"  
4297 - 3081 6E645761  
4298 ->>>>>>> .r35  
4299 3081 69745469 3426 3081 69745469
4300 3081 6D656F75 3427 3081 6D656F75
4301 3081 7400 3428 3081 7400
4302 3082 .LASF77: 3429 3082 .LASF77:
4303 -<<<<<<< .mine  
4304 3083 03ba 63685363 .ascii "chSchGoSleepTimeoutS\000" 3430 3083 03ba 63685363 .ascii "chSchGoSleepTimeoutS\000"
4305 -=======  
4306 - 3083 03b4 63685363 .ascii "chSchGoSleepTimeoutS\000"  
4307 ->>>>>>> .r35  
4308 3083 68476F53 3431 3083 68476F53
4309 3083 6C656570 3432 3083 6C656570
4310 3083 54696D65 3433 3083 54696D65
4311 3083 6F757453 3434 3083 6F757453
4312 3084 .LASF50: 3435 3084 .LASF50:
4313 -<<<<<<< .mine  
4314 3085 03cf 725F7072 .ascii "r_preempt\000" 3436 3085 03cf 725F7072 .ascii "r_preempt\000"
4315 -=======  
4316 - 3085 03c9 725F7072 .ascii "r_preempt\000"  
4317 ->>>>>>> .r35  
4318 3085 65656D70 3437 3085 65656D70
4319 3085 7400 3438 3085 7400
4320 3086 .LASF55: 3439 3086 .LASF55:
4321 -<<<<<<< .mine  
4322 3087 03d9 6D5F6F77 .ascii "m_owner\000" 3440 3087 03d9 6D5F6F77 .ascii "m_owner\000"
4323 -=======  
4324 - 3087 03d3 6D5F6F77 .ascii "m_owner\000"  
4325 ->>>>>>> .r35  
4326 3087 6E657200 3441 3087 6E657200
4327 3088 .LASF24: 3442 3088 .LASF24:
4328 -<<<<<<< .mine  
4329 3089 03e1 705F6374 .ascii "p_ctx\000" 3443 3089 03e1 705F6374 .ascii "p_ctx\000"
4330 -=======  
4331 - 3089 03db 705F6374 .ascii "p_ctx\000"  
4332 ->>>>>>> .r35  
4333 3089 7800 3444 3089 7800
4334 3090 .LASF32: 3445 3090 .LASF32:
4335 -<<<<<<< .mine  
4336 3091 03e7 705F7761 .ascii "p_waiting\000" 3446 3091 03e7 705F7761 .ascii "p_waiting\000"
4337 -=======  
4338 - 3091 03e1 705F7761 .ascii "p_waiting\000"  
4339 ->>>>>>> .r35  
4340 3091 6974696E 3447 3091 6974696E
4341 3091 6700 3448 3091 6700
4342 3092 .ident "GCC: (GNU) 4.7.2" 3449 3092 .ident "GCC: (GNU) 4.7.2"
4343 -<<<<<<< .mine  
4344 - ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 59  
4345 -=======  
4346 - ARM GAS C:\cygwin64\tmp\cca2pTog.s page 59  
4347 ->>>>>>> .r35 3450 + ARM GAS C:\cygwin\tmp\cc1DTrGF.s page 59
4348 3451
4349 3452
4350 DEFINED SYMBOLS 3453 DEFINED SYMBOLS
4351 *ABS*:00000000 chcond.c 3454 *ABS*:00000000 chcond.c
4352 -<<<<<<< .mine  
4353 -C:\cygwin\tmp\ccDgcrZH.s:19 .text.chCondInit:00000000 $t  
4354 -C:\cygwin\tmp\ccDgcrZH.s:25 .text.chCondInit:00000000 chCondInit  
4355 -C:\cygwin\tmp\ccDgcrZH.s:42 .text.chCondSignal:00000000 $t  
4356 -C:\cygwin\tmp\ccDgcrZH.s:48 .text.chCondSignal:00000000 chCondSignal  
4357 -C:\cygwin\tmp\ccDgcrZH.s:103 .text.chCondSignalI:00000000 $t  
4358 -C:\cygwin\tmp\ccDgcrZH.s:109 .text.chCondSignalI:00000000 chCondSignalI  
4359 -C:\cygwin\tmp\ccDgcrZH.s:149 .text.chCondBroadcastI:00000000 $t  
4360 -C:\cygwin\tmp\ccDgcrZH.s:155 .text.chCondBroadcastI:00000000 chCondBroadcastI  
4361 -C:\cygwin\tmp\ccDgcrZH.s:203 .text.chCondBroadcast:00000000 $t  
4362 -C:\cygwin\tmp\ccDgcrZH.s:209 .text.chCondBroadcast:00000000 chCondBroadcast  
4363 -C:\cygwin\tmp\ccDgcrZH.s:242 .text.chCondWaitS:00000000 $t  
4364 -C:\cygwin\tmp\ccDgcrZH.s:248 .text.chCondWaitS:00000000 chCondWaitS  
4365 -C:\cygwin\tmp\ccDgcrZH.s:338 .text.chCondWaitS:00000044 $d  
4366 -C:\cygwin\tmp\ccDgcrZH.s:345 .text.chCondWait:00000000 $t  
4367 -C:\cygwin\tmp\ccDgcrZH.s:351 .text.chCondWait:00000000 chCondWait  
4368 -C:\cygwin\tmp\ccDgcrZH.s:382 .text.chCondWaitTimeoutS:00000000 $t  
4369 -C:\cygwin\tmp\ccDgcrZH.s:388 .text.chCondWaitTimeoutS:00000000 chCondWaitTimeoutS  
4370 -C:\cygwin\tmp\ccDgcrZH.s:480 .text.chCondWaitTimeoutS:00000048 $d  
4371 -C:\cygwin\tmp\ccDgcrZH.s:485 .text.chCondWaitTimeout:00000000 $t  
4372 -C:\cygwin\tmp\ccDgcrZH.s:491 .text.chCondWaitTimeout:00000000 chCondWaitTimeout  
4373 -=======  
4374 -C:\cygwin64\tmp\cca2pTog.s:19 .text.chCondInit:00000000 $t  
4375 -C:\cygwin64\tmp\cca2pTog.s:25 .text.chCondInit:00000000 chCondInit  
4376 -C:\cygwin64\tmp\cca2pTog.s:42 .text.chCondSignal:00000000 $t  
4377 -C:\cygwin64\tmp\cca2pTog.s:48 .text.chCondSignal:00000000 chCondSignal  
4378 -C:\cygwin64\tmp\cca2pTog.s:103 .text.chCondSignalI:00000000 $t  
4379 -C:\cygwin64\tmp\cca2pTog.s:109 .text.chCondSignalI:00000000 chCondSignalI  
4380 -C:\cygwin64\tmp\cca2pTog.s:149 .text.chCondBroadcastI:00000000 $t  
4381 -C:\cygwin64\tmp\cca2pTog.s:155 .text.chCondBroadcastI:00000000 chCondBroadcastI  
4382 -C:\cygwin64\tmp\cca2pTog.s:203 .text.chCondBroadcast:00000000 $t  
4383 -C:\cygwin64\tmp\cca2pTog.s:209 .text.chCondBroadcast:00000000 chCondBroadcast  
4384 -C:\cygwin64\tmp\cca2pTog.s:242 .text.chCondWaitS:00000000 $t  
4385 -C:\cygwin64\tmp\cca2pTog.s:248 .text.chCondWaitS:00000000 chCondWaitS  
4386 -C:\cygwin64\tmp\cca2pTog.s:338 .text.chCondWaitS:00000044 $d  
4387 -C:\cygwin64\tmp\cca2pTog.s:345 .text.chCondWait:00000000 $t  
4388 -C:\cygwin64\tmp\cca2pTog.s:351 .text.chCondWait:00000000 chCondWait  
4389 -C:\cygwin64\tmp\cca2pTog.s:382 .text.chCondWaitTimeoutS:00000000 $t  
4390 -C:\cygwin64\tmp\cca2pTog.s:388 .text.chCondWaitTimeoutS:00000000 chCondWaitTimeoutS  
4391 -C:\cygwin64\tmp\cca2pTog.s:480 .text.chCondWaitTimeoutS:00000048 $d  
4392 -C:\cygwin64\tmp\cca2pTog.s:485 .text.chCondWaitTimeout:00000000 $t  
4393 -C:\cygwin64\tmp\cca2pTog.s:491 .text.chCondWaitTimeout:00000000 chCondWaitTimeout  
4394 ->>>>>>> .r35 3455 +C:\cygwin\tmp\cc1DTrGF.s:19 .text.chCondInit:00000000 $t
  3456 +C:\cygwin\tmp\cc1DTrGF.s:25 .text.chCondInit:00000000 chCondInit
  3457 +C:\cygwin\tmp\cc1DTrGF.s:42 .text.chCondSignal:00000000 $t
  3458 +C:\cygwin\tmp\cc1DTrGF.s:48 .text.chCondSignal:00000000 chCondSignal
  3459 +C:\cygwin\tmp\cc1DTrGF.s:103 .text.chCondSignalI:00000000 $t
  3460 +C:\cygwin\tmp\cc1DTrGF.s:109 .text.chCondSignalI:00000000 chCondSignalI
  3461 +C:\cygwin\tmp\cc1DTrGF.s:149 .text.chCondBroadcastI:00000000 $t
  3462 +C:\cygwin\tmp\cc1DTrGF.s:155 .text.chCondBroadcastI:00000000 chCondBroadcastI
  3463 +C:\cygwin\tmp\cc1DTrGF.s:203 .text.chCondBroadcast:00000000 $t
  3464 +C:\cygwin\tmp\cc1DTrGF.s:209 .text.chCondBroadcast:00000000 chCondBroadcast
  3465 +C:\cygwin\tmp\cc1DTrGF.s:242 .text.chCondWaitS:00000000 $t
  3466 +C:\cygwin\tmp\cc1DTrGF.s:248 .text.chCondWaitS:00000000 chCondWaitS
  3467 +C:\cygwin\tmp\cc1DTrGF.s:338 .text.chCondWaitS:00000044 $d
  3468 +C:\cygwin\tmp\cc1DTrGF.s:345 .text.chCondWait:00000000 $t
  3469 +C:\cygwin\tmp\cc1DTrGF.s:351 .text.chCondWait:00000000 chCondWait
  3470 +C:\cygwin\tmp\cc1DTrGF.s:382 .text.chCondWaitTimeoutS:00000000 $t
  3471 +C:\cygwin\tmp\cc1DTrGF.s:388 .text.chCondWaitTimeoutS:00000000 chCondWaitTimeoutS
  3472 +C:\cygwin\tmp\cc1DTrGF.s:480 .text.chCondWaitTimeoutS:00000048 $d
  3473 +C:\cygwin\tmp\cc1DTrGF.s:485 .text.chCondWaitTimeout:00000000 $t
  3474 +C:\cygwin\tmp\cc1DTrGF.s:491 .text.chCondWaitTimeout:00000000 chCondWaitTimeout
4395 .debug_frame:00000010 $d 3475 .debug_frame:00000010 $d
4396 -<<<<<<< .mine  
4397 -C:\cygwin\tmp\ccDgcrZH.s:344 .text.chCondWaitS:00000048 $t  
4398 -C:\cygwin\tmp\ccDgcrZH.s:484 .text.chCondWaitTimeoutS:0000004c $t  
4399 -=======  
4400 -C:\cygwin64\tmp\cca2pTog.s:344 .text.chCondWaitS:00000048 $t  
4401 -C:\cygwin64\tmp\cca2pTog.s:484 .text.chCondWaitTimeoutS:0000004c $t  
4402 ->>>>>>> .r35 3476 +C:\cygwin\tmp\cc1DTrGF.s:344 .text.chCondWaitS:00000048 $t
  3477 +C:\cygwin\tmp\cc1DTrGF.s:484 .text.chCondWaitTimeoutS:0000004c $t
4403 3478
4404 UNDEFINED SYMBOLS 3479 UNDEFINED SYMBOLS
4405 chSchWakeupS 3480 chSchWakeupS
Project/applications/smartcities/build/lst/chcore.lst
  View file @08c7da6
1 -<<<<<<< .mine  
2 -ARM GAS C:\cygwin\tmp\ccapa2ly.s page 1  
3 -=======  
4 -ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1  
5 ->>>>>>> .r35 1 +ARM GAS C:\cygwin\tmp\cc6Pibko.s page 1
6 2
7 3
8 1 .syntax unified 4 1 .syntax unified
@@ -58,21 +54,11 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1 @@ -58,21 +54,11 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
58 49 0006 00000000 .4byte .Ldebug_abbrev0 54 49 0006 00000000 .4byte .Ldebug_abbrev0
59 50 000a 04 .byte 0x4 55 50 000a 04 .byte 0x4
60 51 000b 01 .uleb128 0x1 56 51 000b 01 .uleb128 0x1
61 -<<<<<<< .mine  
62 52 000c 1B000000 .4byte .LASF11 57 52 000c 1B000000 .4byte .LASF11
63 -=======  
64 - 52 000c 8A000000 .4byte .LASF11  
65 ->>>>>>> .r35  
66 53 0010 01 .byte 0x1 58 53 0010 01 .byte 0x1
67 -<<<<<<< .mine  
68 54 0011 C5000000 .4byte .LASF12 59 54 0011 C5000000 .4byte .LASF12
69 55 0015 39000000 .4byte .LASF13 60 55 0015 39000000 .4byte .LASF13
70 - ARM GAS C:\cygwin\tmp\ccapa2ly.s page 2  
71 -=======  
72 - 54 0011 BF000000 .4byte .LASF12  
73 - 55 0015 1B000000 .4byte .LASF13  
74 - ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 2  
75 ->>>>>>> .r35 61 + ARM GAS C:\cygwin\tmp\cc6Pibko.s page 2
76 62
77 63
78 56 0019 00000000 .4byte .Ldebug_ranges0+0 64 56 0019 00000000 .4byte .Ldebug_ranges0+0
@@ -90,51 +76,27 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1 @@ -90,51 +76,27 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
90 68 0037 03 .uleb128 0x3 76 68 0037 03 .uleb128 0x3
91 69 0038 01 .byte 0x1 77 69 0038 01 .byte 0x1
92 70 0039 06 .byte 0x6 78 70 0039 06 .byte 0x6
93 -<<<<<<< .mine  
94 71 003a 18010000 .4byte .LASF1 79 71 003a 18010000 .4byte .LASF1
95 -=======  
96 - 71 003a 12010000 .4byte .LASF1  
97 ->>>>>>> .r35  
98 72 003e 03 .uleb128 0x3 80 72 003e 03 .uleb128 0x3
99 73 003f 01 .byte 0x1 81 73 003f 01 .byte 0x1
100 74 0040 08 .byte 0x8 82 74 0040 08 .byte 0x8
101 -<<<<<<< .mine  
102 75 0041 E9000000 .4byte .LASF2 83 75 0041 E9000000 .4byte .LASF2
103 -=======  
104 - 75 0041 E3000000 .4byte .LASF2  
105 ->>>>>>> .r35  
106 76 0045 03 .uleb128 0x3 84 76 0045 03 .uleb128 0x3
107 77 0046 02 .byte 0x2 85 77 0046 02 .byte 0x2
108 78 0047 05 .byte 0x5 86 78 0047 05 .byte 0x5
109 -<<<<<<< .mine  
110 79 0048 2E010000 .4byte .LASF3 87 79 0048 2E010000 .4byte .LASF3
111 -=======  
112 - 79 0048 28010000 .4byte .LASF3  
113 ->>>>>>> .r35  
114 80 004c 03 .uleb128 0x3 88 80 004c 03 .uleb128 0x3
115 81 004d 02 .byte 0x2 89 81 004d 02 .byte 0x2
116 82 004e 07 .byte 0x7 90 82 004e 07 .byte 0x7
117 -<<<<<<< .mine  
118 83 004f 05010000 .4byte .LASF4 91 83 004f 05010000 .4byte .LASF4
119 -=======  
120 - 83 004f FF000000 .4byte .LASF4  
121 ->>>>>>> .r35  
122 84 0053 03 .uleb128 0x3 92 84 0053 03 .uleb128 0x3
123 85 0054 04 .byte 0x4 93 85 0054 04 .byte 0x4
124 86 0055 05 .byte 0x5 94 86 0055 05 .byte 0x5
125 -<<<<<<< .mine  
126 87 0056 FC000000 .4byte .LASF5 95 87 0056 FC000000 .4byte .LASF5
127 -=======  
128 - 87 0056 F6000000 .4byte .LASF5  
129 ->>>>>>> .r35  
130 88 005a 03 .uleb128 0x3 96 88 005a 03 .uleb128 0x3
131 89 005b 04 .byte 0x4 97 89 005b 04 .byte 0x4
132 90 005c 07 .byte 0x7 98 90 005c 07 .byte 0x7
133 -<<<<<<< .mine  
134 91 005d 27000000 .4byte .LASF6 99 91 005d 27000000 .4byte .LASF6
135 -=======  
136 - 91 005d 96000000 .4byte .LASF6  
137 ->>>>>>> .r35  
138 92 0061 03 .uleb128 0x3 100 92 0061 03 .uleb128 0x3
139 93 0062 08 .byte 0x8 101 93 0062 08 .byte 0x8
140 94 0063 05 .byte 0x5 102 94 0063 05 .byte 0x5
@@ -142,41 +104,21 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1 @@ -142,41 +104,21 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
142 96 0068 03 .uleb128 0x3 104 96 0068 03 .uleb128 0x3
143 97 0069 08 .byte 0x8 105 97 0069 08 .byte 0x8
144 98 006a 07 .byte 0x7 106 98 006a 07 .byte 0x7
145 -<<<<<<< .mine  
146 99 006b AE000000 .4byte .LASF8 107 99 006b AE000000 .4byte .LASF8
147 -=======  
148 - 99 006b A8000000 .4byte .LASF8  
149 ->>>>>>> .r35  
150 100 006f 03 .uleb128 0x3 108 100 006f 03 .uleb128 0x3
151 101 0070 04 .byte 0x4 109 101 0070 04 .byte 0x4
152 102 0071 07 .byte 0x7 110 102 0071 07 .byte 0x7
153 -<<<<<<< .mine  
154 103 0072 38010000 .4byte .LASF9 111 103 0072 38010000 .4byte .LASF9
155 -=======  
156 - 103 0072 32010000 .4byte .LASF9  
157 ->>>>>>> .r35  
158 104 0076 03 .uleb128 0x3 112 104 0076 03 .uleb128 0x3
159 105 0077 01 .byte 0x1 113 105 0077 01 .byte 0x1
160 106 0078 08 .byte 0x8 114 106 0078 08 .byte 0x8
161 -<<<<<<< .mine  
162 107 0079 F7000000 .4byte .LASF10 115 107 0079 F7000000 .4byte .LASF10
163 -=======  
164 - 107 0079 F1000000 .4byte .LASF10  
165 ->>>>>>> .r35  
166 108 007d 04 .uleb128 0x4 116 108 007d 04 .uleb128 0x4
167 109 007e 01 .byte 0x1 117 109 007e 01 .byte 0x1
168 -<<<<<<< .mine  
169 110 007f 24010000 .4byte .LASF14 118 110 007f 24010000 .4byte .LASF14
170 -=======  
171 - 110 007f 1E010000 .4byte .LASF14  
172 ->>>>>>> .r35  
173 111 0083 01 .byte 0x1 119 111 0083 01 .byte 0x1
174 112 0084 2E .byte 0x2e 120 112 0084 2E .byte 0x2e
175 -<<<<<<< .mine  
176 - ARM GAS C:\cygwin\tmp\ccapa2ly.s page 3  
177 -=======  
178 - ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 3  
179 ->>>>>>> .r35 121 + ARM GAS C:\cygwin\tmp\cc6Pibko.s page 3
180 122
181 123
182 113 0085 01 .byte 0x1 124 113 0085 01 .byte 0x1
@@ -236,11 +178,7 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1 @@ -236,11 +178,7 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
236 167 002c 2E .uleb128 0x2e 178 167 002c 2E .uleb128 0x2e
237 168 002d 00 .byte 0 179 168 002d 00 .byte 0
238 169 002e 3F .uleb128 0x3f 180 169 002e 3F .uleb128 0x3f
239 -<<<<<<< .mine  
240 - ARM GAS C:\cygwin\tmp\ccapa2ly.s page 4  
241 -=======  
242 - ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 4  
243 ->>>>>>> .r35 181 + ARM GAS C:\cygwin\tmp\cc6Pibko.s page 4
244 182
245 183
246 170 002f 0C .uleb128 0xc 184 170 002f 0C .uleb128 0xc
@@ -298,18 +236,11 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1 @@ -298,18 +236,11 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
298 214 676E6564 236 214 676E6564
299 214 20696E74 237 214 20696E74
300 214 00 238 214 00
301 -<<<<<<< .mine  
302 215 .LASF11: 239 215 .LASF11:
303 216 001b 474E5520 .ascii "GNU C 4.7.2\000" 240 216 001b 474E5520 .ascii "GNU C 4.7.2\000"
304 - ARM GAS C:\cygwin\tmp\ccapa2ly.s page 5  
305 -=======  
306 - 215 .LASF13:  
307 - 216 001b 433A5C44 .ascii "C:\\Documents and Settings\\maria\\Mis documentos\\"  
308 - ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 5  
309 ->>>>>>> .r35 241 + ARM GAS C:\cygwin\tmp\cc6Pibko.s page 5
310 242
311 243
312 -<<<<<<< .mine  
313 216 4320342E 244 216 4320342E
314 216 372E3200 245 216 372E3200
315 217 .LASF6: 246 217 .LASF6:
@@ -334,144 +265,63 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1 @@ -334,144 +265,63 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
334 222 735C736D 265 222 735C736D
335 222 61727463 266 222 61727463
336 222 69746965 267 222 69746965
337 -=======  
338 - 216 6F63756D  
339 - 216 656E7473  
340 - 216 20616E64  
341 - 216 20536574  
342 - 217 004a 756E695C .ascii "uni\\tercer\\Q2\\PAET\\Smartcities\\Project\\applic"  
343 - 217 74657263  
344 - 217 65725C51  
345 - 217 325C5041  
346 - 217 45545C53  
347 - 218 0077 6174696F .ascii "ations\\smartcities\000"  
348 - 218 6E735C73  
349 - 218 6D617274  
350 - 218 63697469  
351 - 218 657300  
352 - 219 .LASF11:  
353 - 220 008a 474E5520 .ascii "GNU C 4.7.2\000"  
354 - 220 4320342E  
355 - 220 372E3200  
356 - 221 .LASF6:  
357 - 222 0096 6C6F6E67 .ascii "long unsigned int\000"  
358 - 222 20756E73  
359 - 222 69676E65  
360 - 222 6420696E  
361 - 222 7400  
362 ->>>>>>> .r35  
363 223 .LASF8: 268 223 .LASF8:
364 -<<<<<<< .mine  
365 224 00ae 6C6F6E67 .ascii "long long unsigned int\000" 269 224 00ae 6C6F6E67 .ascii "long long unsigned int\000"
366 -=======  
367 - 224 00a8 6C6F6E67 .ascii "long long unsigned int\000"  
368 ->>>>>>> .r35  
369 224 206C6F6E 270 224 206C6F6E
370 224 6720756E 271 224 6720756E
371 224 7369676E 272 224 7369676E
372 224 65642069 273 224 65642069
373 225 .LASF12: 274 225 .LASF12:
374 -<<<<<<< .mine  
375 226 00c5 2E2E2F2E .ascii "../..//os/ports/GCC/ARMCMx/chcore.c\000" 275 226 00c5 2E2E2F2E .ascii "../..//os/ports/GCC/ARMCMx/chcore.c\000"
376 -=======  
377 - 226 00bf 2E2E2F2E .ascii "../..//os/ports/GCC/ARMCMx/chcore.c\000"  
378 ->>>>>>> .r35  
379 226 2E2F2F6F 276 226 2E2F2F6F
380 226 732F706F 277 226 732F706F
381 226 7274732F 278 226 7274732F
382 226 4743432F 279 226 4743432F
383 227 .LASF2: 280 227 .LASF2:
384 -<<<<<<< .mine  
385 228 00e9 756E7369 .ascii "unsigned char\000" 281 228 00e9 756E7369 .ascii "unsigned char\000"
386 -=======  
387 - 228 00e3 756E7369 .ascii "unsigned char\000"  
388 ->>>>>>> .r35  
389 228 676E6564 282 228 676E6564
390 228 20636861 283 228 20636861
391 228 7200 284 228 7200
392 229 .LASF10: 285 229 .LASF10:
393 -<<<<<<< .mine  
394 230 00f7 63686172 .ascii "char\000" 286 230 00f7 63686172 .ascii "char\000"
395 -=======  
396 - 230 00f1 63686172 .ascii "char\000"  
397 ->>>>>>> .r35  
398 230 00 287 230 00
399 231 .LASF5: 288 231 .LASF5:
400 -<<<<<<< .mine  
401 232 00fc 6C6F6E67 .ascii "long int\000" 289 232 00fc 6C6F6E67 .ascii "long int\000"
402 -=======  
403 - 232 00f6 6C6F6E67 .ascii "long int\000"  
404 ->>>>>>> .r35  
405 232 20696E74 290 232 20696E74
406 232 00 291 232 00
407 233 .LASF4: 292 233 .LASF4:
408 -<<<<<<< .mine  
409 234 0105 73686F72 .ascii "short unsigned int\000" 293 234 0105 73686F72 .ascii "short unsigned int\000"
410 -=======  
411 - 234 00ff 73686F72 .ascii "short unsigned int\000"  
412 ->>>>>>> .r35  
413 234 7420756E 294 234 7420756E
414 234 7369676E 295 234 7369676E
415 234 65642069 296 234 65642069
416 234 6E7400 297 234 6E7400
417 235 .LASF1: 298 235 .LASF1:
418 -<<<<<<< .mine  
419 236 0118 7369676E .ascii "signed char\000" 299 236 0118 7369676E .ascii "signed char\000"
420 -=======  
421 - 236 0112 7369676E .ascii "signed char\000"  
422 ->>>>>>> .r35  
423 236 65642063 300 236 65642063
424 -<<<<<<< .mine  
425 - ARM GAS C:\cygwin\tmp\ccapa2ly.s page 6 301 + ARM GAS C:\cygwin\tmp\cc6Pibko.s page 6
426 302
427 303
428 -=======  
429 - ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 6  
430 -  
431 -  
432 ->>>>>>> .r35  
433 236 68617200 304 236 68617200
434 237 .LASF14: 305 237 .LASF14:
435 -<<<<<<< .mine  
436 238 0124 706F7274 .ascii "port_halt\000" 306 238 0124 706F7274 .ascii "port_halt\000"
437 -=======  
438 - 238 011e 706F7274 .ascii "port_halt\000"  
439 ->>>>>>> .r35  
440 238 5F68616C 307 238 5F68616C
441 238 7400 308 238 7400
442 239 .LASF3: 309 239 .LASF3:
443 -<<<<<<< .mine  
444 240 012e 73686F72 .ascii "short int\000" 310 240 012e 73686F72 .ascii "short int\000"
445 -=======  
446 - 240 0128 73686F72 .ascii "short int\000"  
447 ->>>>>>> .r35  
448 240 7420696E 311 240 7420696E
449 240 7400 312 240 7400
450 241 .LASF9: 313 241 .LASF9:
451 -<<<<<<< .mine  
452 242 0138 73697A65 .ascii "sizetype\000" 314 242 0138 73697A65 .ascii "sizetype\000"
453 -=======  
454 - 242 0132 73697A65 .ascii "sizetype\000"  
455 ->>>>>>> .r35  
456 242 74797065 315 242 74797065
457 242 00 316 242 00
458 243 .ident "GCC: (GNU) 4.7.2" 317 243 .ident "GCC: (GNU) 4.7.2"
459 -<<<<<<< .mine  
460 - ARM GAS C:\cygwin\tmp\ccapa2ly.s page 7  
461 -=======  
462 - ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 7  
463 ->>>>>>> .r35 318 + ARM GAS C:\cygwin\tmp\cc6Pibko.s page 7
464 319
465 320
466 DEFINED SYMBOLS 321 DEFINED SYMBOLS
467 *ABS*:00000000 chcore.c 322 *ABS*:00000000 chcore.c
468 -<<<<<<< .mine  
469 -C:\cygwin\tmp\ccapa2ly.s:19 .text.port_halt:00000000 $t  
470 -C:\cygwin\tmp\ccapa2ly.s:25 .text.port_halt:00000000 port_halt  
471 -=======  
472 -C:\cygwin64\tmp\ccjkIUJJ.s:19 .text.port_halt:00000000 $t  
473 -C:\cygwin64\tmp\ccjkIUJJ.s:25 .text.port_halt:00000000 port_halt  
474 ->>>>>>> .r35 323 +C:\cygwin\tmp\cc6Pibko.s:19 .text.port_halt:00000000 $t
  324 +C:\cygwin\tmp\cc6Pibko.s:25 .text.port_halt:00000000 port_halt
475 .debug_frame:00000010 $d 325 .debug_frame:00000010 $d
476 326
477 NO UNDEFINED SYMBOLS 327 NO UNDEFINED SYMBOLS