HCoop / jackhill / guix / guix.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
blame | history | raw | HEAD
gnu: Python 3.9: Fix CVE-2021-3177.
[jackhill/guix/guix.git] / gnu / packages / patches / sdcc-disable-non-free-code.patch
1 This patch disables the use of non-free code distributed with SDCC by
2 removing
3
4 - The "--disable-non-free" option to "configure" and the build logic
5 it controls;
6
7 - All references to the "device/non-free" source directory and the
8 corresponding "non-free" installation directory; and
9
10 - The "--use-non-free" and "--no-warn-non-free" compiler options and
11 references to them in build scripts and compiler output.
12
13 It also updates SDCC's documentation to reflect these changes and to
14 remove instructions that encourage the use of SDCC with non-free
15 software.
16
17 diff --git a/Makefile.common.in b/Makefile.common.in
18 index 412fd5a..81bbd61 100644
19 --- a/Makefile.common.in
20 +++ b/Makefile.common.in
21 @@ -69,7 +69,6 @@ OPT_DISABLE_PACKIHX = @OPT_DISABLE_PACKIHX@
22 OPT_DISABLE_SDBINUTILS = @OPT_DISABLE_SDBINUTILS@
23 OPT_DISABLE_SDCPP = @OPT_DISABLE_SDCPP@
24 OPT_DISABLE_UCSIM = @OPT_DISABLE_UCSIM@
25 -OPT_DISABLE_NON_FREE = @OPT_DISABLE_NON_FREE@
26
27 SLIB = $(top_builddir)/support/util
28
29 diff --git a/Makefile.in b/Makefile.in
30 index f3b028d..cfdf06d 100644
31 --- a/Makefile.in
32 +++ b/Makefile.in
33 @@ -100,9 +100,6 @@ endif
34 ifeq ($(OPT_DISABLE_DEVICE_LIB), 0)
35 TARGETS += sdcc-device-lib
36 PKGS += device/lib
37 -ifeq ($(OPT_DISABLE_NON_FREE), 0)
38 -PKGS += device/non-free/lib
39 -endif
40 endif
41
42 ifeq ($(OPT_DISABLE_PACKIHX), 0)
43 @@ -123,9 +120,6 @@ endif
44 TARGETS += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts
45
46 PKGS += $(SDCC_LIBS) src device/include
47 -ifeq ($(OPT_DISABLE_NON_FREE), 0)
48 -PKGS += device/non-free/include
49 -endif
50 PKGS += $(SDCC_AS) sdas/linksrc $(SDCC_SCRIPTS)
51
52 PORTS = $(shell cat ports.build)
53 @@ -171,21 +165,12 @@ sdcc-sdbinutils:
54
55 sdcc-device-inc:
56 $(MAKE) -C device/include
57 -ifeq ($(OPT_DISABLE_NON_FREE), 0)
58 - $(MAKE) -C device/non-free/include
59 -endif
60
61 sdcc-device-lib: sdcc-cc sdcc-as sdcc-ld $(SDCC_BINUTILS)
62 $(MAKE) -C device/lib
63 -ifeq ($(OPT_DISABLE_NON_FREE), 0)
64 - $(MAKE) -C device/non-free/lib
65 -endif
66
67 sdcc-device-tini:
68 $(MAKE) -C device/include
69 -ifeq ($(OPT_DISABLE_NON_FREE), 0)
70 - $(MAKE) -C device/non-free/include
71 -endif
72 $(MAKE) -C device/lib model-ds390 model-ds400
73
74 # doc depends on latex and latex2html
75 diff --git a/configure b/configure
76 index 43ccb6f..d345f54 100755
77 --- a/configure
78 +++ b/configure
79 @@ -632,7 +632,6 @@ LATEX
80 LATEX2HTML
81 LYX
82 OPT_ENABLE_DOC
83 -OPT_DISABLE_NON_FREE
84 OPT_DISABLE_SDBINUTILS
85 OPT_DISABLE_SDCDB
86 OPT_DISABLE_SDCPP
87 @@ -659,10 +658,7 @@ OPT_DISABLE_R2K
88 OPT_DISABLE_Z180
89 OPT_DISABLE_Z80
90 OPT_DISABLE_MCS51
91 -non_free_lib_dir_suffix
92 lib_dir_suffix
93 -non_free_include_dir_suffix
94 -non_free_inclib_dir_suffix
95 include_dir_suffix
96 inclib_dir_suffix
97 LIB_TYPE
98 @@ -780,7 +776,6 @@ enable_packihx
99 enable_sdcpp
100 enable_sdcdb
101 enable_sdbinutils
102 -enable_non_free
103 enable_doc
104 enable_libgc
105 '
106 @@ -801,10 +796,7 @@ sdccconf_h_dir_separator
107 LIB_TYPE
108 inclib_dir_suffix
109 include_dir_suffix
110 -non_free_inclib_dir_suffix
111 -non_free_include_dir_suffix
112 lib_dir_suffix
113 -non_free_lib_dir_suffix
114 docdir'
115 ac_subdirs_all='support/cpp
116 support/packihx
117 @@ -812,9 +804,7 @@ sim/ucsim
118 debugger/mcs51
119 support/sdbinutils
120 device/lib/pic14
121 -device/non-free/lib/pic14
122 -device/lib/pic16
123 -device/non-free/lib/pic16'
124 +device/lib/pic16'
125
126 # Initialize some variables set by options.
127 ac_init_help=
128 @@ -1455,7 +1445,6 @@ Optional Features:
129 --disable-sdcpp Disables building sdcpp
130 --disable-sdcdb Disables building sdcdb
131 --disable-sdbinutils Disables configuring and building of sdbinutils
132 - --disable-non-free Disables non-free runtime library parts
133 --enable-doc Enables building the documentation
134 --enable-libgc Use the Bohem memory allocator. Lower runtime
135 footprint.
136 @@ -1484,16 +1473,8 @@ Some influential environment variables:
137 appended to datadir to define SDCC's include/lib directory
138 include_dir_suffix
139 appended to datadir to define SDCC's include directory
140 - non_free_inclib_dir_suffix
141 - appended to datadir to define SDCC's non-free include/lib
142 - directory
143 - non_free_include_dir_suffix
144 - appended to datadir to define SDCC's non-free include directory
145 lib_dir_suffix
146 appended to datadir to define SDCC's library root directory
147 - non_free_lib_dir_suffix
148 - appended to datadir to define SDCC's non-free library root
149 - directory
150 docdir documentation installation directory
151
152 Use these variables to override the choices made by `configure' or to help
153 @@ -7134,19 +7115,6 @@ if test "${include_dir_suffix}" = ""; then
154 include_dir_suffix="${inclib_dir_suffix}/include"
155 fi
156
157 -
158 -if test "${non_free_inclib_dir_suffix}" = ""; then
159 - non_free_inclib_dir_suffix="sdcc/non-free"
160 -fi
161 -
162 -# non_free_include_dir_suffix:
163 -# *nix default: "sdcc/non-free/include"
164 -
165 -
166 -if test "${non_free_include_dir_suffix}" = ""; then
167 - non_free_include_dir_suffix="${non_free_inclib_dir_suffix}/include"
168 -fi
169 -
170 # lib_dir_suffix:
171 # *nix default: "sdcc/lib"
172
173 @@ -7154,13 +7122,6 @@ if test "${lib_dir_suffix}" = ""; then
174 lib_dir_suffix="${inclib_dir_suffix}/lib"
175 fi
176
177 -# non_free_lib_dir_suffix:
178 -# *nix default: "sdcc/non-free/lib"
179 -
180 -if test "${non_free_lib_dir_suffix}" = ""; then
181 - non_free_lib_dir_suffix="${non_free_inclib_dir_suffix}/lib"
182 -fi
183 -
184 # docdir:
185 # *nix default: "${datadir}/sdcc/doc"
186
187 @@ -7327,24 +7288,6 @@ cat >>confdefs.h <<_ACEOF
188 #define INCLUDE_DIR_SUFFIX DIR_SEPARATOR_STRING "${norm_inc_dir_suffix}"
189 _ACEOF
190
191 -norm_non_free_inc_dir_suffix=${non_free_include_dir_suffix}
192 -case ":$norm_non_free_inc_dir_suffix:" in
193 - ::) norm_non_free_inc_dir_suffix='.' ;;
194 - :*[\\/]:) norm_non_free_inc_dir_suffix=`echo "$norm_non_free_inc_dir_suffix" | sed 's,[\\/]*$,,'` ;;
195 - :*:) ;;
196 -esac
197 -case $sdccconf_h_dir_separator in
198 -
199 - *\\*) norm_non_free_inc_dir_suffix=`echo "$norm_non_free_inc_dir_suffix" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
200 - s,^[\\/],\\\\\\\\,'` ;;
201 -
202 - *) norm_non_free_inc_dir_suffix=`echo "$norm_non_free_inc_dir_suffix" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
203 -esac
204 -
205 -cat >>confdefs.h <<_ACEOF
206 -#define NON_FREE_INCLUDE_DIR_SUFFIX DIR_SEPARATOR_STRING "${norm_non_free_inc_dir_suffix}"
207 -_ACEOF
208 -
209
210 norm_lib_dir_suffix=${lib_dir_suffix}
211 case ":$norm_lib_dir_suffix:" in
212 @@ -7364,24 +7307,6 @@ cat >>confdefs.h <<_ACEOF
213 #define LIB_DIR_SUFFIX DIR_SEPARATOR_STRING "${norm_lib_dir_suffix}"
214 _ACEOF
215
216 -norm_non_free_lib_dir_suffix=${non_free_lib_dir_suffix}
217 -case ":$norm_non_free_lib_dir_suffix:" in
218 - ::) norm_non_free_lib_dir_suffix='.' ;;
219 - :*[\\/]:) norm_non_free_lib_dir_suffix=`echo "$norm_non_free_lib_dir_suffix" | sed 's,[\\/]*$,,'` ;;
220 - :*:) ;;
221 -esac
222 -case $sdccconf_h_dir_separator in
223 -
224 - *\\*) norm_non_free_lib_dir_suffix=`echo "$norm_non_free_lib_dir_suffix" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
225 - s,^[\\/],\\\\\\\\,'` ;;
226 -
227 - *) norm_non_free_lib_dir_suffix=`echo "$norm_non_free_lib_dir_suffix" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
228 -esac
229 -
230 -cat >>confdefs.h <<_ACEOF
231 -#define NON_FREE_LIB_DIR_SUFFIX DIR_SEPARATOR_STRING "${norm_non_free_lib_dir_suffix}"
232 -_ACEOF
233 -
234
235 # relative paths
236 for _lcl_i in expanded_bindir:expanded_datadir:bin2data_dir; do
237 @@ -8439,28 +8364,6 @@ _ACEOF
238
239
240
241 - # Check whether --enable-non-free was given.
242 -if test "${enable_non_free+set}" = set; then :
243 - enableval=$enable_non_free;
244 -fi
245 -
246 -
247 - arg1=`echo non-free | sed s/-/_/`
248 -
249 - if test "`eval echo \\$enable_$arg1`" = "no"; then
250 - OPT_DISABLE_NON_FREE=1
251 - else
252 - OPT_DISABLE_NON_FREE=0
253 - fi
254 -
255 -
256 -cat >>confdefs.h <<_ACEOF
257 -#define OPT_DISABLE_NON_FREE $OPT_DISABLE_NON_FREE
258 -_ACEOF
259 -
260 -
261 -
262 -
263
264 # Check whether --enable-doc was given.
265 if test "${enable_doc+set}" = set; then :
266 @@ -8855,20 +8758,12 @@ if test $OPT_DISABLE_PIC14 = 0; then
267
268 test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/lib/pic14"
269
270 -fi
271 -if test $OPT_DISABLE_PIC14 = 0 && test $OPT_DISABLE_NON_FREE = 0; then
272 - test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/non-free/lib/pic14"
273 -
274 fi
275 if test $OPT_DISABLE_PIC16 = 0; then
276 ac_config_files="$ac_config_files src/pic16/Makefile"
277
278 test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/lib/pic16"
279
280 -fi
281 -if test $OPT_DISABLE_PIC16 = 0 && test $OPT_DISABLE_NON_FREE = 0; then
282 - test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/non-free/lib/pic16"
283 -
284 fi
285
286 if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_GBZ80 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0; then
287 @@ -8945,15 +8840,9 @@ fi
288
289 test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/Makefile"
290
291 -test $OPT_DISABLE_DEVICE_LIB = 0 && test $OPT_DISABLE_NON_FREE = 0 && ac_config_files="$ac_config_files device/non-free/lib/Makefile"
292 -
293
294 ac_config_files="$ac_config_files main.mk:main_in.mk src/Makefile device/include/Makefile sdas/linksrc/Makefile support/makebin/Makefile support/regression/Makefile support/valdiag/Makefile support/scripts/Makefile support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in"
295
296 -if test $OPT_DISABLE_NON_FREE = 0; then
297 - ac_config_files="$ac_config_files device/non-free/include/Makefile"
298 -
299 -fi
300 cat >confcache <<\_ACEOF
301 # This file is a shell script that caches the results of configure
302 # tests run on this system so they can be shared between configure
303 @@ -9692,7 +9581,6 @@ do
304 "device/lib/pdk15-stack-auto/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/pdk15-stack-auto/Makefile" ;;
305 "sdas/aspdk16/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/aspdk16/Makefile" ;;
306 "device/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/Makefile" ;;
307 - "device/non-free/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/non-free/lib/Makefile" ;;
308 "main.mk") CONFIG_FILES="$CONFIG_FILES main.mk:main_in.mk" ;;
309 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
310 "device/include/Makefile") CONFIG_FILES="$CONFIG_FILES device/include/Makefile" ;;
311 @@ -9704,7 +9592,6 @@ do
312 "support/regression/ports/host/spec.mk") CONFIG_FILES="$CONFIG_FILES support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in" ;;
313 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
314 "Makefile.common") CONFIG_FILES="$CONFIG_FILES Makefile.common:Makefile.common.in" ;;
315 - "device/non-free/include/Makefile") CONFIG_FILES="$CONFIG_FILES device/non-free/include/Makefile" ;;
316
317 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
318 esac
319 @@ -10513,54 +10400,6 @@ esac
320 incPath3=`echo "$incPath3" | sed 's,\\\\\\\\,\\\\,g'`
321
322
323 -nonFreeIncPath1=`echo "/${prefix2data_dir}/${norm_non_free_inc_dir_suffix}" | sed 's,/\./,/,g'`
324 -case ":$nonFreeIncPath1:" in
325 - ::) nonFreeIncPath1='.' ;;
326 - :*[\\/]:) nonFreeIncPath1=`echo "$nonFreeIncPath1" | sed 's,[\\/]*$,,'` ;;
327 - :*:) ;;
328 -esac
329 -case $dirch in
330 -
331 - *\\*) nonFreeIncPath1=`echo "$nonFreeIncPath1" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
332 - s,^[\\/],\\\\\\\\,'` ;;
333 -
334 - *) nonFreeIncPath1=`echo "$nonFreeIncPath1" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
335 -esac
336 -nonFreeIncPath1=`echo "$nonFreeIncPath1" | sed 's,\\\\\\\\,\\\\,g'`
337 -
338 -
339 -nonFreeIncPath2=`echo "/${bin2data_dir}/${norm_non_free_inc_dir_suffix}" | sed 's,/\./,/,g'`
340 -case ":$nonFreeIncPath2:" in
341 - ::) nonFreeIncPath2='.' ;;
342 - :*[\\/]:) nonFreeIncPath2=`echo "$nonFreeIncPath2" | sed 's,[\\/]*$,,'` ;;
343 - :*:) ;;
344 -esac
345 -case $dirch in
346 -
347 - *\\*) nonFreeIncPath2=`echo "$nonFreeIncPath2" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
348 - s,^[\\/],\\\\\\\\,'` ;;
349 -
350 - *) nonFreeIncPath2=`echo "$nonFreeIncPath2" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
351 -esac
352 -nonFreeIncPath2=`echo "$nonFreeIncPath2" | sed 's,\\\\\\\\,\\\\,g'`
353 -
354 -
355 -nonFreeIncPath3=`echo "${expanded_datadir}/${norm_non_free_inc_dir_suffix}" | sed 's,/\./,/,g'`
356 -case ":$nonFreeIncPath3:" in
357 - ::) nonFreeIncPath3='.' ;;
358 - :*[\\/]:) nonFreeIncPath3=`echo "$nonFreeIncPath3" | sed 's,[\\/]*$,,'` ;;
359 - :*:) ;;
360 -esac
361 -case $dirch in
362 -
363 - *\\*) nonFreeIncPath3=`echo "$nonFreeIncPath3" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
364 - s,^[\\/],\\\\\\\\,'` ;;
365 -
366 - *) nonFreeIncPath3=`echo "$nonFreeIncPath3" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
367 -esac
368 -nonFreeIncPath3=`echo "$nonFreeIncPath3" | sed 's,\\\\\\\\,\\\\,g'`
369 -
370 -
371
372 libPath1=`echo "/${prefix2data_dir}/${norm_lib_dir_suffix}" | sed 's,/\./,/,g'`
373 case ":$libPath1:" in
374 @@ -10610,54 +10449,6 @@ esac
375 libPath3=`echo "$libPath3" | sed 's,\\\\\\\\,\\\\,g'`
376
377
378 -nonFreeLibPath1=`echo "/${prefix2data_dir}/${norm_non_free_lib_dir_suffix}" | sed 's,/\./,/,g'`
379 -case ":$nonFreeLibPath1:" in
380 - ::) nonFreeLibPath1='.' ;;
381 - :*[\\/]:) nonFreeLibPath1=`echo "$nonFreeLibPath1" | sed 's,[\\/]*$,,'` ;;
382 - :*:) ;;
383 -esac
384 -case $dirch in
385 -
386 - *\\*) nonFreeLibPath1=`echo "$nonFreeLibPath1" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
387 - s,^[\\/],\\\\\\\\,'` ;;
388 -
389 - *) nonFreeLibPath1=`echo "$nonFreeLibPath1" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
390 -esac
391 -nonFreeLibPath1=`echo "$nonFreeLibPath1" | sed 's,\\\\\\\\,\\\\,g'`
392 -
393 -
394 -nonFreeLibPath2=`echo "/${bin2data_dir}/${norm_non_free_lib_dir_suffix}" | sed 's,/\./,/,g'`
395 -case ":$nonFreeLibPath2:" in
396 - ::) nonFreeLibPath2='.' ;;
397 - :*[\\/]:) nonFreeLibPath2=`echo "$nonFreeLibPath2" | sed 's,[\\/]*$,,'` ;;
398 - :*:) ;;
399 -esac
400 -case $dirch in
401 -
402 - *\\*) nonFreeLibPath2=`echo "$nonFreeLibPath2" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
403 - s,^[\\/],\\\\\\\\,'` ;;
404 -
405 - *) nonFreeLibPath2=`echo "$nonFreeLibPath2" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
406 -esac
407 -nonFreeLibPath2=`echo "$nonFreeLibPath2" | sed 's,\\\\\\\\,\\\\,g'`
408 -
409 -
410 -nonFreeLibPath3=`echo "${expanded_datadir}/${norm_non_free_lib_dir_suffix}" | sed 's,/\./,/,g'`
411 -case ":$nonFreeLibPath3:" in
412 - ::) nonFreeLibPath3='.' ;;
413 - :*[\\/]:) nonFreeLibPath3=`echo "$nonFreeLibPath3" | sed 's,[\\/]*$,,'` ;;
414 - :*:) ;;
415 -esac
416 -case $dirch in
417 -
418 - *\\*) nonFreeLibPath3=`echo "$nonFreeLibPath3" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
419 - s,^[\\/],\\\\\\\\,'` ;;
420 -
421 - *) nonFreeLibPath3=`echo "$nonFreeLibPath3" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
422 -esac
423 -nonFreeLibPath3=`echo "$nonFreeLibPath3" | sed 's,\\\\\\\\,\\\\,g'`
424 -
425 -
426 { $as_echo "$as_me:${as_lineno-$LINENO}: result:
427 sdcc ${VERSION} is now configured for
428
429 @@ -10694,7 +10485,6 @@ sdcc ${VERSION} is now configured for
430 pdk15 ${enable_pdk15_port}
431 pdk16 ${enable_pdk16_port}
432
433 - Disable non-free lib: ${OPT_DISABLE_NON_FREE}
434 Disable packihx: ${OPT_DISABLE_PACKIHX}
435 Disable ucsim: ${OPT_DISABLE_UCSIM}
436 Disable device lib: ${OPT_DISABLE_DEVICE_LIB}
437 @@ -10709,9 +10499,6 @@ sdcc ${VERSION} is now configured for
438 include/library files: ${datadir}/${inclib_dir_suffix}
439 include files: ${datadir}/${include_dir_suffix}
440 library files: ${datadir}/${lib_dir_suffix}
441 - non-free files: ${datadir}/${non_free_inclib_dir_suffix}
442 - non-free include files: ${datadir}/${non_free_include_dir_suffix}
443 - non-free library files: ${datadir}/${non_free_lib_dir_suffix}
444 documentation: ${docdir}
445
446 prefix: ${prefix}
447 @@ -10723,15 +10510,9 @@ sdcc ${VERSION} is now configured for
448 include files: ${incPath1}
449 path(argv[0])${incPath2}
450 ${incPath3}
451 - ${nonFreeIncPath1}
452 - path(argv[0])${nonFreeIncPath2}
453 - ${nonFreeIncPath3}
454 library files: \$SDCC_HOME${libPath1}${dirch}<model>
455 path(argv[0])${libPath2}${dirch}<model>
456 ${libPath3}${dirch}<model>
457 - \$SDCC_HOME${nonFreeLibPath1}${dirch}<model>
458 - path(argv[0])${nonFreeLibPath2}${dirch}<model>
459 - ${nonFreeLibPath3}${dirch}<model>
460 " >&5
461 $as_echo "
462 sdcc ${VERSION} is now configured for
463 @@ -10769,7 +10550,6 @@ sdcc ${VERSION} is now configured for
464 pdk15 ${enable_pdk15_port}
465 pdk16 ${enable_pdk16_port}
466
467 - Disable non-free lib: ${OPT_DISABLE_NON_FREE}
468 Disable packihx: ${OPT_DISABLE_PACKIHX}
469 Disable ucsim: ${OPT_DISABLE_UCSIM}
470 Disable device lib: ${OPT_DISABLE_DEVICE_LIB}
471 @@ -10784,9 +10564,6 @@ sdcc ${VERSION} is now configured for
472 include/library files: ${datadir}/${inclib_dir_suffix}
473 include files: ${datadir}/${include_dir_suffix}
474 library files: ${datadir}/${lib_dir_suffix}
475 - non-free files: ${datadir}/${non_free_inclib_dir_suffix}
476 - non-free include files: ${datadir}/${non_free_include_dir_suffix}
477 - non-free library files: ${datadir}/${non_free_lib_dir_suffix}
478 documentation: ${docdir}
479
480 prefix: ${prefix}
481 @@ -10798,14 +10575,8 @@ sdcc ${VERSION} is now configured for
482 include files: ${incPath1}
483 path(argv[0])${incPath2}
484 ${incPath3}
485 - ${nonFreeIncPath1}
486 - path(argv[0])${nonFreeIncPath2}
487 - ${nonFreeIncPath3}
488 library files: \$SDCC_HOME${libPath1}${dirch}<model>
489 path(argv[0])${libPath2}${dirch}<model>
490 ${libPath3}${dirch}<model>
491 - \$SDCC_HOME${nonFreeLibPath1}${dirch}<model>
492 - path(argv[0])${nonFreeLibPath2}${dirch}<model>
493 - ${nonFreeLibPath3}${dirch}<model>
494 " >&6; }
495 # End of configure/configure.in
496 diff --git a/configure.ac b/configure.ac
497 index 2185793..76ab155 100644
498 --- a/configure.ac
499 +++ b/configure.ac
500 @@ -544,19 +544,6 @@ if test "${include_dir_suffix}" = ""; then
501 include_dir_suffix="${inclib_dir_suffix}/include"
502 fi
503
504 -AC_ARG_VAR([non_free_inclib_dir_suffix], [appended to datadir to define SDCC's non-free include/lib directory])
505 -if test "${non_free_inclib_dir_suffix}" = ""; then
506 - non_free_inclib_dir_suffix="sdcc/non-free"
507 -fi
508 -
509 -# non_free_include_dir_suffix:
510 -# *nix default: "sdcc/non-free/include"
511 -
512 -AC_ARG_VAR([non_free_include_dir_suffix], [appended to datadir to define SDCC's non-free include directory])
513 -if test "${non_free_include_dir_suffix}" = ""; then
514 - non_free_include_dir_suffix="${non_free_inclib_dir_suffix}/include"
515 -fi
516 -
517 # lib_dir_suffix:
518 # *nix default: "sdcc/lib"
519 AC_ARG_VAR([lib_dir_suffix], [appended to datadir to define SDCC's library root directory])
520 @@ -564,13 +551,6 @@ if test "${lib_dir_suffix}" = ""; then
521 lib_dir_suffix="${inclib_dir_suffix}/lib"
522 fi
523
524 -# non_free_lib_dir_suffix:
525 -# *nix default: "sdcc/non-free/lib"
526 -AC_ARG_VAR([non_free_lib_dir_suffix], [appended to datadir to define SDCC's non-free library root directory])
527 -if test "${non_free_lib_dir_suffix}" = ""; then
528 - non_free_lib_dir_suffix="${non_free_inclib_dir_suffix}/lib"
529 -fi
530 -
531 # docdir:
532 # *nix default: "${datadir}/sdcc/doc"
533 AC_ARG_VAR([docdir], [documentation installation directory])
534 @@ -611,19 +591,11 @@ norm_inc_dir_suffix=${include_dir_suffix}
535 adl_NORMALIZE_PATH([norm_inc_dir_suffix], [$sdccconf_h_dir_separator])
536 AC_DEFINE_UNQUOTED(INCLUDE_DIR_SUFFIX,
537 DIR_SEPARATOR_STRING "${norm_inc_dir_suffix}", [XXX])
538 -norm_non_free_inc_dir_suffix=${non_free_include_dir_suffix}
539 -adl_NORMALIZE_PATH([norm_non_free_inc_dir_suffix], [$sdccconf_h_dir_separator])
540 -AC_DEFINE_UNQUOTED(NON_FREE_INCLUDE_DIR_SUFFIX,
541 - DIR_SEPARATOR_STRING "${norm_non_free_inc_dir_suffix}", [XXX])
542
543 norm_lib_dir_suffix=${lib_dir_suffix}
544 adl_NORMALIZE_PATH([norm_lib_dir_suffix], [$sdccconf_h_dir_separator])
545 AC_DEFINE_UNQUOTED(LIB_DIR_SUFFIX,
546 DIR_SEPARATOR_STRING "${norm_lib_dir_suffix}", [XXX])
547 -norm_non_free_lib_dir_suffix=${non_free_lib_dir_suffix}
548 -adl_NORMALIZE_PATH([norm_non_free_lib_dir_suffix], [$sdccconf_h_dir_separator])
549 -AC_DEFINE_UNQUOTED(NON_FREE_LIB_DIR_SUFFIX,
550 - DIR_SEPARATOR_STRING "${norm_non_free_lib_dir_suffix}", [XXX])
551
552 # relative paths
553 adl_COMPUTE_RELATIVE_PATHS([expanded_bindir:expanded_datadir:bin2data_dir])
554 @@ -797,7 +769,6 @@ AC_DO_DISABLER(packihx, PACKIHX, [Disables building packihx])
555 AC_DO_DISABLER(sdcpp, SDCPP, [Disables building sdcpp])
556 AC_DO_DISABLER(sdcdb, SDCDB, [Disables building sdcdb])
557 AC_DO_DISABLER(sdbinutils, SDBINUTILS, [Disables configuring and building of sdbinutils])
558 -AC_DO_DISABLER(non-free, NON_FREE, [Disables non-free runtime library parts])
559
560 AC_DO_ENABLER(doc, DOC, [Enables building the documentation])
561 AC_CHECK_PROG([LYX], [lyx], [lyx], [:])
562 @@ -868,16 +839,10 @@ if test $OPT_DISABLE_PIC14 = 0; then
563 AC_CONFIG_FILES(src/pic14/Makefile)
564 test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/lib/pic14)
565 fi
566 -if test $OPT_DISABLE_PIC14 = 0 && test $OPT_DISABLE_NON_FREE = 0; then
567 - test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/non-free/lib/pic14)
568 -fi
569 if test $OPT_DISABLE_PIC16 = 0; then
570 AC_CONFIG_FILES(src/pic16/Makefile)
571 test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/lib/pic16)
572 fi
573 -if test $OPT_DISABLE_PIC16 = 0 && test $OPT_DISABLE_NON_FREE = 0; then
574 - test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/non-free/lib/pic16)
575 -fi
576
577 if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_GBZ80 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0; then
578 AC_CONFIG_FILES([src/z80/Makefile])
579 @@ -939,7 +904,6 @@ fi
580
581
582 test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/Makefile])
583 -test $OPT_DISABLE_DEVICE_LIB = 0 && test $OPT_DISABLE_NON_FREE = 0 && AC_CONFIG_FILES([device/non-free/lib/Makefile])
584
585 AC_CONFIG_FILES([main.mk:main_in.mk
586 src/Makefile
587 @@ -953,9 +917,6 @@ support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in
588 Makefile
589 Makefile.common:Makefile.common.in
590 ])
591 -if test $OPT_DISABLE_NON_FREE = 0; then
592 - AC_CONFIG_FILES([device/non-free/include/Makefile])
593 -fi
594 AC_OUTPUT
595
596 # I found no better place
597 @@ -973,16 +934,10 @@ adl_NORMALIZE_PATH_MSG(/${prefix2bin_dir}, [binPath], [
598 adl_NORMALIZE_PATH_MSG(/${prefix2data_dir}/${norm_inc_dir_suffix}, [incPath1], [$dirch])
599 adl_NORMALIZE_PATH_MSG(/${bin2data_dir}/${norm_inc_dir_suffix}, [incPath2], [$dirch])
600 adl_NORMALIZE_PATH_MSG(${expanded_datadir}/${norm_inc_dir_suffix}, [incPath3], [$dirch])
601 -adl_NORMALIZE_PATH_MSG(/${prefix2data_dir}/${norm_non_free_inc_dir_suffix}, [nonFreeIncPath1], [$dirch])
602 -adl_NORMALIZE_PATH_MSG(/${bin2data_dir}/${norm_non_free_inc_dir_suffix}, [nonFreeIncPath2], [$dirch])
603 -adl_NORMALIZE_PATH_MSG(${expanded_datadir}/${norm_non_free_inc_dir_suffix}, [nonFreeIncPath3], [$dirch])
604
605 adl_NORMALIZE_PATH_MSG(/${prefix2data_dir}/${norm_lib_dir_suffix}, [libPath1], [$dirch])
606 adl_NORMALIZE_PATH_MSG(/${bin2data_dir}/${norm_lib_dir_suffix}, [libPath2], [$dirch])
607 adl_NORMALIZE_PATH_MSG(${expanded_datadir}/${norm_lib_dir_suffix}, [libPath3], [$dirch])
608 -adl_NORMALIZE_PATH_MSG(/${prefix2data_dir}/${norm_non_free_lib_dir_suffix}, [nonFreeLibPath1], [$dirch])
609 -adl_NORMALIZE_PATH_MSG(/${bin2data_dir}/${norm_non_free_lib_dir_suffix}, [nonFreeLibPath2], [$dirch])
610 -adl_NORMALIZE_PATH_MSG(${expanded_datadir}/${norm_non_free_lib_dir_suffix}, [nonFreeLibPath3], [$dirch])
611
612 AC_MSG_RESULT([
613 sdcc ${VERSION} is now configured for
614 @@ -1020,7 +975,6 @@ sdcc ${VERSION} is now configured for
615 pdk15 ${enable_pdk15_port}
616 pdk16 ${enable_pdk16_port}
617
618 - Disable non-free lib: ${OPT_DISABLE_NON_FREE}
619 Disable packihx: ${OPT_DISABLE_PACKIHX}
620 Disable ucsim: ${OPT_DISABLE_UCSIM}
621 Disable device lib: ${OPT_DISABLE_DEVICE_LIB}
622 @@ -1035,9 +989,6 @@ sdcc ${VERSION} is now configured for
623 include/library files: ${datadir}/${inclib_dir_suffix}
624 include files: ${datadir}/${include_dir_suffix}
625 library files: ${datadir}/${lib_dir_suffix}
626 - non-free files: ${datadir}/${non_free_inclib_dir_suffix}
627 - non-free include files: ${datadir}/${non_free_include_dir_suffix}
628 - non-free library files: ${datadir}/${non_free_lib_dir_suffix}
629 documentation: ${docdir}
630
631 prefix: ${prefix}
632 @@ -1049,14 +1000,8 @@ sdcc ${VERSION} is now configured for
633 include files: ${incPath1}
634 path(argv[[0]])${incPath2}
635 ${incPath3}
636 - ${nonFreeIncPath1}
637 - path(argv[[0]])${nonFreeIncPath2}
638 - ${nonFreeIncPath3}
639 library files: \$SDCC_HOME${libPath1}${dirch}<model>
640 path(argv[[0]])${libPath2}${dirch}<model>
641 ${libPath3}${dirch}<model>
642 - \$SDCC_HOME${nonFreeLibPath1}${dirch}<model>
643 - path(argv[[0]])${nonFreeLibPath2}${dirch}<model>
644 - ${nonFreeLibPath3}${dirch}<model>
645 ])
646 # End of configure/configure.in
647 diff --git a/device/lib/pic14/Makefile.common b/device/lib/pic14/Makefile.common
648 index 019fe0f..da3389d 100644
649 --- a/device/lib/pic14/Makefile.common
650 +++ b/device/lib/pic14/Makefile.common
651 @@ -68,14 +68,14 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR))
652 AM_CPPFLAGS =
653 AM_CPPFLAGS += -I.
654 AM_CPPFLAGS += -I$(top_srcdir)
655 -AM_CPPFLAGS += -I$(DEVICE_TOP_DIR)/include/pic14 -I$(DEVICE_TOP_DIR)/non-free/include/pic14 -I$(DEVICE_TOP_DIR)/include
656 +AM_CPPFLAGS += -I$(DEVICE_TOP_DIR)/include/pic14 -I$(DEVICE_TOP_DIR)/include
657
658 ############################################################
659 # C compiler flags
660 ############################################################
661
662 SDCC_FLAGS =
663 -SDCC_FLAGS += -mpic14 --less-pedantic --no-warn-non-free --i-code-in-asm --fverbose-asm
664 +SDCC_FLAGS += -mpic14 --less-pedantic --i-code-in-asm --fverbose-asm
665 SDCC_FLAGS += --std-c11
666
667 # extra flags for enhanced cores
668 @@ -113,7 +113,7 @@ AM_CFLAGS_EOX = -p$(EARCH) $(SDCC_FLAGS) $(SDCC_FLAGS_ENHANCED) $(SDCC_FLAGS_NOO
669 AM_CCASFLAGS =
670 AM_CCASFLAGS += -p$(ARCH)
671 AM_CCASFLAGS += -I$(srcdir)
672 -AM_CCASFLAGS += -I$(DEVICE_TOP_DIR)/include/pic14 -I$(DEVICE_TOP_DIR)/non-free/include/pic14
673 +AM_CCASFLAGS += -I$(DEVICE_TOP_DIR)/include/pic14
674
675 ############################################################
676 # Common actions
677 diff --git a/device/lib/pic14/Makefile.in b/device/lib/pic14/Makefile.in
678 index 39b6cb0..ae3e37b 100644
679 --- a/device/lib/pic14/Makefile.in
680 +++ b/device/lib/pic14/Makefile.in
681 @@ -335,13 +335,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR))
682 # C preprocessor flags
683 ############################################################
684 AM_CPPFLAGS = -I. -I$(top_srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
685 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14 \
686 -I$(DEVICE_TOP_DIR)/include
687
688 ############################################################
689 # C compiler flags
690 ############################################################
691 -SDCC_FLAGS = -mpic14 --less-pedantic --no-warn-non-free \
692 +SDCC_FLAGS = -mpic14 --less-pedantic \
693 --i-code-in-asm --fverbose-asm --std-c11 $(am__append_4)
694
695 # extra flags for enhanced cores
696 @@ -366,8 +365,7 @@ AM_CFLAGS_EOX = -p$(EARCH) $(SDCC_FLAGS) $(SDCC_FLAGS_ENHANCED) $(SDCC_FLAGS_NOO
697 ############################################################
698 # Assembler flags
699 ############################################################
700 -AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
701 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14
702 +AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14
703
704 # extensions generated by the build process
705 CLEAN_EXTENSIONS = .asm .lst .sym .d .p .g .v .adb
706 diff --git a/device/lib/pic14/libc/Makefile.in b/device/lib/pic14/libc/Makefile.in
707 index 0efeeb0..d4dd8e6 100644
708 --- a/device/lib/pic14/libc/Makefile.in
709 +++ b/device/lib/pic14/libc/Makefile.in
710 @@ -878,13 +878,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR))
711 # C preprocessor flags
712 ############################################################
713 AM_CPPFLAGS = -I. -I$(top_srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
714 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14 \
715 -I$(DEVICE_TOP_DIR)/include
716
717 ############################################################
718 # C compiler flags
719 ############################################################
720 -SDCC_FLAGS = -mpic14 --less-pedantic --no-warn-non-free \
721 +SDCC_FLAGS = -mpic14 --less-pedantic \
722 --i-code-in-asm --fverbose-asm --std-c11 $(am__append_9)
723
724 # extra flags for enhanced cores
725 @@ -909,8 +908,7 @@ AM_CFLAGS_EOX = -p$(EARCH) $(SDCC_FLAGS) $(SDCC_FLAGS_ENHANCED) $(SDCC_FLAGS_NOO
726 ############################################################
727 # Assembler flags
728 ############################################################
729 -AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
730 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14
731 +AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14
732
733 # extensions generated by the build process
734 CLEAN_EXTENSIONS = .asm .lst .sym .d .p .g .v .adb
735 diff --git a/device/lib/pic14/libm/Makefile.in b/device/lib/pic14/libm/Makefile.in
736 index f0dc9ca..98ed2cf 100644
737 --- a/device/lib/pic14/libm/Makefile.in
738 +++ b/device/lib/pic14/libm/Makefile.in
739 @@ -511,13 +511,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR))
740 # C preprocessor flags
741 ############################################################
742 AM_CPPFLAGS = -I. -I$(top_srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
743 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14 \
744 -I$(DEVICE_TOP_DIR)/include
745
746 ############################################################
747 # C compiler flags
748 ############################################################
749 -SDCC_FLAGS = -mpic14 --less-pedantic --no-warn-non-free \
750 +SDCC_FLAGS = -mpic14 --less-pedantic \
751 --i-code-in-asm --fverbose-asm --std-c11 $(am__append_9)
752
753 # extra flags for enhanced cores
754 @@ -542,8 +541,7 @@ AM_CFLAGS_EOX = -p$(EARCH) $(SDCC_FLAGS) $(SDCC_FLAGS_ENHANCED) $(SDCC_FLAGS_NOO
755 ############################################################
756 # Assembler flags
757 ############################################################
758 -AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
759 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14
760 +AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14
761
762 # extensions generated by the build process
763 CLEAN_EXTENSIONS = .asm .lst .sym .d .p .g .v .adb
764 diff --git a/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in b/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in
765 index 098ec94..d1240ba 100644
766 --- a/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in
767 +++ b/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in
768 @@ -518,13 +518,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR))
769 # C preprocessor flags
770 ############################################################
771 AM_CPPFLAGS = -I. -I$(top_srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
772 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14 \
773 -I$(DEVICE_TOP_DIR)/include
774
775 ############################################################
776 # C compiler flags
777 ############################################################
778 -SDCC_FLAGS = -mpic14 --less-pedantic --no-warn-non-free \
779 +SDCC_FLAGS = -mpic14 --less-pedantic \
780 --i-code-in-asm --fverbose-asm --std-c11 $(am__append_5)
781
782 # extra flags for enhanced cores
783 @@ -549,8 +548,7 @@ AM_CFLAGS_EOX = -p$(EARCH) $(SDCC_FLAGS) $(SDCC_FLAGS_ENHANCED) $(SDCC_FLAGS_NOO
784 ############################################################
785 # Assembler flags
786 ############################################################
787 -AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
788 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14
789 +AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14
790
791 # extensions generated by the build process
792 CLEAN_EXTENSIONS = .asm .lst .sym .d .p .g .v .adb
793 diff --git a/device/lib/pic14/libsdcc/enhanced/Makefile.in b/device/lib/pic14/libsdcc/enhanced/Makefile.in
794 index d2dba9c..0857601 100644
795 --- a/device/lib/pic14/libsdcc/enhanced/Makefile.in
796 +++ b/device/lib/pic14/libsdcc/enhanced/Makefile.in
797 @@ -518,13 +518,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR))
798 # C preprocessor flags
799 ############################################################
800 AM_CPPFLAGS = -I. -I$(top_srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
801 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14 \
802 -I$(DEVICE_TOP_DIR)/include
803
804 ############################################################
805 # C compiler flags
806 ############################################################
807 -SDCC_FLAGS = -mpic14 --less-pedantic --no-warn-non-free \
808 +SDCC_FLAGS = -mpic14 --less-pedantic \
809 --i-code-in-asm --fverbose-asm --std-c11 $(am__append_5)
810
811 # extra flags for enhanced cores
812 @@ -549,8 +548,7 @@ AM_CFLAGS_EOX = -p$(EARCH) $(SDCC_FLAGS) $(SDCC_FLAGS_ENHANCED) $(SDCC_FLAGS_NOO
813 ############################################################
814 # Assembler flags
815 ############################################################
816 -AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
817 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14
818 +AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14
819
820 # extensions generated by the build process
821 CLEAN_EXTENSIONS = .asm .lst .sym .d .p .g .v .adb
822 diff --git a/device/lib/pic14/libsdcc/regular/Makefile.in b/device/lib/pic14/libsdcc/regular/Makefile.in
823 index 3c9bccd..9430fb5 100644
824 --- a/device/lib/pic14/libsdcc/regular/Makefile.in
825 +++ b/device/lib/pic14/libsdcc/regular/Makefile.in
826 @@ -511,13 +511,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR))
827 # C preprocessor flags
828 ############################################################
829 AM_CPPFLAGS = -I. -I$(top_srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
830 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14 \
831 -I$(DEVICE_TOP_DIR)/include
832
833 ############################################################
834 # C compiler flags
835 ############################################################
836 -SDCC_FLAGS = -mpic14 --less-pedantic --no-warn-non-free \
837 +SDCC_FLAGS = -mpic14 --less-pedantic \
838 --i-code-in-asm --fverbose-asm --std-c11 $(am__append_5)
839
840 # extra flags for enhanced cores
841 @@ -542,8 +541,7 @@ AM_CFLAGS_EOX = -p$(EARCH) $(SDCC_FLAGS) $(SDCC_FLAGS_ENHANCED) $(SDCC_FLAGS_NOO
842 ############################################################
843 # Assembler flags
844 ############################################################
845 -AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14 \
846 - -I$(DEVICE_TOP_DIR)/non-free/include/pic14
847 +AM_CCASFLAGS = -p$(ARCH) -I$(srcdir) -I$(DEVICE_TOP_DIR)/include/pic14
848
849 # extensions generated by the build process
850 CLEAN_EXTENSIONS = .asm .lst .sym .d .p .g .v .adb
851 diff --git a/device/lib/pic16/Makefile.common b/device/lib/pic16/Makefile.common
852 index 01ad950..62839b9 100644
853 --- a/device/lib/pic16/Makefile.common
854 +++ b/device/lib/pic16/Makefile.common
855 @@ -1,11 +1,10 @@
856 AM_CPPFLAGS =
857 AM_CPPFLAGS += -I.
858 -AM_CPPFLAGS += -I$(top_srcdir)/../../include/pic16 -I$(top_srcdir)/../../non-free/include/pic16
859 +AM_CPPFLAGS += -I$(top_srcdir)/../../include/pic16
860
861 AM_CFLAGS =
862 AM_CFLAGS += --std-c11
863 AM_CFLAGS += --asm="$(CCAS)"
864 -AM_CFLAGS += --no-warn-non-free
865 ##AM_CFLAGS += -Wa,-q
866
867 AM_CFLAGS += --fomit-frame-pointer
868 @@ -31,7 +30,7 @@ AM_CFLAGS += --i-code-in-asm
869 AM_CFLAGS += @USE_FLOATS@
870
871 AM_CCASFLAGS =
872 -AM_CCASFLAGS += -I$(top_srcdir)/../../include/pic16 -I$(top_srcdir)/../../non-free/include/pic16
873 +AM_CCASFLAGS += -I$(top_srcdir)/../../include/pic16
874 AM_CCASFLAGS += -I$(srcdir)
875
876 clean-local:
877 diff --git a/device/lib/pic16/Makefile.in b/device/lib/pic16/Makefile.in
878 index 15d2e1d..9664ad4 100644
879 --- a/device/lib/pic16/Makefile.in
880 +++ b/device/lib/pic16/Makefile.in
881 @@ -87,10 +87,7 @@ PRE_UNINSTALL = :
882 POST_UNINSTALL = :
883 subdir = .
884 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
885 -am__aclocal_m4_deps = \
886 - $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
887 - $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
888 - $(top_srcdir)/configure.ac
889 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
890 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
891 $(ACLOCAL_M4)
892 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
893 @@ -295,8 +292,7 @@ top_build_prefix = @top_build_prefix@
894 top_builddir = @top_builddir@
895 top_srcdir = @top_srcdir@
896 SUBDIRS = debug libc libio libm libsdcc startup
897 -AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
898 - -I$(top_srcdir)/../../non-free/include/pic16
899 +AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
900 #AM_CFLAGS += --no-optimize-goto
901
902 #AM_CFLAGS += --debug-ralloc
903 @@ -310,11 +306,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
904 #AM_CFLAGS += --noinduction
905 #AM_CFLAGS += --nojtbound
906 #AM_CFLAGS += --noloopreverse
907 -AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
908 +AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
909 --fomit-frame-pointer --obanksel=9 --denable-peeps \
910 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
911 -AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
912 - -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
913 +AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
914 DISTCLEANFILES = a.cod a.hex ./.checkdevices/* pics.supported
915 all: config.h
916 $(MAKE) $(AM_MAKEFLAGS) all-recursive
917 diff --git a/device/lib/pic16/configure b/device/lib/pic16/configure
918 index c8f5b98..76f93a8 100755
919 --- a/device/lib/pic16/configure
920 +++ b/device/lib/pic16/configure
921 @@ -3657,7 +3657,6 @@ fi
922
923
924
925 -LIBDEV="${srcdir}/../../non-free/lib/pic16/libdev"
926 { $as_echo "$as_me:${as_lineno-$LINENO}: checking devices supported by gputils" >&5
927 $as_echo_n "checking devices supported by gputils... " >&6; }
928 GOOD_PICS="";
929 diff --git a/device/lib/pic16/configure.ac b/device/lib/pic16/configure.ac
930 index 3966c11..cdbffc7 100644
931 --- a/device/lib/pic16/configure.ac
932 +++ b/device/lib/pic16/configure.ac
933 @@ -68,10 +68,6 @@ AC_SUBST(OBJEXT, [o])
934 _AM_DEPENDENCIES(CC)
935 _AM_DEPENDENCIES(CCAS)
936
937 -LIBDEV="${srcdir}/../../non-free/lib/pic16/libdev"
938 -m4_include([../../non-free/lib/pic16/supported-devices.ac])
939 -m4_include([../../non-free/lib/pic16/processors.ac])
940 -
941 # Checks for libraries.
942
943 # Checks for header files.
944 diff --git a/device/lib/pic16/debug/Makefile.in b/device/lib/pic16/debug/Makefile.in
945 index df593e3..8cb5137 100644
946 --- a/device/lib/pic16/debug/Makefile.in
947 +++ b/device/lib/pic16/debug/Makefile.in
948 @@ -88,10 +88,7 @@ PRE_UNINSTALL = :
949 POST_UNINSTALL = :
950 subdir = debug
951 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
952 -am__aclocal_m4_deps = \
953 - $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
954 - $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
955 - $(top_srcdir)/configure.ac
956 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
957 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
958 $(ACLOCAL_M4)
959 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
960 @@ -291,8 +288,7 @@ top_builddir = @top_builddir@
961 top_srcdir = @top_srcdir@
962 lib_LIBRARIES = libdebug.a
963 libdebug_a_SOURCES = gstack/gstack.c
964 -AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
965 - -I$(top_srcdir)/../../non-free/include/pic16
966 +AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
967 #AM_CFLAGS += --no-optimize-goto
968
969 #AM_CFLAGS += --debug-ralloc
970 @@ -306,11 +302,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
971 #AM_CFLAGS += --noinduction
972 #AM_CFLAGS += --nojtbound
973 #AM_CFLAGS += --noloopreverse
974 -AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
975 +AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
976 --fomit-frame-pointer --obanksel=9 --denable-peeps \
977 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
978 -AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
979 - -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
980 +AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
981 all: all-am
982
983 .SUFFIXES:
984 diff --git a/device/lib/pic16/libc/Makefile.in b/device/lib/pic16/libc/Makefile.in
985 index 85bec90..c0ea488 100644
986 --- a/device/lib/pic16/libc/Makefile.in
987 +++ b/device/lib/pic16/libc/Makefile.in
988 @@ -88,10 +88,7 @@ PRE_UNINSTALL = :
989 POST_UNINSTALL = :
990 subdir = libc
991 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
992 -am__aclocal_m4_deps = \
993 - $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
994 - $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
995 - $(top_srcdir)/configure.ac
996 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
997 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
998 $(ACLOCAL_M4)
999 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
1000 @@ -381,8 +378,7 @@ libc18f_a_SOURCES = ctype/iscntrl.c ctype/isdigit.c ctype/isgraph.c \
1001 string/strpbrk.c string/strrchr.c string/strspn.c \
1002 string/strstr.c string/strtok.c string/strupr.c \
1003 utils/cnvfrac.S utils/cnvint.S utils/cvtdec.S
1004 -AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1005 - -I$(top_srcdir)/../../non-free/include/pic16
1006 +AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
1007 #AM_CFLAGS += --no-optimize-goto
1008
1009 #AM_CFLAGS += --debug-ralloc
1010 @@ -396,11 +392,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1011 #AM_CFLAGS += --noinduction
1012 #AM_CFLAGS += --nojtbound
1013 #AM_CFLAGS += --noloopreverse
1014 -AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
1015 +AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
1016 --fomit-frame-pointer --obanksel=9 --denable-peeps \
1017 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
1018 -AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
1019 - -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
1020 +AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
1021 all: all-am
1022
1023 .SUFFIXES:
1024 diff --git a/device/lib/pic16/libio/Makefile.in b/device/lib/pic16/libio/Makefile.in
1025 index 06fff29..78fe388 100644
1026 --- a/device/lib/pic16/libio/Makefile.in
1027 +++ b/device/lib/pic16/libio/Makefile.in
1028 @@ -481,10 +481,7 @@ POST_UNINSTALL = :
1029 @ENABLE_18LF8723_TRUE@am__append_393 = libio18lf8723.a
1030 subdir = libio
1031 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1032 -am__aclocal_m4_deps = \
1033 - $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
1034 - $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
1035 - $(top_srcdir)/configure.ac
1036 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1037 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1038 $(ACLOCAL_M4)
1039 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
1040 @@ -15600,8 +15597,7 @@ libio18lf8722_a_SOURCES = dummy.c i2c/i2cack.c i2c/i2cclose.c \
1041 libio18lf8722_a_CFLAGS = -p18lf8722 $(AM_CFLAGS)
1042 libio18lf8723_a_SOURCES = dummy.c
1043 libio18lf8723_a_CFLAGS = -p18lf8723 $(AM_CFLAGS)
1044 -AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1045 - -I$(top_srcdir)/../../non-free/include/pic16
1046 +AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
1047 #AM_CFLAGS += --no-optimize-goto
1048
1049 #AM_CFLAGS += --debug-ralloc
1050 @@ -15615,11 +15611,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1051 #AM_CFLAGS += --noinduction
1052 #AM_CFLAGS += --nojtbound
1053 #AM_CFLAGS += --noloopreverse
1054 -AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
1055 +AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
1056 --fomit-frame-pointer --obanksel=9 --denable-peeps \
1057 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
1058 -AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
1059 - -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
1060 +AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
1061 all: all-am
1062
1063 .SUFFIXES:
1064 diff --git a/device/lib/pic16/libio/mkmk.sh b/device/lib/pic16/libio/mkmk.sh
1065 index 211604e..e8896bf 100755
1066 --- a/device/lib/pic16/libio/mkmk.sh
1067 +++ b/device/lib/pic16/libio/mkmk.sh
1068 @@ -17,40 +17,6 @@ lib_LIBRARIES =
1069
1070 HEREDOC
1071
1072 -for f in "../../../non-free/lib/pic16/libdev/pic1"*.c; do
1073 - p="${f##*/pic}";
1074 - p="${p%.c}";
1075 - P=$(echo "$p" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ);
1076 - echo "Generating for device >>${p}<<" >&2;
1077 - cat <<HERE
1078 -if ENABLE_$P
1079 -lib_LIBRARIES += libio${p}.a
1080 -endif ENABLE_$P
1081 -libio${p}_a_SOURCES = dummy.c
1082 -HERE
1083 - sed -e 's/\s*\(#.*\)\{0,1\}$//' adc.ignore | grep -x "$p" > /dev/null 2>&1 && { echo "No adc." >&2 ; } || cat <<HERE
1084 -libio${p}_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
1085 -libio${p}_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
1086 -HERE
1087 - sed -e 's/\s*\(#.*\)\{0,1\}$//' i2c.ignore | grep -x "$p" > /dev/null 2>&1 && { echo "No i2c." >&2 ; } || cat <<HERE
1088 -libio${p}_a_SOURCES += i2c/i2cack.c i2c/i2cclose.c i2c/i2cdrdy.c
1089 -libio${p}_a_SOURCES += i2c/i2cidle.c i2c/i2cnack.c i2c/i2copen.c
1090 -libio${p}_a_SOURCES += i2c/i2creadc.c i2c/i2creads.c i2c/i2crestart.c
1091 -libio${p}_a_SOURCES += i2c/i2cstart.c i2c/i2cstop.c i2c/i2cwritec.c
1092 -libio${p}_a_SOURCES += i2c/i2cwrites.c
1093 -HERE
1094 - sed -e 's/\s*\(#.*\)\{0,1\}$//' usart.ignore | grep -x "$p" > /dev/null 2>&1 && { echo "No usart." >&2 ; } || cat <<HERE
1095 -libio${p}_a_SOURCES += usart/ubaud.c usart/ubusy.c usart/uclose.c
1096 -libio${p}_a_SOURCES += usart/udrdy.c usart/ugetc.c usart/ugets.c
1097 -libio${p}_a_SOURCES += usart/uopen.c usart/uputc.c usart/uputs.c
1098 -libio${p}_a_SOURCES += usart/usartd.c
1099 -HERE
1100 - cat <<HERE
1101 -libio${p}_a_CFLAGS = -p${p} \$(AM_CFLAGS)
1102 -
1103 -HERE
1104 -done
1105 -
1106 cat <<HEREDOC
1107 include \$(top_srcdir)/Makefile.common
1108
1109 diff --git a/device/lib/pic16/libm/Makefile.in b/device/lib/pic16/libm/Makefile.in
1110 index 6728a39..495459e 100644
1111 --- a/device/lib/pic16/libm/Makefile.in
1112 +++ b/device/lib/pic16/libm/Makefile.in
1113 @@ -88,10 +88,7 @@ PRE_UNINSTALL = :
1114 POST_UNINSTALL = :
1115 subdir = libm
1116 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1117 -am__aclocal_m4_deps = \
1118 - $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
1119 - $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
1120 - $(top_srcdir)/configure.ac
1121 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1122 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1123 $(ACLOCAL_M4)
1124 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
1125 @@ -312,8 +309,7 @@ libm18f_a_SOURCES = acosf.c asincosf.c asinf.c atan2f.c atanf.c \
1126 frexpf.c isinf.c isnan.c ldexpf.c log10f.c logf.c modff.c \
1127 powf.c sincosf.c sincoshf.c sinf.c sinhf.c sqrtf.c tancotf.c \
1128 tanf.c tanhf.c
1129 -AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1130 - -I$(top_srcdir)/../../non-free/include/pic16
1131 +AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
1132 #AM_CFLAGS += --no-optimize-goto
1133
1134 #AM_CFLAGS += --debug-ralloc
1135 @@ -327,11 +323,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1136 #AM_CFLAGS += --noinduction
1137 #AM_CFLAGS += --nojtbound
1138 #AM_CFLAGS += --noloopreverse
1139 -AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
1140 +AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
1141 --fomit-frame-pointer --obanksel=9 --denable-peeps \
1142 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
1143 -AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
1144 - -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
1145 +AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
1146 all: all-am
1147
1148 .SUFFIXES:
1149 diff --git a/device/lib/pic16/libsdcc/Makefile.in b/device/lib/pic16/libsdcc/Makefile.in
1150 index 331aea0..63565be 100644
1151 --- a/device/lib/pic16/libsdcc/Makefile.in
1152 +++ b/device/lib/pic16/libsdcc/Makefile.in
1153 @@ -88,10 +88,7 @@ PRE_UNINSTALL = :
1154 POST_UNINSTALL = :
1155 subdir = libsdcc
1156 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1157 -am__aclocal_m4_deps = \
1158 - $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
1159 - $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
1160 - $(top_srcdir)/configure.ac
1161 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1162 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1163 $(ACLOCAL_M4)
1164 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
1165 @@ -413,8 +410,7 @@ libsdcc_a_SOURCES = char/divschar.c char/divuchar.c char/modschar.c \
1166 int/modsint.c int/moduint.c int/mulint.c long/divslong.c \
1167 long/divulong.c long/modslong.c long/modulong.c long/mullong.c \
1168 lregs/lrrest.c lregs/lrst.c stack/stack.S
1169 -AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1170 - -I$(top_srcdir)/../../non-free/include/pic16
1171 +AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
1172 #AM_CFLAGS += --no-optimize-goto
1173
1174 #AM_CFLAGS += --debug-ralloc
1175 @@ -428,11 +424,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1176 #AM_CFLAGS += --noinduction
1177 #AM_CFLAGS += --nojtbound
1178 #AM_CFLAGS += --noloopreverse
1179 -AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
1180 +AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
1181 --fomit-frame-pointer --obanksel=9 --denable-peeps \
1182 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
1183 -AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
1184 - -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
1185 +AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
1186 all: all-am
1187
1188 .SUFFIXES:
1189 diff --git a/device/lib/pic16/startup/Makefile.in b/device/lib/pic16/startup/Makefile.in
1190 index 2e59220..b213866 100644
1191 --- a/device/lib/pic16/startup/Makefile.in
1192 +++ b/device/lib/pic16/startup/Makefile.in
1193 @@ -89,10 +89,7 @@ PRE_UNINSTALL = :
1194 POST_UNINSTALL = :
1195 subdir = startup
1196 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1197 -am__aclocal_m4_deps = \
1198 - $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
1199 - $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
1200 - $(top_srcdir)/configure.ac
1201 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1202 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1203 $(ACLOCAL_M4)
1204 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
1205 @@ -308,8 +305,7 @@ libcrt0iz_a_SOURCES = crt0iz.c
1206 # Force installation of .o files into $libdir
1207 crtdir = $(libdir)
1208 crt_DATA = crt0.o crt0i.o crt0iz.o
1209 -AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1210 - -I$(top_srcdir)/../../non-free/include/pic16
1211 +AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
1212 #AM_CFLAGS += --no-optimize-goto
1213
1214 #AM_CFLAGS += --debug-ralloc
1215 @@ -323,11 +319,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1216 #AM_CFLAGS += --noinduction
1217 #AM_CFLAGS += --nojtbound
1218 #AM_CFLAGS += --noloopreverse
1219 -AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
1220 +AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
1221 --fomit-frame-pointer --obanksel=9 --denable-peeps \
1222 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
1223 -AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
1224 - -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
1225 +AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
1226 all: all-am
1227
1228 .SUFFIXES:
1229 diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt
1230 index 76a6f42..0f92463 100644
1231 --- a/doc/INSTALL.txt
1232 +++ b/doc/INSTALL.txt
1233 @@ -18,9 +18,7 @@ To install:
1234
1235 This will install sdcc binaries into: /usr/local/bin/
1236 header files into: /usr/local/share/sdcc/include/
1237 -non-free header files into: /usr/local/share/sdcc/non-free/include/
1238 library files into: /usr/local/share/sdcc/lib/
1239 -non-free library files into: /usr/local/share/sdcc/non-free/lib/
1240 and documentation into: /usr/local/share/sdcc/doc/
1241
1242 You can test the install by entering:
1243 @@ -44,9 +42,7 @@ To install:
1244
1245 By default this will install sdcc binaries into: C:\Program Files\SDCC\bin\
1246 header files into: C:\Program Files\SDCC\include\
1247 -non-free header files into: C:\Program Files\SDCC\non-free\include\
1248 library files into: C:\Program Files\SDCC\lib\
1249 -non-free library files into: C:\Program Files\SDCC\non-free\lib\
1250 and documentation into: C:\Program Files\SDCC\doc\
1251
1252 You can test the install by opening a DOS box and entering:
1253 @@ -75,9 +71,7 @@ To install:
1254
1255 This will install sdcc binaries into: /Developer/sdcc/bin/
1256 header files into: /Developer/sdcc/share/sdcc/include/
1257 -non-free header files into: /Developer/sdcc/share/sdcc/non-free/include/
1258 library files into: /Developer/sdcc/share/sdcc/lib/
1259 -non-free library files into: /Developer/sdcc/share/sdcc/non-free/lib/
1260 and documentation into: /Developer/sdcc/share/sdcc/doc/
1261
1262 You can test the install by entering:
1263 diff --git a/doc/README.txt b/doc/README.txt
1264 index 88f8c98..a36db81 100644
1265 --- a/doc/README.txt
1266 +++ b/doc/README.txt
1267 @@ -35,10 +35,9 @@ Exception are pic device libraries and header files which are derived
1268 from Microchip header (.inc) and linker script (.lkr) files. Microchip
1269 requires that "The header files should state that they are only to be
1270 used with authentic Microchip devices" which makes them incompatible
1271 -with the GPL. Pic device libraries and header files are located at
1272 -non-free/lib and non-free/include directories respectively. Sdcc should
1273 -be run with the --use-non-free command line option in order to include
1274 -non-free header files and libraries.
1275 +with the GPL. These non-free libraries and header files (and the build
1276 +and run-time options that enable their use) are omitted in the SDCC
1277 +package distributed with GNU Guix.
1278
1279 See:
1280
1281 diff --git a/doc/sdccman.lyx b/doc/sdccman.lyx
1282 index d18a509..b95bf61 100644
1283 --- a/doc/sdccman.lyx
1284 +++ b/doc/sdccman.lyx
1285 @@ -1092,54 +1092,9 @@ A possible exception are pic device libraries and header files which are
1286 to be used with authentic Microchip devices" which makes them incompatible
1287 with the GPL, if Microchip has any copyright in them (which might depend
1288 on local copyright laws).
1289 - Pic device libraries and header files are located at non-free/lib and non-free/
1290 -include directories respectively.
1291 - SDCC should be run with the
1292 -\series bold
1293 --
1294 -\begin_inset ERT
1295 -status collapsed
1296 -
1297 -\begin_layout Plain Layout
1298 -
1299 -
1300 -\backslash
1301 -/
1302 -\end_layout
1303 -
1304 -\end_inset
1305 -
1306 --
1307 -\series default
1308 -use-non-free
1309 -\series bold
1310 -
1311 -\begin_inset Index idx
1312 -status collapsed
1313 -
1314 -\begin_layout Plain Layout
1315 --
1316 -\begin_inset ERT
1317 -status collapsed
1318 -
1319 -\begin_layout Plain Layout
1320 -
1321 -
1322 -\backslash
1323 -/
1324 -\end_layout
1325 -
1326 -\end_inset
1327 -
1328 --use-non-free
1329 -\end_layout
1330 -
1331 -\end_inset
1332 -
1333 -
1334 -\series default
1335 - command line option in order to include non-free header files and libraries.
1336 -
1337 + These non-free libraries and header files (and the build and run-time options
1338 + that enable their use) are omitted in the SDCC package distributed with
1339 + GNU Guix.
1340 \end_layout
1341
1342 \begin_layout Itemize
1343 @@ -2870,18 +2825,6 @@ include_dir_suffix environment variable, see table below
1344 \end_inset
1345
1346
1347 -\begin_inset space ~
1348 -\end_inset
1349 -
1350 -non_free_include_dir_suffix environment variable, see table below
1351 -\end_layout
1352 -
1353 -\begin_layout Labeling
1354 -\labelwidthstring 00.00.0000
1355 -\begin_inset space ~
1356 -\end_inset
1357 -
1358 -
1359 \begin_inset space ~
1360 \end_inset
1361
1362 @@ -2894,22 +2837,6 @@ lib_dir_suffix environment variable, see table below
1363 \end_inset
1364
1365
1366 -\begin_inset space ~
1367 -\end_inset
1368 -
1369 -
1370 -\begin_inset space ~
1371 -\end_inset
1372 -
1373 -non_free_lib_dir_suffix environment variable, see table below
1374 -\end_layout
1375 -
1376 -\begin_layout Labeling
1377 -\labelwidthstring 00.00.0000
1378 -\begin_inset space ~
1379 -\end_inset
1380 -
1381 -
1382 \begin_inset space ~
1383 \end_inset
1384
1385 @@ -3408,7 +3335,7 @@ These defaults are:
1386 \begin_layout Standard
1387 \align center
1388 \begin_inset Tabular
1389 -<lyxtabular version="3" rows="11" columns="3">
1390 +<lyxtabular version="3" rows="9" columns="3">
1391 <features tabularvalignment="middle">
1392 <column alignment="block" valignment="top" width="0in">
1393 <column alignment="block" valignment="top" width="0in">
1394 @@ -3692,68 +3619,6 @@ sdcc/include
1395 include
1396 \end_layout
1397
1398 -\end_inset
1399 -</cell>
1400 -</row>
1401 -<row>
1402 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1403 -\begin_inset Text
1404 -
1405 -\begin_layout Plain Layout
1406 -
1407 -\emph on
1408 -NON_FREE_INCLUDE_DIR_SUFFIX
1409 -\end_layout
1410 -
1411 -\end_inset
1412 -</cell>
1413 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1414 -\begin_inset Text
1415 -
1416 -\begin_layout Plain Layout
1417 -sdcc/non-free/include
1418 -\end_layout
1419 -
1420 -\end_inset
1421 -</cell>
1422 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1423 -\begin_inset Text
1424 -
1425 -\begin_layout Plain Layout
1426 -non-free/include
1427 -\end_layout
1428 -
1429 -\end_inset
1430 -</cell>
1431 -</row>
1432 -<row>
1433 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1434 -\begin_inset Text
1435 -
1436 -\begin_layout Plain Layout
1437 -
1438 -\emph on
1439 -LIB_DIR_SUFFIX
1440 -\end_layout
1441 -
1442 -\end_inset
1443 -</cell>
1444 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1445 -\begin_inset Text
1446 -
1447 -\begin_layout Plain Layout
1448 -sdcc/lib
1449 -\end_layout
1450 -
1451 -\end_inset
1452 -</cell>
1453 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1454 -\begin_inset Text
1455 -
1456 -\begin_layout Plain Layout
1457 -lib
1458 -\end_layout
1459 -
1460 \end_inset
1461 </cell>
1462 </row>
1463 @@ -3764,7 +3629,7 @@ lib
1464 \begin_layout Plain Layout
1465
1466 \emph on
1467 -NON_FREE_LIB_DIR_SUFFIX
1468 +LIB_DIR_SUFFIX
1469 \end_layout
1470
1471 \end_inset
1472 @@ -3773,7 +3638,7 @@ NON_FREE_LIB_DIR_SUFFIX
1473 \begin_inset Text
1474
1475 \begin_layout Plain Layout
1476 -sdcc/non-free/lib
1477 +sdcc/lib
1478 \end_layout
1479
1480 \end_inset
1481 @@ -3782,7 +3647,7 @@ sdcc/non-free/lib
1482 \begin_inset Text
1483
1484 \begin_layout Plain Layout
1485 -non-free/lib
1486 +lib
1487 \end_layout
1488
1489 \end_inset
1490 @@ -4181,20 +4046,6 @@ include
1491 \end_inset
1492
1493
1494 -\backslash
1495 -
1496 -\begin_inset Newline newline
1497 -\end_inset
1498 -
1499 -non_free_include_dir_suffix=
1500 -\begin_inset Quotes srd
1501 -\end_inset
1502 -
1503 -non-free/include
1504 -\begin_inset Quotes srd
1505 -\end_inset
1506 -
1507 -
1508 \backslash
1509
1510 \begin_inset Newline newline
1511 @@ -4209,20 +4060,6 @@ lib
1512 \end_inset
1513
1514
1515 -\backslash
1516 -
1517 -\begin_inset Newline newline
1518 -\end_inset
1519 -
1520 -non_free_lib_dir_suffix=
1521 -\begin_inset Quotes srd
1522 -\end_inset
1523 -
1524 -non-free/lib
1525 -\begin_inset Quotes srd
1526 -\end_inset
1527 -
1528 -
1529 \backslash
1530
1531 \begin_inset Newline newline
1532 @@ -4403,20 +4240,6 @@ include
1533 \end_inset
1534
1535
1536 -\backslash
1537 -
1538 -\begin_inset Newline newline
1539 -\end_inset
1540 -
1541 -non_free_include_dir_suffix=
1542 -\begin_inset Quotes srd
1543 -\end_inset
1544 -
1545 -non-free/include
1546 -\begin_inset Quotes srd
1547 -\end_inset
1548 -
1549 -
1550 \backslash
1551
1552 \begin_inset Newline newline
1553 @@ -4431,20 +4254,6 @@ lib
1554 \end_inset
1555
1556
1557 -\backslash
1558 -
1559 -\begin_inset Newline newline
1560 -\end_inset
1561 -
1562 -non_free_lib_dir_suffix=
1563 -\begin_inset Quotes srd
1564 -\end_inset
1565 -
1566 -non-free/lib
1567 -\begin_inset Quotes srd
1568 -\end_inset
1569 -
1570 -
1571 \backslash
1572
1573 \begin_inset Newline newline
1574 @@ -4541,7 +4350,7 @@ Install paths
1575 \begin_layout Standard
1576 \align center
1577 \begin_inset Tabular
1578 -<lyxtabular version="3" rows="7" columns="4">
1579 +<lyxtabular version="3" rows="5" columns="4">
1580 <features tabularvalignment="middle">
1581 <column alignment="left" valignment="top">
1582 <column alignment="left" valignment="top" width="4.5cm">
1583 @@ -4697,64 +4506,6 @@ include
1584 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1585 \begin_inset Text
1586
1587 -\begin_layout Plain Layout
1588 -Non-free include files
1589 -\end_layout
1590 -
1591 -\end_inset
1592 -</cell>
1593 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1594 -\begin_inset Text
1595 -
1596 -\begin_layout Plain Layout
1597 -
1598 -\emph on
1599 -$DATADIR/non-free/
1600 -\emph default
1601 -
1602 -\begin_inset Newline newline
1603 -\end_inset
1604 -
1605 -
1606 -\emph on
1607 -$INCLUDE_DIR_SUFFIX
1608 -\end_layout
1609 -
1610 -\end_inset
1611 -</cell>
1612 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1613 -\begin_inset Text
1614 -
1615 -\begin_layout Plain Layout
1616 -/usr/local/share/
1617 -\begin_inset Newline newline
1618 -\end_inset
1619 -
1620 -sdcc/non-free/include
1621 -\end_layout
1622 -
1623 -\end_inset
1624 -</cell>
1625 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1626 -\begin_inset Text
1627 -
1628 -\begin_layout Plain Layout
1629 -
1630 -\backslash
1631 -sdcc
1632 -\backslash
1633 -non-free
1634 -\backslash
1635 -include
1636 -\end_layout
1637 -
1638 -\end_inset
1639 -</cell>
1640 -</row>
1641 -<row>
1642 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1643 -\begin_inset Text
1644 -
1645 \begin_layout Plain Layout
1646 Library file**
1647 \end_layout
1648 @@ -4804,64 +4555,6 @@ sdcc
1649 lib
1650 \end_layout
1651
1652 -\end_inset
1653 -</cell>
1654 -</row>
1655 -<row>
1656 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1657 -\begin_inset Text
1658 -
1659 -\begin_layout Plain Layout
1660 -Library file**
1661 -\end_layout
1662 -
1663 -\end_inset
1664 -</cell>
1665 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1666 -\begin_inset Text
1667 -
1668 -\begin_layout Plain Layout
1669 -
1670 -\emph on
1671 -$DATADIR/non-free/
1672 -\emph default
1673 -
1674 -\begin_inset Newline newline
1675 -\end_inset
1676 -
1677 -
1678 -\emph on
1679 -$LIB_DIR_SUFFIX
1680 -\end_layout
1681 -
1682 -\end_inset
1683 -</cell>
1684 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1685 -\begin_inset Text
1686 -
1687 -\begin_layout Plain Layout
1688 -/usr/local/share/
1689 -\begin_inset Newline newline
1690 -\end_inset
1691 -
1692 -sdcc/non-free/lib
1693 -\end_layout
1694 -
1695 -\end_inset
1696 -</cell>
1697 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1698 -\begin_inset Text
1699 -
1700 -\begin_layout Plain Layout
1701 -
1702 -\backslash
1703 -sdcc
1704 -\backslash
1705 -non-free
1706 -\backslash
1707 -lib
1708 -\end_layout
1709 -
1710 \end_inset
1711 </cell>
1712 </row>
1713 @@ -5184,7 +4877,7 @@ $PATH
1714 \begin_layout Standard
1715 \align center
1716 \begin_inset Tabular
1717 -<lyxtabular version="3" rows="9" columns="4">
1718 +<lyxtabular version="3" rows="6" columns="4">
1719 <features tabularvalignment="middle">
1720 <column alignment="block" valignment="top" width="0.5cm">
1721 <column alignment="block" valignment="top" width="4.8cm">
1722 @@ -5462,203 +5155,13 @@ include
1723 </cell>
1724 </row>
1725 <row>
1726 -<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
1727 +<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
1728 \begin_inset Text
1729
1730 \begin_layout Plain Layout
1731 5
1732 \end_layout
1733
1734 -\end_inset
1735 -</cell>
1736 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1737 -\begin_inset Text
1738 -
1739 -\begin_layout Plain Layout
1740 -
1741 -\emph on
1742 -$DATADIR/
1743 -\emph default
1744 -
1745 -\begin_inset Newline newline
1746 -\end_inset
1747 -
1748 -
1749 -\emph on
1750 -$INCLUDE_DIR_SUFFIX
1751 -\end_layout
1752 -
1753 -\end_inset
1754 -</cell>
1755 -<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
1756 -\begin_inset Text
1757 -
1758 -\begin_layout Plain Layout
1759 -/usr/local/share/
1760 -\begin_inset Newline newline
1761 -\end_inset
1762 -
1763 -sdcc/include
1764 -\end_layout
1765 -
1766 -\end_inset
1767 -</cell>
1768 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1769 -\begin_inset Text
1770 -
1771 -\begin_layout Plain Layout
1772 -(not on Win32)
1773 -\end_layout
1774 -
1775 -\end_inset
1776 -</cell>
1777 -</row>
1778 -<row>
1779 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1780 -\begin_inset Text
1781 -
1782 -\begin_layout Plain Layout
1783 -6
1784 -\end_layout
1785 -
1786 -\end_inset
1787 -</cell>
1788 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1789 -\begin_inset Text
1790 -
1791 -\begin_layout Plain Layout
1792 -$SDCC_HOME/
1793 -\begin_inset Newline newline
1794 -\end_inset
1795 -
1796 -
1797 -\emph on
1798 -$PREFIX2DATA_DIR/
1799 -\emph default
1800 -
1801 -\begin_inset Newline newline
1802 -\end_inset
1803 -
1804 -
1805 -\emph on
1806 -non-free/
1807 -\emph default
1808 -
1809 -\begin_inset Newline newline
1810 -\end_inset
1811 -
1812 -
1813 -\emph on
1814 -$INCLUDE_DIR_SUFFIX
1815 -\end_layout
1816 -
1817 -\end_inset
1818 -</cell>
1819 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1820 -\begin_inset Text
1821 -
1822 -\begin_layout Plain Layout
1823 -$SDCC_HOME/share/
1824 -\begin_inset Newline newline
1825 -\end_inset
1826 -
1827 -sdcc/non-free/include
1828 -\end_layout
1829 -
1830 -\end_inset
1831 -</cell>
1832 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1833 -\begin_inset Text
1834 -
1835 -\begin_layout Plain Layout
1836 -$SDCC_HOME
1837 -\backslash
1838 -non-free
1839 -\backslash
1840 -include
1841 -\end_layout
1842 -
1843 -\end_inset
1844 -</cell>
1845 -</row>
1846 -<row>
1847 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1848 -\begin_inset Text
1849 -
1850 -\begin_layout Plain Layout
1851 -7
1852 -\end_layout
1853 -
1854 -\end_inset
1855 -</cell>
1856 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1857 -\begin_inset Text
1858 -
1859 -\begin_layout Plain Layout
1860 -path(argv[0])/
1861 -\begin_inset Newline newline
1862 -\end_inset
1863 -
1864 -
1865 -\emph on
1866 -$BIN2DATADIR/
1867 -\emph default
1868 -
1869 -\begin_inset Newline newline
1870 -\end_inset
1871 -
1872 -
1873 -\emph on
1874 -non-free/
1875 -\emph default
1876 -
1877 -\begin_inset Newline newline
1878 -\end_inset
1879 -
1880 -
1881 -\emph on
1882 -$INCLUDE_DIR_SUFFIX
1883 -\end_layout
1884 -
1885 -\end_inset
1886 -</cell>
1887 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1888 -\begin_inset Text
1889 -
1890 -\begin_layout Plain Layout
1891 -path(argv[0])/../
1892 -\begin_inset Newline newline
1893 -\end_inset
1894 -
1895 -sdcc/non-free/include
1896 -\end_layout
1897 -
1898 -\end_inset
1899 -</cell>
1900 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1901 -\begin_inset Text
1902 -
1903 -\begin_layout Plain Layout
1904 -path(argv[0])
1905 -\backslash
1906 -..
1907 -\backslash
1908 -non-free
1909 -\backslash
1910 -include
1911 -\end_layout
1912 -
1913 -\end_inset
1914 -</cell>
1915 -</row>
1916 -<row>
1917 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
1918 -\begin_inset Text
1919 -
1920 -\begin_layout Plain Layout
1921 -8
1922 -\end_layout
1923 -
1924 \end_inset
1925 </cell>
1926 <cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
1927 @@ -5674,21 +5177,13 @@ $DATADIR/
1928 \end_inset
1929
1930
1931 -\emph on
1932 -non-free/
1933 -\emph default
1934 -
1935 -\begin_inset Newline newline
1936 -\end_inset
1937 -
1938 -
1939 \emph on
1940 $INCLUDE_DIR_SUFFIX
1941 \end_layout
1942
1943 \end_inset
1944 </cell>
1945 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
1946 +<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
1947 \begin_inset Text
1948
1949 \begin_layout Plain Layout
1950 @@ -5696,7 +5191,7 @@ $INCLUDE_DIR_SUFFIX
1951 \begin_inset Newline newline
1952 \end_inset
1953
1954 -sdcc/non-free/include
1955 +sdcc/include
1956 \end_layout
1957
1958 \end_inset
1959 @@ -5794,7 +5289,7 @@ model
1960 \begin_layout Standard
1961 \align center
1962 \begin_inset Tabular
1963 -<lyxtabular version="3" rows="10" columns="4">
1964 +<lyxtabular version="3" rows="6" columns="4">
1965 <features tabularvalignment="middle">
1966 <column alignment="block" valignment="top" width="0.5cm">
1967 <column alignment="block" valignment="top" width="4.5cm">
1968 @@ -6074,7 +5569,7 @@ lib
1969 </cell>
1970 </row>
1971 <row>
1972 -<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
1973 +<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
1974 \begin_inset Text
1975
1976 \begin_layout Plain Layout
1977 @@ -6083,7 +5578,7 @@ lib
1978
1979 \end_inset
1980 </cell>
1981 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1982 +<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
1983 \begin_inset Text
1984
1985 \begin_layout Plain Layout
1986 @@ -6114,7 +5609,7 @@ $LIB_DIR_SUFFIX/
1987
1988 \end_inset
1989 </cell>
1990 -<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
1991 +<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
1992 \begin_inset Text
1993
1994 \begin_layout Plain Layout
1995 @@ -6129,7 +5624,7 @@ lib/
1996
1997 \end_inset
1998 </cell>
1999 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2000 +<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2001 \begin_inset Text
2002
2003 \begin_layout Plain Layout
2004 @@ -6152,308 +5647,6 @@ lib
2005 <model>
2006 \end_layout
2007
2008 -\end_inset
2009 -</cell>
2010 -</row>
2011 -<row>
2012 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2013 -\begin_inset Text
2014 -
2015 -\begin_layout Plain Layout
2016 -6
2017 -\end_layout
2018 -
2019 -\end_inset
2020 -</cell>
2021 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2022 -\begin_inset Text
2023 -
2024 -\begin_layout Plain Layout
2025 -
2026 -\emph on
2027 -$DATADIR/non-free/
2028 -\emph default
2029 -
2030 -\begin_inset Newline newline
2031 -\end_inset
2032 -
2033 -
2034 -\emph on
2035 -$LIB_DIR_SUFFIX/
2036 -\emph default
2037 -
2038 -\begin_inset Newline newline
2039 -\end_inset
2040 -
2041 -
2042 -\emph on
2043 -<model>
2044 -\end_layout
2045 -
2046 -\end_inset
2047 -</cell>
2048 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2049 -\begin_inset Text
2050 -
2051 -\begin_layout Plain Layout
2052 -/usr/local/share/sdcc/
2053 -\begin_inset Newline newline
2054 -\end_inset
2055 -
2056 -lib/
2057 -\emph on
2058 -<model>
2059 -\end_layout
2060 -
2061 -\end_inset
2062 -</cell>
2063 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2064 -\begin_inset Text
2065 -
2066 -\begin_layout Plain Layout
2067 -(not on Win32)
2068 -\end_layout
2069 -
2070 -\end_inset
2071 -</cell>
2072 -</row>
2073 -<row>
2074 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2075 -\begin_inset Text
2076 -
2077 -\begin_layout Plain Layout
2078 -7
2079 -\end_layout
2080 -
2081 -\end_inset
2082 -</cell>
2083 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2084 -\begin_inset Text
2085 -
2086 -\begin_layout Plain Layout
2087 -$SDCC_HOME/
2088 -\begin_inset Newline newline
2089 -\end_inset
2090 -
2091 -
2092 -\emph on
2093 -$PREFIX2DATA_DIR/
2094 -\emph default
2095 -
2096 -\begin_inset Newline newline
2097 -\end_inset
2098 -
2099 -
2100 -\emph on
2101 -non-free/
2102 -\emph default
2103 -
2104 -\begin_inset Newline newline
2105 -\end_inset
2106 -
2107 -
2108 -\emph on
2109 -$LIB_DIR_SUFFIX/
2110 -\emph default
2111 -
2112 -\begin_inset Newline newline
2113 -\end_inset
2114 -
2115 -
2116 -\emph on
2117 -<model>
2118 -\end_layout
2119 -
2120 -\end_inset
2121 -</cell>
2122 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2123 -\begin_inset Text
2124 -
2125 -\begin_layout Plain Layout
2126 -$SDCC_HOME/share/sdcc/
2127 -\begin_inset Newline newline
2128 -\end_inset
2129 -
2130 -non-free/lib/
2131 -\emph on
2132 -<model>
2133 -\end_layout
2134 -
2135 -\end_inset
2136 -</cell>
2137 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2138 -\begin_inset Text
2139 -
2140 -\begin_layout Plain Layout
2141 -$SDCC_HOME
2142 -\backslash
2143 -
2144 -\begin_inset Newline newline
2145 -\end_inset
2146 -
2147 -lib
2148 -\backslash
2149 -non-free
2150 -\emph on
2151 -
2152 -\backslash
2153 -<model>
2154 -\end_layout
2155 -
2156 -\end_inset
2157 -</cell>
2158 -</row>
2159 -<row>
2160 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2161 -\begin_inset Text
2162 -
2163 -\begin_layout Plain Layout
2164 -8
2165 -\end_layout
2166 -
2167 -\end_inset
2168 -</cell>
2169 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2170 -\begin_inset Text
2171 -
2172 -\begin_layout Plain Layout
2173 -path(argv[0])/
2174 -\begin_inset Newline newline
2175 -\end_inset
2176 -
2177 -
2178 -\emph on
2179 -$BIN2DATADIR/
2180 -\emph default
2181 -
2182 -\begin_inset Newline newline
2183 -\end_inset
2184 -
2185 -
2186 -\emph on
2187 -non-free/
2188 -\emph default
2189 -
2190 -\begin_inset Newline newline
2191 -\end_inset
2192 -
2193 -
2194 -\emph on
2195 -$LIB_DIR_SUFFIX/
2196 -\emph default
2197 -
2198 -\begin_inset Newline newline
2199 -\end_inset
2200 -
2201 -
2202 -\emph on
2203 -<model>
2204 -\end_layout
2205 -
2206 -\end_inset
2207 -</cell>
2208 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2209 -\begin_inset Text
2210 -
2211 -\begin_layout Plain Layout
2212 -path(argv[0])/../sdcc/
2213 -\begin_inset Newline newline
2214 -\end_inset
2215 -
2216 -non-free/lib/
2217 -\emph on
2218 -<model>
2219 -\end_layout
2220 -
2221 -\end_inset
2222 -</cell>
2223 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2224 -\begin_inset Text
2225 -
2226 -\begin_layout Plain Layout
2227 -path(argv[0])
2228 -\backslash
2229 -..
2230 -\backslash
2231 -
2232 -\begin_inset Newline newline
2233 -\end_inset
2234 -
2235 -lib
2236 -\backslash
2237 -non-free
2238 -\emph on
2239 -
2240 -\backslash
2241 -<model>
2242 -\end_layout
2243 -
2244 -\end_inset
2245 -</cell>
2246 -</row>
2247 -<row>
2248 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2249 -\begin_inset Text
2250 -
2251 -\begin_layout Plain Layout
2252 -9
2253 -\end_layout
2254 -
2255 -\end_inset
2256 -</cell>
2257 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2258 -\begin_inset Text
2259 -
2260 -\begin_layout Plain Layout
2261 -
2262 -\emph on
2263 -$DATADIR/non-free/
2264 -\emph default
2265 -
2266 -\begin_inset Newline newline
2267 -\end_inset
2268 -
2269 -
2270 -\emph on
2271 -$LIB_DIR_SUFFIX/
2272 -\emph default
2273 -
2274 -\begin_inset Newline newline
2275 -\end_inset
2276 -
2277 -
2278 -\emph on
2279 -<model>
2280 -\end_layout
2281 -
2282 -\end_inset
2283 -</cell>
2284 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2285 -\begin_inset Text
2286 -
2287 -\begin_layout Plain Layout
2288 -/usr/local/share/sdcc/
2289 -\begin_inset Newline newline
2290 -\end_inset
2291 -
2292 -non-free/lib/
2293 -\begin_inset Newline newline
2294 -\end_inset
2295 -
2296 -
2297 -\emph on
2298 -<model>
2299 -\end_layout
2300 -
2301 -\end_inset
2302 -</cell>
2303 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2304 -\begin_inset Text
2305 -
2306 -\begin_layout Plain Layout
2307 -(not on Win32)
2308 -\end_layout
2309 -
2310 \end_inset
2311 </cell>
2312 </row>
2313 @@ -8717,14 +7910,6 @@ In <installdir>/share/sdcc/include
2314 the include files
2315 \end_layout
2316
2317 -\begin_layout Standard
2318 -In <installdir>/share/sdcc/non-free/include
2319 -\end_layout
2320 -
2321 -\begin_layout Itemize
2322 -the non-free include files
2323 -\end_layout
2324 -
2325 \begin_layout Standard
2326 In <installdir>/share/sdcc/lib
2327 \end_layout
2328 @@ -8733,14 +7918,6 @@ In <installdir>/share/sdcc/lib
2329 the src and target subdirectories with the precompiled relocatables.
2330 \end_layout
2331
2332 -\begin_layout Standard
2333 -In <installdir>/share/sdcc/non-free/lib
2334 -\end_layout
2335 -
2336 -\begin_layout Itemize
2337 -the src and target subdirectories with the non-free precompiled relocatables.
2338 -\end_layout
2339 -
2340 \begin_layout Standard
2341 In <installdir>/share/sdcc/doc
2342 \end_layout
2343 @@ -15254,66 +14431,6 @@ splint
2344 myprogram.c
2345 \end_layout
2346
2347 -\begin_layout Labeling
2348 -\labelwidthstring 00.00.0000
2349 -
2350 -\series bold
2351 --
2352 -\begin_inset ERT
2353 -status collapsed
2354 -
2355 -\begin_layout Plain Layout
2356 -
2357 -
2358 -\backslash
2359 -/
2360 -\end_layout
2361 -
2362 -\end_inset
2363 -
2364 --use-non-free
2365 -\series default
2366 -
2367 -\begin_inset Index idx
2368 -status collapsed
2369 -
2370 -\begin_layout Plain Layout
2371 --
2372 -\begin_inset ERT
2373 -status collapsed
2374 -
2375 -\begin_layout Plain Layout
2376 -
2377 -
2378 -\backslash
2379 -/
2380 -\end_layout
2381 -
2382 -\end_inset
2383 -
2384 --use-non-free
2385 -\end_layout
2386 -
2387 -\end_inset
2388 -
2389 -
2390 -\begin_inset CommandInset label
2391 -LatexCommand label
2392 -name "lyx:--use-non-free"
2393 -
2394 -\end_inset
2395 -
2396 - Search / include non-free licensed libraries and header files, located
2397 - under the non-free directory - see section
2398 -\begin_inset CommandInset ref
2399 -LatexCommand ref
2400 -reference "subsec:Search-Paths"
2401 -
2402 -\end_inset
2403 -
2404 -
2405 -\end_layout
2406 -
2407 \begin_layout Subsection
2408 Linker Options
2409 \begin_inset Index idx
2410 @@ -44656,66 +43773,9 @@ http://sourceforge.net/projects/gputils
2411 Pic device specific header and c source files are automatically generated
2412 from MPLAB include files, which are published by Microchip with a special
2413 requirement that they are only to be used with authentic Microchip devices.
2414 - This reqirement prevents to publish generated header and c source files
2415 - under the GPL compatible license, so they are located in non-free directory
2416 - (see section
2417 -\begin_inset CommandInset ref
2418 -LatexCommand ref
2419 -reference "subsec:Search-Paths"
2420 -
2421 -\end_inset
2422 -
2423 -).
2424 - In order to include them in include and library search paths, the
2425 -\series bold
2426 --
2427 -\begin_inset ERT
2428 -status collapsed
2429 -
2430 -\begin_layout Plain Layout
2431 -
2432 -
2433 -\backslash
2434 -/
2435 -\end_layout
2436 -
2437 -\end_inset
2438 -
2439 --use-non-free
2440 -\begin_inset Index idx
2441 -status collapsed
2442 -
2443 -\begin_layout Plain Layout
2444 --
2445 -\begin_inset ERT
2446 -status collapsed
2447 -
2448 -\begin_layout Plain Layout
2449 -
2450 -
2451 -\backslash
2452 -/
2453 -\end_layout
2454 -
2455 -\end_inset
2456 -
2457 --use-non-free
2458 -\end_layout
2459 -
2460 -\end_inset
2461 -
2462 -
2463 -\series default
2464 - command line option should be defined.
2465 -\begin_inset Newline newline
2466 -\end_inset
2467 -
2468 -
2469 -\begin_inset Newline newline
2470 -\end_inset
2471 -
2472 -NOTE: the compiled code, which use non-free pic device specific libraries,
2473 - is not GPL compatible!
2474 + As this restriction is incompatible with the goal of software freedom,
2475 + header files and libraries generated from these files are not included
2476 + in the SDCC package distributed with Guix.
2477 \begin_inset Newline newline
2478 \end_inset
2479
2480 @@ -44769,7 +43829,7 @@ Makefile
2481 \begin_inset space ~
2482 \end_inset
2483
2484 -sdcc -V --use-non-free -mpic14 -p16f877 -c $<
2485 +sdcc -V -mpic14 -p16f877 -c $<
2486 \begin_inset Newline newline
2487 \end_inset
2488
2489 @@ -44863,7 +43923,7 @@ Makefile
2490 \begin_inset space ~
2491 \end_inset
2492
2493 -sdcc -S -V --use-non-free -mpic14 -p16f877 $<
2494 +sdcc -S -V -mpic14 -p16f877 $<
2495 \begin_inset Newline newline
2496 \end_inset
2497
2498 @@ -45145,47 +44205,6 @@ status collapsed
2499 \begin_layout Plain Layout
2500
2501
2502 -\backslash
2503 -/
2504 -\end_layout
2505 -
2506 -\end_inset
2507 -
2508 --use-non-free
2509 -\begin_inset Index idx
2510 -status collapsed
2511 -
2512 -\begin_layout Plain Layout
2513 -PIC14!Options!-
2514 -\begin_inset ERT
2515 -status collapsed
2516 -
2517 -\begin_layout Plain Layout
2518 -
2519 -
2520 -\backslash
2521 -/
2522 -\end_layout
2523 -
2524 -\end_inset
2525 -
2526 --use-non-free
2527 -\end_layout
2528 -
2529 -\end_inset
2530 -
2531 - make non-free device headers and libraries available in the compiler's
2532 - search paths (implicit -I and -L options)
2533 -\end_layout
2534 -
2535 -\begin_layout Description
2536 --
2537 -\begin_inset ERT
2538 -status collapsed
2539 -
2540 -\begin_layout Plain Layout
2541 -
2542 -
2543 \backslash
2544 /
2545 \end_layout
2546 @@ -46058,47 +45077,6 @@ status collapsed
2547 -all-callee-saves
2548 \end_layout
2549
2550 -\begin_layout Description
2551 --
2552 -\begin_inset ERT
2553 -status collapsed
2554 -
2555 -\begin_layout Plain Layout
2556 -
2557 -
2558 -\backslash
2559 -/
2560 -\end_layout
2561 -
2562 -\end_inset
2563 -
2564 --use-non-free
2565 -\begin_inset Index idx
2566 -status collapsed
2567 -
2568 -\begin_layout Plain Layout
2569 -PIC16!Options!-
2570 -\begin_inset ERT
2571 -status collapsed
2572 -
2573 -\begin_layout Plain Layout
2574 -
2575 -
2576 -\backslash
2577 -/
2578 -\end_layout
2579 -
2580 -\end_inset
2581 -
2582 --use-non-free
2583 -\end_layout
2584 -
2585 -\end_inset
2586 -
2587 - Make non-free device headers and libraries available in the compiler's
2588 - search paths (implicit -I and -L options).
2589 -\end_layout
2590 -
2591 \begin_layout Subsection
2592 Port Specific Options
2593 \begin_inset Index idx
2594 @@ -47375,188 +46353,6 @@ Linker
2595 \end_inset
2596
2597
2598 -\end_layout
2599 -
2600 -\begin_layout Standard
2601 -If the
2602 -\series bold
2603 --
2604 -\begin_inset ERT
2605 -status collapsed
2606 -
2607 -\begin_layout Plain Layout
2608 -
2609 -
2610 -\backslash
2611 -/
2612 -\end_layout
2613 -
2614 -\end_inset
2615 -
2616 --use-non-free
2617 -\begin_inset Index idx
2618 -status collapsed
2619 -
2620 -\begin_layout Plain Layout
2621 --
2622 -\begin_inset ERT
2623 -status collapsed
2624 -
2625 -\begin_layout Plain Layout
2626 -
2627 -
2628 -\backslash
2629 -/
2630 -\end_layout
2631 -
2632 -\end_inset
2633 -
2634 --use-non-free
2635 -\end_layout
2636 -
2637 -\end_inset
2638 -
2639 -
2640 -\series default
2641 - command line option is specified, non-free directories are searched:
2642 -\begin_inset Newline newline
2643 -\end_inset
2644 -
2645 -
2646 -\begin_inset Separator latexpar
2647 -\end_inset
2648 -
2649 -
2650 -\end_layout
2651 -
2652 -\begin_layout Standard
2653 -\align center
2654 -\begin_inset Tabular
2655 -<lyxtabular version="3" rows="3" columns="4">
2656 -<features tabularvalignment="middle">
2657 -<column alignment="center" valignment="top">
2658 -<column alignment="center" valignment="top">
2659 -<column alignment="center" valignment="top">
2660 -<column alignment="center" valignment="top">
2661 -<row>
2662 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2663 -\begin_inset Text
2664 -
2665 -\begin_layout Plain Layout
2666 -Directory
2667 -\end_layout
2668 -
2669 -\end_inset
2670 -</cell>
2671 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2672 -\begin_inset Text
2673 -
2674 -\begin_layout Plain Layout
2675 -Description
2676 -\end_layout
2677 -
2678 -\end_inset
2679 -</cell>
2680 -<cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
2681 -\begin_inset Text
2682 -
2683 -\begin_layout Plain Layout
2684 -Target
2685 -\end_layout
2686 -
2687 -\end_inset
2688 -</cell>
2689 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2690 -\begin_inset Text
2691 -
2692 -\begin_layout Plain Layout
2693 -Command prefix
2694 -\end_layout
2695 -
2696 -\end_inset
2697 -</cell>
2698 -</row>
2699 -<row>
2700 -<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2701 -\begin_inset Text
2702 -
2703 -\begin_layout Plain Layout
2704 -PREFIX/sdcc/non-free/include/pic16
2705 -\end_layout
2706 -
2707 -\end_inset
2708 -</cell>
2709 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2710 -\begin_inset Text
2711 -
2712 -\begin_layout Plain Layout
2713 -PIC16 specific non-free headers
2714 -\end_layout
2715 -
2716 -\end_inset
2717 -</cell>
2718 -<cell alignment="center" valignment="top" topline="true" usebox="none">
2719 -\begin_inset Text
2720 -
2721 -\begin_layout Plain Layout
2722 -Compiler
2723 -\end_layout
2724 -
2725 -\end_inset
2726 -</cell>
2727 -<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2728 -\begin_inset Text
2729 -
2730 -\begin_layout Plain Layout
2731 --I
2732 -\end_layout
2733 -
2734 -\end_inset
2735 -</cell>
2736 -</row>
2737 -<row>
2738 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2739 -\begin_inset Text
2740 -
2741 -\begin_layout Plain Layout
2742 -PREFIX/sdcc/non-free/lib/pic16
2743 -\end_layout
2744 -
2745 -\end_inset
2746 -</cell>
2747 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2748 -\begin_inset Text
2749 -
2750 -\begin_layout Plain Layout
2751 -PIC16 specific non-free libraries
2752 -\end_layout
2753 -
2754 -\end_inset
2755 -</cell>
2756 -<cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
2757 -\begin_inset Text
2758 -
2759 -\begin_layout Plain Layout
2760 -Linker
2761 -\end_layout
2762 -
2763 -\end_inset
2764 -</cell>
2765 -<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2766 -\begin_inset Text
2767 -
2768 -\begin_layout Plain Layout
2769 --L
2770 -\end_layout
2771 -
2772 -\end_inset
2773 -</cell>
2774 -</row>
2775 -</lyxtabular>
2776 -
2777 -\end_inset
2778 -
2779 -
2780 \end_layout
2781
2782 \begin_layout Subsection
2783 @@ -48252,66 +47048,9 @@ name "subsec:PIC16_Header-Files-and-Libraries"
2784 Pic device specific header and c source files are automatically generated
2785 from MPLAB include files, which are published by Microchip with a special
2786 requirement that they are only to be used with authentic Microchip devices.
2787 - This requirement prevents to publish generated header and c source files
2788 - under the GPL compatible license, so they are located in the non-free directory
2789 - (see section
2790 -\begin_inset CommandInset ref
2791 -LatexCommand ref
2792 -reference "subsec:Search-Paths"
2793 -
2794 -\end_inset
2795 -
2796 -).
2797 - In order to include them in include and library search paths, the
2798 -\series bold
2799 --
2800 -\begin_inset ERT
2801 -status collapsed
2802 -
2803 -\begin_layout Plain Layout
2804 -
2805 -
2806 -\backslash
2807 -/
2808 -\end_layout
2809 -
2810 -\end_inset
2811 -
2812 --use-non-free
2813 -\begin_inset Index idx
2814 -status collapsed
2815 -
2816 -\begin_layout Plain Layout
2817 --
2818 -\begin_inset ERT
2819 -status collapsed
2820 -
2821 -\begin_layout Plain Layout
2822 -
2823 -
2824 -\backslash
2825 -/
2826 -\end_layout
2827 -
2828 -\end_inset
2829 -
2830 --use-non-free
2831 -\end_layout
2832 -
2833 -\end_inset
2834 -
2835 -
2836 -\series default
2837 - command line option should be defined.
2838 -\begin_inset Newline newline
2839 -\end_inset
2840 -
2841 -
2842 -\begin_inset Newline newline
2843 -\end_inset
2844 -
2845 -NOTE: the compiled code, which use non-free pic device specific libraries,
2846 - is not GPL compatible!
2847 + As this restriction is incompatible with the goal of software freedom,
2848 + header files and libraries generated from these files are not included
2849 + in the SDCC package distributed with Guix.
2850 \end_layout
2851
2852 \begin_layout Subsection
2853 @@ -48557,195 +47296,6 @@ vfprintf.c
2854 should also work, but is untested.
2855 \end_layout
2856
2857 -\begin_layout Subsection
2858 -Adding New Devices to the Port
2859 -\end_layout
2860 -
2861 -\begin_layout Standard
2862 -Adding support for a new 16
2863 -\begin_inset ERT
2864 -status collapsed
2865 -
2866 -\begin_layout Plain Layout
2867 -
2868 -
2869 -\backslash
2870 -,
2871 -\end_layout
2872 -
2873 -\end_inset
2874 -
2875 -bit PIC MCU requires the following steps:
2876 -\end_layout
2877 -
2878 -\begin_layout Enumerate
2879 -Create picDEVICE.c and picDEVICE.h from pDEVICE.inc using
2880 -\begin_inset Newline newline
2881 -\end_inset
2882 -
2883 -
2884 -\family typewriter
2885 -perl /path/to/sdcc/support/scripts/inc2h-pic16.pl
2886 -\backslash
2887 -
2888 -\begin_inset Newline newline
2889 -\end_inset
2890 -
2891 -/path/to/gputils/header/pDEVICE.inc
2892 -\end_layout
2893 -
2894 -\begin_layout Enumerate
2895 -
2896 -\family typewriter
2897 -mv picDEVICE.h /path/to/sdcc/device/non-free/include/pic16
2898 -\end_layout
2899 -
2900 -\begin_layout Enumerate
2901 -
2902 -\family typewriter
2903 -mv picDEVICE.c /path/to/sdcc/device/non-free/lib/pic16/libdev
2904 -\end_layout
2905 -
2906 -\begin_layout Enumerate
2907 -Either
2908 -\begin_inset Separator latexpar
2909 -\end_inset
2910 -
2911 -
2912 -\end_layout
2913 -
2914 -\begin_deeper
2915 -\begin_layout Enumerate
2916 -add the new device to
2917 -\family typewriter
2918 -/path/to/sdcc/device/lib/pic16/libio/*.ignore
2919 -\family default
2920 - to suppress building any of the I/O libraries for the new device
2921 -\begin_inset Foot
2922 -status collapsed
2923 -
2924 -\begin_layout Plain Layout
2925 -In fact, the
2926 -\family typewriter
2927 -.ignore
2928 -\family default
2929 - files are only used when auto-generating
2930 -\family typewriter
2931 -Makefile.am
2932 -\family default
2933 - using the
2934 -\family typewriter
2935 -.../libio/mkmk.sh
2936 -\family default
2937 - script.
2938 -\end_layout
2939 -
2940 -\end_inset
2941 -
2942 -, or
2943 -\end_layout
2944 -
2945 -\begin_layout Enumerate
2946 -add the device (family) to
2947 -\family typewriter
2948 -/path/to/sdcc/support/scripts/pic18fam-h-gen.pl
2949 -\family default
2950 - to assign I/O styles, run the
2951 -\family typewriter
2952 -pic18fam-h-gen.pl
2953 -\family default
2954 - script to generate
2955 -\family typewriter
2956 -pic18fam.h.gen
2957 -\family default
2958 -, replace your existing
2959 -\family typewriter
2960 -pic18fam.h
2961 -\family default
2962 - with the generated file, and (if required) implement new I/O styles in
2963 -
2964 -\family typewriter
2965 -/path/to/sdcc/device/include/pic16/{adc,i2c,usart}.h
2966 -\family default
2967 - and
2968 -\family typewriter
2969 -/path/to/sdcc/device/lib/pic16/libio/*/*.
2970 -\end_layout
2971 -
2972 -\end_deeper
2973 -\begin_layout Enumerate
2974 -Edit
2975 -\family typewriter
2976 -/path/to/sdcc/device/include/pic16/pic18fregs.h
2977 -\family default
2978 -
2979 -\begin_inset Newline newline
2980 -\end_inset
2981 -
2982 -The file format is self-explanatory, just add
2983 -\begin_inset Newline newline
2984 -\end_inset
2985 -
2986 -
2987 -\family typewriter
2988 -#elif defined(picDEVICE)
2989 -\begin_inset Newline newline
2990 -\end_inset
2991 -
2992 -#
2993 -\begin_inset ERT
2994 -status collapsed
2995 -
2996 -\begin_layout Plain Layout
2997 -
2998 -
2999 -\backslash
3000 -
3001 -\backslash
3002 -
3003 -\end_layout
3004 -
3005 -\end_inset
3006 -
3007 -include <picDEVICE.h>
3008 -\family default
3009 -
3010 -\begin_inset Newline newline
3011 -\end_inset
3012 -
3013 -at the right place (keep the file sorted, please).
3014 -\end_layout
3015 -
3016 -\begin_layout Enumerate
3017 -Edit
3018 -\family typewriter
3019 -/path/to/sdcc/device/include/pic16devices.txt
3020 -\begin_inset Newline newline
3021 -\end_inset
3022 -
3023 -
3024 -\family default
3025 -Copy and modify an existing entry or create a new one and insert it at the
3026 - correct place (keep the file sorted, please).
3027 -\end_layout
3028 -
3029 -\begin_layout Enumerate
3030 -
3031 -\family typewriter
3032 -( cd /path/to/sdcc/device/non-free/lib/pic16 && sh update.sh )
3033 -\end_layout
3034 -
3035 -\begin_layout Enumerate
3036 -Recompile the pic16 libraries as described in
3037 -\begin_inset CommandInset ref
3038 -LatexCommand ref
3039 -reference "subsec:pic16Libraries"
3040 -
3041 -\end_inset
3042 -
3043 - or just configure and build sdcc again from scratch (recommended).
3044 -\end_layout
3045 -
3046 \begin_layout Subsection
3047 Memory Models
3048 \end_layout
3049 @@ -73531,6 +72081,12 @@ This document was initially written by Sandeep Dutta and updated by SDCC
3050 developers.
3051 \end_layout
3052
3053 +\begin_layout Standard
3054 +It has been modified from the original to reflect the removal of non-free
3055 + components and related functionality in the SDCC package distributed with
3056 + GNU Guix.
3057 +\end_layout
3058 +
3059 \begin_layout Standard
3060 All product names mentioned herein may be trademarks
3061 \begin_inset Index idx
3062 diff --git a/sdcc.spec b/sdcc.spec
3063 index b8baa92..be90a84 100644
3064 --- a/sdcc.spec
3065 +++ b/sdcc.spec
3066 @@ -83,15 +83,15 @@ rm -rf $RPM_BUILD_ROOT
3067 %files common
3068 %defattr(-,root,root)
3069 /usr/share/sdcc/include
3070 -/usr/share/sdcc/non-free/include
3071 /usr/share/sdcc/lib
3072 -/usr/share/sdcc/non-free/lib
3073
3074 %files doc
3075 %defattr(-,root,root)
3076 %doc %{_defaultdocdir}
3077
3078 %changelog
3079 +* Tue Dec 08 2020 - simon AT simonsouth.net
3080 +- removed non-free include and lib directories
3081 * Sat Jan 18 2029 - pkk AT spth.de
3082 - version updated to 4.0.0
3083 * Fri Apr 05 2019 - krauseph AT informatik.uni-freiburg.de
3084 diff --git a/sdcc_vc.h.in b/sdcc_vc.h.in
3085 index 06d8cca..736c325 100644
3086 --- a/sdcc_vc.h.in
3087 +++ b/sdcc_vc.h.in
3088 @@ -23,8 +23,6 @@
3089
3090 #define INCLUDE_DIR_SUFFIX "\\include"
3091 #define LIB_DIR_SUFFIX "\\lib"
3092 -#define NON_FREE_INCLUDE_DIR_SUFFIX "\\non-free\\include"
3093 -#define NON_FREE_LIB_DIR_SUFFIX "\\non-free\\lib"
3094
3095 #define BIN2DATA_DIR "\\.."
3096 #define PREFIX2BIN_DIR "\\bin"
3097 diff --git a/sdccconf_in.h b/sdccconf_in.h
3098 index aeb2724..9c1df9d 100644
3099 --- a/sdccconf_in.h
3100 +++ b/sdccconf_in.h
3101 @@ -97,12 +97,6 @@
3102 /* XXX */
3103 #undef LIB_DIR_SUFFIX
3104
3105 -/* XXX */
3106 -#undef NON_FREE_INCLUDE_DIR_SUFFIX
3107 -
3108 -/* XXX */
3109 -#undef NON_FREE_LIB_DIR_SUFFIX
3110 -
3111 /* Define to 1 to disable the AVR port */
3112 #undef OPT_DISABLE_AVR
3113
3114 @@ -127,9 +121,6 @@
3115 /* XXX */
3116 #undef OPT_DISABLE_MCS51
3117
3118 -/* XXX */
3119 -#undef OPT_DISABLE_NON_FREE
3120 -
3121 /* XXX */
3122 #undef OPT_DISABLE_PACKIHX
3123
3124 diff --git a/src/SDCCglobl.h b/src/SDCCglobl.h
3125 index b8d156b..db81fd7 100644
3126 --- a/src/SDCCglobl.h
3127 +++ b/src/SDCCglobl.h
3128 @@ -288,7 +288,6 @@ struct options
3129 int no_pack_iram; /* MCS51/DS390 - Deprecated: Tells the linker not to pack variables in internal ram */
3130 int acall_ajmp; /* MCS51 - Use acall/ajmp instead of lcall/ljmp */
3131 int no_ret_without_call; /* MCS51 - Do not use ret independent of acall/lcall */
3132 - int use_non_free; /* Search / include non-free licensed libraries and header files */
3133 /* starting address of the segments */
3134 int xstack_loc; /* initial location of external stack */
3135 int stack_loc; /* initial value of internal stack pointer */
3136 diff --git a/src/SDCCmain.c b/src/SDCCmain.c
3137 index d4598a5..cd36f3d 100644
3138 --- a/src/SDCCmain.c
3139 +++ b/src/SDCCmain.c
3140 @@ -142,7 +142,6 @@ char buffer[PATH_MAX * 2];
3141 #define OPTION_DATA_SEG "--dataseg"
3142 #define OPTION_DOLLARS_IN_IDENT "--fdollars-in-identifiers"
3143 #define OPTION_SIGNED_CHAR "--fsigned-char"
3144 -#define OPTION_USE_NON_FREE "--use-non-free"
3145 #define OPTION_PEEP_RETURN "--peep-return"
3146 #define OPTION_NO_PEEP_RETURN "--no-peep-return"
3147 #define OPTION_NO_OPTSDCC_IN_ASM "--no-optsdcc-in-asm"
3148 @@ -197,7 +196,6 @@ static const OPTION optionsTable[] = {
3149 {0, OPTION_STD_SDCC2X, NULL, "Use ISO C2X standard with SDCC extensions"},
3150 {0, OPTION_DOLLARS_IN_IDENT, &options.dollars_in_ident, "Permit '$' as an identifier character"},
3151 {0, OPTION_SIGNED_CHAR, &options.signed_char, "Make \"char\" signed by default"},
3152 - {0, OPTION_USE_NON_FREE, &options.use_non_free, "Search / include non-free licensed libraries and header files"},
3153
3154 {0, NULL, NULL, "Code generation options"},
3155 {'m', NULL, NULL, "Set the port to use e.g. -mz80."},
3156 @@ -2084,10 +2082,6 @@ preProcess (char **envp)
3157 else
3158 addSet (&preArgvSet, Safe_strdup ("-D__SDCC_CHAR_UNSIGNED"));
3159
3160 - /* set the macro for non-free */
3161 - if (options.use_non_free)
3162 - addSet (&preArgvSet, Safe_strdup ("-D__SDCC_USE_NON_FREE"));
3163 -
3164 /* set the macro for large model */
3165 switch (options.model)
3166 {
3167 @@ -2301,12 +2295,6 @@ setIncludePath (void)
3168 * 6. - $SDCC_HOME/PREFIX2DATA_DIR/INCLUDE_DIR_SUFFIX
3169 * 7. - path(argv[0])/BIN2DATA_DIR/INCLUDE_DIR_SUFFIX
3170 * 8. - DATADIR/INCLUDE_DIR_SUFFIX (only on *nix)
3171 - * 9. - $SDCC_HOME/PREFIX2DATA_DIR/NON_FREE_INCLUDE_DIR_SUFFIX/target
3172 - * 10. - path(argv[0])/BIN2DATA_DIR/NON_FREE_INCLUDE_DIR_SUFFIX/target
3173 - * 11. - DATADIR/NON_FREE_INCLUDE_DIR_SUFFIX/target (only on *nix)
3174 - * 12. - $SDCC_HOME/PREFIX2DATA_DIR/NON_FREE_INCLUDE_DIR_SUFFIX
3175 - * 13. - path(argv[0])/BIN2DATA_DIR/NON_FREE_INCLUDE_DIR_SUFFIX
3176 - * 14. - DATADIR/NON_FREE_INCLUDE_DIR_SUFFIX (only on *nix)
3177 */
3178
3179 if (!options.nostdinc)
3180 @@ -2319,17 +2307,6 @@ setIncludePath (void)
3181 includeDirsSet = processStrSet (includeDirsSet, NULL, port->target, NULL);
3182 mergeSets (&includeDirsSet, tempSet);
3183
3184 - if (options.use_non_free)
3185 - {
3186 - set *tempSet1;
3187 -
3188 - tempSet = processStrSet (dataDirsSet, NULL, NON_FREE_INCLUDE_DIR_SUFFIX, NULL);
3189 - tempSet1 = processStrSet (tempSet, NULL, DIR_SEPARATOR_STRING, NULL);
3190 - tempSet1 = processStrSet (tempSet1, NULL, port->target, NULL);
3191 - mergeSets (&tempSet1, tempSet);
3192 - mergeSets (&includeDirsSet, tempSet1);
3193 - }
3194 -
3195 if ((p = getenv (SDCC_INCLUDE_NAME)) != NULL)
3196 {
3197 struct dbuf_s dbuf;
3198 @@ -2354,9 +2331,6 @@ setLibPath (void)
3199 * 3. - $SDCC_HOME/PREFIX2DATA_DIR/LIB_DIR_SUFFIX/<model>
3200 * 4. - path(argv[0])/BIN2DATA_DIR/LIB_DIR_SUFFIX/<model>
3201 * 5. - DATADIR/LIB_DIR_SUFFIX/<model> (only on *nix)
3202 - * 6. - $SDCC_HOME/PREFIX2DATA_DIR/NON_FREE_LIB_DIR_SUFFIX/<model>
3203 - * 7. - path(argv[0])/BIN2DATA_DIR/NON_FREE_LIB_DIR_SUFFIX/<model>
3204 - * 8. - DATADIR/NON_FREE_LIB_DIR_SUFFIX/<model> (only on *nix)
3205 */
3206
3207 if (!options.nostdlib)
3208 @@ -2373,13 +2347,6 @@ setLibPath (void)
3209 dbuf_makePath (&dbuf, LIB_DIR_SUFFIX, port->general.get_model ? port->general.get_model () : targetname);
3210 libDirsSet = processStrSet (dataDirsSet, NULL, dbuf_c_str (&dbuf), NULL);
3211
3212 - if (options.use_non_free)
3213 - {
3214 - dbuf_set_length (&dbuf, 0);
3215 - dbuf_makePath (&dbuf, NON_FREE_LIB_DIR_SUFFIX, port->general.get_model ? port->general.get_model () : targetname);
3216 - mergeSets (&libDirsSet, processStrSet (dataDirsSet, NULL, dbuf_c_str (&dbuf), NULL));
3217 - }
3218 -
3219 if ((p = getenv (SDCC_LIB_NAME)) != NULL)
3220 {
3221 addSetHead (&libDirsSet, Safe_strdup (p));
3222 diff --git a/src/pic14/main.c b/src/pic14/main.c
3223 index ee90470..519ccfc 100644
3224 --- a/src/pic14/main.c
3225 +++ b/src/pic14/main.c
3226 @@ -42,7 +42,6 @@ static OPTION _pic14_poptions[] =
3227 { 0, "--no-pcode-opt", &pic14_options.disable_df, "disable (slightly faulty) optimization on pCode" },
3228 { 0, OPTION_STACK_SIZE, &options.stack_size, "sets the size if the argument passing stack (default: 16, minimum: 4)", CLAT_INTEGER },
3229 { 0, "--no-extended-instructions", &pic14_options.no_ext_instr, "forbid use of the extended instruction set (e.g., ADDFSR)" },
3230 - { 0, "--no-warn-non-free", &pic14_options.no_warn_non_free, "suppress warning on absent --use-non-free option" },
3231 { 0, NULL, NULL, NULL }
3232 };
3233
3234 @@ -176,16 +175,6 @@ _pic14_finaliseOptions (void)
3235 addSet (&preArgvSet, Safe_strdup (dbuf_detach_c_str (&dbuf)));
3236 }
3237
3238 - if (!pic14_options.no_warn_non_free && !options.use_non_free)
3239 - {
3240 - fprintf(stderr,
3241 - "WARNING: Command line option --use-non-free not present.\n"
3242 - " When compiling for PIC14/PIC16, please provide --use-non-free\n"
3243 - " to get access to device headers and libraries.\n"
3244 - " If you do not use these, you may provide --no-warn-non-free\n"
3245 - " to suppress this warning (not recommended).\n");
3246 - } // if
3247 -
3248 }
3249
3250 static void
3251 diff --git a/src/pic14/main.h b/src/pic14/main.h
3252 index 4275b65..0dc8c86 100644
3253 --- a/src/pic14/main.h
3254 +++ b/src/pic14/main.h
3255 @@ -5,7 +5,6 @@ typedef struct {
3256 unsigned int isLibrarySource:1;
3257 int disable_df;
3258 int no_ext_instr;
3259 - int no_warn_non_free;
3260 } pic14_options_t;
3261
3262 extern pic14_options_t pic14_options;
3263 diff --git a/src/pic16/device.h b/src/pic16/device.h
3264 index cdfbba0..5877f09 100644
3265 --- a/src/pic16/device.h
3266 +++ b/src/pic16/device.h
3267 @@ -99,7 +99,6 @@ typedef struct {
3268 int gstack;
3269 unsigned int debgen;
3270 int xinst;
3271 - int no_warn_non_free;
3272 } pic16_options_t;
3273
3274 extern pic16_options_t pic16_options;
3275 diff --git a/src/pic16/main.c b/src/pic16/main.c
3276 index 61d9cfb..75d1182 100644
3277 --- a/src/pic16/main.c
3278 +++ b/src/pic16/main.c
3279 @@ -655,7 +655,6 @@ OPTION pic16_optionsTable[]= {
3280 { 0, "--pcode-verbose", &pic16_pcode_verbose, "dump pcode related info"},
3281 { 0, "--calltree", &pic16_options.dumpcalltree, "dump call tree in .calltree file"},
3282 { 0, "--gstack", &pic16_options.gstack, "trace stack pointer push/pop to overflow"},
3283 - { 0, "--no-warn-non-free", &pic16_options.no_warn_non_free, "suppress warning on absent --use-non-free option" },
3284 { 0, NULL, NULL, NULL}
3285 };
3286
3287 @@ -940,16 +939,6 @@ _pic16_finaliseOptions (void)
3288 addSet (&asmOptionsSet, Safe_strdup ("-D__STACK_MODEL_SMALL"));
3289 }
3290
3291 - if (!pic16_options.no_warn_non_free && !options.use_non_free)
3292 - {
3293 - fprintf(stderr,
3294 - "WARNING: Command line option --use-non-free not present.\n"
3295 - " When compiling for PIC14/PIC16, please provide --use-non-free\n"
3296 - " to get access to device headers and libraries.\n"
3297 - " If you do not use these, you may provide --no-warn-non-free\n"
3298 - " to suppress this warning (not recommended).\n");
3299 - } // if
3300 -
3301 dbuf_destroy (&dbuf);
3302 }
3303
3304 @@ -979,7 +968,6 @@ _pic16_setDefaultOptions (void)
3305 pic16_options.ip_stack = 1; /* set to 1 to enable ipop/ipush for stack */
3306 pic16_options.gstack = 0;
3307 pic16_options.debgen = 0;
3308 - pic16_options.no_warn_non_free = 0;
3309 }
3310
3311 static const char *
3312 diff --git a/src/regression/Makefile b/src/regression/Makefile
3313 index d8dae7c..1a32355 100644
3314 --- a/src/regression/Makefile
3315 +++ b/src/regression/Makefile
3316 @@ -107,12 +107,12 @@ endif
3317 CC = $(top_builddir)/bin/sdcc
3318
3319 # compiler options
3320 -CFLAGS = --no-warn-non-free -m$(ARCH) -p$(DEV) --fsigned-char --i-code-in-asm --fverbose-asm --std-c99
3321 -CFLAGS += --nostdinc -I$(top_srcdir)/device/include/$(ARCH) -I$(top_srcdir)/device/non-free/include/$(ARCH) -I$(top_srcdir)/device/include
3322 +CFLAGS = -m$(ARCH) -p$(DEV) --fsigned-char --i-code-in-asm --fverbose-asm --std-c99
3323 +CFLAGS += --nostdinc -I$(top_srcdir)/device/include/$(ARCH) -I$(top_srcdir)/device/include
3324
3325 # linker options (for sdcc)
3326 CFLAGS += -Wl,-l,-O2
3327 -CFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/$(ARCH) -L$(top_builddir)/device/non-free/lib/build/$(ARCH)
3328 +CFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/$(ARCH)
3329
3330 # linker libraries
3331 LIB_SUFFIX = $(LIB_E)$(LIB_O)$(LIB_X)
3332 diff --git a/support/regression/ports/pic14/spec.mk b/support/regression/ports/pic14/spec.mk
3333 index a3dcc05..bef1c45 100644
3334 --- a/support/regression/ports/pic14/spec.mk
3335 +++ b/support/regression/ports/pic14/spec.mk
3336 @@ -12,13 +12,9 @@ endif
3337
3338 ifndef SDCC_BIN_PATH
3339 ifndef CROSSCOMPILING
3340 - SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic14 -I$(top_srcdir)/device/non-free/include/pic14 -I$(top_srcdir)
3341 - LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic14 -L$(top_builddir)/device/non-free/lib/build/pic14
3342 - else
3343 - SDCCFLAGS += --use-non-free
3344 + SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic14 -I$(top_srcdir)
3345 + LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic14
3346 endif
3347 -else
3348 - SDCCFLAGS += --use-non-free
3349 endif
3350
3351 ifdef CROSSCOMPILING
3352 @@ -26,7 +22,6 @@ ifdef CROSSCOMPILING
3353 endif
3354
3355 SDCCFLAGS += -mpic14 -pp16f877 --less-pedantic -Wl,-q
3356 -SDCCFLAGS += --no-warn-non-free
3357 LINKFLAGS += libsdcc.lib libm.lib
3358
3359 OBJEXT = .o
3360 diff --git a/support/regression/ports/pic16/spec.mk b/support/regression/ports/pic16/spec.mk
3361 index 1f94cde..f1ac726 100644
3362 --- a/support/regression/ports/pic16/spec.mk
3363 +++ b/support/regression/ports/pic16/spec.mk
3364 @@ -12,13 +12,9 @@ endif
3365
3366 ifndef SDCC_BIN_PATH
3367 ifndef CROSSCOMPILING
3368 - SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic16 -I$(top_srcdir)/device/non-free/include/pic16 -I$(top_srcdir)
3369 - LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic16 -L$(top_builddir)/device/non-free/lib/build/pic16
3370 - else
3371 - SDCCFLAGS += --use-non-free
3372 + SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic16 -I$(top_srcdir)
3373 + LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic16
3374 endif
3375 -else
3376 - SDCCFLAGS += --use-non-free
3377 endif
3378
3379 ifdef CROSSCOMPILING
3380 @@ -27,7 +23,6 @@ endif
3381
3382 SDCCFLAGS += -mpic16 -pp18f452 --less-pedantic -Wl,-q
3383 SDCCFLAGS += --no-peep
3384 -SDCCFLAGS += --no-warn-non-free
3385 LINKFLAGS += libsdcc.lib libc18f.lib libm18f.lib
3386
3387 OBJEXT = .o
3388 diff --git a/support/scripts/cinc2h.pl b/support/scripts/cinc2h.pl
3389 index 8558135..30d72b7 100755
3390 --- a/support/scripts/cinc2h.pl
3391 +++ b/support/scripts/cinc2h.pl
3392 @@ -39,58 +39,10 @@
3393
3394 -------------------------------------------------
3395
3396 - Steps to add a new target device to SDCC/PIC16:
3397 - (Following Raphael Neider <rneider AT web.de>)
3398 -
3399 - 1. Create the picDEVICE.c and picDEVICE.h from pDEVICE.inc using
3400 - ./cinc2h.pl -p 18f4520 -cb -cp -gp "path/to/gputils_source" -o "path/to/output"
3401 -
3402 - 2. mv picDEVICE.h $SDCC/device/non-free/include/pic16
3403 - 3. mv picDEVICE.c $SDCC/device/non-free/lib/pic16/libdev
3404 - 4. either
3405 -
3406 - (a) adjust $SDCC/device/lib/pic16/libio/*.ignore
3407 - if the device does not support ADC, I2C, or USART
3408 - --- OR ---
3409 - (b) adjust
3410 - * SDCC/scripts/pic18fam-h-gen.pl
3411 - * SDCC/device/include/pic16/adc.h (if required)
3412 - * SDCC/device/include/pic16/usart.h (if required)
3413 - * SDCC/device/lib/pic16/libio/*/* (if required)
3414 - to add the new device to the appropriate I/O style
3415 - and implement new styles (if required).
3416 -
3417 - Having modified pic18fam-h-gen.pl, you need to run the
3418 - script to generate pic18fam.h.gen, which in turn must
3419 - then replace your .../include/pic16/pic18fam.h to take
3420 - effect; see pic18fam-h-gen.pl for usage information.
3421 - 6. edit $SDCC/device/include/pic16/pic18fregs.h
3422 - 7. edit $SDCC/device/include/pic16/pic16devices.txt
3423 - 8. run cd $SDCC/device/non-free/lib/pic16 && sh update.sh
3424 - to regenerate .../libdev/Makefile.am and processors.ac
3425 -
3426 - The file format of steps 6 and 7 is self explanatory, in most
3427 - if not all cases you can copy and paste another device's records
3428 - and adjust them to the newly added device.
3429 -
3430 - -------------------------------------------------
3431 -
3432 - Steps to add a new target device to SDCC/PIC14:
3433 -
3434 - 1. Create the picDEVICE.c and picDEVICE.h from pDEVICE.inc using
3435 - ./cinc2h.pl -p 16f1503 -cb -cp -gp "path/to/gputils_source" -o "path/to/output"
3436 -
3437 - 2. mv picDEVICE.h $SDCC/device/non-free/include/pic14
3438 - 3. mv picDEVICE.c $SDCC/device/non-free/lib/pic14/libdev
3439 - 4. add DEVICE to $SDCC/device/non-free/lib/pic14/libdev/devices.txt
3440 - (The names of the enhanced devices the "# enhanced cores" line
3441 - after follow.)
3442 -
3443 - 5. edit $SDCC/device/include/pic14/pic14devices.txt
3444 -
3445 - The file format of step 5 is self explanatory, in most if not all
3446 - cases you can copy and paste another device's records and adjust
3447 - them to the newly added device.
3448 + For its inclusion in the SDCC package distributed with GNU Guix
3449 + (https://guix.gnu.org/) this file has been modified from the
3450 + original to remove instructions on its use with non-free software
3451 + and to update the output of the print_license subroutine below.
3452
3453 $Id: cinc2h.pl 9450 2016-01-09 16:47:43Z molnarkaroly $
3454 =cut
3455 @@ -1345,10 +1297,9 @@ sub print_license($)
3456 * Microchip header (.inc) and linker script (.lkr) files Microchip
3457 * requires that "The header files should state that they are only to be
3458 * used with authentic Microchip devices" which makes them incompatible
3459 - * with the GPL. Pic device libraries and header files are located at
3460 - * non-free/lib and non-free/include directories respectively.
3461 - * Sdcc should be run with the --use-non-free command line option in
3462 - * order to include non-free header files and libraries.
3463 + * with the GPL. These non-free libraries and header files (and the
3464 + * build and run-time options that enable their use) are omitted in the
3465 + * SDCC package distributed with GNU Guix.
3466 *
3467 * See http://sdcc.sourceforge.net/ for the latest information on sdcc.
3468 */
3469 diff --git a/support/scripts/pic14-header-parser.pl b/support/scripts/pic14-header-parser.pl
3470 index 4413c25..57c6076 100755
3471 --- a/support/scripts/pic14-header-parser.pl
3472 +++ b/support/scripts/pic14-header-parser.pl
3473 @@ -63,9 +63,7 @@ use constant P_SHOW_ONLY_NAME => 3;
3474
3475 my @default_paths =
3476 (
3477 - '/usr/share/sdcc/non-free/include',
3478 '/usr/share/sdcc/include',
3479 - '/usr/local/share/sdcc/non-free/include',
3480 '/usr/local/share/sdcc/include'
3481 );
3482
3483 diff --git a/support/scripts/pic16-header-parser.pl b/support/scripts/pic16-header-parser.pl
3484 index 6db417a..4b35225 100755
3485 --- a/support/scripts/pic16-header-parser.pl
3486 +++ b/support/scripts/pic16-header-parser.pl
3487 @@ -62,9 +62,7 @@ use constant P_SHOW_ONLY_NAME => 3;
3488
3489 my @default_paths =
3490 (
3491 - '/usr/share/sdcc/non-free/include',
3492 '/usr/share/sdcc/include',
3493 - '/usr/local/share/sdcc/non-free/include',
3494 '/usr/local/share/sdcc/include'
3495 );
3496
3497 diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi
3498 index 68e9035..92e5784 100644
3499 --- a/support/scripts/sdcc.nsi
3500 +++ b/support/scripts/sdcc.nsi
3501 @@ -483,11 +483,6 @@ ${Section} "SDCC include files" SEC05
3502
3503 SetOutPath "$INSTDIR\include"
3504 File "${DEV_ROOT}\include\*.h"
3505 -
3506 - SetOutPath "$INSTDIR\non-free\include\pic14"
3507 - File "${DEV_ROOT}\non-free\include\pic14\*.h"
3508 - SetOutPath "$INSTDIR\non-free\include\pic16"
3509 - File "${DEV_ROOT}\non-free\include\pic16\*.h"
3510 ${SectionEnd}
3511
3512 ${Section} "SDCC DS390 library" SEC06
3513 @@ -585,18 +580,12 @@ ${Section} "SDCC PIC16 library" SEC21
3514 SetOutPath "$INSTDIR\lib\pic16"
3515 File "${DEV_ROOT}\lib\pic16\*.o"
3516 File "${DEV_ROOT}\lib\pic16\*.lib"
3517 -
3518 - SetOutPath "$INSTDIR\non-free\lib\pic16"
3519 - File "${DEV_ROOT}\non-free\lib\pic16\*.lib"
3520 ${SectionEnd}
3521
3522 ${Section} "SDCC PIC14 library" SEC22
3523 SectionIn 1 2
3524 SetOutPath "$INSTDIR\lib\pic14"
3525 File "${DEV_ROOT}\lib\pic14\*.lib"
3526 -
3527 - SetOutPath "$INSTDIR\non-free\lib\pic14"
3528 - File "${DEV_ROOT}\non-free\lib\pic14\*.lib"
3529 ${SectionEnd}
3530
3531 ${Section} "SDCC STM8 small model library" SEC23
3532 @@ -697,10 +686,6 @@ ${Section} "SDCC library sources" SEC25
3533 File "${DEV_ROOT}\lib\src\pic14\libsdcc\enhanced\*.inc"
3534 # File "${DEV_ROOT}\lib\src\pic14\libsdcc\Makefile"
3535
3536 - SetOutPath "$INSTDIR\non-free\lib\src\pic14\libdev"
3537 - File "${DEV_ROOT}\non-free\lib\src\pic14\libdev\*.c"
3538 -# File "${DEV_ROOT}\non-free\lib\src\pic14\libdev\Makefile"
3539 -
3540 SetOutPath "$INSTDIR\lib\src\pic14\libm"
3541 # File "${DEV_ROOT}\lib\src\pic14\libm\*.c"
3542
3543 @@ -752,10 +737,6 @@ ${Section} "SDCC library sources" SEC25
3544 File "${DEV_ROOT}\lib\src\pic16\libc\utils\*.S"
3545 # File "${DEV_ROOT}\lib\src\pic16\libc\utils\Makefile"
3546
3547 - SetOutPath "$INSTDIR\non-free\lib\src\pic16\libdev"
3548 - File "${DEV_ROOT}\non-free\lib\src\pic16\libdev\*.c"
3549 -# File "${DEV_ROOT}\non-free\lib\src\pic16\libdev\Makefile"
3550 -
3551 SetOutPath "$INSTDIR\lib\src\pic16\libio"
3552 File "${DEV_ROOT}\lib\src\pic16\libio\*.ignore"
3553 # File "${DEV_ROOT}\lib\src\pic16\libio\Makefile"
3554 @@ -1074,13 +1055,9 @@ ${Section} Uninstall SECUNINSTALL
3555
3556 Delete "$INSTDIR\lib\pic14\*.lib"
3557
3558 - Delete "$INSTDIR\non-free\lib\pic14\*.lib"
3559 -
3560 Delete "$INSTDIR\lib\pic16\*.o"
3561 Delete "$INSTDIR\lib\pic16\*.lib"
3562
3563 - Delete "$INSTDIR\non-free\lib\pic16\*.lib"
3564 -
3565 Delete "$INSTDIR\lib\hc08\*.lib"
3566
3567 Delete "$INSTDIR\lib\s08\*.lib"
3568 @@ -1144,9 +1121,7 @@ ${Section} Uninstall SECUNINSTALL
3569 Delete "$INSTDIR\include\pic14\*.h"
3570 Delete "$INSTDIR\include\pic14\*.txt"
3571 Delete "$INSTDIR\include\pic14\*.inc"
3572 - Delete "$INSTDIR\non-free\include\pic14\*.h"
3573 Delete "$INSTDIR\include\pic16\*.h"
3574 - Delete "$INSTDIR\non-free\include\pic16\*.h"
3575 Delete "$INSTDIR\include\pic16\*.txt"
3576 Delete "$INSTDIR\include\mcs51\*.h"
3577 Delete "$INSTDIR\include\hc08\*.h"
3578 @@ -1208,9 +1183,7 @@ ${Section} Uninstall SECUNINSTALL
3579 Delete "$INSTDIR\uninstall.exe"
3580
3581 RMDir /r "$INSTDIR\lib\src\pic14"
3582 - RMDir /r "$INSTDIR\non-free\lib\src\pic14"
3583 RMDir /r "$INSTDIR\lib\src\pic16"
3584 - RMDir /r "$INSTDIR\non-free\lib\src\pic16"
3585 RMDir "$INSTDIR\lib\src\small"
3586 RMDir "$INSTDIR\lib\src\medium"
3587 RMDir "$INSTDIR\lib\src\large"
3588 @@ -1233,12 +1206,9 @@ ${Section} Uninstall SECUNINSTALL
3589 RMDir "$INSTDIR\lib\src\pdk15"
3590 RMDir "$INSTDIR\lib\src\pdk15-stack-auto"
3591 RMDir "$INSTDIR\lib\src"
3592 - RMDir "$INSTDIR\non-free\lib\src"
3593
3594 RMDir "$INSTDIR\lib\pic14"
3595 - RMDir "$INSTDIR\non-free\lib\pic14"
3596 RMDir "$INSTDIR\lib\pic16"
3597 - RMDir "$INSTDIR\non-free\lib\pic16"
3598 RMDir "$INSTDIR\lib\z80"
3599 RMDir "$INSTDIR\lib\z180"
3600 RMDir "$INSTDIR\lib\r2k"
3601 @@ -1261,7 +1231,6 @@ ${Section} Uninstall SECUNINSTALL
3602 RMDir "$INSTDIR\lib\pdk15"
3603 RMDir "$INSTDIR\lib\pdk15-stack-auto"
3604 RMDir "$INSTDIR\lib"
3605 - RMDir "$INSTDIR\non-free\lib"
3606
3607 RMDir "$INSTDIR\include\asm\z80"
3608 RMDir "$INSTDIR\include\asm\z180"
3609 @@ -1269,9 +1238,7 @@ ${Section} Uninstall SECUNINSTALL
3610 RMDir "$INSTDIR\include\asm\r3ka"
3611 RMDir "$INSTDIR\include\asm\ez80_z80"
3612 RMDir "$INSTDIR\include\asm\pic16"
3613 - RMDir "$INSTDIR\non-free\include\asm\pic16"
3614 RMDir "$INSTDIR\include\asm\pic14"
3615 - RMDir "$INSTDIR\non-free\include\asm\pic14"
3616 RMDir "$INSTDIR\include\asm\mcs51"
3617 RMDir "$INSTDIR\include\asm\gbz80"
3618 RMDir "$INSTDIR\include\asm\ds390"
3619 @@ -1280,17 +1247,12 @@ ${Section} Uninstall SECUNINSTALL
3620 RMDir "$INSTDIR\include\asm"
3621 RMDir "$INSTDIR\include\z180"
3622 RMDir "$INSTDIR\include\pic14"
3623 - RMDir "$INSTDIR\non-free\include\pic14"
3624 RMDir "$INSTDIR\include\pic16"
3625 - RMDir "$INSTDIR\non-free\include\pic16"
3626 RMDir "$INSTDIR\include\mcs51"
3627 RMDir "$INSTDIR\include\hc08"
3628 RMDir "$INSTDIR\include\ds400"
3629 RMDir "$INSTDIR\include\ds390"
3630 RMDir "$INSTDIR\include"
3631 - RMDir "$INSTDIR\non-free\include"
3632 -
3633 - RMDir "$INSTDIR\non-free"
3634
3635 !ifdef FULL_DOC
3636 RMDir /r "$INSTDIR\doc"
3637 diff --git a/support/scripts/sdcc_cygwin_mingw32 b/support/scripts/sdcc_cygwin_mingw32
3638 index 5575663..2588d4f 100755
3639 --- a/support/scripts/sdcc_cygwin_mingw32
3640 +++ b/support/scripts/sdcc_cygwin_mingw32
3641 @@ -6,9 +6,7 @@
3642 --datarootdir="/sdcc" \
3643 docdir="\${datarootdir}/doc" \
3644 include_dir_suffix="include" \
3645 -non_free_include_dir_suffix="non-free/include" \
3646 lib_dir_suffix="lib" \
3647 -non_free_lib_dir_suffix="non-free/lib" \
3648 sdccconf_h_dir_separator="\\\\" \
3649 CC="gcc -mno-cygwin" \
3650 CXX="g++ -mno-cygwin"
3651 diff --git a/support/scripts/sdcc_mingw32 b/support/scripts/sdcc_mingw32
3652 index 96e3280..050761e 100755
3653 --- a/support/scripts/sdcc_mingw32
3654 +++ b/support/scripts/sdcc_mingw32
3655 @@ -19,9 +19,7 @@ export SDCCCONFIGUREFLAGS=" \
3656 --datarootdir=/sdcc \
3657 docdir=\${datarootdir}/doc \
3658 include_dir_suffix=include \
3659 -non_free_include_dir_suffix=non-free/include \
3660 lib_dir_suffix=lib \
3661 -non_free_lib_dir_suffix=non-free/lib \
3662 sdccconf_h_dir_separator=\\\\ \
3663 --disable-device-lib \
3664 --host=i586-mingw32msvc --build=unknown-unknown-linux-gnu"
jackhill's copy of GNU Guix: https://guix.gnu.org/