Imanol-Mikel Barba Sabariego / smartcities · Commits

Commit e5481e168c1a6d37f92070f813cb7e8ee6a171d3

Authored by Ferràn Quer i Guerrero
1 parent 4c779f78

--no commit message

Inline Side-by-side
Showing 37 changed files with 37284 additions and 13839 deletions

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

To preserve performance only 6 of 37 files are displayed.

Project/applications/smartcities/.dep/httpClient.o.d 0 → 100644
  View file @e5481e1
  1 +build/obj/httpClient.o: httpClient.c include/httpClient.h \
  2 + ../..//econais/libwismart.h ../..//os/kernel/include/ch.h \
  3 + ../..//econais/inc/STM32F1/chconf.h ../..//os/ports/GCC/ARMCMx/chtypes.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 \
  8 + ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
  9 + ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
  10 + ../..//os/ports/common/ARMCMx/nvic.h ../..//os/kernel/include/chsys.h \
  11 + ../..//os/kernel/include/chvt.h ../..//os/kernel/include/chschd.h \
  12 + ../..//os/kernel/include/chsem.h ../..//os/kernel/include/chbsem.h \
  13 + ../..//os/kernel/include/chmtx.h ../..//os/kernel/include/chcond.h \
  14 + ../..//os/kernel/include/chevents.h ../..//os/kernel/include/chmsg.h \
  15 + ../..//os/kernel/include/chmboxes.h ../..//os/kernel/include/chmemcore.h \
  16 + ../..//os/kernel/include/chheap.h ../..//os/kernel/include/chmempools.h \
  17 + ../..//os/kernel/include/chthreads.h \
  18 + ../..//os/kernel/include/chdynamic.h \
  19 + ../..//os/kernel/include/chregistry.h \
  20 + ../..//os/kernel/include/chinline.h ../..//os/kernel/include/chqueues.h \
  21 + ../..//os/kernel/include/chstreams.h ../..//os/kernel/include/chioch.h \
  22 + ../..//os/kernel/include/chfiles.h ../..//os/kernel/include/chdebug.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 \
  46 + ../..//externalModules/lwip_v141/src/include/lwip/opt.h \
  47 + ../..//externalModules/lwip_v141/port/lwipopts.h \
  48 + ../..//externalModules/lwip_v141/src/include/lwip/debug.h \
  49 + ../..//externalModules/lwip_v141/src/include/lwip/arch.h \
  50 + ../..//externalModules/lwip_v141/port/arch/cc.h \
  51 + ../..//externalModules/lwip_v141/src/include/lwip/tcp.h \
  52 + ../..//externalModules/lwip_v141/src/include/lwip/mem.h \
  53 + ../..//externalModules/lwip_v141/src/include/lwip/pbuf.h \
  54 + ../..//externalModules/lwip_v141/src/include/lwip/err.h \
  55 + ../..//externalModules/lwip_v141/src/include/ipv4/lwip/ip.h \
  56 + ../..//externalModules/lwip_v141/src/include/lwip/def.h \
  57 + ../..//externalModules/lwip_v141/src/include/ipv4/lwip/ip_addr.h \
  58 + ../..//externalModules/lwip_v141/src/include/lwip/netif.h \
  59 + ../..//externalModules/lwip_v141/src/include/ipv4/lwip/icmp.h \
  60 + ../..//externalModules/lwip_v141/src/include/lwip/udp.h \
  61 + ../..//externalModules/lwip_v141/src/include/lwip/sys.h \
  62 + ../..//externalModules/lwip_v141/port/arch/sys_arch.h \
  63 + ../..//externalModules/lwip_v141/src/include/lwip/api.h \
  64 + ../..//externalModules/lwip_v141/src/include/lwip/netbuf.h
  65 +
  66 +include/httpClient.h:
  67 +
  68 +../..//econais/libwismart.h:
  69 +
  70 +../..//os/kernel/include/ch.h:
  71 +
  72 +../..//econais/inc/STM32F1/chconf.h:
  73 +
  74 +../..//os/ports/GCC/ARMCMx/chtypes.h:
  75 +
  76 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
  77 +
  78 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
  79 +
  80 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
  81 +
  82 +../..//os/kernel/include/chlists.h:
  83 +
  84 +../..//os/ports/GCC/ARMCMx/chcore.h:
  85 +
  86 +../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h:
  87 +
  88 +../..//os/ports/GCC/ARMCMx/chcore_v7m.h:
  89 +
  90 +../..//os/ports/common/ARMCMx/nvic.h:
  91 +
  92 +../..//os/kernel/include/chsys.h:
  93 +
  94 +../..//os/kernel/include/chvt.h:
  95 +
  96 +../..//os/kernel/include/chschd.h:
  97 +
  98 +../..//os/kernel/include/chsem.h:
  99 +
  100 +../..//os/kernel/include/chbsem.h:
  101 +
  102 +../..//os/kernel/include/chmtx.h:
  103 +
  104 +../..//os/kernel/include/chcond.h:
  105 +
  106 +../..//os/kernel/include/chevents.h:
  107 +
  108 +../..//os/kernel/include/chmsg.h:
  109 +
  110 +../..//os/kernel/include/chmboxes.h:
  111 +
  112 +../..//os/kernel/include/chmemcore.h:
  113 +
  114 +../..//os/kernel/include/chheap.h:
  115 +
  116 +../..//os/kernel/include/chmempools.h:
  117 +
  118 +../..//os/kernel/include/chthreads.h:
  119 +
  120 +../..//os/kernel/include/chdynamic.h:
  121 +
  122 +../..//os/kernel/include/chregistry.h:
  123 +
  124 +../..//os/kernel/include/chinline.h:
  125 +
  126 +../..//os/kernel/include/chqueues.h:
  127 +
  128 +../..//os/kernel/include/chstreams.h:
  129 +
  130 +../..//os/kernel/include/chioch.h:
  131 +
  132 +../..//os/kernel/include/chfiles.h:
  133 +
  134 +../..//os/kernel/include/chdebug.h:
  135 +
  136 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdio.h:
  137 +
  138 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
  139 +
  140 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/newlib.h:
  141 +
  142 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h:
  143 +
  144 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h:
  145 +
  146 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h:
  147 +
  148 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdarg.h:
  149 +
  150 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h:
  151 +
  152 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
  153 +
  154 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h:
  155 +
  156 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h:
  157 +
  158 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h:
  159 +
  160 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h:
  161 +
  162 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h:
  163 +
  164 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h:
  165 +
  166 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/stdio.h:
  167 +
  168 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/string.h:
  169 +
  170 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h:
  171 +
  172 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h:
  173 +
  174 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h:
  175 +
  176 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h:
  177 +
  178 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/alloca.h:
  179 +
  180 +../..//econais/libwismart_mcu.h:
  181 +
  182 +../..//externalModules/lwip_v141/src/include/lwip/opt.h:
  183 +
  184 +../..//externalModules/lwip_v141/port/lwipopts.h:
  185 +
  186 +../..//externalModules/lwip_v141/src/include/lwip/debug.h:
  187 +
  188 +../..//externalModules/lwip_v141/src/include/lwip/arch.h:
  189 +
  190 +../..//externalModules/lwip_v141/port/arch/cc.h:
  191 +
  192 +../..//externalModules/lwip_v141/src/include/lwip/tcp.h:
  193 +
  194 +../..//externalModules/lwip_v141/src/include/lwip/mem.h:
  195 +
  196 +../..//externalModules/lwip_v141/src/include/lwip/pbuf.h:
  197 +
  198 +../..//externalModules/lwip_v141/src/include/lwip/err.h:
  199 +
  200 +../..//externalModules/lwip_v141/src/include/ipv4/lwip/ip.h:
  201 +
  202 +../..//externalModules/lwip_v141/src/include/lwip/def.h:
  203 +
  204 +../..//externalModules/lwip_v141/src/include/ipv4/lwip/ip_addr.h:
  205 +
  206 +../..//externalModules/lwip_v141/src/include/lwip/netif.h:
  207 +
  208 +../..//externalModules/lwip_v141/src/include/ipv4/lwip/icmp.h:
  209 +
  210 +../..//externalModules/lwip_v141/src/include/lwip/udp.h:
  211 +
  212 +../..//externalModules/lwip_v141/src/include/lwip/sys.h:
  213 +
  214 +../..//externalModules/lwip_v141/port/arch/sys_arch.h:
  215 +
  216 +../..//externalModules/lwip_v141/src/include/lwip/api.h:
  217 +
  218 +../..//externalModules/lwip_v141/src/include/lwip/netbuf.h:
... ...
Project/applications/smartcities/.dep/main.o.d
  View file @e5481e1
1 1 build/obj/main.o: main.c ../..//econais/libwismart.h \
2 2 ../..//os/kernel/include/ch.h ../..//econais/inc/STM32F1/chconf.h \
3 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 7 ../..//os/kernel/include/chlists.h ../..//os/ports/GCC/ARMCMx/chcore.h \
8 8 ../..//os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h \
9 9 ../..//os/ports/GCC/ARMCMx/chcore_v7m.h \
... ... @@ -20,28 +20,28 @@ build/obj/main.o: main.c ../..//econais/libwismart.h \
20 20 ../..//os/kernel/include/chinline.h ../..//os/kernel/include/chqueues.h \
21 21 ../..//os/kernel/include/chstreams.h ../..//os/kernel/include/chioch.h \
22 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 45 ../..//econais/libwismart_mcu.h \
46 46 ../..//econais/inc/STM32F1/libwismart_irqs.h \
47 47 ../..//econais/STM32_Libs/F1/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h \
... ... @@ -81,11 +81,11 @@ build/obj/main.o: main.c ../..//econais/libwismart.h \
81 81  
82 82 ../..//os/ports/GCC/ARMCMx/chtypes.h:
83 83  
84   -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
  84 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stddef.h:
85 85  
86   -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
  86 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdint.h:
87 87  
88   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
  88 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
89 89  
90 90 ../..//os/kernel/include/chlists.h:
91 91  
... ... @@ -141,49 +141,49 @@ c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdint.h:
141 141  
142 142 ../..//os/kernel/include/chdebug.h:
143 143  
144   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdio.h:
  144 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdio.h:
145 145  
146   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
  146 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
147 147  
148   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/newlib.h:
  148 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/newlib.h:
149 149  
150   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h:
  150 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/config.h:
151 151  
152   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h:
  152 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/ieeefp.h:
153 153  
154   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h:
  154 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/features.h:
155 155  
156   -c:\yagarto-20121222\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdarg.h:
  156 +c:\yagarto\bin\../lib/gcc/arm-none-eabi/4.7.2/include/stdarg.h:
157 157  
158   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h:
  158 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/reent.h:
159 159  
160   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
  160 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/_ansi.h:
161 161  
162   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h:
  162 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/_types.h:
163 163  
164   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h:
  164 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_types.h:
165 165  
166   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h:
  166 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/_default_types.h:
167 167  
168   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h:
  168 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/lock.h:
169 169  
170   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h:
  170 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/types.h:
171 171  
172   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h:
  172 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/types.h:
173 173  
174   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/stdio.h:
  174 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/stdio.h:
175 175  
176   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/string.h:
  176 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/string.h:
177 177  
178   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h:
  178 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/cdefs.h:
179 179  
180   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h:
  180 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/sys/string.h:
181 181  
182   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h:
  182 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/stdlib.h:
183 183  
184   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h:
  184 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/machine/stdlib.h:
185 185  
186   -c:/yagarto-20121222/lib/gcc/../../arm-none-eabi/sys-include/alloca.h:
  186 +c:/yagarto/lib/gcc/../../arm-none-eabi/sys-include/alloca.h:
187 187  
188 188 ../..//econais/libwismart_mcu.h:
189 189  
... ...
Project/applications/smartcities/Makefile
  View file @e5481e1
... ... @@ -10,7 +10,7 @@
10 10 SDK_ROOT = ../../
11 11 PROJECT_OUT = smartcities
12 12  
13   -USER_SRC = main.c
  13 +USER_SRC = main.c httpClient.c
14 14 USER_INCDIR = include/
15 15  
16 16 # if you need to add build Defines options add to USER_DEFS define
... ...
Project/applications/smartcities/build/lst/chcond.lst
  View file @e5481e1
  1 +<<<<<<< .mine
  2 +ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 1
  3 +=======
1 4 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
  5 +>>>>>>> .r35
2 6  
3 7  
4 8 1 .syntax unified
... ... @@ -58,7 +62,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
58 62 53 @ frame_needed = 0, uses_anonymous_args = 0
59 63 54 .LVL1:
60 64 55 0000 08B5 push {r3, lr}
  65 +<<<<<<< .mine
  66 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 2
  67 +=======
61 68 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 2
  69 +>>>>>>> .r35
62 70  
63 71  
64 72 56 .LCFI0:
... ... @@ -118,7 +126,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
118 126 110 .LFB9:
119 127 111 .loc 1 94 0
120 128 112 .cfi_startproc
  129 +<<<<<<< .mine
  130 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 3
  131 +=======
121 132 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 3
  133 +>>>>>>> .r35
122 134  
123 135  
124 136 113 @ args = 0, pretend = 0, frame = 0
... ... @@ -178,7 +190,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
178 190 166 .cfi_offset 4, -12
179 191 167 .cfi_offset 5, -8
180 192 168 .cfi_offset 14, -4
  193 +<<<<<<< .mine
  194 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 4
  195 +=======
181 196 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 4
  197 +>>>>>>> .r35
182 198  
183 199  
184 200 169 .loc 1 129 0
... ... @@ -238,7 +254,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
238 254 220 .cfi_offset 14, -4
239 255 221 .loc 1 112 0
240 256 222 @ 112 "../..//os/kernel/src/chcond.c" 1
  257 +<<<<<<< .mine
  258 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 5
  259 +=======
241 260 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 5
  261 +>>>>>>> .r35
242 262  
243 263  
244 264 223 0002 72B6 cpsid i
... ... @@ -298,7 +318,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
298 318 277 000e 0746 mov r7, r0
299 319 278 .LVL21:
300 320 279 .loc 1 196 0
  321 +<<<<<<< .mine
  322 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 6
  323 +=======
301 324 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 6
  325 +>>>>>>> .r35
302 326  
303 327  
304 328 280 0010 6562 str r5, [r4, #36]
... ... @@ -358,7 +382,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
358 382 334 0042 EFE7 b .L17
359 383 335 .L23:
360 384 336 .align 2
  385 +<<<<<<< .mine
  386 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 7
  387 +=======
361 388 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 7
  389 +>>>>>>> .r35
362 390  
363 391  
364 392 337 .L22:
... ... @@ -418,7 +446,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
418 446 390 .loc 1 270 0
419 447 391 .cfi_startproc
420 448 392 @ args = 0, pretend = 0, frame = 0
  449 +<<<<<<< .mine
  450 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 8
  451 +=======
421 452 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 8
  453 +>>>>>>> .r35
422 454  
423 455  
424 456 393 @ frame_needed = 0, uses_anonymous_args = 0
... ... @@ -478,7 +510,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
478 510 447 .LBE26:
479 511 448 .LBE28:
480 512 449 .loc 1 283 0
  513 +<<<<<<< .mine
  514 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 9
  515 +=======
481 516 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 9
  517 +>>>>>>> .r35
482 518  
483 519  
484 520 450 002c 4146 mov r1, r8
... ... @@ -538,7 +574,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
538 574 504 @ 236 "../..//os/kernel/src/chcond.c" 1
539 575 505 0002 72B6 cpsid i
540 576 506 @ 0 "" 2
  577 +<<<<<<< .mine
  578 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 10
  579 +=======
541 580 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 10
  581 +>>>>>>> .r35
542 582  
543 583  
544 584 507 .loc 1 237 0
... ... @@ -572,10 +612,19 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
572 612 535 0006 00000000 .4byte .Ldebug_abbrev0
573 613 536 000a 04 .byte 0x4
574 614 537 000b 01 .uleb128 0x1
  615 +<<<<<<< .mine
  616 + 538 000c 0C020000 .4byte .LASF78
  617 +=======
575 618 538 000c 06020000 .4byte .LASF78
  619 +>>>>>>> .r35
576 620 539 0010 01 .byte 0x1
  621 +<<<<<<< .mine
  622 + 540 0011 7C030000 .4byte .LASF79
  623 + 541 0015 06000000 .4byte .LASF80
  624 +=======
577 625 540 0011 76030000 .4byte .LASF79
578 626 541 0015 A7000000 .4byte .LASF80
  627 +>>>>>>> .r35
579 628 542 0019 A0000000 .4byte .Ldebug_ranges0+0xa0
580 629 543 001d 00000000 .4byte 0
581 630 544 0021 00000000 .4byte 0
... ... @@ -587,113 +636,193 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
587 636 550 0030 03 .uleb128 0x3
588 637 551 0031 04 .byte 0x4
589 638 552 0032 07 .byte 0x7
  639 +<<<<<<< .mine
  640 + 553 0033 5E010000 .4byte .LASF0
  641 +=======
590 642 553 0033 58010000 .4byte .LASF0
  643 +>>>>>>> .r35
591 644 554 0037 03 .uleb128 0x3
592 645 555 0038 01 .byte 0x1
593 646 556 0039 06 .byte 0x6
594   - 557 003a 5E000000 .4byte .LASF1
  647 + 557 003a D3000000 .4byte .LASF1
595 648 558 003e 04 .uleb128 0x4
  649 +<<<<<<< .mine
  650 + 559 003f 74030000 .4byte .LASF5
  651 +=======
596 652 559 003f 6E030000 .4byte .LASF5
  653 +>>>>>>> .r35
597 654 560 0043 03 .byte 0x3
598 655 561 0044 2A .byte 0x2a
599 656 562 0045 49000000 .4byte 0x49
600 657 563 0049 03 .uleb128 0x3
  658 +<<<<<<< .mine
  659 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 11
  660 +=======
601 661 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 11
  662 +>>>>>>> .r35
602 663  
603 664  
604 665 564 004a 01 .byte 0x1
605 666 565 004b 08 .byte 0x8
  667 +<<<<<<< .mine
  668 + 566 004c 67020000 .4byte .LASF2
  669 +=======
606 670 566 004c 61020000 .4byte .LASF2
  671 +>>>>>>> .r35
607 672 567 0050 03 .uleb128 0x3
608 673 568 0051 02 .byte 0x2
609 674 569 0052 05 .byte 0x5
  675 +<<<<<<< .mine
  676 + 570 0053 7F020000 .4byte .LASF3
  677 +=======
610 678 570 0053 79020000 .4byte .LASF3
  679 +>>>>>>> .r35
611 680 571 0057 03 .uleb128 0x3
612 681 572 0058 02 .byte 0x2
613 682 573 0059 07 .byte 0x7
  683 +<<<<<<< .mine
  684 + 574 005a 85010000 .4byte .LASF4
  685 +=======
614 686 574 005a 7F010000 .4byte .LASF4
  687 +>>>>>>> .r35
615 688 575 005e 04 .uleb128 0x4
  689 +<<<<<<< .mine
  690 + 576 005f 5F020000 .4byte .LASF6
  691 +=======
616 692 576 005f 59020000 .4byte .LASF6
  693 +>>>>>>> .r35
617 694 577 0063 03 .byte 0x3
618 695 578 0064 4F .byte 0x4f
619 696 579 0065 69000000 .4byte 0x69
620 697 580 0069 03 .uleb128 0x3
621 698 581 006a 04 .byte 0x4
622 699 582 006b 05 .byte 0x5
623   - 583 006c 82000000 .4byte .LASF7
  700 + 583 006c F7000000 .4byte .LASF7
624 701 584 0070 04 .uleb128 0x4
  702 +<<<<<<< .mine
  703 + 585 0071 D6020000 .4byte .LASF8
  704 +=======
625 705 585 0071 D0020000 .4byte .LASF8
  706 +>>>>>>> .r35
626 707 586 0075 03 .byte 0x3
627 708 587 0076 50 .byte 0x50
628 709 588 0077 7B000000 .4byte 0x7b
629 710 589 007b 03 .uleb128 0x3
630 711 590 007c 04 .byte 0x4
631 712 591 007d 07 .byte 0x7
  713 +<<<<<<< .mine
  714 + 592 007e 6B010000 .4byte .LASF9
  715 +=======
632 716 592 007e 65010000 .4byte .LASF9
  717 +>>>>>>> .r35
633 718 593 0082 03 .uleb128 0x3
634 719 594 0083 08 .byte 0x8
635 720 595 0084 05 .byte 0x5
636   - 596 0085 50000000 .4byte .LASF10
  721 + 596 0085 C5000000 .4byte .LASF10
637 722 597 0089 03 .uleb128 0x3
638 723 598 008a 08 .byte 0x8
639 724 599 008b 07 .byte 0x7
640   - 600 008c 18000000 .4byte .LASF11
  725 + 600 008c 8D000000 .4byte .LASF11
641 726 601 0090 04 .uleb128 0x4
  727 +<<<<<<< .mine
  728 + 602 0091 AA010000 .4byte .LASF12
  729 +=======
642 730 602 0091 A4010000 .4byte .LASF12
  731 +>>>>>>> .r35
643 732 603 0095 04 .byte 0x4
644 733 604 0096 2F .byte 0x2f
645 734 605 0097 3E000000 .4byte 0x3e
646 735 606 009b 04 .uleb128 0x4
647   - 607 009c 8B000000 .4byte .LASF13
  736 + 607 009c 00010000 .4byte .LASF13
648 737 608 00a0 04 .byte 0x4
649 738 609 00a1 30 .byte 0x30
650 739 610 00a2 3E000000 .4byte 0x3e
651 740 611 00a6 04 .uleb128 0x4
  741 +<<<<<<< .mine
  742 + 612 00a7 3A020000 .4byte .LASF14
  743 +=======
652 744 612 00a7 34020000 .4byte .LASF14
  745 +>>>>>>> .r35
653 746 613 00ab 04 .byte 0x4
654 747 614 00ac 31 .byte 0x31
655 748 615 00ad 3E000000 .4byte 0x3e
656 749 616 00b1 04 .uleb128 0x4
  750 +<<<<<<< .mine
  751 + 617 00b2 49020000 .4byte .LASF15
  752 +=======
657 753 617 00b2 43020000 .4byte .LASF15
  754 +>>>>>>> .r35
658 755 618 00b6 04 .byte 0x4
659 756 619 00b7 32 .byte 0x32
660 757 620 00b8 70000000 .4byte 0x70
  758 +<<<<<<< .mine
  759 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 12
  760 +=======
661 761 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 12
  762 +>>>>>>> .r35
662 763  
663 764  
664 765 621 00bc 04 .uleb128 0x4
  766 +<<<<<<< .mine
  767 + 622 00bd 98010000 .4byte .LASF16
  768 +=======
665 769 622 00bd 92010000 .4byte .LASF16
  770 +>>>>>>> .r35
666 771 623 00c1 04 .byte 0x4
667 772 624 00c2 33 .byte 0x33
668 773 625 00c3 5E000000 .4byte 0x5e
669 774 626 00c7 04 .uleb128 0x4
  775 +<<<<<<< .mine
  776 + 627 00c8 BE010000 .4byte .LASF17
  777 +=======
670 778 627 00c8 B8010000 .4byte .LASF17
  779 +>>>>>>> .r35
671 780 628 00cc 04 .byte 0x4
672 781 629 00cd 35 .byte 0x35
673 782 630 00ce 70000000 .4byte 0x70
674 783 631 00d2 04 .uleb128 0x4
  784 +<<<<<<< .mine
  785 + 632 00d3 17030000 .4byte .LASF18
  786 +=======
675 787 632 00d3 11030000 .4byte .LASF18
  788 +>>>>>>> .r35
676 789 633 00d7 04 .byte 0x4
677 790 634 00d8 36 .byte 0x36
678 791 635 00d9 70000000 .4byte 0x70
679 792 636 00dd 04 .uleb128 0x4
  793 +<<<<<<< .mine
  794 + 637 00de 4B010000 .4byte .LASF19
  795 +=======
680 796 637 00de 45010000 .4byte .LASF19
  797 +>>>>>>> .r35
681 798 638 00e2 04 .byte 0x4
682 799 639 00e3 37 .byte 0x37
683 800 640 00e4 5E000000 .4byte 0x5e
684 801 641 00e8 04 .uleb128 0x4
  802 +<<<<<<< .mine
  803 + 642 00e9 AE020000 .4byte .LASF20
  804 +=======
685 805 642 00e9 A8020000 .4byte .LASF20
  806 +>>>>>>> .r35
686 807 643 00ed 05 .byte 0x5
687 808 644 00ee 2A .byte 0x2a
688 809 645 00ef F3000000 .4byte 0xf3
689 810 646 00f3 05 .uleb128 0x5
  811 +<<<<<<< .mine
  812 + 647 00f4 AE020000 .4byte .LASF20
  813 +=======
690 814 647 00f4 A8020000 .4byte .LASF20
  815 +>>>>>>> .r35
691 816 648 00f8 48 .byte 0x48
692 817 649 00f9 06 .byte 0x6
693 818 650 00fa 5E .byte 0x5e
694 819 651 00fb 0A020000 .4byte 0x20a
695 820 652 00ff 06 .uleb128 0x6
  821 +<<<<<<< .mine
  822 + 653 0100 9F020000 .4byte .LASF21
  823 +=======
696 824 653 0100 99020000 .4byte .LASF21
  825 +>>>>>>> .r35
697 826 654 0104 06 .byte 0x6
698 827 655 0105 5F .byte 0x5f
699 828 656 0106 2F020000 .4byte 0x22f
... ... @@ -701,7 +830,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
701 830 658 010b 23 .byte 0x23
702 831 659 010c 00 .uleb128 0
703 832 660 010d 06 .uleb128 0x6
  833 +<<<<<<< .mine
  834 + 661 010e 42020000 .4byte .LASF22
  835 +=======
704 836 661 010e 3C020000 .4byte .LASF22
  837 +>>>>>>> .r35
705 838 662 0112 06 .byte 0x6
706 839 663 0113 61 .byte 0x61
707 840 664 0114 2F020000 .4byte 0x22f
... ... @@ -709,7 +842,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
709 842 666 0119 23 .byte 0x23
710 843 667 011a 04 .uleb128 0x4
711 844 668 011b 06 .uleb128 0x6
712   - 669 011c 49000000 .4byte .LASF23
  845 + 669 011c BE000000 .4byte .LASF23
713 846 670 0120 06 .byte 0x6
714 847 671 0121 63 .byte 0x63
715 848 672 0122 B1000000 .4byte 0xb1
... ... @@ -717,8 +850,13 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
717 850 674 0127 23 .byte 0x23
718 851 675 0128 08 .uleb128 0x8
719 852 676 0129 06 .uleb128 0x6
  853 +<<<<<<< .mine
  854 + 677 012a E1030000 .4byte .LASF24
  855 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 13
  856 +=======
720 857 677 012a DB030000 .4byte .LASF24
721 858 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 13
  859 +>>>>>>> .r35
722 860  
723 861  
724 862 678 012e 06 .byte 0x6
... ... @@ -728,7 +866,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
728 866 682 0135 23 .byte 0x23
729 867 683 0136 0C .uleb128 0xc
730 868 684 0137 06 .uleb128 0x6
731   - 685 0138 9F000000 .4byte .LASF25
  869 + 685 0138 14010000 .4byte .LASF25
732 870 686 013c 06 .byte 0x6
733 871 687 013d 66 .byte 0x66
734 872 688 013e 2F020000 .4byte 0x22f
... ... @@ -736,7 +874,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
736 874 690 0143 23 .byte 0x23
737 875 691 0144 10 .uleb128 0x10
738 876 692 0145 06 .uleb128 0x6
  877 +<<<<<<< .mine
  878 + 693 0146 EC010000 .4byte .LASF26
  879 +=======
739 880 693 0146 E6010000 .4byte .LASF26
  881 +>>>>>>> .r35
740 882 694 014a 06 .byte 0x6
741 883 695 014b 67 .byte 0x67
742 884 696 014c 2F020000 .4byte 0x22f
... ... @@ -744,7 +886,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
744 886 698 0151 23 .byte 0x23
745 887 699 0152 14 .uleb128 0x14
746 888 700 0153 06 .uleb128 0x6
  889 +<<<<<<< .mine
  890 + 701 0154 A1030000 .4byte .LASF27
  891 +=======
747 892 701 0154 9B030000 .4byte .LASF27
  893 +>>>>>>> .r35
748 894 702 0158 06 .byte 0x6
749 895 703 0159 6E .byte 0x6e
750 896 704 015a 44040000 .4byte 0x444
... ... @@ -752,7 +898,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
752 898 706 015f 23 .byte 0x23
753 899 707 0160 18 .uleb128 0x18
754 900 708 0161 06 .uleb128 0x6
  901 +<<<<<<< .mine
  902 + 709 0162 89020000 .4byte .LASF28
  903 +=======
755 904 709 0162 83020000 .4byte .LASF28
  905 +>>>>>>> .r35
756 906 710 0166 06 .byte 0x6
757 907 711 0167 79 .byte 0x79
758 908 712 0168 9B000000 .4byte 0x9b
... ... @@ -760,7 +910,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
760 910 714 016d 23 .byte 0x23
761 911 715 016e 1C .uleb128 0x1c
762 912 716 016f 06 .uleb128 0x6
  913 +<<<<<<< .mine
  914 + 717 0170 A6020000 .4byte .LASF29
  915 +=======
763 916 717 0170 A0020000 .4byte .LASF29
  917 +>>>>>>> .r35
764 918 718 0174 06 .byte 0x6
765 919 719 0175 7D .byte 0x7d
766 920 720 0176 90000000 .4byte 0x90
... ... @@ -768,7 +922,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
768 922 722 017b 23 .byte 0x23
769 923 723 017c 1D .uleb128 0x1d
770 924 724 017d 06 .uleb128 0x6
  925 +<<<<<<< .mine
  926 + 725 017e 5D030000 .4byte .LASF30
  927 +=======
771 928 725 017e 57030000 .4byte .LASF30
  929 +>>>>>>> .r35
772 930 726 0182 06 .byte 0x6
773 931 727 0183 82 .byte 0x82
774 932 728 0184 A6000000 .4byte 0xa6
... ... @@ -776,9 +934,17 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
776 934 730 0189 23 .byte 0x23
777 935 731 018a 1E .uleb128 0x1e
778 936 732 018b 06 .uleb128 0x6
  937 +<<<<<<< .mine
  938 + 733 018c 37030000 .4byte .LASF31
  939 +=======
779 940 733 018c 31030000 .4byte .LASF31
  941 +>>>>>>> .r35
780 942 734 0190 06 .byte 0x6
  943 +<<<<<<< .mine
  944 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 14
  945 +=======
781 946 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 14
  947 +>>>>>>> .r35
782 948  
783 949  
784 950 735 0191 89 .byte 0x89
... ... @@ -795,7 +961,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
795 961 746 01a5 23 .byte 0x23
796 962 747 01a6 24 .uleb128 0x24
797 963 748 01a7 06 .uleb128 0x6
  964 +<<<<<<< .mine
  965 + 749 01a8 E7030000 .4byte .LASF32
  966 +=======
798 967 749 01a8 E1030000 .4byte .LASF32
  968 +>>>>>>> .r35
799 969 750 01ac 06 .byte 0x6
800 970 751 01ad B3 .byte 0xb3
801 971 752 01ae 57020000 .4byte 0x257
... ... @@ -803,7 +973,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
803 973 754 01b3 23 .byte 0x23
804 974 755 01b4 28 .uleb128 0x28
805 975 756 01b5 06 .uleb128 0x6
  976 +<<<<<<< .mine
  977 + 757 01b6 45030000 .4byte .LASF33
  978 +=======
806 979 757 01b6 3F030000 .4byte .LASF33
  980 +>>>>>>> .r35
807 981 758 01ba 06 .byte 0x6
808 982 759 01bb B9 .byte 0xb9
809 983 760 01bc 35020000 .4byte 0x235
... ... @@ -819,7 +993,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
819 993 770 01cf 23 .byte 0x23
820 994 771 01d0 34 .uleb128 0x34
821 995 772 01d1 06 .uleb128 0x6
  996 +<<<<<<< .mine
  997 + 773 01d2 CB020000 .4byte .LASF35
  998 +=======
822 999 773 01d2 C5020000 .4byte .LASF35
  1000 +>>>>>>> .r35
823 1001 774 01d6 06 .byte 0x6
824 1002 775 01d7 C3 .byte 0xc3
825 1003 776 01d8 C7000000 .4byte 0xc7
... ... @@ -827,7 +1005,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
827 1005 778 01dd 23 .byte 0x23
828 1006 779 01de 38 .uleb128 0x38
829 1007 780 01df 06 .uleb128 0x6
  1008 +<<<<<<< .mine
  1009 + 781 01e0 75020000 .4byte .LASF36
  1010 +=======
830 1011 781 01e0 6F020000 .4byte .LASF36
  1012 +>>>>>>> .r35
831 1013 782 01e4 06 .byte 0x6
832 1014 783 01e5 CA .byte 0xca
833 1015 784 01e6 56040000 .4byte 0x456
... ... @@ -835,10 +1017,18 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
835 1017 786 01eb 23 .byte 0x23
836 1018 787 01ec 3C .uleb128 0x3c
837 1019 788 01ed 06 .uleb128 0x6
  1020 +<<<<<<< .mine
  1021 + 789 01ee 21030000 .4byte .LASF37
  1022 +=======
838 1023 789 01ee 1B030000 .4byte .LASF37
  1024 +>>>>>>> .r35
839 1025 790 01f2 06 .byte 0x6
840 1026 791 01f3 CE .byte 0xce
  1027 +<<<<<<< .mine
  1028 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 15
  1029 +=======
841 1030 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 15
  1031 +>>>>>>> .r35
842 1032  
843 1033  
844 1034 792 01f4 B1000000 .4byte 0xb1
... ... @@ -846,7 +1036,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
846 1036 794 01f9 23 .byte 0x23
847 1037 795 01fa 40 .uleb128 0x40
848 1038 796 01fb 06 .uleb128 0x6
849   - 797 01fc 6A000000 .4byte .LASF38
  1039 + 797 01fc DF000000 .4byte .LASF38
850 1040 798 0200 06 .byte 0x6
851 1041 799 0201 D4 .byte 0xd4
852 1042 800 0202 6D020000 .4byte 0x26d
... ... @@ -860,7 +1050,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
860 1050 808 020d 61 .byte 0x61
861 1051 809 020e 2F020000 .4byte 0x22f
862 1052 810 0212 06 .uleb128 0x6
  1053 +<<<<<<< .mine
  1054 + 811 0213 9F020000 .4byte .LASF21
  1055 +=======
863 1056 811 0213 99020000 .4byte .LASF21
  1057 +>>>>>>> .r35
864 1058 812 0217 05 .byte 0x5
865 1059 813 0218 62 .byte 0x62
866 1060 814 0219 2F020000 .4byte 0x22f
... ... @@ -868,7 +1062,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
868 1062 816 021e 23 .byte 0x23
869 1063 817 021f 00 .uleb128 0
870 1064 818 0220 06 .uleb128 0x6
  1065 +<<<<<<< .mine
  1066 + 819 0221 42020000 .4byte .LASF22
  1067 +=======
871 1068 819 0221 3C020000 .4byte .LASF22
  1069 +>>>>>>> .r35
872 1070 820 0225 05 .byte 0x5
873 1071 821 0226 64 .byte 0x64
874 1072 822 0227 2F020000 .4byte 0x22f
... ... @@ -880,7 +1078,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
880 1078 828 0230 04 .byte 0x4
881 1079 829 0231 E8000000 .4byte 0xe8
882 1080 830 0235 04 .uleb128 0x4
  1081 +<<<<<<< .mine
  1082 + 831 0236 FA010000 .4byte .LASF39
  1083 +=======
883 1084 831 0236 F4010000 .4byte .LASF39
  1085 +>>>>>>> .r35
884 1086 832 023a 05 .byte 0x5
885 1087 833 023b 66 .byte 0x66
886 1088 834 023c 0A020000 .4byte 0x20a
... ... @@ -890,7 +1092,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
890 1092 838 0243 6B .byte 0x6b
891 1093 839 0244 57020000 .4byte 0x257
892 1094 840 0248 06 .uleb128 0x6
  1095 +<<<<<<< .mine
  1096 + 841 0249 9F020000 .4byte .LASF21
  1097 +=======
893 1098 841 0249 99020000 .4byte .LASF21
  1099 +>>>>>>> .r35
894 1100 842 024d 05 .byte 0x5
895 1101 843 024e 6D .byte 0x6d
896 1102 844 024f 2F020000 .4byte 0x22f
... ... @@ -898,23 +1104,39 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
898 1104 846 0254 23 .byte 0x23
899 1105 847 0255 00 .uleb128 0
900 1106 848 0256 00 .byte 0
  1107 +<<<<<<< .mine
  1108 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 16
  1109 +=======
901 1110 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 16
  1111 +>>>>>>> .r35
902 1112  
903 1113  
904 1114 849 0257 04 .uleb128 0x4
  1115 +<<<<<<< .mine
  1116 + 850 0258 B2010000 .4byte .LASF40
  1117 +=======
905 1118 850 0258 AC010000 .4byte .LASF40
  1119 +>>>>>>> .r35
906 1120 851 025c 05 .byte 0x5
907 1121 852 025d 70 .byte 0x70
908 1122 853 025e 40020000 .4byte 0x240
909 1123 854 0262 04 .uleb128 0x4
  1124 +<<<<<<< .mine
  1125 + 855 0263 35010000 .4byte .LASF41
  1126 +=======
910 1127 855 0263 2F010000 .4byte .LASF41
  1128 +>>>>>>> .r35
911 1129 856 0267 07 .byte 0x7
912 1130 857 0268 D7 .byte 0xd7
913 1131 858 0269 6D020000 .4byte 0x26d
914 1132 859 026d 0A .uleb128 0xa
915 1133 860 026e 04 .byte 0x4
916 1134 861 026f 05 .uleb128 0x5
  1135 +<<<<<<< .mine
  1136 + 862 0270 3E030000 .4byte .LASF42
  1137 +=======
917 1138 862 0270 38030000 .4byte .LASF42
  1139 +>>>>>>> .r35
918 1140 863 0274 24 .byte 0x24
919 1141 864 0275 07 .byte 0x7
920 1142 865 0276 FE .byte 0xfe
... ... @@ -958,7 +1180,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
958 1180 903 02ba 62020000 .4byte 0x262
959 1181 904 02be 02 .byte 0x2
960 1182 905 02bf 23 .byte 0x23
  1183 +<<<<<<< .mine
  1184 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 17
  1185 +=======
961 1186 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 17
  1187 +>>>>>>> .r35
962 1188  
963 1189  
964 1190 906 02c0 10 .uleb128 0x10
... ... @@ -996,7 +1222,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
996 1222 938 02fa 20 .uleb128 0x20
997 1223 939 02fb 00 .byte 0
998 1224 940 02fc 0C .uleb128 0xc
  1225 +<<<<<<< .mine
  1226 + 941 02fd 7D010000 .4byte .LASF43
  1227 +=======
999 1228 941 02fd 77010000 .4byte .LASF43
  1229 +>>>>>>> .r35
1000 1230 942 0301 04 .byte 0x4
1001 1231 943 0302 07 .byte 0x7
1002 1232 944 0303 2301 .2byte 0x123
... ... @@ -1016,9 +1246,17 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1016 1246 958 031f 03 .uleb128 0x3
1017 1247 959 0320 04 .byte 0x4
1018 1248 960 0321 07 .byte 0x7
  1249 +<<<<<<< .mine
  1250 + 961 0322 D0010000 .4byte .LASF44
  1251 +=======
1019 1252 961 0322 CA010000 .4byte .LASF44
  1253 +>>>>>>> .r35
1020 1254 962 0326 0D .uleb128 0xd
  1255 +<<<<<<< .mine
  1256 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 18
  1257 +=======
1021 1258 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 18
  1259 +>>>>>>> .r35
1022 1260  
1023 1261  
1024 1262 963 0327 D2000000 .4byte 0xd2
... ... @@ -1028,7 +1266,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1028 1266 967 032e 5E .byte 0x5e
1029 1267 968 032f 96030000 .4byte 0x396
1030 1268 969 0333 06 .uleb128 0x6
  1269 +<<<<<<< .mine
  1270 + 970 0334 DF020000 .4byte .LASF45
  1271 +=======
1031 1272 970 0334 D9020000 .4byte .LASF45
  1273 +>>>>>>> .r35
1032 1274 971 0338 08 .byte 0x8
1033 1275 972 0339 5F .byte 0x5f
1034 1276 973 033a 35020000 .4byte 0x235
... ... @@ -1036,7 +1278,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1036 1278 975 033f 23 .byte 0x23
1037 1279 976 0340 00 .uleb128 0
1038 1280 977 0341 06 .uleb128 0x6
  1281 +<<<<<<< .mine
  1282 + 978 0342 91020000 .4byte .LASF46
  1283 +=======
1039 1284 978 0342 8B020000 .4byte .LASF46
  1285 +>>>>>>> .r35
1040 1286 979 0346 08 .byte 0x8
1041 1287 980 0347 60 .byte 0x60
1042 1288 981 0348 B1000000 .4byte 0xb1
... ... @@ -1044,7 +1290,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1044 1290 983 034d 23 .byte 0x23
1045 1291 984 034e 08 .uleb128 0x8
1046 1292 985 034f 06 .uleb128 0x6
  1293 +<<<<<<< .mine
  1294 + 986 0350 F4010000 .4byte .LASF47
  1295 +=======
1047 1296 986 0350 EE010000 .4byte .LASF47
  1297 +>>>>>>> .r35
1048 1298 987 0354 08 .byte 0x8
1049 1299 988 0355 62 .byte 0x62
1050 1300 989 0356 FC020000 .4byte 0x2fc
... ... @@ -1052,7 +1302,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1052 1302 991 035b 23 .byte 0x23
1053 1303 992 035c 0C .uleb128 0xc
1054 1304 993 035d 06 .uleb128 0x6
  1305 +<<<<<<< .mine
  1306 + 994 035e 2D010000 .4byte .LASF48
  1307 +=======
1055 1308 994 035e 27010000 .4byte .LASF48
  1309 +>>>>>>> .r35
1056 1310 995 0362 08 .byte 0x8
1057 1311 996 0363 65 .byte 0x65
1058 1312 997 0364 2F020000 .4byte 0x22f
... ... @@ -1060,7 +1314,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1060 1314 999 0369 23 .byte 0x23
1061 1315 1000 036a 10 .uleb128 0x10
1062 1316 1001 036b 06 .uleb128 0x6
  1317 +<<<<<<< .mine
  1318 + 1002 036c 22020000 .4byte .LASF49
  1319 +=======
1063 1320 1002 036c 1C020000 .4byte .LASF49
  1321 +>>>>>>> .r35
1064 1322 1003 0370 08 .byte 0x8
1065 1323 1004 0371 66 .byte 0x66
1066 1324 1005 0372 2F020000 .4byte 0x22f
... ... @@ -1068,7 +1326,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1068 1326 1007 0377 23 .byte 0x23
1069 1327 1008 0378 14 .uleb128 0x14
1070 1328 1009 0379 06 .uleb128 0x6
  1329 +<<<<<<< .mine
  1330 + 1010 037a CF030000 .4byte .LASF50
  1331 +=======
1071 1332 1010 037a C9030000 .4byte .LASF50
  1333 +>>>>>>> .r35
1072 1334 1011 037e 08 .byte 0x8
1073 1335 1012 037f 6A .byte 0x6a
1074 1336 1013 0380 DD000000 .4byte 0xdd
... ... @@ -1076,9 +1338,17 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1076 1338 1015 0385 23 .byte 0x23
1077 1339 1016 0386 18 .uleb128 0x18
1078 1340 1017 0387 06 .uleb128 0x6
  1341 +<<<<<<< .mine
  1342 + 1018 0388 18020000 .4byte .LASF51
  1343 +=======
1079 1344 1018 0388 12020000 .4byte .LASF51
  1345 +>>>>>>> .r35
1080 1346 1019 038c 08 .byte 0x8
  1347 +<<<<<<< .mine
  1348 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 19
  1349 +=======
1081 1350 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 19
  1351 +>>>>>>> .r35
1082 1352  
1083 1353  
1084 1354 1020 038d 6C .byte 0x6c
... ... @@ -1088,18 +1358,26 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1088 1358 1024 0394 1C .uleb128 0x1c
1089 1359 1025 0395 00 .byte 0
1090 1360 1026 0396 04 .uleb128 0x4
  1361 +<<<<<<< .mine
  1362 + 1027 0397 64030000 .4byte .LASF52
  1363 +=======
1091 1364 1027 0397 5E030000 .4byte .LASF52
  1365 +>>>>>>> .r35
1092 1366 1028 039b 08 .byte 0x8
1093 1367 1029 039c 6E .byte 0x6e
1094 1368 1030 039d 2B030000 .4byte 0x32b
1095 1369 1031 03a1 05 .uleb128 0x5
  1370 +<<<<<<< .mine
  1371 + 1032 03a2 CA010000 .4byte .LASF53
  1372 +=======
1096 1373 1032 03a2 C4010000 .4byte .LASF53
  1374 +>>>>>>> .r35
1097 1375 1033 03a6 10 .byte 0x10
1098 1376 1034 03a7 09 .byte 0x9
1099 1377 1035 03a8 2C .byte 0x2c
1100 1378 1036 03a9 D8030000 .4byte 0x3d8
1101 1379 1037 03ad 06 .uleb128 0x6
1102   - 1038 03ae 72000000 .4byte .LASF54
  1380 + 1038 03ae E7000000 .4byte .LASF54
1103 1381 1039 03b2 09 .byte 0x9
1104 1382 1040 03b3 2D .byte 0x2d
1105 1383 1041 03b4 35020000 .4byte 0x235
... ... @@ -1107,7 +1385,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1107 1385 1043 03b9 23 .byte 0x23
1108 1386 1044 03ba 00 .uleb128 0
1109 1387 1045 03bb 06 .uleb128 0x6
  1388 +<<<<<<< .mine
  1389 + 1046 03bc D9030000 .4byte .LASF55
  1390 +=======
1110 1391 1046 03bc D3030000 .4byte .LASF55
  1392 +>>>>>>> .r35
1111 1393 1047 03c0 09 .byte 0x9
1112 1394 1048 03c1 2F .byte 0x2f
1113 1395 1049 03c2 2F020000 .4byte 0x22f
... ... @@ -1115,7 +1397,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1115 1397 1051 03c7 23 .byte 0x23
1116 1398 1052 03c8 08 .uleb128 0x8
1117 1399 1053 03c9 06 .uleb128 0x6
  1400 +<<<<<<< .mine
  1401 + 1054 03ca 10030000 .4byte .LASF56
  1402 +=======
1118 1403 1054 03ca 0A030000 .4byte .LASF56
  1404 +>>>>>>> .r35
1119 1405 1055 03ce 09 .byte 0x9
1120 1406 1056 03cf 31 .byte 0x31
1121 1407 1057 03d0 D8030000 .4byte 0x3d8
... ... @@ -1127,21 +1413,33 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1127 1413 1063 03d9 04 .byte 0x4
1128 1414 1064 03da A1030000 .4byte 0x3a1
1129 1415 1065 03de 04 .uleb128 0x4
  1416 +<<<<<<< .mine
  1417 + 1066 03df CA010000 .4byte .LASF53
  1418 +=======
1130 1419 1066 03df C4010000 .4byte .LASF53
  1420 +>>>>>>> .r35
1131 1421 1067 03e3 09 .byte 0x9
1132 1422 1068 03e4 33 .byte 0x33
1133 1423 1069 03e5 A1030000 .4byte 0x3a1
1134 1424 1070 03e9 05 .uleb128 0x5
1135   - 1071 03ea 7A000000 .4byte .LASF57
  1425 + 1071 03ea EF000000 .4byte .LASF57
1136 1426 1072 03ee 08 .byte 0x8
1137 1427 1073 03ef 0A .byte 0xa
1138 1428 1074 03f0 36 .byte 0x36
1139 1429 1075 03f1 04040000 .4byte 0x404
1140 1430 1076 03f5 06 .uleb128 0x6
  1431 +<<<<<<< .mine
  1432 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 20
  1433 +=======
1141 1434 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 20
  1435 +>>>>>>> .r35
1142 1436  
1143 1437  
  1438 +<<<<<<< .mine
  1439 + 1077 03f6 B5020000 .4byte .LASF58
  1440 +=======
1144 1441 1077 03f6 AF020000 .4byte .LASF58
  1442 +>>>>>>> .r35
1145 1443 1078 03fa 0A .byte 0xa
1146 1444 1079 03fb 37 .byte 0x37
1147 1445 1080 03fc 35020000 .4byte 0x235
... ... @@ -1150,7 +1448,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1150 1448 1083 0402 00 .uleb128 0
1151 1449 1084 0403 00 .byte 0
1152 1450 1085 0404 04 .uleb128 0x4
1153   - 1086 0405 7A000000 .4byte .LASF57
  1451 + 1086 0405 EF000000 .4byte .LASF57
1154 1452 1087 0409 0A .byte 0xa
1155 1453 1088 040a 38 .byte 0x38
1156 1454 1089 040b E9030000 .4byte 0x3e9
... ... @@ -1160,22 +1458,30 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1160 1458 1093 0412 90 .byte 0x90
1161 1459 1094 0413 44040000 .4byte 0x444
1162 1460 1095 0417 0F .uleb128 0xf
1163   - 1096 0418 11000000 .4byte .LASF59
  1461 + 1096 0418 86000000 .4byte .LASF59
1164 1462 1097 041c 06 .byte 0x6
1165 1463 1098 041d 97 .byte 0x97
1166 1464 1099 041e BC000000 .4byte 0xbc
1167 1465 1100 0422 0F .uleb128 0xf
1168   - 1101 0423 2F000000 .4byte .LASF60
  1466 + 1101 0423 A4000000 .4byte .LASF60
1169 1467 1102 0427 06 .byte 0x6
1170 1468 1103 0428 9E .byte 0x9e
1171 1469 1104 0429 BC000000 .4byte 0xbc
1172 1470 1105 042d 0F .uleb128 0xf
  1471 +<<<<<<< .mine
  1472 + 1106 042e 9A030000 .4byte .LASF61
  1473 +=======
1173 1474 1106 042e 94030000 .4byte .LASF61
  1475 +>>>>>>> .r35
1174 1476 1107 0432 06 .byte 0x6
1175 1477 1108 0433 A5 .byte 0xa5
1176 1478 1109 0434 6D020000 .4byte 0x26d
1177 1479 1110 0438 0F .uleb128 0xf
  1480 +<<<<<<< .mine
  1481 + 1111 0439 98020000 .4byte .LASF62
  1482 +=======
1178 1483 1111 0439 92020000 .4byte .LASF62
  1484 +>>>>>>> .r35
1179 1485 1112 043d 06 .byte 0x6
1180 1486 1113 043e AC .byte 0xac
1181 1487 1114 043f C7000000 .4byte 0xc7
... ... @@ -1188,17 +1494,29 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1188 1494 1121 044f 03 .uleb128 0x3
1189 1495 1122 0450 01 .byte 0x1
1190 1496 1123 0451 08 .byte 0x8
  1497 +<<<<<<< .mine
  1498 + 1124 0452 F3020000 .4byte .LASF63
  1499 +=======
1191 1500 1124 0452 ED020000 .4byte .LASF63
  1501 +>>>>>>> .r35
1192 1502 1125 0456 09 .uleb128 0x9
1193 1503 1126 0457 04 .byte 0x4
1194 1504 1127 0458 DE030000 .4byte 0x3de
1195 1505 1128 045c 11 .uleb128 0x11
  1506 +<<<<<<< .mine
  1507 + 1129 045d F8020000 .4byte .LASF81
  1508 +=======
1196 1509 1129 045d F2020000 .4byte .LASF81
  1510 +>>>>>>> .r35
1197 1511 1130 0461 02 .byte 0x2
1198 1512 1131 0462 3B .byte 0x3b
1199 1513 1132 0463 01 .byte 0x1
1200 1514 1133 0464 2F020000 .4byte 0x22f
  1515 +<<<<<<< .mine
  1516 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 21
  1517 +=======
1201 1518 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 21
  1519 +>>>>>>> .r35
1202 1520  
1203 1521  
1204 1522 1134 0468 03 .byte 0x3
... ... @@ -1218,7 +1536,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1218 1536 1148 0484 04 .byte 0x4
1219 1537 1149 0485 35020000 .4byte 0x235
1220 1538 1150 0489 14 .uleb128 0x14
  1539 +<<<<<<< .mine
  1540 + 1151 048a 9E010000 .4byte .LASF82
  1541 +=======
1221 1542 1151 048a 98010000 .4byte .LASF82
  1543 +>>>>>>> .r35
1222 1544 1152 048e 02 .byte 0x2
1223 1545 1153 048f 29 .byte 0x29
1224 1546 1154 0490 01 .byte 0x1
... ... @@ -1242,7 +1564,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1242 1564 1172 04b5 00 .byte 0
1243 1565 1173 04b6 15 .uleb128 0x15
1244 1566 1174 04b7 01 .byte 0x1
1245   - 1175 04b8 06000000 .4byte .LASF64
  1567 + 1175 04b8 7B000000 .4byte .LASF64
1246 1568 1176 04bc 01 .byte 0x1
1247 1569 1177 04bd 3B .byte 0x3b
1248 1570 1178 04be 01 .byte 0x1
... ... @@ -1258,7 +1580,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1258 1580 1188 04d3 01 .byte 0x1
1259 1581 1189 04d4 3B .byte 0x3b
1260 1582 1190 04d5 DC040000 .4byte 0x4dc
  1583 +<<<<<<< .mine
  1584 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 22
  1585 +=======
1261 1586 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 22
  1587 +>>>>>>> .r35
1262 1588  
1263 1589  
1264 1590 1191 04d9 01 .byte 0x1
... ... @@ -1269,7 +1595,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1269 1595 1196 04de 04040000 .4byte 0x404
1270 1596 1197 04e2 17 .uleb128 0x17
1271 1597 1198 04e3 01 .byte 0x1
  1598 +<<<<<<< .mine
  1599 + 1199 04e4 3E010000 .4byte .LASF65
  1600 +=======
1272 1601 1199 04e4 38010000 .4byte .LASF65
  1602 +>>>>>>> .r35
1273 1603 1200 04e8 01 .byte 0x1
1274 1604 1201 04e9 49 .byte 0x49
1275 1605 1202 04ea 01 .byte 0x1
... ... @@ -1313,12 +1643,20 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1313 1643 1240 0545 00 .byte 0
1314 1644 1241 0546 17 .uleb128 0x17
1315 1645 1242 0547 01 .byte 0x1
  1646 +<<<<<<< .mine
  1647 + 1243 0548 51020000 .4byte .LASF66
  1648 +=======
1316 1649 1243 0548 4B020000 .4byte .LASF66
  1650 +>>>>>>> .r35
1317 1651 1244 054c 01 .byte 0x1
1318 1652 1245 054d 5E .byte 0x5e
1319 1653 1246 054e 01 .byte 0x1
1320 1654 1247 054f 00000000 .4byte .LFB9
  1655 +<<<<<<< .mine
  1656 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 23
  1657 +=======
1321 1658 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 23
  1659 +>>>>>>> .r35
1322 1660  
1323 1661  
1324 1662 1248 0553 1A000000 .4byte .LFE9
... ... @@ -1355,7 +1693,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1355 1693 1279 05a7 00 .byte 0
1356 1694 1280 05a8 17 .uleb128 0x17
1357 1695 1281 05a9 01 .byte 0x1
1358   - 1282 05aa 38000000 .4byte .LASF67
  1696 + 1282 05aa AD000000 .4byte .LASF67
1359 1697 1283 05ae 01 .byte 0x1
1360 1698 1284 05af 81 .byte 0x81
1361 1699 1285 05b0 01 .byte 0x1
... ... @@ -1378,7 +1716,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1378 1716 1302 05de 8A .byte 0x8a
1379 1717 1303 05df 00060000 .4byte 0x600
1380 1718 1304 05e3 1A .uleb128 0x1a
  1719 +<<<<<<< .mine
  1720 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 24
  1721 +=======
1381 1722 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 24
  1723 +>>>>>>> .r35
1382 1724  
1383 1725  
1384 1726 1305 05e4 6D040000 .4byte 0x46d
... ... @@ -1397,7 +1739,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1397 1739 1318 0609 00 .byte 0
1398 1740 1319 060a 17 .uleb128 0x17
1399 1741 1320 060b 01 .byte 0x1
  1742 +<<<<<<< .mine
  1743 + 1321 060c 2A020000 .4byte .LASF68
  1744 +=======
1400 1745 1321 060c 24020000 .4byte .LASF68
  1746 +>>>>>>> .r35
1401 1747 1322 0610 01 .byte 0x1
1402 1748 1323 0611 6E .byte 0x6e
1403 1749 1324 0612 01 .byte 0x1
... ... @@ -1430,7 +1776,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1430 1776 1351 0650 00 .byte 0
1431 1777 1352 0651 23 .uleb128 0x23
1432 1778 1353 0652 01 .byte 0x1
  1779 +<<<<<<< .mine
  1780 + 1354 0653 04030000 .4byte .LASF69
  1781 +=======
1433 1782 1354 0653 FE020000 .4byte .LASF69
  1783 +>>>>>>> .r35
1434 1784 1355 0657 01 .byte 0x1
1435 1785 1356 0658 B8 .byte 0xb8
1436 1786 1357 0659 01 .byte 0x1
... ... @@ -1438,7 +1788,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1438 1788 1359 065e 00000000 .4byte .LFB13
1439 1789 1360 0662 48000000 .4byte .LFE13
1440 1790 1361 0666 A5010000 .4byte .LLST14
  1791 +<<<<<<< .mine
  1792 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 25
  1793 +=======
1441 1794 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 25
  1795 +>>>>>>> .r35
1442 1796  
1443 1797  
1444 1798 1362 066a 01 .byte 0x1
... ... @@ -1498,7 +1852,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1498 1852 1416 06f2 1E .uleb128 0x1e
1499 1853 1417 06f3 01 .byte 0x1
1500 1854 1418 06f4 50 .byte 0x50
  1855 +<<<<<<< .mine
  1856 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 26
  1857 +=======
1501 1858 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 26
  1859 +>>>>>>> .r35
1502 1860  
1503 1861  
1504 1862 1419 06f5 01 .byte 0x1
... ... @@ -1517,7 +1875,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1517 1875 1432 0708 00 .byte 0
1518 1876 1433 0709 23 .uleb128 0x23
1519 1877 1434 070a 01 .byte 0x1
  1878 +<<<<<<< .mine
  1879 + 1435 070b 2C030000 .4byte .LASF70
  1880 +=======
1520 1881 1435 070b 26030000 .4byte .LASF70
  1882 +>>>>>>> .r35
1521 1883 1436 070f 01 .byte 0x1
1522 1884 1437 0710 9E .byte 0x9e
1523 1885 1438 0711 01 .byte 0x1
... ... @@ -1554,11 +1916,19 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1554 1916 1469 0753 00 .byte 0
1555 1917 1470 0754 27 .uleb128 0x27
1556 1918 1471 0755 01 .byte 0x1
  1919 +<<<<<<< .mine
  1920 + 1472 0756 D9010000 .4byte .LASF71
  1921 +=======
1557 1922 1472 0756 D3010000 .4byte .LASF71
  1923 +>>>>>>> .r35
1558 1924 1473 075a 01 .byte 0x1
1559 1925 1474 075b 0E01 .2byte 0x10e
1560 1926 1475 075d 01 .byte 0x1
  1927 +<<<<<<< .mine
  1928 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 27
  1929 +=======
1561 1930 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 27
  1931 +>>>>>>> .r35
1562 1932  
1563 1933  
1564 1934 1476 075e BC000000 .4byte 0xbc
... ... @@ -1574,7 +1944,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1574 1944 1486 077a DC040000 .4byte 0x4dc
1575 1945 1487 077e E5020000 .4byte .LLST24
1576 1946 1488 0782 29 .uleb128 0x29
  1947 +<<<<<<< .mine
  1948 + 1489 0783 07020000 .4byte .LASF72
  1949 +=======
1577 1950 1489 0783 01020000 .4byte .LASF72
  1951 +>>>>>>> .r35
1578 1952 1490 0787 01 .byte 0x1
1579 1953 1491 0788 0E01 .2byte 0x10e
1580 1954 1492 078a D2000000 .4byte 0xd2
... ... @@ -1618,7 +1992,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1618 1992 1530 07ee 22 .uleb128 0x22
1619 1993 1531 07ef 36000000 .4byte .LVL38
1620 1994 1532 07f3 F7080000 .4byte 0x8f7
  1995 +<<<<<<< .mine
  1996 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 28
  1997 +=======
1621 1998 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 28
  1999 +>>>>>>> .r35
1622 2000  
1623 2001  
1624 2002 1533 07f7 07080000 .4byte 0x807
... ... @@ -1647,7 +2025,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1647 2025 1556 0817 00 .byte 0
1648 2026 1557 0818 23 .uleb128 0x23
1649 2027 1558 0819 01 .byte 0x1
  2028 +<<<<<<< .mine
  2029 + 1559 081a A8030000 .4byte .LASF73
  2030 +=======
1650 2031 1559 081a A2030000 .4byte .LASF73
  2032 +>>>>>>> .r35
1651 2033 1560 081e 01 .byte 0x1
1652 2034 1561 081f E9 .byte 0xe9
1653 2035 1562 0820 01 .byte 0x1
... ... @@ -1664,7 +2046,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1664 2046 1573 083c DC040000 .4byte 0x4dc
1665 2047 1574 0840 A3030000 .4byte .LLST31
1666 2048 1575 0844 2C .uleb128 0x2c
  2049 +<<<<<<< .mine
  2050 + 1576 0845 07020000 .4byte .LASF72
  2051 +=======
1667 2052 1576 0845 01020000 .4byte .LASF72
  2053 +>>>>>>> .r35
1668 2054 1577 0849 01 .byte 0x1
1669 2055 1578 084a E9 .byte 0xe9
1670 2056 1579 084b D2000000 .4byte 0xd2
... ... @@ -1678,7 +2064,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1678 2064 1587 085f 50 .byte 0x50
1679 2065 1588 0860 1D .uleb128 0x1d
1680 2066 1589 0861 08000000 .4byte .LVL43
  2067 +<<<<<<< .mine
  2068 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 29
  2069 +=======
1681 2070 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 29
  2071 +>>>>>>> .r35
1682 2072  
1683 2073  
1684 2074 1590 0865 54070000 .4byte 0x754
... ... @@ -1699,7 +2089,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1699 2089 1605 0877 00 .byte 0
1700 2090 1606 0878 00 .byte 0
1701 2091 1607 0879 2D .uleb128 0x2d
  2092 +<<<<<<< .mine
  2093 + 1608 087a 6E030000 .4byte .LASF83
  2094 +=======
1702 2095 1608 087a 68030000 .4byte .LASF83
  2096 +>>>>>>> .r35
1703 2097 1609 087e 08 .byte 0x8
1704 2098 1610 087f 72 .byte 0x72
1705 2099 1611 0880 96030000 .4byte 0x396
... ... @@ -1707,7 +2101,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1707 2101 1613 0885 01 .byte 0x1
1708 2102 1614 0886 2E .uleb128 0x2e
1709 2103 1615 0887 01 .byte 0x1
  2104 +<<<<<<< .mine
  2105 + 1616 0888 50030000 .4byte .LASF74
  2106 +=======
1710 2107 1616 0888 4A030000 .4byte .LASF74
  2108 +>>>>>>> .r35
1711 2109 1617 088c 08 .byte 0x8
1712 2110 1618 088d 9C .byte 0x9c
1713 2111 1619 088e 01 .byte 0x1
... ... @@ -1720,7 +2118,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1720 2118 1626 089e 00 .byte 0
1721 2119 1627 089f 30 .uleb128 0x30
1722 2120 1628 08a0 01 .byte 0x1
  2121 +<<<<<<< .mine
  2122 + 1629 08a1 E7020000 .4byte .LASF84
  2123 +=======
1723 2124 1629 08a1 E1020000 .4byte .LASF84
  2125 +>>>>>>> .r35
1724 2126 1630 08a5 08 .byte 0x8
1725 2127 1631 08a6 93 .byte 0x93
1726 2128 1632 08a7 01 .byte 0x1
... ... @@ -1732,17 +2134,29 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1732 2134 1638 08b6 00 .byte 0
1733 2135 1639 08b7 31 .uleb128 0x31
1734 2136 1640 08b8 01 .byte 0x1
  2137 +<<<<<<< .mine
  2138 + 1641 08b9 1C010000 .4byte .LASF85
  2139 +=======
1735 2140 1641 08b9 16010000 .4byte .LASF85
  2141 +>>>>>>> .r35
1736 2142 1642 08bd 08 .byte 0x8
1737 2143 1643 08be 9F .byte 0x9f
1738 2144 1644 08bf 01 .byte 0x1
1739 2145 1645 08c0 01 .byte 0x1
1740 2146 1646 08c1 32 .uleb128 0x32
  2147 +<<<<<<< .mine
  2148 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 30
  2149 +=======
1741 2150 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 30
  2151 +>>>>>>> .r35
1742 2152  
1743 2153  
1744 2154 1647 08c2 01 .byte 0x1
  2155 +<<<<<<< .mine
  2156 + 1648 08c3 51010000 .4byte .LASF86
  2157 +=======
1745 2158 1648 08c3 4B010000 .4byte .LASF86
  2159 +>>>>>>> .r35
1746 2160 1649 08c7 09 .byte 0x9
1747 2161 1650 08c8 3E .byte 0x3e
1748 2162 1651 08c9 01 .byte 0x1
... ... @@ -1750,7 +2164,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1750 2164 1653 08ce 01 .byte 0x1
1751 2165 1654 08cf 2E .uleb128 0x2e
1752 2166 1655 08d0 01 .byte 0x1
  2167 +<<<<<<< .mine
  2168 + 1656 08d1 BD020000 .4byte .LASF75
  2169 +=======
1753 2170 1656 08d1 B7020000 .4byte .LASF75
  2171 +>>>>>>> .r35
1754 2172 1657 08d5 08 .byte 0x8
1755 2173 1658 08d6 96 .byte 0x96
1756 2174 1659 08d7 01 .byte 0x1
... ... @@ -1761,7 +2179,7 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1761 2179 1664 08e2 00 .byte 0
1762 2180 1665 08e3 2E .uleb128 0x2e
1763 2181 1666 08e4 01 .byte 0x1
1764   - 1667 08e5 94000000 .4byte .LASF76
  2182 + 1667 08e5 09010000 .4byte .LASF76
1765 2183 1668 08e9 09 .byte 0x9
1766 2184 1669 08ea 3A .byte 0x3a
1767 2185 1670 08eb 01 .byte 0x1
... ... @@ -1772,7 +2190,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1772 2190 1675 08f6 00 .byte 0
1773 2191 1676 08f7 33 .uleb128 0x33
1774 2192 1677 08f8 01 .byte 0x1
  2193 +<<<<<<< .mine
  2194 + 1678 08f9 BA030000 .4byte .LASF77
  2195 +=======
1775 2196 1678 08f9 B4030000 .4byte .LASF77
  2197 +>>>>>>> .r35
1776 2198 1679 08fd 08 .byte 0x8
1777 2199 1680 08fe 99 .byte 0x99
1778 2200 1681 08ff 01 .byte 0x1
... ... @@ -1798,7 +2220,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1798 2220 1701 0009 1B .uleb128 0x1b
1799 2221 1702 000a 0E .uleb128 0xe
1800 2222 1703 000b 55 .uleb128 0x55
  2223 +<<<<<<< .mine
  2224 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 31
  2225 +=======
1801 2226 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 31
  2227 +>>>>>>> .r35
1802 2228  
1803 2229  
1804 2230 1704 000c 06 .uleb128 0x6
... ... @@ -1858,7 +2284,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1858 2284 1758 0042 0B .uleb128 0xb
1859 2285 1759 0043 01 .uleb128 0x1
1860 2286 1760 0044 13 .uleb128 0x13
  2287 +<<<<<<< .mine
  2288 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 32
  2289 +=======
1861 2290 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 32
  2291 +>>>>>>> .r35
1862 2292  
1863 2293  
1864 2294 1761 0045 00 .byte 0
... ... @@ -1918,7 +2348,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1918 2348 1815 007b 0A .uleb128 0xa
1919 2349 1816 007c 0F .uleb128 0xf
1920 2350 1817 007d 00 .byte 0
  2351 +<<<<<<< .mine
  2352 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 33
  2353 +=======
1921 2354 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 33
  2355 +>>>>>>> .r35
1922 2356  
1923 2357  
1924 2358 1818 007e 0B .uleb128 0xb
... ... @@ -1978,7 +2412,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
1978 2412 1872 00b4 0F .uleb128 0xf
1979 2413 1873 00b5 0D .uleb128 0xd
1980 2414 1874 00b6 00 .byte 0
  2415 +<<<<<<< .mine
  2416 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 34
  2417 +=======
1981 2418 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 34
  2419 +>>>>>>> .r35
1982 2420  
1983 2421  
1984 2422 1875 00b7 03 .uleb128 0x3
... ... @@ -2038,7 +2476,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2038 2476 1929 00ed 3A .uleb128 0x3a
2039 2477 1930 00ee 0B .uleb128 0xb
2040 2478 1931 00ef 3B .uleb128 0x3b
  2479 +<<<<<<< .mine
  2480 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 35
  2481 +=======
2041 2482 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 35
  2483 +>>>>>>> .r35
2042 2484  
2043 2485  
2044 2486 1932 00f0 0B .uleb128 0xb
... ... @@ -2098,7 +2540,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2098 2540 1986 0127 3B .uleb128 0x3b
2099 2541 1987 0128 0B .uleb128 0xb
2100 2542 1988 0129 49 .uleb128 0x49
  2543 +<<<<<<< .mine
  2544 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 36
  2545 +=======
2101 2546 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 36
  2547 +>>>>>>> .r35
2102 2548  
2103 2549  
2104 2550 1989 012a 13 .uleb128 0x13
... ... @@ -2158,7 +2604,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2158 2604 2043 0161 58 .uleb128 0x58
2159 2605 2044 0162 0B .uleb128 0xb
2160 2606 2045 0163 59 .uleb128 0x59
  2607 +<<<<<<< .mine
  2608 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 37
  2609 +=======
2161 2610 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 37
  2611 +>>>>>>> .r35
2162 2612  
2163 2613  
2164 2614 2046 0164 0B .uleb128 0xb
... ... @@ -2218,7 +2668,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2218 2668 2100 019f 01 .uleb128 0x1
2219 2669 2101 01a0 12 .uleb128 0x12
2220 2670 2102 01a1 01 .uleb128 0x1
  2671 +<<<<<<< .mine
  2672 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 38
  2673 +=======
2221 2674 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 38
  2675 +>>>>>>> .r35
2222 2676  
2223 2677  
2224 2678 2103 01a2 58 .uleb128 0x58
... ... @@ -2278,7 +2732,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2278 2732 2157 01dc 12 .uleb128 0x12
2279 2733 2158 01dd 01 .uleb128 0x1
2280 2734 2159 01de 40 .uleb128 0x40
  2735 +<<<<<<< .mine
  2736 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 39
  2737 +=======
2281 2738 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 39
  2739 +>>>>>>> .r35
2282 2740  
2283 2741  
2284 2742 2160 01df 06 .uleb128 0x6
... ... @@ -2338,7 +2796,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2338 2796 2214 0216 0B .uleb128 0xb
2339 2797 2215 0217 3B .uleb128 0x3b
2340 2798 2216 0218 05 .uleb128 0x5
  2799 +<<<<<<< .mine
  2800 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 40
  2801 +=======
2341 2802 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 40
  2803 +>>>>>>> .r35
2342 2804  
2343 2805  
2344 2806 2217 0219 27 .uleb128 0x27
... ... @@ -2398,7 +2860,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2398 2860 2271 0250 05 .uleb128 0x5
2399 2861 2272 0251 49 .uleb128 0x49
2400 2862 2273 0252 13 .uleb128 0x13
  2863 +<<<<<<< .mine
  2864 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 41
  2865 +=======
2401 2866 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 41
  2867 +>>>>>>> .r35
2402 2868  
2403 2869  
2404 2870 2274 0253 02 .uleb128 0x2
... ... @@ -2458,7 +2924,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2458 2924 2328 0289 2E .uleb128 0x2e
2459 2925 2329 028a 01 .byte 0x1
2460 2926 2330 028b 3F .uleb128 0x3f
  2927 +<<<<<<< .mine
  2928 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 42
  2929 +=======
2461 2930 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 42
  2931 +>>>>>>> .r35
2462 2932  
2463 2933  
2464 2934 2331 028c 0C .uleb128 0xc
... ... @@ -2518,7 +2988,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2518 2988 2385 02c2 27 .uleb128 0x27
2519 2989 2386 02c3 0C .uleb128 0xc
2520 2990 2387 02c4 3C .uleb128 0x3c
  2991 +<<<<<<< .mine
  2992 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 43
  2993 +=======
2521 2994 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 43
  2995 +>>>>>>> .r35
2522 2996  
2523 2997  
2524 2998 2388 02c5 0C .uleb128 0xc
... ... @@ -2578,7 +3052,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2578 3052 2442 0017 08 .sleb128 8
2579 3053 2443 0018 00000000 .4byte 0
2580 3054 2444 001c 00000000 .4byte 0
  3055 +<<<<<<< .mine
  3056 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 44
  3057 +=======
2581 3058 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 44
  3059 +>>>>>>> .r35
2582 3060  
2583 3061  
2584 3062 2445 .LLST1:
... ... @@ -2638,7 +3116,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2638 3116 2499 00a4 06000000 .4byte .LVL6
2639 3117 2500 00a8 0100 .2byte 0x1
2640 3118 2501 00aa 50 .byte 0x50
  3119 +<<<<<<< .mine
  3120 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 45
  3121 +=======
2641 3122 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 45
  3123 +>>>>>>> .r35
2642 3124  
2643 3125  
2644 3126 2502 00ab 06000000 .4byte .LVL6
... ... @@ -2698,7 +3180,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2698 3180 2556 0133 0100 .2byte 0x1
2699 3181 2557 0135 54 .byte 0x54
2700 3182 2558 0136 00000000 .4byte 0
  3183 +<<<<<<< .mine
  3184 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 46
  3185 +=======
2701 3186 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 46
  3187 +>>>>>>> .r35
2702 3188  
2703 3189  
2704 3190 2559 013a 00000000 .4byte 0
... ... @@ -2758,7 +3244,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2758 3244 2613 01c1 00000000 .4byte 0
2759 3245 2614 .LLST15:
2760 3246 2615 01c5 00000000 .4byte .LVL18
  3247 +<<<<<<< .mine
  3248 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 47
  3249 +=======
2761 3250 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 47
  3251 +>>>>>>> .r35
2762 3252  
2763 3253  
2764 3254 2616 01c9 0B000000 .4byte .LVL20-1
... ... @@ -2818,7 +3308,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2818 3308 2670 025b 10000000 .4byte .LVL21
2819 3309 2671 025f 16000000 .4byte .LVL22
2820 3310 2672 0263 0100 .2byte 0x1
  3311 +<<<<<<< .mine
  3312 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 48
  3313 +=======
2821 3314 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 48
  3315 +>>>>>>> .r35
2822 3316  
2823 3317  
2824 3318 2673 0265 55 .byte 0x55
... ... @@ -2878,7 +3372,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2878 3372 2727 02ed 0100 .2byte 0x1
2879 3373 2728 02ef 50 .byte 0x50
2880 3374 2729 02f0 0B000000 .4byte .LVL33-1
  3375 +<<<<<<< .mine
  3376 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 49
  3377 +=======
2881 3378 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 49
  3379 +>>>>>>> .r35
2882 3380  
2883 3381  
2884 3382 2730 02f4 4C000000 .4byte .LFE15
... ... @@ -2938,7 +3436,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2938 3436 2784 0387 02000000 .4byte .LCFI7
2939 3437 2785 038b 0200 .2byte 0x2
2940 3438 2786 038d 7D .byte 0x7d
  3439 +<<<<<<< .mine
  3440 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 50
  3441 +=======
2941 3442 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 50
  3443 +>>>>>>> .r35
2942 3444  
2943 3445  
2944 3446 2787 038e 00 .sleb128 0
... ... @@ -2998,7 +3500,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
2998 3500 2841 0038 00000000 .4byte .LFB13
2999 3501 2842 003c 48000000 .4byte .LFE13-.LFB13
3000 3502 2843 0040 00000000 .4byte .LFB12
  3503 +<<<<<<< .mine
  3504 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 51
  3505 +=======
3001 3506 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 51
  3507 +>>>>>>> .r35
3002 3508  
3003 3509  
3004 3510 2844 0044 0C000000 .4byte .LFE12-.LFB12
... ... @@ -3058,7 +3564,11 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3058 3564 2898 00b4 1A000000 .4byte .LFE9
3059 3565 2899 00b8 00000000 .4byte .LFB11
3060 3566 2900 00bc 22000000 .4byte .LFE11
  3567 +<<<<<<< .mine
  3568 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 52
  3569 +=======
3061 3570 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 52
  3571 +>>>>>>> .r35
3062 3572  
3063 3573  
3064 3574 2901 00c0 00000000 .4byte .LFB10
... ... @@ -3083,6 +3593,44 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3083 3593 2916 .LASF34:
3084 3594 2917 0000 705F6D73 .ascii "p_msg\000"
3085 3595 2917 6700
  3596 +<<<<<<< .mine
  3597 + 2918 .LASF80:
  3598 + 2919 0006 433A5C44 .ascii "C:\\Documents and Settings\\Administrador\\Mis docu"
  3599 + 2919 6F63756D
  3600 + 2919 656E7473
  3601 + 2919 20616E64
  3602 + 2919 20536574
  3603 + 2920 0036 6D656E74 .ascii "mentos\\SMART-CITIES\\SmartCities-SVN\\Project\\app"
  3604 + 2920 6F735C53
  3605 + 2920 4D415254
  3606 + 2920 2D434954
  3607 + 2920 4945535C
  3608 + 2921 0065 6C696361 .ascii "lications\\smartcities\000"
  3609 + 2921 74696F6E
  3610 + 2921 735C736D
  3611 + 2921 61727463
  3612 + 2921 69746965
  3613 + 2922 .LASF64:
  3614 + 2923 007b 6368436F .ascii "chCondInit\000"
  3615 + 2923 6E64496E
  3616 + 2923 697400
  3617 + 2924 .LASF59:
  3618 + 2925 0086 7264796D .ascii "rdymsg\000"
  3619 + 2925 736700
  3620 + 2926 .LASF11:
  3621 + 2927 008d 6C6F6E67 .ascii "long long unsigned int\000"
  3622 + 2927 206C6F6E
  3623 + 2927 6720756E
  3624 + 2927 7369676E
  3625 + 2927 65642069
  3626 + 2928 .LASF60:
  3627 + 2929 00a4 65786974 .ascii "exitcode\000"
  3628 + 2929 636F6465
  3629 + 2929 00
  3630 + 2930 .LASF67:
  3631 + 2931 00ad 6368436F .ascii "chCondBroadcastI\000"
  3632 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 53
  3633 +=======
3086 3634 2918 .LASF64:
3087 3635 2919 0006 6368436F .ascii "chCondInit\000"
3088 3636 2919 6E64496E
... ... @@ -3119,8 +3667,56 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3119 3667 2933 65642063
3120 3668 2933 68617200
3121 3669 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 53
  3670 +>>>>>>> .r35
3122 3671  
3123 3672  
  3673 +<<<<<<< .mine
  3674 + 2931 6E644272
  3675 + 2931 6F616463
  3676 + 2931 61737449
  3677 + 2931 00
  3678 + 2932 .LASF23:
  3679 + 2933 00be 705F7072 .ascii "p_prio\000"
  3680 + 2933 696F00
  3681 + 2934 .LASF10:
  3682 + 2935 00c5 6C6F6E67 .ascii "long long int\000"
  3683 + 2935 206C6F6E
  3684 + 2935 6720696E
  3685 + 2935 7400
  3686 + 2936 .LASF1:
  3687 + 2937 00d3 7369676E .ascii "signed char\000"
  3688 + 2937 65642063
  3689 + 2937 68617200
  3690 + 2938 .LASF38:
  3691 + 2939 00df 705F6D70 .ascii "p_mpool\000"
  3692 + 2939 6F6F6C00
  3693 + 2940 .LASF54:
  3694 + 2941 00e7 6D5F7175 .ascii "m_queue\000"
  3695 + 2941 65756500
  3696 + 2942 .LASF57:
  3697 + 2943 00ef 436F6E64 .ascii "CondVar\000"
  3698 + 2943 56617200
  3699 + 2944 .LASF7:
  3700 + 2945 00f7 6C6F6E67 .ascii "long int\000"
  3701 + 2945 20696E74
  3702 + 2945 00
  3703 + 2946 .LASF13:
  3704 + 2947 0100 74737461 .ascii "tstate_t\000"
  3705 + 2947 74655F74
  3706 + 2947 00
  3707 + 2948 .LASF76:
  3708 + 2949 0109 63684D74 .ascii "chMtxLockS\000"
  3709 + 2949 784C6F63
  3710 + 2949 6B5300
  3711 + 2950 .LASF25:
  3712 + 2951 0114 705F6E65 .ascii "p_newer\000"
  3713 + 2951 77657200
  3714 + 2952 .LASF85:
  3715 + 2953 011c 63685363 .ascii "chSchRescheduleS\000"
  3716 + 2953 68526573
  3717 + 2953 63686564
  3718 + 2953 756C6553
  3719 +=======
3124 3720 2934 .LASF38:
3125 3721 2935 006a 705F6D70 .ascii "p_mpool\000"
3126 3722 2935 6F6F6C00
... ... @@ -3166,7 +3762,22 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3166 3762 2953 68526573
3167 3763 2953 63686564
3168 3764 2953 756C6553
  3765 +>>>>>>> .r35
3169 3766 2953 00
  3767 +<<<<<<< .mine
  3768 + 2954 .LASF48:
  3769 + 2955 012d 725F6E65 .ascii "r_newer\000"
  3770 + 2955 77657200
  3771 + 2956 .LASF41:
  3772 + 2957 0135 72656761 .ascii "regarm_t\000"
  3773 + 2957 726D5F74
  3774 + 2957 00
  3775 + 2958 .LASF65:
  3776 + 2959 013e 6368436F .ascii "chCondSignal\000"
  3777 + 2959 6E645369
  3778 + 2959 676E616C
  3779 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 54
  3780 +=======
3170 3781 2954 .LASF48:
3171 3782 2955 0127 725F6E65 .ascii "r_newer\000"
3172 3783 2955 77657200
... ... @@ -3179,8 +3790,69 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3179 3790 2959 6E645369
3180 3791 2959 676E616C
3181 3792 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 54
  3793 +>>>>>>> .r35
3182 3794  
3183 3795  
  3796 +<<<<<<< .mine
  3797 + 2959 00
  3798 + 2960 .LASF19:
  3799 + 2961 014b 636E745F .ascii "cnt_t\000"
  3800 + 2961 7400
  3801 + 2962 .LASF86:
  3802 + 2963 0151 63684D74 .ascii "chMtxUnlockS\000"
  3803 + 2963 78556E6C
  3804 + 2963 6F636B53
  3805 + 2963 00
  3806 + 2964 .LASF0:
  3807 + 2965 015e 756E7369 .ascii "unsigned int\000"
  3808 + 2965 676E6564
  3809 + 2965 20696E74
  3810 + 2965 00
  3811 + 2966 .LASF9:
  3812 + 2967 016b 6C6F6E67 .ascii "long unsigned int\000"
  3813 + 2967 20756E73
  3814 + 2967 69676E65
  3815 + 2967 6420696E
  3816 + 2967 7400
  3817 + 2968 .LASF43:
  3818 + 2969 017d 636F6E74 .ascii "context\000"
  3819 + 2969 65787400
  3820 + 2970 .LASF4:
  3821 + 2971 0185 73686F72 .ascii "short unsigned int\000"
  3822 + 2971 7420756E
  3823 + 2971 7369676E
  3824 + 2971 65642069
  3825 + 2971 6E7400
  3826 + 2972 .LASF16:
  3827 + 2973 0198 6D73675F .ascii "msg_t\000"
  3828 + 2973 7400
  3829 + 2974 .LASF82:
  3830 + 2975 019e 7072696F .ascii "prio_insert\000"
  3831 + 2975 5F696E73
  3832 + 2975 65727400
  3833 + 2976 .LASF12:
  3834 + 2977 01aa 746D6F64 .ascii "tmode_t\000"
  3835 + 2977 655F7400
  3836 + 2978 .LASF40:
  3837 + 2979 01b2 54687265 .ascii "ThreadsList\000"
  3838 + 2979 6164734C
  3839 + 2979 69737400
  3840 + 2980 .LASF17:
  3841 + 2981 01be 6576656E .ascii "eventmask_t\000"
  3842 + 2981 746D6173
  3843 + 2981 6B5F7400
  3844 + 2982 .LASF53:
  3845 + 2983 01ca 4D757465 .ascii "Mutex\000"
  3846 + 2983 7800
  3847 + 2984 .LASF44:
  3848 + 2985 01d0 73697A65 .ascii "sizetype\000"
  3849 + 2985 74797065
  3850 + 2985 00
  3851 + 2986 .LASF71:
  3852 + 2987 01d9 6368436F .ascii "chCondWaitTimeoutS\000"
  3853 + 2987 6E645761
  3854 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 55
  3855 +=======
3184 3856 2959 00
3185 3857 2960 .LASF19:
3186 3858 2961 0145 636E745F .ascii "cnt_t\000"
... ... @@ -3239,8 +3911,69 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3239 3911 2987 01d3 6368436F .ascii "chCondWaitTimeoutS\000"
3240 3912 2987 6E645761
3241 3913 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 55
  3914 +>>>>>>> .r35
3242 3915  
3243 3916  
  3917 +<<<<<<< .mine
  3918 + 2987 69745469
  3919 + 2987 6D656F75
  3920 + 2987 745300
  3921 + 2988 .LASF26:
  3922 + 2989 01ec 705F6F6C .ascii "p_older\000"
  3923 + 2989 64657200
  3924 + 2990 .LASF47:
  3925 + 2991 01f4 725F6374 .ascii "r_ctx\000"
  3926 + 2991 7800
  3927 + 2992 .LASF39:
  3928 + 2993 01fa 54687265 .ascii "ThreadsQueue\000"
  3929 + 2993 61647351
  3930 + 2993 75657565
  3931 + 2993 00
  3932 + 2994 .LASF72:
  3933 + 2995 0207 74696D65 .ascii "time\000"
  3934 + 2995 00
  3935 + 2996 .LASF78:
  3936 + 2997 020c 474E5520 .ascii "GNU C 4.7.2\000"
  3937 + 2997 4320342E
  3938 + 2997 372E3200
  3939 + 2998 .LASF51:
  3940 + 2999 0218 725F6375 .ascii "r_current\000"
  3941 + 2999 7272656E
  3942 + 2999 7400
  3943 + 3000 .LASF49:
  3944 + 3001 0222 725F6F6C .ascii "r_older\000"
  3945 + 3001 64657200
  3946 + 3002 .LASF68:
  3947 + 3003 022a 6368436F .ascii "chCondBroadcast\000"
  3948 + 3003 6E644272
  3949 + 3003 6F616463
  3950 + 3003 61737400
  3951 + 3004 .LASF14:
  3952 + 3005 023a 74726566 .ascii "trefs_t\000"
  3953 + 3005 735F7400
  3954 + 3006 .LASF22:
  3955 + 3007 0242 705F7072 .ascii "p_prev\000"
  3956 + 3007 657600
  3957 + 3008 .LASF15:
  3958 + 3009 0249 74707269 .ascii "tprio_t\000"
  3959 + 3009 6F5F7400
  3960 + 3010 .LASF66:
  3961 + 3011 0251 6368436F .ascii "chCondSignalI\000"
  3962 + 3011 6E645369
  3963 + 3011 676E616C
  3964 + 3011 4900
  3965 + 3012 .LASF6:
  3966 + 3013 025f 696E7433 .ascii "int32_t\000"
  3967 + 3013 325F7400
  3968 + 3014 .LASF2:
  3969 + 3015 0267 756E7369 .ascii "unsigned char\000"
  3970 + 3015 676E6564
  3971 + 3015 20636861
  3972 + 3015 7200
  3973 + 3016 .LASF36:
  3974 + 3017 0275 705F6D74 .ascii "p_mtxlist\000"
  3975 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 56
  3976 +=======
3244 3977 2987 69745469
3245 3978 2987 6D656F75
3246 3979 2987 745300
... ... @@ -3299,8 +4032,32 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3299 4032 3016 .LASF36:
3300 4033 3017 026f 705F6D74 .ascii "p_mtxlist\000"
3301 4034 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 56
  4035 +>>>>>>> .r35
3302 4036  
3303 4037  
  4038 +<<<<<<< .mine
  4039 + 3017 786C6973
  4040 + 3017 7400
  4041 + 3018 .LASF3:
  4042 + 3019 027f 73686F72 .ascii "short int\000"
  4043 + 3019 7420696E
  4044 + 3019 7400
  4045 + 3020 .LASF28:
  4046 + 3021 0289 705F7374 .ascii "p_state\000"
  4047 + 3021 61746500
  4048 + 3022 .LASF46:
  4049 + 3023 0291 725F7072 .ascii "r_prio\000"
  4050 + 3023 696F00
  4051 + 3024 .LASF62:
  4052 + 3025 0298 65776D61 .ascii "ewmask\000"
  4053 + 3025 736B00
  4054 + 3026 .LASF21:
  4055 + 3027 029f 705F6E65 .ascii "p_next\000"
  4056 + 3027 787400
  4057 + 3028 .LASF29:
  4058 + 3029 02a6 705F666C .ascii "p_flags\000"
  4059 + 3029 61677300
  4060 +=======
3304 4061 3017 786C6973
3305 4062 3017 7400
3306 4063 3018 .LASF3:
... ... @@ -3322,136 +4079,298 @@ ARM GAS C:\cygwin64\tmp\cca2pTog.s page 1
3322 4079 3028 .LASF29:
3323 4080 3029 02a0 705F666C .ascii "p_flags\000"
3324 4081 3029 61677300
  4082 +>>>>>>> .r35
3325 4083 3030 .LASF20:
  4084 +<<<<<<< .mine
  4085 + 3031 02ae 54687265 .ascii "Thread\000"
  4086 +=======
3326 4087 3031 02a8 54687265 .ascii "Thread\000"
  4088 +>>>>>>> .r35
3327 4089 3031 616400
3328 4090 3032 .LASF58:
  4091 +<<<<<<< .mine
  4092 + 3033 02b5 635F7175 .ascii "c_queue\000"
  4093 +=======
3329 4094 3033 02af 635F7175 .ascii "c_queue\000"
  4095 +>>>>>>> .r35
3330 4096 3033 65756500
3331 4097 3034 .LASF75:
  4098 +<<<<<<< .mine
  4099 + 3035 02bd 63685363 .ascii "chSchGoSleepS\000"
  4100 +=======
3332 4101 3035 02b7 63685363 .ascii "chSchGoSleepS\000"
  4102 +>>>>>>> .r35
3333 4103 3035 68476F53
3334 4104 3035 6C656570
3335 4105 3035 5300
3336 4106 3036 .LASF35:
  4107 +<<<<<<< .mine
  4108 + 3037 02cb 705F6570 .ascii "p_epending\000"
  4109 +=======
3337 4110 3037 02c5 705F6570 .ascii "p_epending\000"
  4111 +>>>>>>> .r35
3338 4112 3037 656E6469
3339 4113 3037 6E6700
3340 4114 3038 .LASF8:
  4115 +<<<<<<< .mine
  4116 + 3039 02d6 75696E74 .ascii "uint32_t\000"
  4117 +=======
3341 4118 3039 02d0 75696E74 .ascii "uint32_t\000"
  4119 +>>>>>>> .r35
3342 4120 3039 33325F74
3343 4121 3039 00
3344 4122 3040 .LASF45:
  4123 +<<<<<<< .mine
  4124 + 3041 02df 725F7175 .ascii "r_queue\000"
  4125 +=======
3345 4126 3041 02d9 725F7175 .ascii "r_queue\000"
  4127 +>>>>>>> .r35
3346 4128 3041 65756500
3347 4129 3042 .LASF84:
  4130 +<<<<<<< .mine
  4131 + 3043 02e7 63685363 .ascii "chSchReadyI\000"
  4132 +=======
3348 4133 3043 02e1 63685363 .ascii "chSchReadyI\000"
  4134 +>>>>>>> .r35
3349 4135 3043 68526561
3350 4136 3043 64794900
3351 4137 3044 .LASF63:
  4138 +<<<<<<< .mine
  4139 + 3045 02f3 63686172 .ascii "char\000"
  4140 +=======
3352 4141 3045 02ed 63686172 .ascii "char\000"
  4142 +>>>>>>> .r35
3353 4143 3045 00
3354 4144 3046 .LASF81:
  4145 +<<<<<<< .mine
  4146 + 3047 02f8 6669666F .ascii "fifo_remove\000"
  4147 +=======
3355 4148 3047 02f2 6669666F .ascii "fifo_remove\000"
  4149 +>>>>>>> .r35
3356 4150 3047 5F72656D
3357 4151 3047 6F766500
3358 4152 3048 .LASF69:
  4153 +<<<<<<< .mine
  4154 + 3049 0304 6368436F .ascii "chCondWaitS\000"
  4155 +=======
3359 4156 3049 02fe 6368436F .ascii "chCondWaitS\000"
  4157 +>>>>>>> .r35
3360 4158 3049 6E645761
  4159 +<<<<<<< .mine
  4160 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 57
  4161 +
  4162 +
  4163 +=======
3361 4164 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 57
3362 4165  
3363 4166  
  4167 +>>>>>>> .r35
3364 4168 3049 69745300
3365 4169 3050 .LASF56:
  4170 +<<<<<<< .mine
  4171 + 3051 0310 6D5F6E65 .ascii "m_next\000"
  4172 +=======
3366 4173 3051 030a 6D5F6E65 .ascii "m_next\000"
  4174 +>>>>>>> .r35
3367 4175 3051 787400
3368 4176 3052 .LASF18:
  4177 +<<<<<<< .mine
  4178 + 3053 0317 73797374 .ascii "systime_t\000"
  4179 +=======
3369 4180 3053 0311 73797374 .ascii "systime_t\000"
  4181 +>>>>>>> .r35
3370 4182 3053 696D655F
3371 4183 3053 7400
3372 4184 3054 .LASF37:
  4185 +<<<<<<< .mine
  4186 + 3055 0321 705F7265 .ascii "p_realprio\000"
  4187 +=======
3373 4188 3055 031b 705F7265 .ascii "p_realprio\000"
  4189 +>>>>>>> .r35
3374 4190 3055 616C7072
3375 4191 3055 696F00
3376 4192 3056 .LASF70:
  4193 +<<<<<<< .mine
  4194 + 3057 032c 6368436F .ascii "chCondWait\000"
  4195 +=======
3377 4196 3057 0326 6368436F .ascii "chCondWait\000"
  4197 +>>>>>>> .r35
3378 4198 3057 6E645761
3379 4199 3057 697400
3380 4200 3058 .LASF31:
  4201 +<<<<<<< .mine
  4202 + 3059 0337 705F7469 .ascii "p_time\000"
  4203 +=======
3381 4204 3059 0331 705F7469 .ascii "p_time\000"
  4205 +>>>>>>> .r35
3382 4206 3059 6D6500
3383 4207 3060 .LASF42:
  4208 +<<<<<<< .mine
  4209 + 3061 033e 696E7463 .ascii "intctx\000"
  4210 +=======
3384 4211 3061 0338 696E7463 .ascii "intctx\000"
  4212 +>>>>>>> .r35
3385 4213 3061 747800
3386 4214 3062 .LASF33:
  4215 +<<<<<<< .mine
  4216 + 3063 0345 705F6D73 .ascii "p_msgqueue\000"
  4217 +=======
3387 4218 3063 033f 705F6D73 .ascii "p_msgqueue\000"
  4219 +>>>>>>> .r35
3388 4220 3063 67717565
3389 4221 3063 756500
3390 4222 3064 .LASF74:
  4223 +<<<<<<< .mine
  4224 + 3065 0350 63685363 .ascii "chSchWakeupS\000"
  4225 +=======
3391 4226 3065 034a 63685363 .ascii "chSchWakeupS\000"
  4227 +>>>>>>> .r35
3392 4228 3065 6857616B
3393 4229 3065 65757053
3394 4230 3065 00
3395 4231 3066 .LASF30:
  4232 +<<<<<<< .mine
  4233 + 3067 035d 705F7265 .ascii "p_refs\000"
  4234 +=======
3396 4235 3067 0357 705F7265 .ascii "p_refs\000"
  4236 +>>>>>>> .r35
3397 4237 3067 667300
3398 4238 3068 .LASF52:
  4239 +<<<<<<< .mine
  4240 + 3069 0364 52656164 .ascii "ReadyList\000"
  4241 +=======
3399 4242 3069 035e 52656164 .ascii "ReadyList\000"
  4243 +>>>>>>> .r35
3400 4244 3069 794C6973
3401 4245 3069 7400
3402 4246 3070 .LASF83:
  4247 +<<<<<<< .mine
  4248 + 3071 036e 726C6973 .ascii "rlist\000"
  4249 +=======
3403 4250 3071 0368 726C6973 .ascii "rlist\000"
  4251 +>>>>>>> .r35
3404 4252 3071 7400
3405 4253 3072 .LASF5:
  4254 +<<<<<<< .mine
  4255 + 3073 0374 75696E74 .ascii "uint8_t\000"
  4256 +=======
3406 4257 3073 036e 75696E74 .ascii "uint8_t\000"
  4258 +>>>>>>> .r35
3407 4259 3073 385F7400
3408 4260 3074 .LASF79:
  4261 +<<<<<<< .mine
  4262 + 3075 037c 2E2E2F2E .ascii "../..//os/kernel/src/chcond.c\000"
  4263 +=======
3409 4264 3075 0376 2E2E2F2E .ascii "../..//os/kernel/src/chcond.c\000"
  4265 +>>>>>>> .r35
3410 4266 3075 2E2F2F6F
3411 4267 3075 732F6B65
3412 4268 3075 726E656C
3413 4269 3075 2F737263
3414 4270 3076 .LASF61:
  4271 +<<<<<<< .mine
  4272 + 3077 039a 77746F62 .ascii "wtobjp\000"
  4273 +=======
3415 4274 3077 0394 77746F62 .ascii "wtobjp\000"
  4275 +>>>>>>> .r35
3416 4276 3077 6A7000
3417 4277 3078 .LASF27:
  4278 +<<<<<<< .mine
  4279 + 3079 03a1 705F6E61 .ascii "p_name\000"
  4280 +=======
3418 4281 3079 039b 705F6E61 .ascii "p_name\000"
  4282 +>>>>>>> .r35
3419 4283 3079 6D6500
3420 4284 3080 .LASF73:
  4285 +<<<<<<< .mine
  4286 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 58
  4287 +=======
3421 4288 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 58
  4289 +>>>>>>> .r35
3422 4290  
3423 4291  
  4292 +<<<<<<< .mine
  4293 + 3081 03a8 6368436F .ascii "chCondWaitTimeout\000"
  4294 + 3081 6E645761
  4295 +=======
3424 4296 3081 03a2 6368436F .ascii "chCondWaitTimeout\000"
3425 4297 3081 6E645761
  4298 +>>>>>>> .r35
3426 4299 3081 69745469
3427 4300 3081 6D656F75
3428 4301 3081 7400
3429 4302 3082 .LASF77:
  4303 +<<<<<<< .mine
  4304 + 3083 03ba 63685363 .ascii "chSchGoSleepTimeoutS\000"
  4305 +=======
3430 4306 3083 03b4 63685363 .ascii "chSchGoSleepTimeoutS\000"
  4307 +>>>>>>> .r35
3431 4308 3083 68476F53
3432 4309 3083 6C656570
3433 4310 3083 54696D65
3434 4311 3083 6F757453
3435 4312 3084 .LASF50:
  4313 +<<<<<<< .mine
  4314 + 3085 03cf 725F7072 .ascii "r_preempt\000"
  4315 +=======
3436 4316 3085 03c9 725F7072 .ascii "r_preempt\000"
  4317 +>>>>>>> .r35
3437 4318 3085 65656D70
3438 4319 3085 7400
3439 4320 3086 .LASF55:
  4321 +<<<<<<< .mine
  4322 + 3087 03d9 6D5F6F77 .ascii "m_owner\000"
  4323 +=======
3440 4324 3087 03d3 6D5F6F77 .ascii "m_owner\000"
  4325 +>>>>>>> .r35
3441 4326 3087 6E657200
3442 4327 3088 .LASF24:
  4328 +<<<<<<< .mine
  4329 + 3089 03e1 705F6374 .ascii "p_ctx\000"
  4330 +=======
3443 4331 3089 03db 705F6374 .ascii "p_ctx\000"
  4332 +>>>>>>> .r35
3444 4333 3089 7800
3445 4334 3090 .LASF32:
  4335 +<<<<<<< .mine
  4336 + 3091 03e7 705F7761 .ascii "p_waiting\000"
  4337 +=======
3446 4338 3091 03e1 705F7761 .ascii "p_waiting\000"
  4339 +>>>>>>> .r35
3447 4340 3091 6974696E
3448 4341 3091 6700
3449 4342 3092 .ident "GCC: (GNU) 4.7.2"
  4343 +<<<<<<< .mine
  4344 + ARM GAS C:\cygwin\tmp\ccDgcrZH.s page 59
  4345 +=======
3450 4346 ARM GAS C:\cygwin64\tmp\cca2pTog.s page 59
  4347 +>>>>>>> .r35
3451 4348  
3452 4349  
3453 4350 DEFINED SYMBOLS
3454 4351 *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 +=======
3455 4374 C:\cygwin64\tmp\cca2pTog.s:19 .text.chCondInit:00000000 $t
3456 4375 C:\cygwin64\tmp\cca2pTog.s:25 .text.chCondInit:00000000 chCondInit
3457 4376 C:\cygwin64\tmp\cca2pTog.s:42 .text.chCondSignal:00000000 $t
... ... @@ -3472,9 +4391,15 @@ C:\cygwin64\tmp\cca2pTog.s:388 .text.chCondWaitTimeoutS:00000000 chCondWaitTi
3472 4391 C:\cygwin64\tmp\cca2pTog.s:480 .text.chCondWaitTimeoutS:00000048 $d
3473 4392 C:\cygwin64\tmp\cca2pTog.s:485 .text.chCondWaitTimeout:00000000 $t
3474 4393 C:\cygwin64\tmp\cca2pTog.s:491 .text.chCondWaitTimeout:00000000 chCondWaitTimeout
  4394 +>>>>>>> .r35
3475 4395 .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 +=======
3476 4400 C:\cygwin64\tmp\cca2pTog.s:344 .text.chCondWaitS:00000048 $t
3477 4401 C:\cygwin64\tmp\cca2pTog.s:484 .text.chCondWaitTimeoutS:0000004c $t
  4402 +>>>>>>> .r35
3478 4403  
3479 4404 UNDEFINED SYMBOLS
3480 4405 chSchWakeupS
... ...
Project/applications/smartcities/build/lst/chcore.lst
  View file @e5481e1
  1 +<<<<<<< .mine
  2 +ARM GAS C:\cygwin\tmp\ccapa2ly.s page 1
  3 +=======
1 4 ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
  5 +>>>>>>> .r35
2 6  
3 7  
4 8 1 .syntax unified
... ... @@ -54,11 +58,21 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
54 58 49 0006 00000000 .4byte .Ldebug_abbrev0
55 59 50 000a 04 .byte 0x4
56 60 51 000b 01 .uleb128 0x1
  61 +<<<<<<< .mine
  62 + 52 000c 1B000000 .4byte .LASF11
  63 +=======
57 64 52 000c 8A000000 .4byte .LASF11
  65 +>>>>>>> .r35
58 66 53 0010 01 .byte 0x1
  67 +<<<<<<< .mine
  68 + 54 0011 C5000000 .4byte .LASF12
  69 + 55 0015 39000000 .4byte .LASF13
  70 + ARM GAS C:\cygwin\tmp\ccapa2ly.s page 2
  71 +=======
59 72 54 0011 BF000000 .4byte .LASF12
60 73 55 0015 1B000000 .4byte .LASF13
61 74 ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 2
  75 +>>>>>>> .r35
62 76  
63 77  
64 78 56 0019 00000000 .4byte .Ldebug_ranges0+0
... ... @@ -76,27 +90,51 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
76 90 68 0037 03 .uleb128 0x3
77 91 69 0038 01 .byte 0x1
78 92 70 0039 06 .byte 0x6
  93 +<<<<<<< .mine
  94 + 71 003a 18010000 .4byte .LASF1
  95 +=======
79 96 71 003a 12010000 .4byte .LASF1
  97 +>>>>>>> .r35
80 98 72 003e 03 .uleb128 0x3
81 99 73 003f 01 .byte 0x1
82 100 74 0040 08 .byte 0x8
  101 +<<<<<<< .mine
  102 + 75 0041 E9000000 .4byte .LASF2
  103 +=======
83 104 75 0041 E3000000 .4byte .LASF2
  105 +>>>>>>> .r35
84 106 76 0045 03 .uleb128 0x3
85 107 77 0046 02 .byte 0x2
86 108 78 0047 05 .byte 0x5
  109 +<<<<<<< .mine
  110 + 79 0048 2E010000 .4byte .LASF3
  111 +=======
87 112 79 0048 28010000 .4byte .LASF3
  113 +>>>>>>> .r35
88 114 80 004c 03 .uleb128 0x3
89 115 81 004d 02 .byte 0x2
90 116 82 004e 07 .byte 0x7
  117 +<<<<<<< .mine
  118 + 83 004f 05010000 .4byte .LASF4
  119 +=======
91 120 83 004f FF000000 .4byte .LASF4
  121 +>>>>>>> .r35
92 122 84 0053 03 .uleb128 0x3
93 123 85 0054 04 .byte 0x4
94 124 86 0055 05 .byte 0x5
  125 +<<<<<<< .mine
  126 + 87 0056 FC000000 .4byte .LASF5
  127 +=======
95 128 87 0056 F6000000 .4byte .LASF5
  129 +>>>>>>> .r35
96 130 88 005a 03 .uleb128 0x3
97 131 89 005b 04 .byte 0x4
98 132 90 005c 07 .byte 0x7
  133 +<<<<<<< .mine
  134 + 91 005d 27000000 .4byte .LASF6
  135 +=======
99 136 91 005d 96000000 .4byte .LASF6
  137 +>>>>>>> .r35
100 138 92 0061 03 .uleb128 0x3
101 139 93 0062 08 .byte 0x8
102 140 94 0063 05 .byte 0x5
... ... @@ -104,21 +142,41 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
104 142 96 0068 03 .uleb128 0x3
105 143 97 0069 08 .byte 0x8
106 144 98 006a 07 .byte 0x7
  145 +<<<<<<< .mine
  146 + 99 006b AE000000 .4byte .LASF8
  147 +=======
107 148 99 006b A8000000 .4byte .LASF8
  149 +>>>>>>> .r35
108 150 100 006f 03 .uleb128 0x3
109 151 101 0070 04 .byte 0x4
110 152 102 0071 07 .byte 0x7
  153 +<<<<<<< .mine
  154 + 103 0072 38010000 .4byte .LASF9
  155 +=======
111 156 103 0072 32010000 .4byte .LASF9
  157 +>>>>>>> .r35
112 158 104 0076 03 .uleb128 0x3
113 159 105 0077 01 .byte 0x1
114 160 106 0078 08 .byte 0x8
  161 +<<<<<<< .mine
  162 + 107 0079 F7000000 .4byte .LASF10
  163 +=======
115 164 107 0079 F1000000 .4byte .LASF10
  165 +>>>>>>> .r35
116 166 108 007d 04 .uleb128 0x4
117 167 109 007e 01 .byte 0x1
  168 +<<<<<<< .mine
  169 + 110 007f 24010000 .4byte .LASF14
  170 +=======
118 171 110 007f 1E010000 .4byte .LASF14
  172 +>>>>>>> .r35
119 173 111 0083 01 .byte 0x1
120 174 112 0084 2E .byte 0x2e
  175 +<<<<<<< .mine
  176 + ARM GAS C:\cygwin\tmp\ccapa2ly.s page 3
  177 +=======
121 178 ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 3
  179 +>>>>>>> .r35
122 180  
123 181  
124 182 113 0085 01 .byte 0x1
... ... @@ -178,7 +236,11 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
178 236 167 002c 2E .uleb128 0x2e
179 237 168 002d 00 .byte 0
180 238 169 002e 3F .uleb128 0x3f
  239 +<<<<<<< .mine
  240 + ARM GAS C:\cygwin\tmp\ccapa2ly.s page 4
  241 +=======
181 242 ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 4
  243 +>>>>>>> .r35
182 244  
183 245  
184 246 170 002f 0C .uleb128 0xc
... ... @@ -236,11 +298,43 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
236 298 214 676E6564
237 299 214 20696E74
238 300 214 00
  301 +<<<<<<< .mine
  302 + 215 .LASF11:
  303 + 216 001b 474E5520 .ascii "GNU C 4.7.2\000"
  304 + ARM GAS C:\cygwin\tmp\ccapa2ly.s page 5
  305 +=======
239 306 215 .LASF13:
240 307 216 001b 433A5C44 .ascii "C:\\Documents and Settings\\maria\\Mis documentos\\"
241 308 ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 5
  309 +>>>>>>> .r35
242 310  
243 311  
  312 +<<<<<<< .mine
  313 + 216 4320342E
  314 + 216 372E3200
  315 + 217 .LASF6:
  316 + 218 0027 6C6F6E67 .ascii "long unsigned int\000"
  317 + 218 20756E73
  318 + 218 69676E65
  319 + 218 6420696E
  320 + 218 7400
  321 + 219 .LASF13:
  322 + 220 0039 433A5C44 .ascii "C:\\Documents and Settings\\Administrador\\Mis docu"
  323 + 220 6F63756D
  324 + 220 656E7473
  325 + 220 20616E64
  326 + 220 20536574
  327 + 221 0069 6D656E74 .ascii "mentos\\SMART-CITIES\\SmartCities-SVN\\Project\\app"
  328 + 221 6F735C53
  329 + 221 4D415254
  330 + 221 2D434954
  331 + 221 4945535C
  332 + 222 0098 6C696361 .ascii "lications\\smartcities\000"
  333 + 222 74696F6E
  334 + 222 735C736D
  335 + 222 61727463
  336 + 222 69746965
  337 +=======
244 338 216 6F63756D
245 339 216 656E7473
246 340 216 20616E64
... ... @@ -265,63 +359,119 @@ ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 1
265 359 222 69676E65
266 360 222 6420696E
267 361 222 7400
  362 +>>>>>>> .r35
268 363 223 .LASF8:
  364 +<<<<<<< .mine
  365 + 224 00ae 6C6F6E67 .ascii "long long unsigned int\000"
  366 +=======
269 367 224 00a8 6C6F6E67 .ascii "long long unsigned int\000"
  368 +>>>>>>> .r35
270 369 224 206C6F6E
271 370 224 6720756E
272 371 224 7369676E
273 372 224 65642069
274 373 225 .LASF12:
  374 +<<<<<<< .mine
  375 + 226 00c5 2E2E2F2E .ascii "../..//os/ports/GCC/ARMCMx/chcore.c\000"
  376 +=======
275 377 226 00bf 2E2E2F2E .ascii "../..//os/ports/GCC/ARMCMx/chcore.c\000"
  378 +>>>>>>> .r35
276 379 226 2E2F2F6F
277 380 226 732F706F
278 381 226 7274732F
279 382 226 4743432F
280 383 227 .LASF2:
  384 +<<<<<<< .mine
  385 + 228 00e9 756E7369 .ascii "unsigned char\000"
  386 +=======
281 387 228 00e3 756E7369 .ascii "unsigned char\000"
  388 +>>>>>>> .r35
282 389 228 676E6564
283 390 228 20636861
284 391 228 7200
285 392 229 .LASF10:
  393 +<<<<<<< .mine
  394 + 230 00f7 63686172 .ascii "char\000"
  395 +=======
286 396 230 00f1 63686172 .ascii "char\000"
  397 +>>>>>>> .r35
287 398 230 00
288 399 231 .LASF5:
  400 +<<<<<<< .mine
  401 + 232 00fc 6C6F6E67 .ascii "long int\000"
  402 +=======
289 403 232 00f6 6C6F6E67 .ascii "long int\000"
  404 +>>>>>>> .r35
290 405 232 20696E74
291 406 232 00
292 407 233 .LASF4:
  408 +<<<<<<< .mine
  409 + 234 0105 73686F72 .ascii "short unsigned int\000"
  410 +=======
293 411 234 00ff 73686F72 .ascii "short unsigned int\000"
  412 +>>>>>>> .r35
294 413 234 7420756E
295 414 234 7369676E
296 415 234 65642069
297 416 234 6E7400
298 417 235 .LASF1:
  418 +<<<<<<< .mine
  419 + 236 0118 7369676E .ascii "signed char\000"
  420 +=======
299 421 236 0112 7369676E .ascii "signed char\000"
  422 +>>>>>>> .r35
300 423 236 65642063
  424 +<<<<<<< .mine
  425 + ARM GAS C:\cygwin\tmp\ccapa2ly.s page 6
  426 +
  427 +
  428 +=======
301 429 ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 6
302 430  
303 431  
  432 +>>>>>>> .r35
304 433 236 68617200
305 434 237 .LASF14:
  435 +<<<<<<< .mine
  436 + 238 0124 706F7274 .ascii "port_halt\000"
  437 +=======
306 438 238 011e 706F7274 .ascii "port_halt\000"
  439 +>>>>>>> .r35
307 440 238 5F68616C
308 441 238 7400
309 442 239 .LASF3:
  443 +<<<<<<< .mine
  444 + 240 012e 73686F72 .ascii "short int\000"
  445 +=======
310 446 240 0128 73686F72 .ascii "short int\000"
  447 +>>>>>>> .r35
311 448 240 7420696E
312 449 240 7400
313 450 241 .LASF9:
  451 +<<<<<<< .mine
  452 + 242 0138 73697A65 .ascii "sizetype\000"
  453 +=======
314 454 242 0132 73697A65 .ascii "sizetype\000"
  455 +>>>>>>> .r35
315 456 242 74797065
316 457 242 00
317 458 243 .ident "GCC: (GNU) 4.7.2"
  459 +<<<<<<< .mine
  460 + ARM GAS C:\cygwin\tmp\ccapa2ly.s page 7
  461 +=======
318 462 ARM GAS C:\cygwin64\tmp\ccjkIUJJ.s page 7
  463 +>>>>>>> .r35
319 464  
320 465  
321 466 DEFINED SYMBOLS
322 467 *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 +=======
323 472 C:\cygwin64\tmp\ccjkIUJJ.s:19 .text.port_halt:00000000 $t
324 473 C:\cygwin64\tmp\ccjkIUJJ.s:25 .text.port_halt:00000000 port_halt
  474 +>>>>>>> .r35
325 475 .debug_frame:00000010 $d
326 476  
327 477 NO UNDEFINED SYMBOLS
... ...
Project/applications/smartcities/build/lst/chcore_v7m.lst
  View file @e5481e1
  1 +<<<<<<< .mine
  2 +ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 1
  3 +=======
1 4 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
  5 +>>>>>>> .r35
2 6  
3 7  
4 8 1 .syntax unified
... ... @@ -58,7 +62,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
58 62 55 .size _port_switch_from_isr, .-_port_switch_from_isr
59 63 56 0016 00BFAFF3 .section .text.PendSVVector,"ax",%progbits
60 64 56 0080AFF3
  65 +<<<<<<< .mine
  66 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 2
  67 +=======
61 68 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 2
  69 +>>>>>>> .r35
62 70  
63 71  
64 72 56 0080
... ... @@ -118,7 +126,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
118 126 110 .cfi_offset 14, -4
119 127 111 .loc 1 121 0
120 128 112 0008 CEF20003 movt r3, 57344
  129 +<<<<<<< .mine
  130 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 3
  131 +=======
121 132 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 3
  133 +>>>>>>> .r35
122 134  
123 135  
124 136 113 000c 1446 mov r4, r2
... ... @@ -178,7 +190,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
178 190 164 000a 5B68 ldr r3, [r3, #4]
179 191 165 000c 1B05 lsls r3, r3, #20
180 192 166 000e 19D5 bpl .L7
  193 +<<<<<<< .mine
  194 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 4
  195 +=======
181 196 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 4
  197 +>>>>>>> .r35
182 198  
183 199  
184 200 167 .LBB2:
... ... @@ -238,7 +254,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
238 254 221 0048 1168 ldr r1, [r2, #0]
239 255 222 004a D269 ldr r2, [r2, #28]
240 256 223 004c 8968 ldr r1, [r1, #8]
  257 +<<<<<<< .mine
  258 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 5
  259 +=======
241 260 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 5
  261 +>>>>>>> .r35
242 262  
243 263  
244 264 224 004e 9268 ldr r2, [r2, #8]
... ... @@ -298,7 +318,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
298 318 278 000a BDE80840 pop {r3, lr}
299 319 279 .loc 1 55 0
300 320 280 000e FFF7FEBF b _port_irq_epilogue
  321 +<<<<<<< .mine
  322 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 6
  323 +=======
301 324 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 6
  325 +>>>>>>> .r35
302 326  
303 327  
304 328 281 .LVL12:
... ... @@ -358,7 +382,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
358 382 332 .loc 1 261 0
359 383 333 @ 261 "../..//os/ports/GCC/ARMCMx/chcore_v7m.c" 1
360 384 334 0000 62B6 cpsie i
  385 +<<<<<<< .mine
  386 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 7
  387 +=======
361 388 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 7
  389 +>>>>>>> .r35
362 390  
363 391  
364 392 335 @ 0 "" 2
... ... @@ -391,10 +419,18 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
391 419 362 0006 00000000 .4byte .Ldebug_abbrev0
392 420 363 000a 04 .byte 0x4
393 421 364 000b 01 .uleb128 0x1
  422 +<<<<<<< .mine
  423 + 365 000c 9D020000 .4byte .LASF91
  424 +=======
394 425 365 000c 97020000 .4byte .LASF91
  426 +>>>>>>> .r35
395 427 366 0010 01 .byte 0x1
396 428 367 0011 00000000 .4byte .LASF92
  429 +<<<<<<< .mine
  430 + 368 0015 2E000000 .4byte .LASF93
  431 +=======
397 432 368 0015 E7000000 .4byte .LASF93
  433 +>>>>>>> .r35
398 434 369 0019 18000000 .4byte .Ldebug_ranges0+0x18
399 435 370 001d 00000000 .4byte 0
400 436 371 0021 00000000 .4byte 0
... ... @@ -406,113 +442,193 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
406 442 377 0030 03 .uleb128 0x3
407 443 378 0031 04 .byte 0x4
408 444 379 0032 07 .byte 0x7
  445 +<<<<<<< .mine
  446 + 380 0033 A2010000 .4byte .LASF0
  447 +=======
409 448 380 0033 9C010000 .4byte .LASF0
  449 +>>>>>>> .r35
410 450 381 0037 03 .uleb128 0x3
411 451 382 0038 01 .byte 0x1
412 452 383 0039 06 .byte 0x6
413   - 384 003a 99000000 .4byte .LASF1
  453 + 384 003a 0E010000 .4byte .LASF1
414 454 385 003e 04 .uleb128 0x4
  455 +<<<<<<< .mine
  456 + 386 003f CE030000 .4byte .LASF5
  457 +=======
415 458 386 003f C8030000 .4byte .LASF5
  459 +>>>>>>> .r35
416 460 387 0043 02 .byte 0x2
417 461 388 0044 2A .byte 0x2a
418 462 389 0045 49000000 .4byte 0x49
419 463 390 0049 03 .uleb128 0x3
420 464 391 004a 01 .byte 0x1
  465 +<<<<<<< .mine
  466 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 8
  467 +=======
421 468 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 8
  469 +>>>>>>> .r35
422 470  
423 471  
424 472 392 004b 08 .byte 0x8
  473 +<<<<<<< .mine
  474 + 393 004c DF020000 .4byte .LASF2
  475 +=======
425 476 393 004c D9020000 .4byte .LASF2
  477 +>>>>>>> .r35
426 478 394 0050 03 .uleb128 0x3
427 479 395 0051 02 .byte 0x2
428 480 396 0052 05 .byte 0x5
  481 +<<<<<<< .mine
  482 + 397 0053 FD020000 .4byte .LASF3
  483 +=======
429 484 397 0053 F7020000 .4byte .LASF3
  485 +>>>>>>> .r35
430 486 398 0057 03 .uleb128 0x3
431 487 399 0058 02 .byte 0x2
432 488 400 0059 07 .byte 0x7
  489 +<<<<<<< .mine
  490 + 401 005a 0C020000 .4byte .LASF4
  491 +=======
433 492 401 005a 06020000 .4byte .LASF4
  493 +>>>>>>> .r35
434 494 402 005e 04 .uleb128 0x4
  495 +<<<<<<< .mine
  496 + 403 005f D7020000 .4byte .LASF6
  497 +=======
435 498 403 005f D1020000 .4byte .LASF6
  499 +>>>>>>> .r35
436 500 404 0063 02 .byte 0x2
437 501 405 0064 4F .byte 0x4f
438 502 406 0065 69000000 .4byte 0x69
439 503 407 0069 03 .uleb128 0x3
440 504 408 006a 04 .byte 0x4
441 505 409 006b 05 .byte 0x5
442   - 410 006c B5000000 .4byte .LASF7
  506 + 410 006c 2A010000 .4byte .LASF7
443 507 411 0070 04 .uleb128 0x4
  508 +<<<<<<< .mine
  509 + 412 0071 43030000 .4byte .LASF8
  510 +=======
444 511 412 0071 3D030000 .4byte .LASF8
  512 +>>>>>>> .r35
445 513 413 0075 02 .byte 0x2
446 514 414 0076 50 .byte 0x50
447 515 415 0077 7B000000 .4byte 0x7b
448 516 416 007b 03 .uleb128 0x3
449 517 417 007c 04 .byte 0x4
450 518 418 007d 07 .byte 0x7
  519 +<<<<<<< .mine
  520 + 419 007e CA010000 .4byte .LASF9
  521 +=======
451 522 419 007e C4010000 .4byte .LASF9
  523 +>>>>>>> .r35
452 524 420 0082 03 .uleb128 0x3
453 525 421 0083 08 .byte 0x8
454 526 422 0084 05 .byte 0x5
455   - 423 0085 8B000000 .4byte .LASF10
  527 + 423 0085 00010000 .4byte .LASF10
456 528 424 0089 03 .uleb128 0x3
457 529 425 008a 08 .byte 0x8
458 530 426 008b 07 .byte 0x7
459   - 427 008c 5E000000 .4byte .LASF11
  531 + 427 008c D3000000 .4byte .LASF11
460 532 428 0090 04 .uleb128 0x4
  533 +<<<<<<< .mine
  534 + 429 0091 4E020000 .4byte .LASF12
  535 +=======
461 536 429 0091 48020000 .4byte .LASF12
  537 +>>>>>>> .r35
462 538 430 0095 03 .byte 0x3
463 539 431 0096 2F .byte 0x2f
464 540 432 0097 3E000000 .4byte 0x3e
465 541 433 009b 04 .uleb128 0x4
466   - 434 009c BE000000 .4byte .LASF13
  542 + 434 009c 33010000 .4byte .LASF13
467 543 435 00a0 03 .byte 0x3
468 544 436 00a1 30 .byte 0x30
469 545 437 00a2 3E000000 .4byte 0x3e
470 546 438 00a6 04 .uleb128 0x4
  547 +<<<<<<< .mine
  548 + 439 00a7 BB020000 .4byte .LASF14
  549 +=======
471 550 439 00a7 B5020000 .4byte .LASF14
  551 +>>>>>>> .r35
472 552 440 00ab 03 .byte 0x3
473 553 441 00ac 31 .byte 0x31
474 554 442 00ad 3E000000 .4byte 0x3e
475 555 443 00b1 04 .uleb128 0x4
  556 +<<<<<<< .mine
  557 + 444 00b2 CF020000 .4byte .LASF15
  558 +=======
476 559 444 00b2 C9020000 .4byte .LASF15
  560 +>>>>>>> .r35
477 561 445 00b6 03 .byte 0x3
478 562 446 00b7 32 .byte 0x32
479 563 447 00b8 70000000 .4byte 0x70
480 564 448 00bc 04 .uleb128 0x4
  565 +<<<<<<< .mine
  566 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 9
  567 +=======
481 568 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 9
  569 +>>>>>>> .r35
482 570  
483 571  
  572 +<<<<<<< .mine
  573 + 449 00bd 24020000 .4byte .LASF16
  574 +=======
484 575 449 00bd 1E020000 .4byte .LASF16
  576 +>>>>>>> .r35
485 577 450 00c1 03 .byte 0x3
486 578 451 00c2 33 .byte 0x33
487 579 452 00c3 5E000000 .4byte 0x5e
488 580 453 00c7 04 .uleb128 0x4
  581 +<<<<<<< .mine
  582 + 454 00c8 62020000 .4byte .LASF17
  583 +=======
489 584 454 00c8 5C020000 .4byte .LASF17
  585 +>>>>>>> .r35
490 586 455 00cc 03 .byte 0x3
491 587 456 00cd 35 .byte 0x35
492 588 457 00ce 70000000 .4byte 0x70
493 589 458 00d2 04 .uleb128 0x4
  590 +<<<<<<< .mine
  591 + 459 00d3 75030000 .4byte .LASF18
  592 +=======
494 593 459 00d3 6F030000 .4byte .LASF18
  594 +>>>>>>> .r35
495 595 460 00d7 03 .byte 0x3
496 596 461 00d8 36 .byte 0x36
497 597 462 00d9 70000000 .4byte 0x70
498 598 463 00dd 04 .uleb128 0x4
  599 +<<<<<<< .mine
  600 + 464 00de 9C010000 .4byte .LASF19
  601 +=======
499 602 464 00de 96010000 .4byte .LASF19
  603 +>>>>>>> .r35
500 604 465 00e2 03 .byte 0x3
501 605 466 00e3 37 .byte 0x37
502 606 467 00e4 5E000000 .4byte 0x5e
503 607 468 00e8 04 .uleb128 0x4
  608 +<<<<<<< .mine
  609 + 469 00e9 31030000 .4byte .LASF20
  610 +=======
504 611 469 00e9 2B030000 .4byte .LASF20
  612 +>>>>>>> .r35
505 613 470 00ed 04 .byte 0x4
506 614 471 00ee 2A .byte 0x2a
507 615 472 00ef F3000000 .4byte 0xf3
508 616 473 00f3 05 .uleb128 0x5
  617 +<<<<<<< .mine
  618 + 474 00f4 31030000 .4byte .LASF20
  619 +=======
509 620 474 00f4 2B030000 .4byte .LASF20
  621 +>>>>>>> .r35
510 622 475 00f8 48 .byte 0x48
511 623 476 00f9 05 .byte 0x5
512 624 477 00fa 5E .byte 0x5e
513 625 478 00fb 0A020000 .4byte 0x20a
514 626 479 00ff 06 .uleb128 0x6
  627 +<<<<<<< .mine
  628 + 480 0100 22030000 .4byte .LASF21
  629 +=======
515 630 480 0100 1C030000 .4byte .LASF21
  631 +>>>>>>> .r35
516 632 481 0104 05 .byte 0x5
517 633 482 0105 5F .byte 0x5f
518 634 483 0106 2F020000 .4byte 0x22f
... ... @@ -520,7 +636,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
520 636 485 010b 23 .byte 0x23
521 637 486 010c 00 .uleb128 0
522 638 487 010d 06 .uleb128 0x6
  639 +<<<<<<< .mine
  640 + 488 010e C8020000 .4byte .LASF22
  641 +=======
523 642 488 010e C2020000 .4byte .LASF22
  643 +>>>>>>> .r35
524 644 489 0112 05 .byte 0x5
525 645 490 0113 61 .byte 0x61
526 646 491 0114 2F020000 .4byte 0x22f
... ... @@ -528,7 +648,7 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
528 648 493 0119 23 .byte 0x23
529 649 494 011a 04 .uleb128 0x4
530 650 495 011b 06 .uleb128 0x6
531   - 496 011c 84000000 .4byte .LASF23
  651 + 496 011c F9000000 .4byte .LASF23
532 652 497 0120 05 .byte 0x5
533 653 498 0121 63 .byte 0x63
534 654 499 0122 B1000000 .4byte 0xb1
... ... @@ -536,9 +656,17 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
536 656 501 0127 23 .byte 0x23
537 657 502 0128 08 .uleb128 0x8
538 658 503 0129 06 .uleb128 0x6
  659 +<<<<<<< .mine
  660 + 504 012a 02040000 .4byte .LASF24
  661 +=======
539 662 504 012a FC030000 .4byte .LASF24
  663 +>>>>>>> .r35
540 664 505 012e 05 .byte 0x5
  665 +<<<<<<< .mine
  666 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 10
  667 +=======
541 668 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 10
  669 +>>>>>>> .r35
542 670  
543 671  
544 672 506 012f 64 .byte 0x64
... ... @@ -547,7 +675,7 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
547 675 509 0135 23 .byte 0x23
548 676 510 0136 0C .uleb128 0xc
549 677 511 0137 06 .uleb128 0x6
550   - 512 0138 DA000000 .4byte .LASF25
  678 + 512 0138 4F010000 .4byte .LASF25
551 679 513 013c 05 .byte 0x5
552 680 514 013d 66 .byte 0x66
553 681 515 013e 2F020000 .4byte 0x22f
... ... @@ -555,7 +683,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
555 683 517 0143 23 .byte 0x23
556 684 518 0144 10 .uleb128 0x10
557 685 519 0145 06 .uleb128 0x6
  686 +<<<<<<< .mine
  687 + 520 0146 82020000 .4byte .LASF26
  688 +=======
558 689 520 0146 7C020000 .4byte .LASF26
  690 +>>>>>>> .r35
559 691 521 014a 05 .byte 0x5
560 692 522 014b 67 .byte 0x67
561 693 523 014c 2F020000 .4byte 0x22f
... ... @@ -563,7 +695,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
563 695 525 0151 23 .byte 0x23
564 696 526 0152 14 .uleb128 0x14
565 697 527 0153 06 .uleb128 0x6
  698 +<<<<<<< .mine
  699 + 528 0154 E8030000 .4byte .LASF27
  700 +=======
566 701 528 0154 E2030000 .4byte .LASF27
  702 +>>>>>>> .r35
567 703 529 0158 05 .byte 0x5
568 704 530 0159 6E .byte 0x6e
569 705 531 015a 3A060000 .4byte 0x63a
... ... @@ -571,7 +707,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
571 707 533 015f 23 .byte 0x23
572 708 534 0160 18 .uleb128 0x18
573 709 535 0161 06 .uleb128 0x6
  710 +<<<<<<< .mine
  711 + 536 0162 07030000 .4byte .LASF28
  712 +=======
574 713 536 0162 01030000 .4byte .LASF28
  714 +>>>>>>> .r35
575 715 537 0166 05 .byte 0x5
576 716 538 0167 79 .byte 0x79
577 717 539 0168 9B000000 .4byte 0x9b
... ... @@ -579,7 +719,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
579 719 541 016d 23 .byte 0x23
580 720 542 016e 1C .uleb128 0x1c
581 721 543 016f 06 .uleb128 0x6
  722 +<<<<<<< .mine
  723 + 544 0170 29030000 .4byte .LASF29
  724 +=======
582 725 544 0170 23030000 .4byte .LASF29
  726 +>>>>>>> .r35
583 727 545 0174 05 .byte 0x5
584 728 546 0175 7D .byte 0x7d
585 729 547 0176 90000000 .4byte 0x90
... ... @@ -587,7 +731,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
587 731 549 017b 23 .byte 0x23
588 732 550 017c 1D .uleb128 0x1d
589 733 551 017d 06 .uleb128 0x6
  734 +<<<<<<< .mine
  735 + 552 017e B2030000 .4byte .LASF30
  736 +=======
590 737 552 017e AC030000 .4byte .LASF30
  738 +>>>>>>> .r35
591 739 553 0182 05 .byte 0x5
592 740 554 0183 82 .byte 0x82
593 741 555 0184 A6000000 .4byte 0xa6
... ... @@ -595,10 +743,18 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
595 743 557 0189 23 .byte 0x23
596 744 558 018a 1E .uleb128 0x1e
597 745 559 018b 06 .uleb128 0x6
  746 +<<<<<<< .mine
  747 + 560 018c 94030000 .4byte .LASF31
  748 +=======
598 749 560 018c 8E030000 .4byte .LASF31
  750 +>>>>>>> .r35
599 751 561 0190 05 .byte 0x5
600 752 562 0191 89 .byte 0x89
  753 +<<<<<<< .mine
  754 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 11
  755 +=======
601 756 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 11
  757 +>>>>>>> .r35
602 758  
603 759  
604 760 563 0192 42050000 .4byte 0x542
... ... @@ -614,7 +770,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
614 770 573 01a5 23 .byte 0x23
615 771 574 01a6 24 .uleb128 0x24
616 772 575 01a7 06 .uleb128 0x6
  773 +<<<<<<< .mine
  774 + 576 01a8 08040000 .4byte .LASF32
  775 +=======
617 776 576 01a8 02040000 .4byte .LASF32
  777 +>>>>>>> .r35
618 778 577 01ac 05 .byte 0x5
619 779 578 01ad B3 .byte 0xb3
620 780 579 01ae 57020000 .4byte 0x257
... ... @@ -622,7 +782,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
622 782 581 01b3 23 .byte 0x23
623 783 582 01b4 28 .uleb128 0x28
624 784 583 01b5 06 .uleb128 0x6
  785 +<<<<<<< .mine
  786 + 584 01b6 A7030000 .4byte .LASF33
  787 +=======
625 788 584 01b6 A1030000 .4byte .LASF33
  789 +>>>>>>> .r35
626 790 585 01ba 05 .byte 0x5
627 791 586 01bb B9 .byte 0xb9
628 792 587 01bc 35020000 .4byte 0x235
... ... @@ -638,7 +802,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
638 802 597 01cf 23 .byte 0x23
639 803 598 01d0 34 .uleb128 0x34
640 804 599 01d1 06 .uleb128 0x6
  805 +<<<<<<< .mine
  806 + 600 01d2 38030000 .4byte .LASF35
  807 +=======
641 808 600 01d2 32030000 .4byte .LASF35
  809 +>>>>>>> .r35
642 810 601 01d6 05 .byte 0x5
643 811 602 01d7 C3 .byte 0xc3
644 812 603 01d8 C7000000 .4byte 0xc7
... ... @@ -646,7 +814,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
646 814 605 01dd 23 .byte 0x23
647 815 606 01de 38 .uleb128 0x38
648 816 607 01df 06 .uleb128 0x6
  817 +<<<<<<< .mine
  818 + 608 01e0 F3020000 .4byte .LASF36
  819 +=======
649 820 608 01e0 ED020000 .4byte .LASF36
  821 +>>>>>>> .r35
650 822 609 01e4 05 .byte 0x5
651 823 610 01e5 CA .byte 0xca
652 824 611 01e6 4C060000 .4byte 0x64c
... ... @@ -654,18 +826,26 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
654 826 613 01eb 23 .byte 0x23
655 827 614 01ec 3C .uleb128 0x3c
656 828 615 01ed 06 .uleb128 0x6
  829 +<<<<<<< .mine
  830 + 616 01ee 7F030000 .4byte .LASF37
  831 +=======
657 832 616 01ee 79030000 .4byte .LASF37
  833 +>>>>>>> .r35
658 834 617 01f2 05 .byte 0x5
659 835 618 01f3 CE .byte 0xce
660 836 619 01f4 B1000000 .4byte 0xb1
  837 +<<<<<<< .mine
  838 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 12
  839 +=======
661 840 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 12
  841 +>>>>>>> .r35
662 842  
663 843  
664 844 620 01f8 02 .byte 0x2
665 845 621 01f9 23 .byte 0x23
666 846 622 01fa 40 .uleb128 0x40
667 847 623 01fb 06 .uleb128 0x6
668   - 624 01fc A5000000 .4byte .LASF38
  848 + 624 01fc 1A010000 .4byte .LASF38
669 849 625 0200 05 .byte 0x5
670 850 626 0201 D4 .byte 0xd4
671 851 627 0202 6D020000 .4byte 0x26d
... ... @@ -679,7 +859,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
679 859 635 020d 61 .byte 0x61
680 860 636 020e 2F020000 .4byte 0x22f
681 861 637 0212 06 .uleb128 0x6
  862 +<<<<<<< .mine
  863 + 638 0213 22030000 .4byte .LASF21
  864 +=======
682 865 638 0213 1C030000 .4byte .LASF21
  866 +>>>>>>> .r35
683 867 639 0217 04 .byte 0x4
684 868 640 0218 62 .byte 0x62
685 869 641 0219 2F020000 .4byte 0x22f
... ... @@ -687,7 +871,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
687 871 643 021e 23 .byte 0x23
688 872 644 021f 00 .uleb128 0
689 873 645 0220 06 .uleb128 0x6
  874 +<<<<<<< .mine
  875 + 646 0221 C8020000 .4byte .LASF22
  876 +=======
690 877 646 0221 C2020000 .4byte .LASF22
  878 +>>>>>>> .r35
691 879 647 0225 04 .byte 0x4
692 880 648 0226 64 .byte 0x64
693 881 649 0227 2F020000 .4byte 0x22f
... ... @@ -699,7 +887,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
699 887 655 0230 04 .byte 0x4
700 888 656 0231 E8000000 .4byte 0xe8
701 889 657 0235 04 .uleb128 0x4
  890 +<<<<<<< .mine
  891 + 658 0236 90020000 .4byte .LASF39
  892 +=======
702 893 658 0236 8A020000 .4byte .LASF39
  894 +>>>>>>> .r35
703 895 659 023a 04 .byte 0x4
704 896 660 023b 66 .byte 0x66
705 897 661 023c 0A020000 .4byte 0x20a
... ... @@ -709,7 +901,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
709 901 665 0243 6B .byte 0x6b
710 902 666 0244 57020000 .4byte 0x257
711 903 667 0248 06 .uleb128 0x6
  904 +<<<<<<< .mine
  905 + 668 0249 22030000 .4byte .LASF21
  906 +=======
712 907 668 0249 1C030000 .4byte .LASF21
  908 +>>>>>>> .r35
713 909 669 024d 04 .byte 0x4
714 910 670 024e 6D .byte 0x6d
715 911 671 024f 2F020000 .4byte 0x22f
... ... @@ -718,22 +914,38 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
718 914 674 0255 00 .uleb128 0
719 915 675 0256 00 .byte 0
720 916 676 0257 04 .uleb128 0x4
  917 +<<<<<<< .mine
  918 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 13
  919 +=======
721 920 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 13
  921 +>>>>>>> .r35
722 922  
723 923  
  924 +<<<<<<< .mine
  925 + 677 0258 56020000 .4byte .LASF40
  926 +=======
724 927 677 0258 50020000 .4byte .LASF40
  928 +>>>>>>> .r35
725 929 678 025c 04 .byte 0x4
726 930 679 025d 70 .byte 0x70
727 931 680 025e 40020000 .4byte 0x240
728 932 681 0262 04 .uleb128 0x4
  933 +<<<<<<< .mine
  934 + 682 0263 81010000 .4byte .LASF41
  935 +=======
729 936 682 0263 7B010000 .4byte .LASF41
  937 +>>>>>>> .r35
730 938 683 0267 06 .byte 0x6
731 939 684 0268 D7 .byte 0xd7
732 940 685 0269 6D020000 .4byte 0x26d
733 941 686 026d 0A .uleb128 0xa
734 942 687 026e 04 .byte 0x4
735 943 688 026f 05 .uleb128 0x5
  944 +<<<<<<< .mine
  945 + 689 0270 B6010000 .4byte .LASF42
  946 +=======
736 947 689 0270 B0010000 .4byte .LASF42
  948 +>>>>>>> .r35
737 949 690 0274 20 .byte 0x20
738 950 691 0275 06 .byte 0x6
739 951 692 0276 DF .byte 0xdf
... ... @@ -778,11 +990,19 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
778 990 731 02ba 02 .byte 0x2
779 991 732 02bb 23 .byte 0x23
780 992 733 02bc 10 .uleb128 0x10
  993 +<<<<<<< .mine
  994 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 14
  995 +=======
781 996 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 14
  997 +>>>>>>> .r35
782 998  
783 999  
784 1000 734 02bd 06 .uleb128 0x6
  1001 +<<<<<<< .mine
  1002 + 735 02be AF010000 .4byte .LASF43
  1003 +=======
785 1004 735 02be A9010000 .4byte .LASF43
  1005 +>>>>>>> .r35
786 1006 736 02c2 06 .byte 0x6
787 1007 737 02c3 E5 .byte 0xe5
788 1008 738 02c4 62020000 .4byte 0x262
... ... @@ -798,7 +1018,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
798 1018 748 02d6 23 .byte 0x23
799 1019 749 02d7 18 .uleb128 0x18
800 1020 750 02d8 06 .uleb128 0x6
  1021 +<<<<<<< .mine
  1022 + 751 02d9 0F030000 .4byte .LASF44
  1023 +=======
801 1024 751 02d9 09030000 .4byte .LASF44
  1025 +>>>>>>> .r35
802 1026 752 02dd 06 .byte 0x6
803 1027 753 02de E7 .byte 0xe7
804 1028 754 02df 62020000 .4byte 0x262
... ... @@ -807,7 +1031,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
807 1031 757 02e5 1C .uleb128 0x1c
808 1032 758 02e6 00 .byte 0
809 1033 759 02e7 05 .uleb128 0x5
  1034 +<<<<<<< .mine
  1035 + 760 02e8 A0030000 .4byte .LASF45
  1036 +=======
810 1037 760 02e8 9A030000 .4byte .LASF45
  1038 +>>>>>>> .r35
811 1039 761 02ec 24 .byte 0x24
812 1040 762 02ed 06 .byte 0x6
813 1041 763 02ee FE .byte 0xfe
... ... @@ -838,7 +1066,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
838 1066 788 031c 08 .uleb128 0x8
839 1067 789 031d 0B .uleb128 0xb
840 1068 790 031e 723700 .ascii "r7\000"
  1069 +<<<<<<< .mine
  1070 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 15
  1071 +=======
841 1072 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 15
  1073 +>>>>>>> .r35
842 1074  
843 1075  
844 1076 791 0321 06 .byte 0x6
... ... @@ -889,7 +1121,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
889 1121 836 0372 20 .uleb128 0x20
890 1122 837 0373 00 .byte 0
891 1123 838 0374 0C .uleb128 0xc
  1124 +<<<<<<< .mine
  1125 + 839 0375 04020000 .4byte .LASF46
  1126 +=======
892 1127 839 0375 FE010000 .4byte .LASF46
  1128 +>>>>>>> .r35
893 1129 840 0379 04 .byte 0x4
894 1130 841 037a 06 .byte 0x6
895 1131 842 037b 2301 .2byte 0x123
... ... @@ -898,7 +1134,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
898 1134 845 0382 72313300 .ascii "r13\000"
899 1135 846 0386 06 .byte 0x6
900 1136 847 0387 2401 .2byte 0x124
  1137 +<<<<<<< .mine
  1138 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 16
  1139 +=======
901 1140 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 16
  1141 +>>>>>>> .r35
902 1142  
903 1143  
904 1144 848 0389 91030000 .4byte 0x391
... ... @@ -910,7 +1150,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
910 1150 854 0392 04 .byte 0x4
911 1151 855 0393 E7020000 .4byte 0x2e7
912 1152 856 0397 04 .uleb128 0x4
  1153 +<<<<<<< .mine
  1154 + 857 0398 66030000 .4byte .LASF47
  1155 +=======
913 1156 857 0398 60030000 .4byte .LASF47
  1157 +>>>>>>> .r35
914 1158 858 039c 07 .byte 0x7
915 1159 859 039d 3A .byte 0x3a
916 1160 860 039e A2030000 .4byte 0x3a2
... ... @@ -919,14 +1163,18 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
919 1163 863 03a7 03 .uleb128 0x3
920 1164 864 03a8 04 .byte 0x4
921 1165 865 03a9 07 .byte 0x7
  1166 +<<<<<<< .mine
  1167 + 866 03aa 74020000 .4byte .LASF48
  1168 +=======
922 1169 866 03aa 6E020000 .4byte .LASF48
  1170 +>>>>>>> .r35
923 1171 867 03ae 08 .uleb128 0x8
924 1172 868 03af 8C .byte 0x8c
925 1173 869 03b0 07 .byte 0x7
926 1174 870 03b1 89 .byte 0x89
927 1175 871 03b2 DE040000 .4byte 0x4de
928 1176 872 03b6 06 .uleb128 0x6
929   - 873 03b7 7E000000 .4byte .LASF49
  1177 + 873 03b7 F3000000 .4byte .LASF49
930 1178 874 03bb 07 .byte 0x7
931 1179 875 03bc 8A .byte 0x8a
932 1180 876 03bd 97030000 .4byte 0x397
... ... @@ -934,7 +1182,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
934 1182 878 03c2 23 .byte 0x23
935 1183 879 03c3 00 .uleb128 0
936 1184 880 03c4 06 .uleb128 0x6
  1185 +<<<<<<< .mine
  1186 + 881 03c5 1F020000 .4byte .LASF50
  1187 +=======
937 1188 881 03c5 19020000 .4byte .LASF50
  1189 +>>>>>>> .r35
938 1190 882 03c9 07 .byte 0x7
939 1191 883 03ca 8B .byte 0x8b
940 1192 884 03cb 97030000 .4byte 0x397
... ... @@ -942,7 +1194,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
942 1194 886 03d0 23 .byte 0x23
943 1195 887 03d1 04 .uleb128 0x4
944 1196 888 03d2 06 .uleb128 0x6
  1197 +<<<<<<< .mine
  1198 + 889 03d3 E9010000 .4byte .LASF51
  1199 +=======
945 1200 889 03d3 E3010000 .4byte .LASF51
  1201 +>>>>>>> .r35
946 1202 890 03d7 07 .byte 0x7
947 1203 891 03d8 8C .byte 0x8c
948 1204 892 03d9 97030000 .4byte 0x397
... ... @@ -950,7 +1206,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
950 1206 894 03de 23 .byte 0x23
951 1207 895 03df 08 .uleb128 0x8
952 1208 896 03e0 06 .uleb128 0x6
  1209 +<<<<<<< .mine
  1210 + 897 03e1 2A020000 .4byte .LASF52
  1211 +=======
953 1212 897 03e1 24020000 .4byte .LASF52
  1213 +>>>>>>> .r35
954 1214 898 03e5 07 .byte 0x7
955 1215 899 03e6 8D .byte 0x8d
956 1216 900 03e7 97030000 .4byte 0x397
... ... @@ -958,7 +1218,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
958 1218 902 03ec 23 .byte 0x23
959 1219 903 03ed 0C .uleb128 0xc
960 1220 904 03ee 07 .uleb128 0x7
  1221 +<<<<<<< .mine
  1222 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 17
  1223 +=======
961 1224 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 17
  1225 +>>>>>>> .r35
962 1226  
963 1227  
964 1228 905 03ef 53435200 .ascii "SCR\000"
... ... @@ -977,7 +1241,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
977 1241 918 0408 23 .byte 0x23
978 1242 919 0409 14 .uleb128 0x14
979 1243 920 040a 06 .uleb128 0x6
  1244 +<<<<<<< .mine
  1245 + 921 040b 9B030000 .4byte .LASF53
  1246 +=======
980 1247 921 040b 95030000 .4byte .LASF53
  1248 +>>>>>>> .r35
981 1249 922 040f 07 .byte 0x7
982 1250 923 0410 90 .byte 0x90
983 1251 924 0411 EE040000 .4byte 0x4ee
... ... @@ -985,7 +1253,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
985 1253 926 0416 23 .byte 0x23
986 1254 927 0417 18 .uleb128 0x18
987 1255 928 0418 06 .uleb128 0x6
  1256 +<<<<<<< .mine
  1257 + 929 0419 ED020000 .4byte .LASF54
  1258 +=======
988 1259 929 0419 E7020000 .4byte .LASF54
  1260 +>>>>>>> .r35
989 1261 930 041d 07 .byte 0x7
990 1262 931 041e 91 .byte 0x91
991 1263 932 041f 97030000 .4byte 0x397
... ... @@ -993,7 +1265,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
993 1265 934 0424 23 .byte 0x23
994 1266 935 0425 24 .uleb128 0x24
995 1267 936 0426 06 .uleb128 0x6
  1268 +<<<<<<< .mine
  1269 + 937 0427 7D020000 .4byte .LASF55
  1270 +=======
996 1271 937 0427 77020000 .4byte .LASF55
  1272 +>>>>>>> .r35
997 1273 938 042b 07 .byte 0x7
998 1274 939 042c 92 .byte 0x92
999 1275 940 042d 97030000 .4byte 0x397
... ... @@ -1001,7 +1277,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1001 1277 942 0432 23 .byte 0x23
1002 1278 943 0433 28 .uleb128 0x28
1003 1279 944 0434 06 .uleb128 0x6
  1280 +<<<<<<< .mine
  1281 + 945 0435 F5030000 .4byte .LASF56
  1282 +=======
1004 1283 945 0435 EF030000 .4byte .LASF56
  1284 +>>>>>>> .r35
1005 1285 946 0439 07 .byte 0x7
1006 1286 947 043a 93 .byte 0x93
1007 1287 948 043b 97030000 .4byte 0x397
... ... @@ -1009,7 +1289,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1009 1289 950 0440 23 .byte 0x23
1010 1290 951 0441 2C .uleb128 0x2c
1011 1291 952 0442 06 .uleb128 0x6
  1292 +<<<<<<< .mine
  1293 + 953 0443 30020000 .4byte .LASF57
  1294 +=======
1012 1295 953 0443 2A020000 .4byte .LASF57
  1296 +>>>>>>> .r35
1013 1297 954 0447 07 .byte 0x7
1014 1298 955 0448 94 .byte 0x94
1015 1299 956 0449 97030000 .4byte 0x397
... ... @@ -1017,8 +1301,13 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1017 1301 958 044e 23 .byte 0x23
1018 1302 959 044f 30 .uleb128 0x30
1019 1303 960 0450 06 .uleb128 0x6
  1304 +<<<<<<< .mine
  1305 + 961 0451 35020000 .4byte .LASF58
  1306 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 18
  1307 +=======
1020 1308 961 0451 2F020000 .4byte .LASF58
1021 1309 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 18
  1310 +>>>>>>> .r35
1022 1311  
1023 1312  
1024 1313 962 0455 07 .byte 0x7
... ... @@ -1028,7 +1317,7 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1028 1317 966 045c 23 .byte 0x23
1029 1318 967 045d 34 .uleb128 0x34
1030 1319 968 045e 06 .uleb128 0x6
1031   - 969 045f E2000000 .4byte .LASF59
  1320 + 969 045f 57010000 .4byte .LASF59
1032 1321 970 0463 07 .byte 0x7
1033 1322 971 0464 96 .byte 0x96
1034 1323 972 0465 97030000 .4byte 0x397
... ... @@ -1036,7 +1325,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1036 1325 974 046a 23 .byte 0x23
1037 1326 975 046b 38 .uleb128 0x38
1038 1327 976 046c 06 .uleb128 0x6
  1328 +<<<<<<< .mine
  1329 + 977 046d 54030000 .4byte .LASF60
  1330 +=======
1039 1331 977 046d 4E030000 .4byte .LASF60
  1332 +>>>>>>> .r35
1040 1333 978 0471 07 .byte 0x7
1041 1334 979 0472 97 .byte 0x97
1042 1335 980 0473 97030000 .4byte 0x397
... ... @@ -1068,7 +1361,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1068 1361 1006 04a2 23 .byte 0x23
1069 1362 1007 04a3 4C .uleb128 0x4c
1070 1363 1008 04a4 06 .uleb128 0x6
  1364 +<<<<<<< .mine
  1365 + 1009 04a5 C3030000 .4byte .LASF61
  1366 +=======
1071 1367 1009 04a5 BD030000 .4byte .LASF61
  1368 +>>>>>>> .r35
1072 1369 1010 04a9 07 .byte 0x7
1073 1370 1011 04aa 9B .byte 0x9b
1074 1371 1012 04ab 18050000 .4byte 0x518
... ... @@ -1078,7 +1375,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1078 1375 1016 04b2 07 .uleb128 0x7
1079 1376 1017 04b3 53415200 .ascii "SAR\000"
1080 1377 1018 04b7 07 .byte 0x7
  1378 +<<<<<<< .mine
  1379 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 19
  1380 +=======
1081 1381 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 19
  1382 +>>>>>>> .r35
1082 1383  
1083 1384  
1084 1385 1019 04b8 9C .byte 0x9c
... ... @@ -1087,7 +1388,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1087 1388 1022 04be 23 .byte 0x23
1088 1389 1023 04bf 60 .uleb128 0x60
1089 1390 1024 04c0 06 .uleb128 0x6
  1391 +<<<<<<< .mine
  1392 + 1025 04c1 59030000 .4byte .LASF62
  1393 +=======
1090 1394 1025 04c1 53030000 .4byte .LASF62
  1395 +>>>>>>> .r35
1091 1396 1026 04c5 07 .byte 0x7
1092 1397 1027 04c6 9D .byte 0x9d
1093 1398 1028 04c7 32050000 .4byte 0x532
... ... @@ -1095,7 +1400,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1095 1400 1030 04cc 23 .byte 0x23
1096 1401 1031 04cd 74 .uleb128 0x74
1097 1402 1032 04ce 06 .uleb128 0x6
  1403 +<<<<<<< .mine
  1404 + 1033 04cf EF030000 .4byte .LASF63
  1405 +=======
1098 1406 1033 04cf E9030000 .4byte .LASF63
  1407 +>>>>>>> .r35
1099 1408 1034 04d3 07 .byte 0x7
1100 1409 1035 04d4 9E .byte 0x9e
1101 1410 1036 04d5 97030000 .4byte 0x397
... ... @@ -1138,14 +1447,18 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1138 1447 1073 052b 04 .byte 0x4
1139 1448 1074 052c 00 .byte 0
1140 1449 1075 052d 0D .uleb128 0xd
  1450 +<<<<<<< .mine
  1451 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 20
  1452 +=======
1141 1453 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 20
  1454 +>>>>>>> .r35
1142 1455  
1143 1456  
1144 1457 1076 052e 1D050000 .4byte 0x51d
1145 1458 1077 0532 0D .uleb128 0xd
1146 1459 1078 0533 1D050000 .4byte 0x51d
1147 1460 1079 0537 04 .uleb128 0x4
1148   - 1080 0538 35000000 .4byte .LASF64
  1461 + 1080 0538 AA000000 .4byte .LASF64
1149 1462 1081 053c 07 .byte 0x7
1150 1463 1082 053d 9F .byte 0x9f
1151 1464 1083 053e AE030000 .4byte 0x3ae
... ... @@ -1157,7 +1470,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1157 1470 1089 054a 5E .byte 0x5e
1158 1471 1090 054b B2050000 .4byte 0x5b2
1159 1472 1091 054f 06 .uleb128 0x6
  1473 +<<<<<<< .mine
  1474 + 1092 0550 4C030000 .4byte .LASF65
  1475 +=======
1160 1476 1092 0550 46030000 .4byte .LASF65
  1477 +>>>>>>> .r35
1161 1478 1093 0554 08 .byte 0x8
1162 1479 1094 0555 5F .byte 0x5f
1163 1480 1095 0556 35020000 .4byte 0x235
... ... @@ -1165,7 +1482,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1165 1482 1097 055b 23 .byte 0x23
1166 1483 1098 055c 00 .uleb128 0
1167 1484 1099 055d 06 .uleb128 0x6
  1485 +<<<<<<< .mine
  1486 + 1100 055e 14030000 .4byte .LASF66
  1487 +=======
1168 1488 1100 055e 0E030000 .4byte .LASF66
  1489 +>>>>>>> .r35
1169 1490 1101 0562 08 .byte 0x8
1170 1491 1102 0563 60 .byte 0x60
1171 1492 1103 0564 B1000000 .4byte 0xb1
... ... @@ -1173,7 +1494,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1173 1494 1105 0569 23 .byte 0x23
1174 1495 1106 056a 08 .uleb128 0x8
1175 1496 1107 056b 06 .uleb128 0x6
  1497 +<<<<<<< .mine
  1498 + 1108 056c 8A020000 .4byte .LASF67
  1499 +=======
1176 1500 1108 056c 84020000 .4byte .LASF67
  1501 +>>>>>>> .r35
1177 1502 1109 0570 08 .byte 0x8
1178 1503 1110 0571 62 .byte 0x62
1179 1504 1111 0572 74030000 .4byte 0x374
... ... @@ -1181,7 +1506,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1181 1506 1113 0577 23 .byte 0x23
1182 1507 1114 0578 0C .uleb128 0xc
1183 1508 1115 0579 06 .uleb128 0x6
  1509 +<<<<<<< .mine
  1510 + 1116 057a 5C010000 .4byte .LASF68
  1511 +=======
1184 1512 1116 057a 56010000 .4byte .LASF68
  1513 +>>>>>>> .r35
1185 1514 1117 057e 08 .byte 0x8
1186 1515 1118 057f 65 .byte 0x65
1187 1516 1119 0580 2F020000 .4byte 0x22f
... ... @@ -1189,7 +1518,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1189 1518 1121 0585 23 .byte 0x23
1190 1519 1122 0586 10 .uleb128 0x10
1191 1520 1123 0587 06 .uleb128 0x6
  1521 +<<<<<<< .mine
  1522 + 1124 0588 B3020000 .4byte .LASF69
  1523 +=======
1192 1524 1124 0588 AD020000 .4byte .LASF69
  1525 +>>>>>>> .r35
1193 1526 1125 058c 08 .byte 0x8
1194 1527 1126 058d 66 .byte 0x66
1195 1528 1127 058e 2F020000 .4byte 0x22f
... ... @@ -1197,8 +1530,13 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1197 1530 1129 0593 23 .byte 0x23
1198 1531 1130 0594 14 .uleb128 0x14
1199 1532 1131 0595 06 .uleb128 0x6
  1533 +<<<<<<< .mine
  1534 + 1132 0596 8A030000 .4byte .LASF70
  1535 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 21
  1536 +=======
1200 1537 1132 0596 84030000 .4byte .LASF70
1201 1538 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 21
  1539 +>>>>>>> .r35
1202 1540  
1203 1541  
1204 1542 1133 059a 08 .byte 0x8
... ... @@ -1208,7 +1546,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1208 1546 1137 05a1 23 .byte 0x23
1209 1547 1138 05a2 18 .uleb128 0x18
1210 1548 1139 05a3 06 .uleb128 0x6
  1549 +<<<<<<< .mine
  1550 + 1140 05a4 A9020000 .4byte .LASF71
  1551 +=======
1211 1552 1140 05a4 A3020000 .4byte .LASF71
  1553 +>>>>>>> .r35
1212 1554 1141 05a8 08 .byte 0x8
1213 1555 1142 05a9 6C .byte 0x6c
1214 1556 1143 05aa 2F020000 .4byte 0x22f
... ... @@ -1217,18 +1559,26 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1217 1559 1146 05b0 1C .uleb128 0x1c
1218 1560 1147 05b1 00 .byte 0
1219 1561 1148 05b2 04 .uleb128 0x4
  1562 +<<<<<<< .mine
  1563 + 1149 05b3 B9030000 .4byte .LASF72
  1564 +=======
1220 1565 1149 05b3 B3030000 .4byte .LASF72
  1566 +>>>>>>> .r35
1221 1567 1150 05b7 08 .byte 0x8
1222 1568 1151 05b8 6E .byte 0x6e
1223 1569 1152 05b9 47050000 .4byte 0x547
1224 1570 1153 05bd 05 .uleb128 0x5
  1571 +<<<<<<< .mine
  1572 + 1154 05be 6E020000 .4byte .LASF73
  1573 +=======
1225 1574 1154 05be 68020000 .4byte .LASF73
  1575 +>>>>>>> .r35
1226 1576 1155 05c2 10 .byte 0x10
1227 1577 1156 05c3 09 .byte 0x9
1228 1578 1157 05c4 2C .byte 0x2c
1229 1579 1158 05c5 F4050000 .4byte 0x5f4
1230 1580 1159 05c9 06 .uleb128 0x6
1231   - 1160 05ca AD000000 .4byte .LASF74
  1581 + 1160 05ca 22010000 .4byte .LASF74
1232 1582 1161 05ce 09 .byte 0x9
1233 1583 1162 05cf 2D .byte 0x2d
1234 1584 1163 05d0 35020000 .4byte 0x235
... ... @@ -1236,7 +1586,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1236 1586 1165 05d5 23 .byte 0x23
1237 1587 1166 05d6 00 .uleb128 0
1238 1588 1167 05d7 06 .uleb128 0x6
  1589 +<<<<<<< .mine
  1590 + 1168 05d8 FA030000 .4byte .LASF75
  1591 +=======
1239 1592 1168 05d8 F4030000 .4byte .LASF75
  1593 +>>>>>>> .r35
1240 1594 1169 05dc 09 .byte 0x9
1241 1595 1170 05dd 2F .byte 0x2f
1242 1596 1171 05de 2F020000 .4byte 0x22f
... ... @@ -1244,7 +1598,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1244 1598 1173 05e3 23 .byte 0x23
1245 1599 1174 05e4 08 .uleb128 0x8
1246 1600 1175 05e5 06 .uleb128 0x6
  1601 +<<<<<<< .mine
  1602 + 1176 05e6 6E030000 .4byte .LASF76
  1603 +=======
1247 1604 1176 05e6 68030000 .4byte .LASF76
  1605 +>>>>>>> .r35
1248 1606 1177 05ea 09 .byte 0x9
1249 1607 1178 05eb 31 .byte 0x31
1250 1608 1179 05ec F4050000 .4byte 0x5f4
... ... @@ -1256,9 +1614,17 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1256 1614 1185 05f5 04 .byte 0x4
1257 1615 1186 05f6 BD050000 .4byte 0x5bd
1258 1616 1187 05fa 04 .uleb128 0x4
  1617 +<<<<<<< .mine
  1618 + 1188 05fb 6E020000 .4byte .LASF73
  1619 +=======
1259 1620 1188 05fb 68020000 .4byte .LASF73
  1621 +>>>>>>> .r35
1260 1622 1189 05ff 09 .byte 0x9
  1623 +<<<<<<< .mine
  1624 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 22
  1625 +=======
1261 1626 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 22
  1627 +>>>>>>> .r35
1262 1628  
1263 1629  
1264 1630 1190 0600 33 .byte 0x33
... ... @@ -1269,22 +1635,30 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1269 1635 1195 0608 90 .byte 0x90
1270 1636 1196 0609 3A060000 .4byte 0x63a
1271 1637 1197 060d 11 .uleb128 0x11
1272   - 1198 060e 2E000000 .4byte .LASF77
  1638 + 1198 060e A3000000 .4byte .LASF77
1273 1639 1199 0612 05 .byte 0x5
1274 1640 1200 0613 97 .byte 0x97
1275 1641 1201 0614 BC000000 .4byte 0xbc
1276 1642 1202 0618 11 .uleb128 0x11
1277   - 1203 0619 75000000 .4byte .LASF78
  1643 + 1203 0619 EA000000 .4byte .LASF78
1278 1644 1204 061d 05 .byte 0x5
1279 1645 1205 061e 9E .byte 0x9e
1280 1646 1206 061f BC000000 .4byte 0xbc
1281 1647 1207 0623 11 .uleb128 0x11
  1648 +<<<<<<< .mine
  1649 + 1208 0624 D6030000 .4byte .LASF79
  1650 +=======
1282 1651 1208 0624 D0030000 .4byte .LASF79
  1652 +>>>>>>> .r35
1283 1653 1209 0628 05 .byte 0x5
1284 1654 1210 0629 A5 .byte 0xa5
1285 1655 1211 062a 6D020000 .4byte 0x26d
1286 1656 1212 062e 11 .uleb128 0x11
  1657 +<<<<<<< .mine
  1658 + 1213 062f 1B030000 .4byte .LASF80
  1659 +=======
1287 1660 1213 062f 15030000 .4byte .LASF80
  1661 +>>>>>>> .r35
1288 1662 1214 0633 05 .byte 0x5
1289 1663 1215 0634 AC .byte 0xac
1290 1664 1216 0635 C7000000 .4byte 0xc7
... ... @@ -1297,13 +1671,21 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1297 1671 1223 0645 03 .uleb128 0x3
1298 1672 1224 0646 01 .byte 0x1
1299 1673 1225 0647 08 .byte 0x8
  1674 +<<<<<<< .mine
  1675 + 1226 0648 61030000 .4byte .LASF81
  1676 +=======
1300 1677 1226 0648 5B030000 .4byte .LASF81
  1678 +>>>>>>> .r35
1301 1679 1227 064c 09 .uleb128 0x9
1302 1680 1228 064d 04 .byte 0x4
1303 1681 1229 064e FA050000 .4byte 0x5fa
1304 1682 1230 0652 13 .uleb128 0x13
1305 1683 1231 0653 01 .byte 0x1
  1684 +<<<<<<< .mine
  1685 + 1232 0654 EE010000 .4byte .LASF82
  1686 +=======
1306 1687 1232 0654 E8010000 .4byte .LASF82
  1688 +>>>>>>> .r35
1307 1689 1233 0658 01 .byte 0x1
1308 1690 1234 0659 CF .byte 0xcf
1309 1691 1235 065a 01 .byte 0x1
... ... @@ -1318,12 +1700,20 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1318 1700 1244 066c 04000000 .4byte .LVL0
1319 1701 1245 0670 BA070000 .4byte 0x7ba
1320 1702 1246 0674 00 .byte 0
  1703 +<<<<<<< .mine
  1704 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 23
  1705 +=======
1321 1706 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 23
  1707 +>>>>>>> .r35
1322 1708  
1323 1709  
1324 1710 1247 0675 13 .uleb128 0x13
1325 1711 1248 0676 01 .byte 0x1
  1712 +<<<<<<< .mine
  1713 + 1249 0677 DC010000 .4byte .LASF83
  1714 +=======
1326 1715 1249 0677 D6010000 .4byte .LASF83
  1716 +>>>>>>> .r35
1327 1717 1250 067b 01 .byte 0x1
1328 1718 1251 067c 5C .byte 0x5c
1329 1719 1252 067d 01 .byte 0x1
... ... @@ -1335,7 +1725,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1335 1725 1258 0689 01 .byte 0x1
1336 1726 1259 068a 9E060000 .4byte 0x69e
1337 1727 1260 068e 15 .uleb128 0x15
  1728 +<<<<<<< .mine
  1729 + 1261 068f C3020000 .4byte .LASF86
  1730 +=======
1338 1731 1261 068f BD020000 .4byte .LASF86
  1732 +>>>>>>> .r35
1339 1733 1262 0693 01 .byte 0x1
1340 1734 1263 0694 5D .byte 0x5d
1341 1735 1264 0695 9E060000 .4byte 0x69e
... ... @@ -1346,7 +1740,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1346 1740 1269 06a0 6F020000 .4byte 0x26f
1347 1741 1270 06a4 16 .uleb128 0x16
1348 1742 1271 06a5 01 .byte 0x1
  1743 +<<<<<<< .mine
  1744 + 1272 06a6 DD030000 .4byte .LASF84
  1745 +=======
1349 1746 1272 06a6 D7030000 .4byte .LASF84
  1747 +>>>>>>> .r35
1350 1748 1273 06aa 01 .byte 0x1
1351 1749 1274 06ab 76 .byte 0x76
1352 1750 1275 06ac 01 .byte 0x1
... ... @@ -1378,7 +1776,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1378 1776 1301 06e4 01 .byte 0x1
1379 1777 1302 06e5 51 .byte 0x51
1380 1778 1303 06e6 02 .byte 0x2
  1779 +<<<<<<< .mine
  1780 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 24
  1781 +=======
1381 1782 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 24
  1783 +>>>>>>> .r35
1382 1784  
1383 1785  
1384 1786 1304 06e7 74 .byte 0x74
... ... @@ -1408,7 +1810,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1408 1810 1328 0705 00 .byte 0
1409 1811 1329 0706 13 .uleb128 0x13
1410 1812 1330 0707 01 .byte 0x1
  1813 +<<<<<<< .mine
  1814 + 1331 0708 3B020000 .4byte .LASF85
  1815 +=======
1411 1816 1331 0708 35020000 .4byte .LASF85
  1817 +>>>>>>> .r35
1412 1818 1332 070c 01 .byte 0x1
1413 1819 1333 070d 94 .byte 0x94
1414 1820 1334 070e 01 .byte 0x1
... ... @@ -1422,7 +1828,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1422 1828 1342 071f 1A .uleb128 0x1a
1423 1829 1343 0720 00000000 .4byte .Ldebug_ranges0+0
1424 1830 1344 0724 15 .uleb128 0x15
  1831 +<<<<<<< .mine
  1832 + 1345 0725 C3020000 .4byte .LASF86
  1833 +=======
1425 1834 1345 0725 BD020000 .4byte .LASF86
  1835 +>>>>>>> .r35
1426 1836 1346 0729 01 .byte 0x1
1427 1837 1347 072a 98 .byte 0x98
1428 1838 1348 072b 9E060000 .4byte 0x69e
... ... @@ -1431,14 +1841,18 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1431 1841 1351 0734 00 .byte 0
1432 1842 1352 0735 16 .uleb128 0x16
1433 1843 1353 0736 01 .byte 0x1
1434   - 1354 0737 50000000 .4byte .LASF87
  1844 + 1354 0737 C5000000 .4byte .LASF87
1435 1845 1355 073b 01 .byte 0x1
1436 1846 1356 073c 2F .byte 0x2f
1437 1847 1357 073d 01 .byte 0x1
1438 1848 1358 073e 00000000 .4byte .LFB7
1439 1849 1359 0742 12000000 .4byte .LFE7
1440 1850 1360 0746 7A000000 .4byte .LLST3
  1851 +<<<<<<< .mine
  1852 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 25
  1853 +=======
1441 1854 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 25
  1855 +>>>>>>> .r35
1442 1856  
1443 1857  
1444 1858 1361 074a 01 .byte 0x1
... ... @@ -1453,7 +1867,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1453 1867 1370 0762 00 .byte 0
1454 1868 1371 0763 13 .uleb128 0x13
1455 1869 1372 0764 01 .byte 0x1
  1870 +<<<<<<< .mine
  1871 + 1373 0765 BD010000 .4byte .LASF88
  1872 +=======
1456 1873 1373 0765 B7010000 .4byte .LASF88
  1874 +>>>>>>> .r35
1457 1875 1374 0769 01 .byte 0x1
1458 1876 1375 076a EC .byte 0xec
1459 1877 1376 076b 01 .byte 0x1
... ... @@ -1481,7 +1899,7 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1481 1899 1398 0796 00 .byte 0
1482 1900 1399 0797 1D .uleb128 0x1d
1483 1901 1400 0798 01 .byte 0x1
1484   - 1401 0799 C7000000 .4byte .LASF94
  1902 + 1401 0799 3C010000 .4byte .LASF94
1485 1903 1402 079d 01 .byte 0x1
1486 1904 1403 079e 0301 .2byte 0x103
1487 1905 1404 07a0 01 .byte 0x1
... ... @@ -1492,25 +1910,41 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1492 1910 1409 07ab 00 .sleb128 0
1493 1911 1410 07ac 01 .byte 0x1
1494 1912 1411 07ad 1E .uleb128 0x1e
  1913 +<<<<<<< .mine
  1914 + 1412 07ae C8030000 .4byte .LASF95
  1915 +=======
1495 1916 1412 07ae C2030000 .4byte .LASF95
  1917 +>>>>>>> .r35
1496 1918 1413 07b2 08 .byte 0x8
1497 1919 1414 07b3 72 .byte 0x72
1498 1920 1415 07b4 B2050000 .4byte 0x5b2
1499 1921 1416 07b8 01 .byte 0x1
1500 1922 1417 07b9 01 .byte 0x1
  1923 +<<<<<<< .mine
  1924 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 26
  1925 +=======
1501 1926 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 26
  1927 +>>>>>>> .r35
1502 1928  
1503 1929  
1504 1930 1418 07ba 1F .uleb128 0x1f
1505 1931 1419 07bb 01 .byte 0x1
  1932 +<<<<<<< .mine
  1933 + 1420 07bc 8A010000 .4byte .LASF89
  1934 +=======
1506 1935 1420 07bc 84010000 .4byte .LASF89
  1936 +>>>>>>> .r35
1507 1937 1421 07c0 08 .byte 0x8
1508 1938 1422 07c1 A5 .byte 0xa5
1509 1939 1423 07c2 01 .byte 0x1
1510 1940 1424 07c3 01 .byte 0x1
1511 1941 1425 07c4 20 .uleb128 0x20
1512 1942 1426 07c5 01 .byte 0x1
  1943 +<<<<<<< .mine
  1944 + 1427 07c6 64010000 .4byte .LASF96
  1945 +=======
1513 1946 1427 07c6 5E010000 .4byte .LASF96
  1947 +>>>>>>> .r35
1514 1948 1428 07ca 07 .byte 0x7
1515 1949 1429 07cb 2501 .2byte 0x125
1516 1950 1430 07cd 01 .byte 0x1
... ... @@ -1523,7 +1957,7 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1523 1957 1437 07dd 00 .byte 0
1524 1958 1438 07de 1F .uleb128 0x1f
1525 1959 1439 07df 01 .byte 0x1
1526   - 1440 07e0 3D000000 .4byte .LASF90
  1960 + 1440 07e0 B2000000 .4byte .LASF90
1527 1961 1441 07e4 0A .byte 0xa
1528 1962 1442 07e5 F7 .byte 0xf7
1529 1963 1443 07e6 01 .byte 0x1
... ... @@ -1558,7 +1992,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1558 1992 1472 0018 0B .uleb128 0xb
1559 1993 1473 0019 0B .uleb128 0xb
1560 1994 1474 001a 3E .uleb128 0x3e
  1995 +<<<<<<< .mine
  1996 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 27
  1997 +=======
1561 1998 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 27
  1999 +>>>>>>> .r35
1562 2000  
1563 2001  
1564 2002 1475 001b 0B .uleb128 0xb
... ... @@ -1618,7 +2056,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1618 2056 1529 0051 13 .uleb128 0x13
1619 2057 1530 0052 38 .uleb128 0x38
1620 2058 1531 0053 0A .uleb128 0xa
  2059 +<<<<<<< .mine
  2060 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 28
  2061 +=======
1621 2062 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 28
  2063 +>>>>>>> .r35
1622 2064  
1623 2065  
1624 2066 1532 0054 00 .byte 0
... ... @@ -1678,7 +2120,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1678 2120 1586 008a 05 .uleb128 0x5
1679 2121 1587 008b 49 .uleb128 0x49
1680 2122 1588 008c 13 .uleb128 0x13
  2123 +<<<<<<< .mine
  2124 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 29
  2125 +=======
1681 2126 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 29
  2127 +>>>>>>> .r35
1682 2128  
1683 2129  
1684 2130 1589 008d 38 .uleb128 0x38
... ... @@ -1738,7 +2184,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1738 2184 1643 00c3 13 .uleb128 0x13
1739 2185 1644 00c4 00 .byte 0
1740 2186 1645 00c5 00 .byte 0
  2187 +<<<<<<< .mine
  2188 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 30
  2189 +=======
1741 2190 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 30
  2191 +>>>>>>> .r35
1742 2192  
1743 2193  
1744 2194 1646 00c6 11 .uleb128 0x11
... ... @@ -1798,7 +2248,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1798 2248 1700 00ff 15 .uleb128 0x15
1799 2249 1701 0100 34 .uleb128 0x34
1800 2250 1702 0101 00 .byte 0
  2251 +<<<<<<< .mine
  2252 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 31
  2253 +=======
1801 2254 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 31
  2255 +>>>>>>> .r35
1802 2256  
1803 2257  
1804 2258 1703 0102 03 .uleb128 0x3
... ... @@ -1858,7 +2312,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1858 2312 1757 013e 0A .uleb128 0xa
1859 2313 1758 013f 00 .byte 0
1860 2314 1759 0140 00 .byte 0
  2315 +<<<<<<< .mine
  2316 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 32
  2317 +=======
1861 2318 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 32
  2319 +>>>>>>> .r35
1862 2320  
1863 2321  
1864 2322 1760 0141 19 .uleb128 0x19
... ... @@ -1918,7 +2376,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1918 2376 1814 017d 05 .uleb128 0x5
1919 2377 1815 017e 27 .uleb128 0x27
1920 2378 1816 017f 0C .uleb128 0xc
  2379 +<<<<<<< .mine
  2380 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 33
  2381 +=======
1921 2382 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 33
  2383 +>>>>>>> .r35
1922 2384  
1923 2385  
1924 2386 1817 0180 11 .uleb128 0x11
... ... @@ -1978,7 +2440,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
1978 2440 1871 01b7 05 .uleb128 0x5
1979 2441 1872 01b8 27 .uleb128 0x27
1980 2442 1873 01b9 0C .uleb128 0xc
  2443 +<<<<<<< .mine
  2444 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 34
  2445 +=======
1981 2446 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 34
  2447 +>>>>>>> .r35
1982 2448  
1983 2449  
1984 2450 1874 01ba 3C .uleb128 0x3c
... ... @@ -2038,7 +2504,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
2038 2504 1928 005c 44000000 .4byte .LVL9
2039 2505 1929 0060 0300 .2byte 0x3
2040 2506 1930 0062 73 .byte 0x73
  2507 +<<<<<<< .mine
  2508 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 35
  2509 +=======
2041 2510 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 35
  2511 +>>>>>>> .r35
2042 2512  
2043 2513  
2044 2514 1931 0063 60 .sleb128 -32
... ... @@ -2098,7 +2568,11 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
2098 2568 1985 0014 00000000 .4byte 0
2099 2569 1986 0018 00000000 .4byte .LFB11
2100 2570 1987 001c 16000000 .4byte .LFE11
  2571 +<<<<<<< .mine
  2572 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 36
  2573 +=======
2101 2574 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 36
  2575 +>>>>>>> .r35
2102 2576  
2103 2577  
2104 2578 1988 0020 00000000 .4byte .LFB8
... ... @@ -2131,6 +2605,36 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
2131 2605 2007 .LASF34:
2132 2606 2008 0028 705F6D73 .ascii "p_msg\000"
2133 2607 2008 6700
  2608 +<<<<<<< .mine
  2609 + 2009 .LASF93:
  2610 + 2010 002e 433A5C44 .ascii "C:\\Documents and Settings\\Administrador\\Mis docu"
  2611 + 2010 6F63756D
  2612 + 2010 656E7473
  2613 + 2010 20616E64
  2614 + 2010 20536574
  2615 + 2011 005e 6D656E74 .ascii "mentos\\SMART-CITIES\\SmartCities-SVN\\Project\\app"
  2616 + 2011 6F735C53
  2617 + 2011 4D415254
  2618 + 2011 2D434954
  2619 + 2011 4945535C
  2620 + 2012 008d 6C696361 .ascii "lications\\smartcities\000"
  2621 + 2012 74696F6E
  2622 + 2012 735C736D
  2623 + 2012 61727463
  2624 + 2012 69746965
  2625 + 2013 .LASF77:
  2626 + 2014 00a3 7264796D .ascii "rdymsg\000"
  2627 + 2014 736700
  2628 + 2015 .LASF64:
  2629 + 2016 00aa 434D785F .ascii "CMx_SCB\000"
  2630 + 2016 53434200
  2631 + 2017 .LASF90:
  2632 + 2018 00b2 63685379 .ascii "chSysTimerHandlerI\000"
  2633 + 2018 7354696D
  2634 + 2018 65724861
  2635 + 2018 6E646C65
  2636 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 37
  2637 +=======
2134 2638 2009 .LASF77:
2135 2639 2010 002e 7264796D .ascii "rdymsg\000"
2136 2640 2010 736700
... ... @@ -2159,8 +2663,69 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
2159 2663 2020 636F6465
2160 2664 2020 00
2161 2665 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 37
2162   -
2163   -
  2666 +>>>>>>> .r35
  2667 +
  2668 +
  2669 +<<<<<<< .mine
  2670 + 2018 724900
  2671 + 2019 .LASF87:
  2672 + 2020 00c5 53797354 .ascii "SysTickVector\000"
  2673 + 2020 69636B56
  2674 + 2020 6563746F
  2675 + 2020 7200
  2676 + 2021 .LASF11:
  2677 + 2022 00d3 6C6F6E67 .ascii "long long unsigned int\000"
  2678 + 2022 206C6F6E
  2679 + 2022 6720756E
  2680 + 2022 7369676E
  2681 + 2022 65642069
  2682 + 2023 .LASF78:
  2683 + 2024 00ea 65786974 .ascii "exitcode\000"
  2684 + 2024 636F6465
  2685 + 2024 00
  2686 + 2025 .LASF49:
  2687 + 2026 00f3 43505549 .ascii "CPUID\000"
  2688 + 2026 4400
  2689 + 2027 .LASF23:
  2690 + 2028 00f9 705F7072 .ascii "p_prio\000"
  2691 + 2028 696F00
  2692 + 2029 .LASF10:
  2693 + 2030 0100 6C6F6E67 .ascii "long long int\000"
  2694 + 2030 206C6F6E
  2695 + 2030 6720696E
  2696 + 2030 7400
  2697 + 2031 .LASF1:
  2698 + 2032 010e 7369676E .ascii "signed char\000"
  2699 + 2032 65642063
  2700 + 2032 68617200
  2701 + 2033 .LASF38:
  2702 + 2034 011a 705F6D70 .ascii "p_mpool\000"
  2703 + 2034 6F6F6C00
  2704 + 2035 .LASF74:
  2705 + 2036 0122 6D5F7175 .ascii "m_queue\000"
  2706 + 2036 65756500
  2707 + 2037 .LASF7:
  2708 + 2038 012a 6C6F6E67 .ascii "long int\000"
  2709 + 2038 20696E74
  2710 + 2038 00
  2711 + 2039 .LASF13:
  2712 + 2040 0133 74737461 .ascii "tstate_t\000"
  2713 + 2040 74655F74
  2714 + 2040 00
  2715 + 2041 .LASF94:
  2716 + 2042 013c 5F706F72 .ascii "_port_thread_start\000"
  2717 + 2042 745F7468
  2718 + 2042 72656164
  2719 + 2042 5F737461
  2720 + 2042 727400
  2721 + 2043 .LASF25:
  2722 + 2044 014f 705F6E65 .ascii "p_newer\000"
  2723 + 2044 77657200
  2724 + 2045 .LASF59:
  2725 + 2046 0157 42464152 .ascii "BFAR\000"
  2726 + 2046 00
  2727 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 38
  2728 +=======
2164 2729 2021 .LASF49:
2165 2730 2022 007e 43505549 .ascii "CPUID\000"
2166 2731 2022 4400
... ... @@ -2219,8 +2784,48 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
2219 2784 2046 63697469
2220 2785 2046 657300
2221 2786 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 38
  2787 +>>>>>>> .r35
2222 2788  
2223 2789  
  2790 +<<<<<<< .mine
  2791 + 2047 .LASF68:
  2792 + 2048 015c 725F6E65 .ascii "r_newer\000"
  2793 + 2048 77657200
  2794 + 2049 .LASF96:
  2795 + 2050 0164 6E766963 .ascii "nvicSetSystemHandlerPriority\000"
  2796 + 2050 53657453
  2797 + 2050 79737465
  2798 + 2050 6D48616E
  2799 + 2050 646C6572
  2800 + 2051 .LASF41:
  2801 + 2052 0181 72656761 .ascii "regarm_t\000"
  2802 + 2052 726D5F74
  2803 + 2052 00
  2804 + 2053 .LASF89:
  2805 + 2054 018a 63685363 .ascii "chSchDoReschedule\000"
  2806 + 2054 68446F52
  2807 + 2054 65736368
  2808 + 2054 6564756C
  2809 + 2054 6500
  2810 + 2055 .LASF19:
  2811 + 2056 019c 636E745F .ascii "cnt_t\000"
  2812 + 2056 7400
  2813 + 2057 .LASF0:
  2814 + 2058 01a2 756E7369 .ascii "unsigned int\000"
  2815 + 2058 676E6564
  2816 + 2058 20696E74
  2817 + 2058 00
  2818 + 2059 .LASF43:
  2819 + 2060 01af 6C725F74 .ascii "lr_thd\000"
  2820 + 2060 686400
  2821 + 2061 .LASF42:
  2822 + 2062 01b6 65787463 .ascii "extctx\000"
  2823 + 2062 747800
  2824 + 2063 .LASF88:
  2825 + 2064 01bd 5F706F72 .ascii "_port_switch\000"
  2826 + 2064 745F7377
  2827 + 2064 69746368
  2828 +=======
2224 2829 2047 .LASF68:
2225 2830 2048 0156 725F6E65 .ascii "r_newer\000"
2226 2831 2048 77657200
... ... @@ -2258,7 +2863,30 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
2258 2863 2064 01b7 5F706F72 .ascii "_port_switch\000"
2259 2864 2064 745F7377
2260 2865 2064 69746368
  2866 +>>>>>>> .r35
2261 2867 2064 00
  2868 +<<<<<<< .mine
  2869 + 2065 .LASF9:
  2870 + 2066 01ca 6C6F6E67 .ascii "long unsigned int\000"
  2871 + 2066 20756E73
  2872 + 2066 69676E65
  2873 + 2066 6420696E
  2874 + 2066 7400
  2875 + 2067 .LASF83:
  2876 + 2068 01dc 50656E64 .ascii "PendSVVector\000"
  2877 + 2068 53565665
  2878 + 2068 63746F72
  2879 + 2068 00
  2880 + 2069 .LASF51:
  2881 + 2070 01e9 56544F52 .ascii "VTOR\000"
  2882 + 2070 00
  2883 + 2071 .LASF82:
  2884 + 2072 01ee 5F706F72 .ascii "_port_switch_from_isr\000"
  2885 + 2072 745F7377
  2886 + 2072 69746368
  2887 + 2072 5F66726F
  2888 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 39
  2889 +=======
2262 2890 2065 .LASF9:
2263 2891 2066 01c4 6C6F6E67 .ascii "long unsigned int\000"
2264 2892 2066 20756E73
... ... @@ -2279,8 +2907,29 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
2279 2907 2072 69746368
2280 2908 2072 5F66726F
2281 2909 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 39
  2910 +>>>>>>> .r35
2282 2911  
2283 2912  
  2913 +<<<<<<< .mine
  2914 + 2072 6D5F6973
  2915 + 2073 .LASF46:
  2916 + 2074 0204 636F6E74 .ascii "context\000"
  2917 + 2074 65787400
  2918 + 2075 .LASF4:
  2919 + 2076 020c 73686F72 .ascii "short unsigned int\000"
  2920 + 2076 7420756E
  2921 + 2076 7369676E
  2922 + 2076 65642069
  2923 + 2076 6E7400
  2924 + 2077 .LASF50:
  2925 + 2078 021f 49435352 .ascii "ICSR\000"
  2926 + 2078 00
  2927 + 2079 .LASF16:
  2928 + 2080 0224 6D73675F .ascii "msg_t\000"
  2929 + 2080 7400
  2930 + 2081 .LASF52:
  2931 + 2082 022a 41495243 .ascii "AIRCR\000"
  2932 +=======
2284 2933 2072 6D5F6973
2285 2934 2073 .LASF46:
2286 2935 2074 01fe 636F6E74 .ascii "context\000"
... ... @@ -2299,7 +2948,49 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
2299 2948 2080 7400
2300 2949 2081 .LASF52:
2301 2950 2082 0224 41495243 .ascii "AIRCR\000"
  2951 +>>>>>>> .r35
2302 2952 2082 5200
  2953 +<<<<<<< .mine
  2954 + 2083 .LASF57:
  2955 + 2084 0230 44465352 .ascii "DFSR\000"
  2956 + 2084 00
  2957 + 2085 .LASF58:
  2958 + 2086 0235 4D4D4641 .ascii "MMFAR\000"
  2959 + 2086 5200
  2960 + 2087 .LASF85:
  2961 + 2088 023b 5F706F72 .ascii "_port_irq_epilogue\000"
  2962 + 2088 745F6972
  2963 + 2088 715F6570
  2964 + 2088 696C6F67
  2965 + 2088 756500
  2966 + 2089 .LASF12:
  2967 + 2090 024e 746D6F64 .ascii "tmode_t\000"
  2968 + 2090 655F7400
  2969 + 2091 .LASF40:
  2970 + 2092 0256 54687265 .ascii "ThreadsList\000"
  2971 + 2092 6164734C
  2972 + 2092 69737400
  2973 + 2093 .LASF17:
  2974 + 2094 0262 6576656E .ascii "eventmask_t\000"
  2975 + 2094 746D6173
  2976 + 2094 6B5F7400
  2977 + 2095 .LASF73:
  2978 + 2096 026e 4D757465 .ascii "Mutex\000"
  2979 + 2096 7800
  2980 + 2097 .LASF48:
  2981 + 2098 0274 73697A65 .ascii "sizetype\000"
  2982 + 2098 74797065
  2983 + 2098 00
  2984 + 2099 .LASF55:
  2985 + 2100 027d 43465352 .ascii "CFSR\000"
  2986 + 2100 00
  2987 + 2101 .LASF26:
  2988 + 2102 0282 705F6F6C .ascii "p_older\000"
  2989 + 2102 64657200
  2990 + 2103 .LASF67:
  2991 + 2104 028a 725F6374 .ascii "r_ctx\000"
  2992 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 40
  2993 +=======
2303 2994 2083 .LASF57:
2304 2995 2084 022a 44465352 .ascii "DFSR\000"
2305 2996 2084 00
... ... @@ -2339,8 +3030,69 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
2339 3030 2103 .LASF67:
2340 3031 2104 0284 725F6374 .ascii "r_ctx\000"
2341 3032 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 40
  3033 +>>>>>>> .r35
2342 3034  
2343 3035  
  3036 +<<<<<<< .mine
  3037 + 2104 7800
  3038 + 2105 .LASF39:
  3039 + 2106 0290 54687265 .ascii "ThreadsQueue\000"
  3040 + 2106 61647351
  3041 + 2106 75657565
  3042 + 2106 00
  3043 + 2107 .LASF91:
  3044 + 2108 029d 474E5520 .ascii "GNU C 4.7.2\000"
  3045 + 2108 4320342E
  3046 + 2108 372E3200
  3047 + 2109 .LASF71:
  3048 + 2110 02a9 725F6375 .ascii "r_current\000"
  3049 + 2110 7272656E
  3050 + 2110 7400
  3051 + 2111 .LASF69:
  3052 + 2112 02b3 725F6F6C .ascii "r_older\000"
  3053 + 2112 64657200
  3054 + 2113 .LASF14:
  3055 + 2114 02bb 74726566 .ascii "trefs_t\000"
  3056 + 2114 735F7400
  3057 + 2115 .LASF86:
  3058 + 2116 02c3 63747870 .ascii "ctxp\000"
  3059 + 2116 00
  3060 + 2117 .LASF22:
  3061 + 2118 02c8 705F7072 .ascii "p_prev\000"
  3062 + 2118 657600
  3063 + 2119 .LASF15:
  3064 + 2120 02cf 74707269 .ascii "tprio_t\000"
  3065 + 2120 6F5F7400
  3066 + 2121 .LASF6:
  3067 + 2122 02d7 696E7433 .ascii "int32_t\000"
  3068 + 2122 325F7400
  3069 + 2123 .LASF2:
  3070 + 2124 02df 756E7369 .ascii "unsigned char\000"
  3071 + 2124 676E6564
  3072 + 2124 20636861
  3073 + 2124 7200
  3074 + 2125 .LASF54:
  3075 + 2126 02ed 53484353 .ascii "SHCSR\000"
  3076 + 2126 5200
  3077 + 2127 .LASF36:
  3078 + 2128 02f3 705F6D74 .ascii "p_mtxlist\000"
  3079 + 2128 786C6973
  3080 + 2128 7400
  3081 + 2129 .LASF3:
  3082 + 2130 02fd 73686F72 .ascii "short int\000"
  3083 + 2130 7420696E
  3084 + 2130 7400
  3085 + 2131 .LASF28:
  3086 + 2132 0307 705F7374 .ascii "p_state\000"
  3087 + 2132 61746500
  3088 + 2133 .LASF44:
  3089 + 2134 030f 78707372 .ascii "xpsr\000"
  3090 + 2134 00
  3091 + 2135 .LASF66:
  3092 + 2136 0314 725F7072 .ascii "r_prio\000"
  3093 + 2136 696F00
  3094 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 41
  3095 +=======
2344 3096 2104 7800
2345 3097 2105 .LASF39:
2346 3098 2106 028a 54687265 .ascii "ThreadsQueue\000"
... ... @@ -2399,8 +3151,20 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
2399 3151 2136 030e 725F7072 .ascii "r_prio\000"
2400 3152 2136 696F00
2401 3153 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 41
  3154 +>>>>>>> .r35
2402 3155  
2403 3156  
  3157 +<<<<<<< .mine
  3158 + 2137 .LASF80:
  3159 + 2138 031b 65776D61 .ascii "ewmask\000"
  3160 + 2138 736B00
  3161 + 2139 .LASF21:
  3162 + 2140 0322 705F6E65 .ascii "p_next\000"
  3163 + 2140 787400
  3164 + 2141 .LASF29:
  3165 + 2142 0329 705F666C .ascii "p_flags\000"
  3166 + 2142 61677300
  3167 +=======
2404 3168 2137 .LASF80:
2405 3169 2138 0315 65776D61 .ascii "ewmask\000"
2406 3170 2138 736B00
... ... @@ -2410,111 +3174,255 @@ ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 1
2410 3174 2141 .LASF29:
2411 3175 2142 0323 705F666C .ascii "p_flags\000"
2412 3176 2142 61677300
  3177 +>>>>>>> .r35
2413 3178 2143 .LASF20:
  3179 +<<<<<<< .mine
  3180 + 2144 0331 54687265 .ascii "Thread\000"
  3181 +=======
2414 3182 2144 032b 54687265 .ascii "Thread\000"
  3183 +>>>>>>> .r35
2415 3184 2144 616400
2416 3185 2145 .LASF35:
  3186 +<<<<<<< .mine
  3187 + 2146 0338 705F6570 .ascii "p_epending\000"
  3188 +=======
2417 3189 2146 0332 705F6570 .ascii "p_epending\000"
  3190 +>>>>>>> .r35
2418 3191 2146 656E6469
2419 3192 2146 6E6700
2420 3193 2147 .LASF8:
  3194 +<<<<<<< .mine
  3195 + 2148 0343 75696E74 .ascii "uint32_t\000"
  3196 +=======
2421 3197 2148 033d 75696E74 .ascii "uint32_t\000"
  3198 +>>>>>>> .r35
2422 3199 2148 33325F74
2423 3200 2148 00
2424 3201 2149 .LASF65:
  3202 +<<<<<<< .mine
  3203 + 2150 034c 725F7175 .ascii "r_queue\000"
  3204 +=======
2425 3205 2150 0346 725F7175 .ascii "r_queue\000"
  3206 +>>>>>>> .r35
2426 3207 2150 65756500
2427 3208 2151 .LASF60:
  3209 +<<<<<<< .mine
  3210 + 2152 0354 41465352 .ascii "AFSR\000"
  3211 +=======
2428 3212 2152 034e 41465352 .ascii "AFSR\000"
  3213 +>>>>>>> .r35
2429 3214 2152 00
2430 3215 2153 .LASF62:
  3216 +<<<<<<< .mine
  3217 + 2154 0359 756E7573 .ascii "unused1\000"
  3218 +=======
2431 3219 2154 0353 756E7573 .ascii "unused1\000"
  3220 +>>>>>>> .r35
2432 3221 2154 65643100
2433 3222 2155 .LASF81:
  3223 +<<<<<<< .mine
  3224 + 2156 0361 63686172 .ascii "char\000"
  3225 +=======
2434 3226 2156 035b 63686172 .ascii "char\000"
  3227 +>>>>>>> .r35
2435 3228 2156 00
2436 3229 2157 .LASF47:
  3230 +<<<<<<< .mine
  3231 + 2158 0366 494F5245 .ascii "IOREG32\000"
  3232 +=======
2437 3233 2158 0360 494F5245 .ascii "IOREG32\000"
  3234 +>>>>>>> .r35
2438 3235 2158 47333200
2439 3236 2159 .LASF76:
  3237 +<<<<<<< .mine
  3238 + 2160 036e 6D5F6E65 .ascii "m_next\000"
  3239 +=======
2440 3240 2160 0368 6D5F6E65 .ascii "m_next\000"
  3241 +>>>>>>> .r35
2441 3242 2160 787400
2442 3243 2161 .LASF18:
  3244 +<<<<<<< .mine
  3245 + 2162 0375 73797374 .ascii "systime_t\000"
  3246 +=======
2443 3247 2162 036f 73797374 .ascii "systime_t\000"
  3248 +>>>>>>> .r35
2444 3249 2162 696D655F
2445 3250 2162 7400
2446 3251 2163 .LASF37:
  3252 +<<<<<<< .mine
  3253 + 2164 037f 705F7265 .ascii "p_realprio\000"
  3254 +=======
2447 3255 2164 0379 705F7265 .ascii "p_realprio\000"
  3256 +>>>>>>> .r35
2448 3257 2164 616C7072
2449 3258 2164 696F00
2450 3259 2165 .LASF70:
  3260 +<<<<<<< .mine
  3261 + 2166 038a 725F7072 .ascii "r_preempt\000"
  3262 +=======
2451 3263 2166 0384 725F7072 .ascii "r_preempt\000"
  3264 +>>>>>>> .r35
2452 3265 2166 65656D70
2453 3266 2166 7400
2454 3267 2167 .LASF31:
  3268 +<<<<<<< .mine
  3269 + 2168 0394 705F7469 .ascii "p_time\000"
  3270 +=======
2455 3271 2168 038e 705F7469 .ascii "p_time\000"
  3272 +>>>>>>> .r35
2456 3273 2168 6D6500
2457 3274 2169 .LASF53:
  3275 +<<<<<<< .mine
  3276 + 2170 039b 53485052 .ascii "SHPR\000"
  3277 +=======
2458 3278 2170 0395 53485052 .ascii "SHPR\000"
  3279 +>>>>>>> .r35
2459 3280 2170 00
2460 3281 2171 .LASF45:
  3282 +<<<<<<< .mine
  3283 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 42
  3284 +=======
2461 3285 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 42
  3286 +>>>>>>> .r35
2462 3287  
2463 3288  
  3289 +<<<<<<< .mine
  3290 + 2172 03a0 696E7463 .ascii "intctx\000"
  3291 + 2172 747800
  3292 +=======
2464 3293 2172 039a 696E7463 .ascii "intctx\000"
2465 3294 2172 747800
  3295 +>>>>>>> .r35
2466 3296 2173 .LASF33:
  3297 +<<<<<<< .mine
  3298 + 2174 03a7 705F6D73 .ascii "p_msgqueue\000"
  3299 +=======
2467 3300 2174 03a1 705F6D73 .ascii "p_msgqueue\000"
  3301 +>>>>>>> .r35
2468 3302 2174 67717565
2469 3303 2174 756500
2470 3304 2175 .LASF30:
  3305 +<<<<<<< .mine
  3306 + 2176 03b2 705F7265 .ascii "p_refs\000"
  3307 +=======
2471 3308 2176 03ac 705F7265 .ascii "p_refs\000"
  3309 +>>>>>>> .r35
2472 3310 2176 667300
2473 3311 2177 .LASF72:
  3312 +<<<<<<< .mine
  3313 + 2178 03b9 52656164 .ascii "ReadyList\000"
  3314 +=======
2474 3315 2178 03b3 52656164 .ascii "ReadyList\000"
  3316 +>>>>>>> .r35
2475 3317 2178 794C6973
2476 3318 2178 7400
2477 3319 2179 .LASF61:
  3320 +<<<<<<< .mine
  3321 + 2180 03c3 4D4D4652 .ascii "MMFR\000"
  3322 +=======
2478 3323 2180 03bd 4D4D4652 .ascii "MMFR\000"
  3324 +>>>>>>> .r35
2479 3325 2180 00
2480 3326 2181 .LASF95:
  3327 +<<<<<<< .mine
  3328 + 2182 03c8 726C6973 .ascii "rlist\000"
  3329 +=======
2481 3330 2182 03c2 726C6973 .ascii "rlist\000"
  3331 +>>>>>>> .r35
2482 3332 2182 7400
2483 3333 2183 .LASF5:
  3334 +<<<<<<< .mine
  3335 + 2184 03ce 75696E74 .ascii "uint8_t\000"
  3336 +=======
2484 3337 2184 03c8 75696E74 .ascii "uint8_t\000"
  3338 +>>>>>>> .r35
2485 3339 2184 385F7400
2486 3340 2185 .LASF79:
  3341 +<<<<<<< .mine
  3342 + 2186 03d6 77746F62 .ascii "wtobjp\000"
  3343 +=======
2487 3344 2186 03d0 77746F62 .ascii "wtobjp\000"
  3345 +>>>>>>> .r35
2488 3346 2186 6A7000
2489 3347 2187 .LASF84:
  3348 +<<<<<<< .mine
  3349 + 2188 03dd 5F706F72 .ascii "_port_init\000"
  3350 +=======
2490 3351 2188 03d7 5F706F72 .ascii "_port_init\000"
  3352 +>>>>>>> .r35
2491 3353 2188 745F696E
2492 3354 2188 697400
2493 3355 2189 .LASF27:
  3356 +<<<<<<< .mine
  3357 + 2190 03e8 705F6E61 .ascii "p_name\000"
  3358 +=======
2494 3359 2190 03e2 705F6E61 .ascii "p_name\000"
  3360 +>>>>>>> .r35
2495 3361 2190 6D6500
2496 3362 2191 .LASF63:
  3363 +<<<<<<< .mine
  3364 + 2192 03ef 43504143 .ascii "CPACR\000"
  3365 +=======
2497 3366 2192 03e9 43504143 .ascii "CPACR\000"
  3367 +>>>>>>> .r35
2498 3368 2192 5200
2499 3369 2193 .LASF56:
  3370 +<<<<<<< .mine
  3371 + 2194 03f5 48465352 .ascii "HFSR\000"
  3372 +=======
2500 3373 2194 03ef 48465352 .ascii "HFSR\000"
  3374 +>>>>>>> .r35
2501 3375 2194 00
2502 3376 2195 .LASF75:
  3377 +<<<<<<< .mine
  3378 + 2196 03fa 6D5F6F77 .ascii "m_owner\000"
  3379 +=======
2503 3380 2196 03f4 6D5F6F77 .ascii "m_owner\000"
  3381 +>>>>>>> .r35
2504 3382 2196 6E657200
2505 3383 2197 .LASF24:
  3384 +<<<<<<< .mine
  3385 + 2198 0402 705F6374 .ascii "p_ctx\000"
  3386 +=======
2506 3387 2198 03fc 705F6374 .ascii "p_ctx\000"
  3388 +>>>>>>> .r35
2507 3389 2198 7800
2508 3390 2199 .LASF32:
  3391 +<<<<<<< .mine
  3392 + 2200 0408 705F7761 .ascii "p_waiting\000"
  3393 +=======
2509 3394 2200 0402 705F7761 .ascii "p_waiting\000"
  3395 +>>>>>>> .r35
2510 3396 2200 6974696E
2511 3397 2200 6700
2512 3398 2201 .ident "GCC: (GNU) 4.7.2"
  3399 +<<<<<<< .mine
  3400 + ARM GAS C:\cygwin\tmp\ccuzbO6I.s page 43
  3401 +=======
2513 3402 ARM GAS C:\cygwin64\tmp\cc9K0PqW.s page 43
  3403 +>>>>>>> .r35
2514 3404  
2515 3405  
2516 3406 DEFINED SYMBOLS
2517 3407 *ABS*:00000000 chcore_v7m.c
  3408 +<<<<<<< .mine
  3409 +C:\cygwin\tmp\ccuzbO6I.s:19 .text._port_switch_from_isr:00000000 $t
  3410 +C:\cygwin\tmp\ccuzbO6I.s:25 .text._port_switch_from_isr:00000000 _port_switch_from_isr
  3411 +C:\cygwin\tmp\ccuzbO6I.s:38 .text._port_switch_from_isr:00000004 _port_exit_from_isr
  3412 +C:\cygwin\tmp\ccuzbO6I.s:57 .text.PendSVVector:00000000 $t
  3413 +C:\cygwin\tmp\ccuzbO6I.s:63 .text.PendSVVector:00000000 PendSVVector
  3414 +C:\cygwin\tmp\ccuzbO6I.s:89 .text._port_init:00000000 $t
  3415 +C:\cygwin\tmp\ccuzbO6I.s:95 .text._port_init:00000000 _port_init
  3416 +C:\cygwin\tmp\ccuzbO6I.s:143 .text._port_irq_epilogue:00000000 $t
  3417 +C:\cygwin\tmp\ccuzbO6I.s:149 .text._port_irq_epilogue:00000000 _port_irq_epilogue
  3418 +C:\cygwin\tmp\ccuzbO6I.s:239 .text._port_irq_epilogue:00000064 $d
  3419 +C:\cygwin\tmp\ccuzbO6I.s:247 .text.SysTickVector:00000000 $t
  3420 +C:\cygwin\tmp\ccuzbO6I.s:253 .text.SysTickVector:00000000 SysTickVector
  3421 +C:\cygwin\tmp\ccuzbO6I.s:286 .text._port_switch:00000000 $t
  3422 +C:\cygwin\tmp\ccuzbO6I.s:292 .text._port_switch:00000000 _port_switch
  3423 +C:\cygwin\tmp\ccuzbO6I.s:319 .text._port_thread_start:00000000 $t
  3424 +C:\cygwin\tmp\ccuzbO6I.s:325 .text._port_thread_start:00000000 _port_thread_start
  3425 +=======
2518 3426 C:\cygwin64\tmp\cc9K0PqW.s:19 .text._port_switch_from_isr:00000000 $t
2519 3427 C:\cygwin64\tmp\cc9K0PqW.s:25 .text._port_switch_from_isr:00000000 _port_switch_from_isr
2520 3428 C:\cygwin64\tmp\cc9K0PqW.s:38 .text._port_switch_from_isr:00000004 _port_exit_from_isr
... ... @@ -2531,6 +3439,7 @@ C:\cygwin64\tmp\cc9K0PqW.s:286 .text._port_switch:00000000 $t
2531 3439 C:\cygwin64\tmp\cc9K0PqW.s:292 .text._port_switch:00000000 _port_switch
2532 3440 C:\cygwin64\tmp\cc9K0PqW.s:319 .text._port_thread_start:00000000 $t
2533 3441 C:\cygwin64\tmp\cc9K0PqW.s:325 .text._port_thread_start:00000000 _port_thread_start
  3442 +>>>>>>> .r35
2534 3443 .debug_frame:00000010 $d
2535 3444  
2536 3445 UNDEFINED SYMBOLS
... ...