projects/guix·blob javascript-team · refs

3708 lines · 108.6 KiB

1This patch disables the use of non-free code distributed with SDCC by
2removing
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
13It also updates SDCC's documentation to reflect these changes and to
14remove instructions that encourage the use of SDCC with non-free
15software.
16
17diff --git a/Makefile.common.in b/Makefile.common.in
18index 8469079..174ed91 100644
19--- a/Makefile.common.in
20+++ b/Makefile.common.in
21@@ -78,7 +78,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
29diff --git a/Makefile.in b/Makefile.in
30index 3287e30..69511e1 100644
31--- a/Makefile.in
32+++ b/Makefile.in
33@@ -104,9 +104,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@@ -127,9 +124,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@@ -167,21 +161,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
75diff --git a/configure b/configure
76index b509c84..c7ce7fc 100755
77--- a/configure
78+++ b/configure
79@@ -659,7 +659,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@@ -693,10 +692,7 @@ OPT_DISABLE_Z80
88 OPT_DISABLE_MCS51
89 SVN_REVISION
90 GIT_REVISION
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@@ -828,7 +824,6 @@ enable_packihx
99 enable_sdcpp
100 enable_sdcdb
101 enable_sdbinutils
102-enable_non_free
103 enable_doc
104 enable_libgc
105 '
106@@ -849,10 +844,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@@ -860,9 +852,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@@ -1517,7 +1507,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@@ -1551,16 +1540,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@@ -7869,19 +7850,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@@ -7889,13 +7857,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@@ -8048,22 +8009,6 @@ esac
188
189 printf "%s\n" "#define INCLUDE_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_inc_dir_suffix}\"" >>confdefs.h
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-printf "%s\n" "#define NON_FREE_INCLUDE_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_non_free_inc_dir_suffix}\"" >>confdefs.h
206-
207
208 norm_lib_dir_suffix=${lib_dir_suffix}
209 case ":$norm_lib_dir_suffix:" in
210@@ -8081,22 +8026,6 @@ esac
211
212 printf "%s\n" "#define LIB_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_lib_dir_suffix}\"" >>confdefs.h
213
214-norm_non_free_lib_dir_suffix=${non_free_lib_dir_suffix}
215-case ":$norm_non_free_lib_dir_suffix:" in
216- ::) norm_non_free_lib_dir_suffix='.' ;;
217- :*[\\/]:) norm_non_free_lib_dir_suffix=`echo "$norm_non_free_lib_dir_suffix" | sed 's,[\\/]*$,,'` ;;
218- :*:) ;;
219-esac
220-case $sdccconf_h_dir_separator in
221-
222- *\\*) norm_non_free_lib_dir_suffix=`echo "$norm_non_free_lib_dir_suffix" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
223- s,^[\\/],\\\\\\\\,'` ;;
224-
225- *) norm_non_free_lib_dir_suffix=`echo "$norm_non_free_lib_dir_suffix" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
226-esac
227-
228-printf "%s\n" "#define NON_FREE_LIB_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_non_free_lib_dir_suffix}\"" >>confdefs.h
229-
230
231 # relative paths
232 for _lcl_i in expanded_bindir:expanded_datadir:bin2data_dir; do
233@@ -9237,27 +9166,6 @@ printf "%s\n" "#define OPT_DISABLE_SDBINUTILS $OPT_DISABLE_SDBINUTILS" >>confdef
234
235
236
237- # Check whether --enable-non-free was given.
238-if test ${enable_non_free+y}
239-then :
240- enableval=$enable_non_free;
241-fi
242-
243-
244- arg1=`echo non-free | sed s/-/_/`
245-
246- if test "`eval echo \\$enable_$arg1`" = "no"; then
247- OPT_DISABLE_NON_FREE=1
248- else
249- OPT_DISABLE_NON_FREE=0
250- fi
251-
252-
253-printf "%s\n" "#define OPT_DISABLE_NON_FREE $OPT_DISABLE_NON_FREE" >>confdefs.h
254-
255-
256-
257-
258
259 # Check whether --enable-doc was given.
260 if test ${enable_doc+y}
261@@ -9685,20 +9593,12 @@ if test $OPT_DISABLE_PIC14 = 0; then
262
263 test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/lib/pic14"
264
265-fi
266-if test $OPT_DISABLE_PIC14 = 0 && test $OPT_DISABLE_NON_FREE = 0; then
267- test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/non-free/lib/pic14"
268-
269 fi
270 if test $OPT_DISABLE_PIC16 = 0; then
271 ac_config_files="$ac_config_files src/pic16/Makefile"
272
273 test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/lib/pic16"
274
275-fi
276-if test $OPT_DISABLE_PIC16 = 0 && test $OPT_DISABLE_NON_FREE = 0; then
277- test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/non-free/lib/pic16"
278-
279 fi
280
281 if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R2KA = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_SM83 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0 || test $OPT_DISABLE_Z80N = 0 || test $OPT_DISABLE_R800 = 0; then
282@@ -9775,8 +9675,6 @@ fi
283
284 test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/Makefile"
285
286-test $OPT_DISABLE_DEVICE_LIB = 0 && test $OPT_DISABLE_NON_FREE = 0 && ac_config_files="$ac_config_files device/non-free/lib/Makefile"
287-
288
289 ac_config_files="$ac_config_files main.mk:main_in.mk bin/Makefile src/Makefile device/include/Makefile sdas/linksrc/Makefile support/makebin/Makefile support/regression/Makefile support/regression/cases/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"
290
291@@ -9792,10 +9690,6 @@ ac_config_files="$ac_config_files bin/sdranlib"
292
293 ac_config_files="$ac_config_files bin/sdobjcopy"
294
295-if test $OPT_DISABLE_NON_FREE = 0; then
296- ac_config_files="$ac_config_files device/non-free/include/Makefile"
297-
298-fi
299 cat >confcache <<\_ACEOF
300 # This file is a shell script that caches the results of configure
301 # tests run on this system so they can be shared between configure
302@@ -10538,7 +10432,6 @@ do
303 "device/lib/pdk15-stack-auto/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/pdk15-stack-auto/Makefile" ;;
304 "sdas/aspdk16/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/aspdk16/Makefile" ;;
305 "device/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/Makefile" ;;
306- "device/non-free/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/non-free/lib/Makefile" ;;
307 "main.mk") CONFIG_FILES="$CONFIG_FILES main.mk:main_in.mk" ;;
308 "bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
309 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
310@@ -10558,7 +10451,6 @@ do
311 "bin/sdnm") CONFIG_FILES="$CONFIG_FILES bin/sdnm" ;;
312 "bin/sdranlib") CONFIG_FILES="$CONFIG_FILES bin/sdranlib" ;;
313 "bin/sdobjcopy") CONFIG_FILES="$CONFIG_FILES bin/sdobjcopy" ;;
314- "device/non-free/include/Makefile") CONFIG_FILES="$CONFIG_FILES device/non-free/include/Makefile" ;;
315
316 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
317 esac
318@@ -11375,54 +11267,6 @@ esac
319 incPath3=`echo "$incPath3" | sed 's,\\\\\\\\,\\\\,g'`
320
321
322-nonFreeIncPath1=`echo "/${prefix2data_dir}/${norm_non_free_inc_dir_suffix}" | sed 's,/\./,/,g'`
323-case ":$nonFreeIncPath1:" in
324- ::) nonFreeIncPath1='.' ;;
325- :*[\\/]:) nonFreeIncPath1=`echo "$nonFreeIncPath1" | sed 's,[\\/]*$,,'` ;;
326- :*:) ;;
327-esac
328-case $dirch in
329-
330- *\\*) nonFreeIncPath1=`echo "$nonFreeIncPath1" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
331- s,^[\\/],\\\\\\\\,'` ;;
332-
333- *) nonFreeIncPath1=`echo "$nonFreeIncPath1" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
334-esac
335-nonFreeIncPath1=`echo "$nonFreeIncPath1" | sed 's,\\\\\\\\,\\\\,g'`
336-
337-
338-nonFreeIncPath2=`echo "/${bin2data_dir}/${norm_non_free_inc_dir_suffix}" | sed 's,/\./,/,g'`
339-case ":$nonFreeIncPath2:" in
340- ::) nonFreeIncPath2='.' ;;
341- :*[\\/]:) nonFreeIncPath2=`echo "$nonFreeIncPath2" | sed 's,[\\/]*$,,'` ;;
342- :*:) ;;
343-esac
344-case $dirch in
345-
346- *\\*) nonFreeIncPath2=`echo "$nonFreeIncPath2" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
347- s,^[\\/],\\\\\\\\,'` ;;
348-
349- *) nonFreeIncPath2=`echo "$nonFreeIncPath2" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
350-esac
351-nonFreeIncPath2=`echo "$nonFreeIncPath2" | sed 's,\\\\\\\\,\\\\,g'`
352-
353-
354-nonFreeIncPath3=`echo "${expanded_datadir}/${norm_non_free_inc_dir_suffix}" | sed 's,/\./,/,g'`
355-case ":$nonFreeIncPath3:" in
356- ::) nonFreeIncPath3='.' ;;
357- :*[\\/]:) nonFreeIncPath3=`echo "$nonFreeIncPath3" | sed 's,[\\/]*$,,'` ;;
358- :*:) ;;
359-esac
360-case $dirch in
361-
362- *\\*) nonFreeIncPath3=`echo "$nonFreeIncPath3" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
363- s,^[\\/],\\\\\\\\,'` ;;
364-
365- *) nonFreeIncPath3=`echo "$nonFreeIncPath3" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
366-esac
367-nonFreeIncPath3=`echo "$nonFreeIncPath3" | sed 's,\\\\\\\\,\\\\,g'`
368-
369-
370
371 libPath1=`echo "/${prefix2data_dir}/${norm_lib_dir_suffix}" | sed 's,/\./,/,g'`
372 case ":$libPath1:" in
373@@ -11472,54 +11316,6 @@ esac
374 libPath3=`echo "$libPath3" | sed 's,\\\\\\\\,\\\\,g'`
375
376
377-nonFreeLibPath1=`echo "/${prefix2data_dir}/${norm_non_free_lib_dir_suffix}" | sed 's,/\./,/,g'`
378-case ":$nonFreeLibPath1:" in
379- ::) nonFreeLibPath1='.' ;;
380- :*[\\/]:) nonFreeLibPath1=`echo "$nonFreeLibPath1" | sed 's,[\\/]*$,,'` ;;
381- :*:) ;;
382-esac
383-case $dirch in
384-
385- *\\*) nonFreeLibPath1=`echo "$nonFreeLibPath1" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
386- s,^[\\/],\\\\\\\\,'` ;;
387-
388- *) nonFreeLibPath1=`echo "$nonFreeLibPath1" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
389-esac
390-nonFreeLibPath1=`echo "$nonFreeLibPath1" | sed 's,\\\\\\\\,\\\\,g'`
391-
392-
393-nonFreeLibPath2=`echo "/${bin2data_dir}/${norm_non_free_lib_dir_suffix}" | sed 's,/\./,/,g'`
394-case ":$nonFreeLibPath2:" in
395- ::) nonFreeLibPath2='.' ;;
396- :*[\\/]:) nonFreeLibPath2=`echo "$nonFreeLibPath2" | sed 's,[\\/]*$,,'` ;;
397- :*:) ;;
398-esac
399-case $dirch in
400-
401- *\\*) nonFreeLibPath2=`echo "$nonFreeLibPath2" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
402- s,^[\\/],\\\\\\\\,'` ;;
403-
404- *) nonFreeLibPath2=`echo "$nonFreeLibPath2" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
405-esac
406-nonFreeLibPath2=`echo "$nonFreeLibPath2" | sed 's,\\\\\\\\,\\\\,g'`
407-
408-
409-nonFreeLibPath3=`echo "${expanded_datadir}/${norm_non_free_lib_dir_suffix}" | sed 's,/\./,/,g'`
410-case ":$nonFreeLibPath3:" in
411- ::) nonFreeLibPath3='.' ;;
412- :*[\\/]:) nonFreeLibPath3=`echo "$nonFreeLibPath3" | sed 's,[\\/]*$,,'` ;;
413- :*:) ;;
414-esac
415-case $dirch in
416-
417- *\\*) nonFreeLibPath3=`echo "$nonFreeLibPath3" | sed 's,\(.\)[\\/][\\/]*,\1\\\\\\\\,g
418- s,^[\\/],\\\\\\\\,'` ;;
419-
420- *) nonFreeLibPath3=`echo "$nonFreeLibPath3" | sed 's,\(.\)[\\/][\\/]*,\1/,g'` ;;
421-esac
422-nonFreeLibPath3=`echo "$nonFreeLibPath3" | sed 's,\\\\\\\\,\\\\,g'`
423-
424-
425 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
426 sdcc ${VERSION} is now configured for
427
428@@ -11562,7 +11358,6 @@ sdcc ${VERSION} is now configured for
429 mos6502 ${enable_mos6502_port}
430 mos65c02 ${enable_mos65c02_port}
431
432- Disable non-free lib: ${OPT_DISABLE_NON_FREE}
433 Disable packihx: ${OPT_DISABLE_PACKIHX}
434 Disable ucsim: ${OPT_DISABLE_UCSIM}
435 Disable device lib: ${OPT_DISABLE_DEVICE_LIB}
436@@ -11577,9 +11372,6 @@ sdcc ${VERSION} is now configured for
437 include/library files: ${datadir}/${inclib_dir_suffix}
438 include files: ${datadir}/${include_dir_suffix}
439 library files: ${datadir}/${lib_dir_suffix}
440- non-free files: ${datadir}/${non_free_inclib_dir_suffix}
441- non-free include files: ${datadir}/${non_free_include_dir_suffix}
442- non-free library files: ${datadir}/${non_free_lib_dir_suffix}
443 documentation: ${docdir}
444
445 prefix: ${prefix}
446@@ -11591,15 +11383,9 @@ sdcc ${VERSION} is now configured for
447 include files: ${incPath1}
448 path(argv[0])${incPath2}
449 ${incPath3}
450- ${nonFreeIncPath1}
451- path(argv[0])${nonFreeIncPath2}
452- ${nonFreeIncPath3}
453 library files: \$SDCC_HOME${libPath1}${dirch}<model>
454 path(argv[0])${libPath2}${dirch}<model>
455 ${libPath3}${dirch}<model>
456- \$SDCC_HOME${nonFreeLibPath1}${dirch}<model>
457- path(argv[0])${nonFreeLibPath2}${dirch}<model>
458- ${nonFreeLibPath3}${dirch}<model>
459 " >&5
460 printf "%s\n" "
461 sdcc ${VERSION} is now configured for
462@@ -11643,7 +11429,6 @@ sdcc ${VERSION} is now configured for
463 mos6502 ${enable_mos6502_port}
464 mos65c02 ${enable_mos65c02_port}
465
466- Disable non-free lib: ${OPT_DISABLE_NON_FREE}
467 Disable packihx: ${OPT_DISABLE_PACKIHX}
468 Disable ucsim: ${OPT_DISABLE_UCSIM}
469 Disable device lib: ${OPT_DISABLE_DEVICE_LIB}
470@@ -11658,9 +11443,6 @@ sdcc ${VERSION} is now configured for
471 include/library files: ${datadir}/${inclib_dir_suffix}
472 include files: ${datadir}/${include_dir_suffix}
473 library files: ${datadir}/${lib_dir_suffix}
474- non-free files: ${datadir}/${non_free_inclib_dir_suffix}
475- non-free include files: ${datadir}/${non_free_include_dir_suffix}
476- non-free library files: ${datadir}/${non_free_lib_dir_suffix}
477 documentation: ${docdir}
478
479 prefix: ${prefix}
480@@ -11672,15 +11454,9 @@ sdcc ${VERSION} is now configured for
481 include files: ${incPath1}
482 path(argv[0])${incPath2}
483 ${incPath3}
484- ${nonFreeIncPath1}
485- path(argv[0])${nonFreeIncPath2}
486- ${nonFreeIncPath3}
487 library files: \$SDCC_HOME${libPath1}${dirch}<model>
488 path(argv[0])${libPath2}${dirch}<model>
489 ${libPath3}${dirch}<model>
490- \$SDCC_HOME${nonFreeLibPath1}${dirch}<model>
491- path(argv[0])${nonFreeLibPath2}${dirch}<model>
492- ${nonFreeLibPath3}${dirch}<model>
493 " >&6; }
494 # End of configure/configure.in
495
496diff --git a/configure.ac b/configure.ac
497index adf5060..bd5a036 100644
498--- a/configure.ac
499+++ b/configure.ac
500@@ -542,19 +542,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@@ -562,13 +549,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@@ -609,19 +589,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@@ -815,7 +787,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@@ -895,16 +866,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_R2KA = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_SM83 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0 || test $OPT_DISABLE_Z80N = 0 || test $OPT_DISABLE_R800 = 0; then
578 AC_CONFIG_FILES([src/z80/Makefile])
579@@ -969,7 +934,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 bin/Makefile
587@@ -991,9 +955,6 @@ AC_CONFIG_FILES([bin/sdar], [chmod +x bin/sdar])
588 AC_CONFIG_FILES([bin/sdnm], [chmod +x bin/sdnm])
589 AC_CONFIG_FILES([bin/sdranlib], [chmod +x bin/sdranlib])
590 AC_CONFIG_FILES([bin/sdobjcopy], [chmod +x bin/sdobjcopy])
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@@ -1011,16 +972,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@@ -1064,7 +1019,6 @@ sdcc ${VERSION} is now configured for
615 mos6502 ${enable_mos6502_port}
616 mos65c02 ${enable_mos65c02_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@@ -1079,9 +1033,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@@ -1093,14 +1044,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
647diff --git a/device/lib/pic14/Makefile.common b/device/lib/pic14/Makefile.common
648index 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
677diff --git a/device/lib/pic14/Makefile.in b/device/lib/pic14/Makefile.in
678index 2c1a5d1..5a2082c 100644
679--- a/device/lib/pic14/Makefile.in
680+++ b/device/lib/pic14/Makefile.in
681@@ -338,13 +338,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@@ -369,8 +368,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
706diff --git a/device/lib/pic14/libc/Makefile.in b/device/lib/pic14/libc/Makefile.in
707index ccf2032..8b2ba48 100644
708--- a/device/lib/pic14/libc/Makefile.in
709+++ b/device/lib/pic14/libc/Makefile.in
710@@ -880,13 +880,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@@ -911,8 +910,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
735diff --git a/device/lib/pic14/libm/Makefile.in b/device/lib/pic14/libm/Makefile.in
736index 47f83e9..599023a 100644
737--- a/device/lib/pic14/libm/Makefile.in
738+++ b/device/lib/pic14/libm/Makefile.in
739@@ -513,13 +513,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@@ -544,8 +543,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
764diff --git a/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in b/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in
765index b74e455..0991bfa 100644
766--- a/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in
767+++ b/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in
768@@ -520,13 +520,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@@ -551,8 +550,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
793diff --git a/device/lib/pic14/libsdcc/enhanced/Makefile.in b/device/lib/pic14/libsdcc/enhanced/Makefile.in
794index 0647cca..0e98e11 100644
795--- a/device/lib/pic14/libsdcc/enhanced/Makefile.in
796+++ b/device/lib/pic14/libsdcc/enhanced/Makefile.in
797@@ -520,13 +520,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@@ -551,8 +550,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
822diff --git a/device/lib/pic14/libsdcc/regular/Makefile.in b/device/lib/pic14/libsdcc/regular/Makefile.in
823index 5936858..16786b4 100644
824--- a/device/lib/pic14/libsdcc/regular/Makefile.in
825+++ b/device/lib/pic14/libsdcc/regular/Makefile.in
826@@ -513,13 +513,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@@ -544,8 +543,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
851diff --git a/device/lib/pic16/Makefile.common b/device/lib/pic16/Makefile.common
852index 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:
877diff --git a/device/lib/pic16/Makefile.in b/device/lib/pic16/Makefile.in
878index b0b5dfd..cfa190d 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@@ -298,8 +295,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@@ -313,11 +309,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
917diff --git a/device/lib/pic16/configure b/device/lib/pic16/configure
918index 88da323..abfd874 100755
919--- a/device/lib/pic16/configure
920+++ b/device/lib/pic16/configure
921@@ -3859,7 +3859,6 @@ fi
922
923
924
925-LIBDEV="${srcdir}/../../non-free/lib/pic16/libdev"
926 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking devices supported by gputils" >&5
927 printf %s "checking devices supported by gputils... " >&6; }
928 GOOD_PICS="";
929@@ -3870,20 +3869,6 @@ N_GOOD=0
930 N_BAD=0
931 mkdir -p ".checkdevices";
932 rm -f "$RESULT";
933-for i in "${LIBDEV}/pic1"*.c; do
934- p="${i##*pic}";
935- p="${p%.c}";
936- P=$(echo "$p" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ);
937- printf " include \"p%s.inc\"\n END" "$p" > "${CHECK}.asm";
938- if "$mCCAS" -p "$p" -o "${CHECK}.o" -c "${CHECK}.asm" >/dev/null 2>&1 && "$mLD" "${CHECK}.o" >/dev/null 2>&1; then
939- GOOD_PICS="$GOOD_PICS $p";
940- N_GOOD=`expr $N_GOOD + 1`;
941- echo "$P" >> "$RESULT";
942- else
943- BAD_PICS="$BAD_PICS $p";
944- N_BAD=`expr $N_BAD + 1`;
945- fi;
946-done;
947 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $N_GOOD devices ($GOOD_PICS)" >&5
948 printf "%s\n" "$N_GOOD devices ($GOOD_PICS)" >&6; }
949
950diff --git a/device/lib/pic16/configure.ac b/device/lib/pic16/configure.ac
951index df811a5..4a49c25 100644
952--- a/device/lib/pic16/configure.ac
953+++ b/device/lib/pic16/configure.ac
954@@ -69,10 +69,6 @@ AC_SUBST(OBJEXT, [o])
955 _AM_DEPENDENCIES(CC)
956 _AM_DEPENDENCIES(CCAS)
957
958-LIBDEV="${srcdir}/../../non-free/lib/pic16/libdev"
959-m4_include([../../non-free/lib/pic16/supported-devices.ac])
960-m4_include([../../non-free/lib/pic16/processors.ac])
961-
962 # Checks for libraries.
963
964 # Checks for header files.
965diff --git a/device/lib/pic16/debug/Makefile.in b/device/lib/pic16/debug/Makefile.in
966index db0d421..9e90d7a 100644
967--- a/device/lib/pic16/debug/Makefile.in
968+++ b/device/lib/pic16/debug/Makefile.in
969@@ -88,10 +88,7 @@ PRE_UNINSTALL = :
970 POST_UNINSTALL = :
971 subdir = debug
972 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
973-am__aclocal_m4_deps = \
974- $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
975- $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
976- $(top_srcdir)/configure.ac
977+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
978 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
979 $(ACLOCAL_M4)
980 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
981@@ -293,8 +290,7 @@ top_builddir = @top_builddir@
982 top_srcdir = @top_srcdir@
983 lib_LIBRARIES = libdebug.a
984 libdebug_a_SOURCES = gstack/gstack.c
985-AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
986- -I$(top_srcdir)/../../non-free/include/pic16
987+AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
988 #AM_CFLAGS += --no-optimize-goto
989
990 #AM_CFLAGS += --debug-ralloc
991@@ -308,11 +304,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
992 #AM_CFLAGS += --noinduction
993 #AM_CFLAGS += --nojtbound
994 #AM_CFLAGS += --noloopreverse
995-AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
996+AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
997 --fomit-frame-pointer --obanksel=9 --denable-peeps \
998 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
999-AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
1000- -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
1001+AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
1002 all: all-am
1003
1004 .SUFFIXES:
1005diff --git a/device/lib/pic16/libc/Makefile.in b/device/lib/pic16/libc/Makefile.in
1006index 74147d2..bed548b 100644
1007--- a/device/lib/pic16/libc/Makefile.in
1008+++ b/device/lib/pic16/libc/Makefile.in
1009@@ -88,10 +88,7 @@ PRE_UNINSTALL = :
1010 POST_UNINSTALL = :
1011 subdir = libc
1012 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1013-am__aclocal_m4_deps = \
1014- $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
1015- $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
1016- $(top_srcdir)/configure.ac
1017+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1018 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1019 $(ACLOCAL_M4)
1020 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
1021@@ -384,8 +381,7 @@ libc18f_a_SOURCES = ctype/iscntrl.c ctype/isdigit.c ctype/isgraph.c \
1022 string/strpbrk.c string/strrchr.c string/strspn.c \
1023 string/strstr.c string/strtok.c string/strupr.c \
1024 utils/cnvfrac.S utils/cnvint.S utils/cvtdec.S
1025-AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1026- -I$(top_srcdir)/../../non-free/include/pic16
1027+AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
1028 #AM_CFLAGS += --no-optimize-goto
1029
1030 #AM_CFLAGS += --debug-ralloc
1031@@ -399,11 +395,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1032 #AM_CFLAGS += --noinduction
1033 #AM_CFLAGS += --nojtbound
1034 #AM_CFLAGS += --noloopreverse
1035-AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
1036+AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
1037 --fomit-frame-pointer --obanksel=9 --denable-peeps \
1038 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
1039-AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
1040- -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
1041+AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
1042 all: all-am
1043
1044 .SUFFIXES:
1045diff --git a/device/lib/pic16/libio/Makefile.in b/device/lib/pic16/libio/Makefile.in
1046index f2b4ecc..13537a8 100644
1047--- a/device/lib/pic16/libio/Makefile.in
1048+++ b/device/lib/pic16/libio/Makefile.in
1049@@ -481,10 +481,7 @@ POST_UNINSTALL = :
1050 @ENABLE_18LF8723_TRUE@am__append_393 = libio18lf8723.a
1051 subdir = libio
1052 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1053-am__aclocal_m4_deps = \
1054- $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
1055- $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
1056- $(top_srcdir)/configure.ac
1057+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1058 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1059 $(ACLOCAL_M4)
1060 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
1061@@ -15602,8 +15599,7 @@ libio18lf8722_a_SOURCES = dummy.c i2c/i2cack.c i2c/i2cclose.c \
1062 libio18lf8722_a_CFLAGS = -p18lf8722 $(AM_CFLAGS)
1063 libio18lf8723_a_SOURCES = dummy.c
1064 libio18lf8723_a_CFLAGS = -p18lf8723 $(AM_CFLAGS)
1065-AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1066- -I$(top_srcdir)/../../non-free/include/pic16
1067+AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
1068 #AM_CFLAGS += --no-optimize-goto
1069
1070 #AM_CFLAGS += --debug-ralloc
1071@@ -15617,11 +15613,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1072 #AM_CFLAGS += --noinduction
1073 #AM_CFLAGS += --nojtbound
1074 #AM_CFLAGS += --noloopreverse
1075-AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
1076+AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
1077 --fomit-frame-pointer --obanksel=9 --denable-peeps \
1078 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
1079-AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
1080- -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
1081+AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
1082 all: all-am
1083
1084 .SUFFIXES:
1085diff --git a/device/lib/pic16/libio/mkmk.sh b/device/lib/pic16/libio/mkmk.sh
1086index 211604e..e8896bf 100755
1087--- a/device/lib/pic16/libio/mkmk.sh
1088+++ b/device/lib/pic16/libio/mkmk.sh
1089@@ -17,40 +17,6 @@ lib_LIBRARIES =
1090
1091 HEREDOC
1092
1093-for f in "../../../non-free/lib/pic16/libdev/pic1"*.c; do
1094- p="${f##*/pic}";
1095- p="${p%.c}";
1096- P=$(echo "$p" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ);
1097- echo "Generating for device >>${p}<<" >&2;
1098- cat <<HERE
1099-if ENABLE_$P
1100-lib_LIBRARIES += libio${p}.a
1101-endif ENABLE_$P
1102-libio${p}_a_SOURCES = dummy.c
1103-HERE
1104- sed -e 's/\s*\(#.*\)\{0,1\}$//' adc.ignore | grep -x "$p" > /dev/null 2>&1 && { echo "No adc." >&2 ; } || cat <<HERE
1105-libio${p}_a_SOURCES += adc/adcbusy.c adc/adcclose.c adc/adcconv.c
1106-libio${p}_a_SOURCES += adc/adcopen.c adc/adcread.c adc/adcsetch.c
1107-HERE
1108- sed -e 's/\s*\(#.*\)\{0,1\}$//' i2c.ignore | grep -x "$p" > /dev/null 2>&1 && { echo "No i2c." >&2 ; } || cat <<HERE
1109-libio${p}_a_SOURCES += i2c/i2cack.c i2c/i2cclose.c i2c/i2cdrdy.c
1110-libio${p}_a_SOURCES += i2c/i2cidle.c i2c/i2cnack.c i2c/i2copen.c
1111-libio${p}_a_SOURCES += i2c/i2creadc.c i2c/i2creads.c i2c/i2crestart.c
1112-libio${p}_a_SOURCES += i2c/i2cstart.c i2c/i2cstop.c i2c/i2cwritec.c
1113-libio${p}_a_SOURCES += i2c/i2cwrites.c
1114-HERE
1115- sed -e 's/\s*\(#.*\)\{0,1\}$//' usart.ignore | grep -x "$p" > /dev/null 2>&1 && { echo "No usart." >&2 ; } || cat <<HERE
1116-libio${p}_a_SOURCES += usart/ubaud.c usart/ubusy.c usart/uclose.c
1117-libio${p}_a_SOURCES += usart/udrdy.c usart/ugetc.c usart/ugets.c
1118-libio${p}_a_SOURCES += usart/uopen.c usart/uputc.c usart/uputs.c
1119-libio${p}_a_SOURCES += usart/usartd.c
1120-HERE
1121- cat <<HERE
1122-libio${p}_a_CFLAGS = -p${p} \$(AM_CFLAGS)
1123-
1124-HERE
1125-done
1126-
1127 cat <<HEREDOC
1128 include \$(top_srcdir)/Makefile.common
1129
1130diff --git a/device/lib/pic16/libm/Makefile.in b/device/lib/pic16/libm/Makefile.in
1131index d08a59c..e01d8e2 100644
1132--- a/device/lib/pic16/libm/Makefile.in
1133+++ b/device/lib/pic16/libm/Makefile.in
1134@@ -88,10 +88,7 @@ PRE_UNINSTALL = :
1135 POST_UNINSTALL = :
1136 subdir = libm
1137 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1138-am__aclocal_m4_deps = \
1139- $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
1140- $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
1141- $(top_srcdir)/configure.ac
1142+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1143 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1144 $(ACLOCAL_M4)
1145 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
1146@@ -314,8 +311,7 @@ libm18f_a_SOURCES = acosf.c asincosf.c asinf.c atan2f.c atanf.c \
1147 frexpf.c isinf.c isnan.c ldexpf.c log10f.c logf.c modff.c \
1148 powf.c sincosf.c sincoshf.c sinf.c sinhf.c sqrtf.c tancotf.c \
1149 tanf.c tanhf.c
1150-AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1151- -I$(top_srcdir)/../../non-free/include/pic16
1152+AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
1153 #AM_CFLAGS += --no-optimize-goto
1154
1155 #AM_CFLAGS += --debug-ralloc
1156@@ -329,11 +325,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1157 #AM_CFLAGS += --noinduction
1158 #AM_CFLAGS += --nojtbound
1159 #AM_CFLAGS += --noloopreverse
1160-AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
1161+AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
1162 --fomit-frame-pointer --obanksel=9 --denable-peeps \
1163 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
1164-AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
1165- -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
1166+AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
1167 all: all-am
1168
1169 .SUFFIXES:
1170diff --git a/device/lib/pic16/libsdcc/Makefile.in b/device/lib/pic16/libsdcc/Makefile.in
1171index afbf492..4f4a5e5 100644
1172--- a/device/lib/pic16/libsdcc/Makefile.in
1173+++ b/device/lib/pic16/libsdcc/Makefile.in
1174@@ -88,10 +88,7 @@ PRE_UNINSTALL = :
1175 POST_UNINSTALL = :
1176 subdir = libsdcc
1177 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1178-am__aclocal_m4_deps = \
1179- $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
1180- $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
1181- $(top_srcdir)/configure.ac
1182+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1183 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1184 $(ACLOCAL_M4)
1185 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
1186@@ -415,8 +412,7 @@ libsdcc_a_SOURCES = char/divschar.c char/divuchar.c char/modschar.c \
1187 int/modsint.c int/moduint.c int/mulint.c long/divslong.c \
1188 long/divulong.c long/modslong.c long/modulong.c long/mullong.c \
1189 lregs/lrrest.c lregs/lrst.c stack/stack.S
1190-AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1191- -I$(top_srcdir)/../../non-free/include/pic16
1192+AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
1193 #AM_CFLAGS += --no-optimize-goto
1194
1195 #AM_CFLAGS += --debug-ralloc
1196@@ -430,11 +426,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1197 #AM_CFLAGS += --noinduction
1198 #AM_CFLAGS += --nojtbound
1199 #AM_CFLAGS += --noloopreverse
1200-AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
1201+AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
1202 --fomit-frame-pointer --obanksel=9 --denable-peeps \
1203 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
1204-AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
1205- -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
1206+AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
1207 all: all-am
1208
1209 .SUFFIXES:
1210diff --git a/device/lib/pic16/startup/Makefile.in b/device/lib/pic16/startup/Makefile.in
1211index 5c2fce7..8d70807 100644
1212--- a/device/lib/pic16/startup/Makefile.in
1213+++ b/device/lib/pic16/startup/Makefile.in
1214@@ -89,10 +89,7 @@ PRE_UNINSTALL = :
1215 POST_UNINSTALL = :
1216 subdir = startup
1217 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1218-am__aclocal_m4_deps = \
1219- $(top_srcdir)/../../non-free/lib/pic16/supported-devices.ac \
1220- $(top_srcdir)/../../non-free/lib/pic16/processors.ac \
1221- $(top_srcdir)/configure.ac
1222+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1223 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
1224 $(ACLOCAL_M4)
1225 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
1226@@ -310,8 +307,7 @@ libcrt0iz_a_SOURCES = crt0iz.c
1227 # Force installation of .o files into $libdir
1228 crtdir = $(libdir)
1229 crt_DATA = crt0.o crt0i.o crt0iz.o
1230-AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1231- -I$(top_srcdir)/../../non-free/include/pic16
1232+AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16
1233 #AM_CFLAGS += --no-optimize-goto
1234
1235 #AM_CFLAGS += --debug-ralloc
1236@@ -325,11 +321,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \
1237 #AM_CFLAGS += --noinduction
1238 #AM_CFLAGS += --nojtbound
1239 #AM_CFLAGS += --noloopreverse
1240-AM_CFLAGS = --std-c11 --asm="$(CCAS)" --no-warn-non-free \
1241+AM_CFLAGS = --std-c11 --asm="$(CCAS)" \
1242 --fomit-frame-pointer --obanksel=9 --denable-peeps \
1243 --optimize-cmp --optimize-df --i-code-in-asm @USE_FLOATS@
1244-AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 \
1245- -I$(top_srcdir)/../../non-free/include/pic16 -I$(srcdir)
1246+AM_CCASFLAGS = -I$(top_srcdir)/../../include/pic16 -I$(srcdir)
1247 all: all-am
1248
1249 .SUFFIXES:
1250diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt
1251index 8dfadb6..dd17528 100644
1252--- a/doc/INSTALL.txt
1253+++ b/doc/INSTALL.txt
1254@@ -18,9 +18,7 @@ To install:
1255
1256 This will install sdcc binaries into: /usr/local/bin/
1257 header files into: /usr/local/share/sdcc/include/
1258-non-free header files into: /usr/local/share/sdcc/non-free/include/
1259 library files into: /usr/local/share/sdcc/lib/
1260-non-free library files into: /usr/local/share/sdcc/non-free/lib/
1261 and documentation into: /usr/local/share/sdcc/doc/
1262
1263 You can test the install by entering:
1264@@ -44,9 +42,7 @@ To install:
1265
1266 By default this will install sdcc binaries into: C:\Program Files\SDCC\bin\
1267 header files into: C:\Program Files\SDCC\include\
1268-non-free header files into: C:\Program Files\SDCC\non-free\include\
1269 library files into: C:\Program Files\SDCC\lib\
1270-non-free library files into: C:\Program Files\SDCC\non-free\lib\
1271 and documentation into: C:\Program Files\SDCC\doc\
1272
1273 You can test the install by opening a DOS box and entering:
1274@@ -75,9 +71,7 @@ To install:
1275
1276 This will install sdcc binaries into: /Developer/sdcc/bin/
1277 header files into: /Developer/sdcc/share/sdcc/include/
1278-non-free header files into: /Developer/sdcc/share/sdcc/non-free/include/
1279 library files into: /Developer/sdcc/share/sdcc/lib/
1280-non-free library files into: /Developer/sdcc/share/sdcc/non-free/lib/
1281 and documentation into: /Developer/sdcc/share/sdcc/doc/
1282
1283 You can test the install by entering:
1284diff --git a/doc/README.txt b/doc/README.txt
1285index e62177b..4d09afb 100644
1286--- a/doc/README.txt
1287+++ b/doc/README.txt
1288@@ -37,10 +37,9 @@ Exception are pic device libraries and header files which are derived
1289 from Microchip header (.inc) and linker script (.lkr) files. Microchip
1290 requires that "The header files should state that they are only to be
1291 used with authentic Microchip devices" which makes them incompatible
1292-with the GPL. Pic device libraries and header files are located at
1293-non-free/lib and non-free/include directories respectively. Sdcc should
1294-be run with the --use-non-free command line option in order to include
1295-the potentially non-free header files and libraries.
1296+with the GPL. These non-free libraries and header files (and the build
1297+and run-time options that enable their use) are omitted in the SDCC
1298+package distributed with GNU Guix.
1299
1300 However: Many think that the Microchip requirement is not legally enforceable,
1301 arguing that the header files only contain noncopyrightable facts.
1302diff --git a/doc/sdccman.lyx b/doc/sdccman.lyx
1303index efaf738..0ad1ba7 100644
1304--- a/doc/sdccman.lyx
1305+++ b/doc/sdccman.lyx
1306@@ -1151,54 +1151,9 @@ A possible exception are pic device libraries and header files which are
1307 to be used with authentic Microchip devices" which makes them incompatible
1308 with the GPL, if Microchip has any copyright in them (which might depend
1309 on local copyright laws).
1310- Pic device libraries and header files are located at non-free/lib and non-free/
1311-include directories respectively.
1312- SDCC should be run with the
1313-\series bold
1314--
1315-\begin_inset ERT
1316-status collapsed
1317-
1318-\begin_layout Plain Layout
1319-
1320-
1321-\backslash
1322-/
1323-\end_layout
1324-
1325-\end_inset
1326-
1327--
1328-\series default
1329-use-non-free
1330-\series bold
1331-
1332-\begin_inset Index idx
1333-status collapsed
1334-
1335-\begin_layout Plain Layout
1336--
1337-\begin_inset ERT
1338-status collapsed
1339-
1340-\begin_layout Plain Layout
1341-
1342-
1343-\backslash
1344-/
1345-\end_layout
1346-
1347-\end_inset
1348-
1349--use-non-free
1350-\end_layout
1351-
1352-\end_inset
1353-
1354-
1355-\series default
1356- command line option in order to include non-free header files and libraries.
1357-
1358+ These non-free libraries and header files (and the build and run-time options
1359+ that enable their use) are omitted in the SDCC package distributed with
1360+ GNU Guix.
1361 \end_layout
1362
1363 \begin_layout Itemize
1364@@ -1261,23 +1216,6 @@ makebin:
1365 zlib/libpng License
1366 \end_layout
1367
1368-\begin_layout Itemize
1369-pic libraries in device/non-free:
1370-\begin_inset Newline newline
1371-\end_inset
1372-
1373-Microchip Technology Inc.
1374-\begin_inset space \space{}
1375-\end_inset
1376-
1377-claims to have copyrights on this, and their term are non-free.
1378- However, a more common opinion is that Microchip Technology Inc.
1379-\begin_inset space \space{}
1380-\end_inset
1381-
1382-is just claiming a copyright on uncopyrightable facts.
1383-\end_layout
1384-
1385 \end_deeper
1386 \begin_layout Itemize
1387 libraries:
1388@@ -3194,18 +3132,6 @@ include_dir_suffix environment variable, see table below
1389 \end_inset
1390
1391
1392-\begin_inset space ~
1393-\end_inset
1394-
1395-non_free_include_dir_suffix environment variable, see table below
1396-\end_layout
1397-
1398-\begin_layout Labeling
1399-\labelwidthstring 00.00.0000
1400-\begin_inset space ~
1401-\end_inset
1402-
1403-
1404 \begin_inset space ~
1405 \end_inset
1406
1407@@ -3218,22 +3144,6 @@ lib_dir_suffix environment variable, see table below
1408 \end_inset
1409
1410
1411-\begin_inset space ~
1412-\end_inset
1413-
1414-
1415-\begin_inset space ~
1416-\end_inset
1417-
1418-non_free_lib_dir_suffix environment variable, see table below
1419-\end_layout
1420-
1421-\begin_layout Labeling
1422-\labelwidthstring 00.00.0000
1423-\begin_inset space ~
1424-\end_inset
1425-
1426-
1427 \begin_inset space ~
1428 \end_inset
1429
1430@@ -3876,7 +3786,7 @@ These defaults are:
1431 \begin_layout Standard
1432 \align center
1433 \begin_inset Tabular
1434-<lyxtabular version="3" rows="11" columns="3">
1435+<lyxtabular version="3" rows="9" columns="3">
1436 <features tabularvalignment="middle">
1437 <column alignment="block" valignment="top" width="0in">
1438 <column alignment="block" valignment="top" width="0in">
1439@@ -4160,68 +4070,6 @@ sdcc/include
1440 include
1441 \end_layout
1442
1443-\end_inset
1444-</cell>
1445-</row>
1446-<row>
1447-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1448-\begin_inset Text
1449-
1450-\begin_layout Plain Layout
1451-
1452-\emph on
1453-NON_FREE_INCLUDE_DIR_SUFFIX
1454-\end_layout
1455-
1456-\end_inset
1457-</cell>
1458-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1459-\begin_inset Text
1460-
1461-\begin_layout Plain Layout
1462-sdcc/non-free/include
1463-\end_layout
1464-
1465-\end_inset
1466-</cell>
1467-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1468-\begin_inset Text
1469-
1470-\begin_layout Plain Layout
1471-non-free/include
1472-\end_layout
1473-
1474-\end_inset
1475-</cell>
1476-</row>
1477-<row>
1478-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1479-\begin_inset Text
1480-
1481-\begin_layout Plain Layout
1482-
1483-\emph on
1484-LIB_DIR_SUFFIX
1485-\end_layout
1486-
1487-\end_inset
1488-</cell>
1489-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1490-\begin_inset Text
1491-
1492-\begin_layout Plain Layout
1493-sdcc/lib
1494-\end_layout
1495-
1496-\end_inset
1497-</cell>
1498-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1499-\begin_inset Text
1500-
1501-\begin_layout Plain Layout
1502-lib
1503-\end_layout
1504-
1505 \end_inset
1506 </cell>
1507 </row>
1508@@ -4232,7 +4080,7 @@ lib
1509 \begin_layout Plain Layout
1510
1511 \emph on
1512-NON_FREE_LIB_DIR_SUFFIX
1513+LIB_DIR_SUFFIX
1514 \end_layout
1515
1516 \end_inset
1517@@ -4241,7 +4089,7 @@ NON_FREE_LIB_DIR_SUFFIX
1518 \begin_inset Text
1519
1520 \begin_layout Plain Layout
1521-sdcc/non-free/lib
1522+sdcc/lib
1523 \end_layout
1524
1525 \end_inset
1526@@ -4250,7 +4098,7 @@ sdcc/non-free/lib
1527 \begin_inset Text
1528
1529 \begin_layout Plain Layout
1530-non-free/lib
1531+lib
1532 \end_layout
1533
1534 \end_inset
1535@@ -4649,20 +4497,6 @@ include
1536 \end_inset
1537
1538
1539-\backslash
1540-
1541-\begin_inset Newline newline
1542-\end_inset
1543-
1544-non_free_include_dir_suffix=
1545-\begin_inset Quotes srd
1546-\end_inset
1547-
1548-non-free/include
1549-\begin_inset Quotes srd
1550-\end_inset
1551-
1552-
1553 \backslash
1554
1555 \begin_inset Newline newline
1556@@ -4677,20 +4511,6 @@ lib
1557 \end_inset
1558
1559
1560-\backslash
1561-
1562-\begin_inset Newline newline
1563-\end_inset
1564-
1565-non_free_lib_dir_suffix=
1566-\begin_inset Quotes srd
1567-\end_inset
1568-
1569-non-free/lib
1570-\begin_inset Quotes srd
1571-\end_inset
1572-
1573-
1574 \backslash
1575
1576 \begin_inset Newline newline
1577@@ -4871,20 +4691,6 @@ include
1578 \end_inset
1579
1580
1581-\backslash
1582-
1583-\begin_inset Newline newline
1584-\end_inset
1585-
1586-non_free_include_dir_suffix=
1587-\begin_inset Quotes srd
1588-\end_inset
1589-
1590-non-free/include
1591-\begin_inset Quotes srd
1592-\end_inset
1593-
1594-
1595 \backslash
1596
1597 \begin_inset Newline newline
1598@@ -4899,20 +4705,6 @@ lib
1599 \end_inset
1600
1601
1602-\backslash
1603-
1604-\begin_inset Newline newline
1605-\end_inset
1606-
1607-non_free_lib_dir_suffix=
1608-\begin_inset Quotes srd
1609-\end_inset
1610-
1611-non-free/lib
1612-\begin_inset Quotes srd
1613-\end_inset
1614-
1615-
1616 \backslash
1617
1618 \begin_inset Newline newline
1619@@ -5009,7 +4801,7 @@ Install paths
1620 \begin_layout Standard
1621 \align center
1622 \begin_inset Tabular
1623-<lyxtabular version="3" rows="7" columns="4">
1624+<lyxtabular version="3" rows="5" columns="4">
1625 <features tabularvalignment="middle">
1626 <column alignment="left" valignment="top">
1627 <column alignment="left" valignment="top" width="4.5cm">
1628@@ -5165,64 +4957,6 @@ include
1629 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1630 \begin_inset Text
1631
1632-\begin_layout Plain Layout
1633-Non-free include files
1634-\end_layout
1635-
1636-\end_inset
1637-</cell>
1638-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1639-\begin_inset Text
1640-
1641-\begin_layout Plain Layout
1642-
1643-\emph on
1644-$DATADIR/non-free/
1645-\emph default
1646-
1647-\begin_inset Newline newline
1648-\end_inset
1649-
1650-
1651-\emph on
1652-$INCLUDE_DIR_SUFFIX
1653-\end_layout
1654-
1655-\end_inset
1656-</cell>
1657-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1658-\begin_inset Text
1659-
1660-\begin_layout Plain Layout
1661-/usr/local/share/
1662-\begin_inset Newline newline
1663-\end_inset
1664-
1665-sdcc/non-free/include
1666-\end_layout
1667-
1668-\end_inset
1669-</cell>
1670-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1671-\begin_inset Text
1672-
1673-\begin_layout Plain Layout
1674-
1675-\backslash
1676-sdcc
1677-\backslash
1678-non-free
1679-\backslash
1680-include
1681-\end_layout
1682-
1683-\end_inset
1684-</cell>
1685-</row>
1686-<row>
1687-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1688-\begin_inset Text
1689-
1690 \begin_layout Plain Layout
1691 Library file**
1692 \end_layout
1693@@ -5272,64 +5006,6 @@ sdcc
1694 lib
1695 \end_layout
1696
1697-\end_inset
1698-</cell>
1699-</row>
1700-<row>
1701-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1702-\begin_inset Text
1703-
1704-\begin_layout Plain Layout
1705-Library file**
1706-\end_layout
1707-
1708-\end_inset
1709-</cell>
1710-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1711-\begin_inset Text
1712-
1713-\begin_layout Plain Layout
1714-
1715-\emph on
1716-$DATADIR/non-free/
1717-\emph default
1718-
1719-\begin_inset Newline newline
1720-\end_inset
1721-
1722-
1723-\emph on
1724-$LIB_DIR_SUFFIX
1725-\end_layout
1726-
1727-\end_inset
1728-</cell>
1729-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1730-\begin_inset Text
1731-
1732-\begin_layout Plain Layout
1733-/usr/local/share/
1734-\begin_inset Newline newline
1735-\end_inset
1736-
1737-sdcc/non-free/lib
1738-\end_layout
1739-
1740-\end_inset
1741-</cell>
1742-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1743-\begin_inset Text
1744-
1745-\begin_layout Plain Layout
1746-
1747-\backslash
1748-sdcc
1749-\backslash
1750-non-free
1751-\backslash
1752-lib
1753-\end_layout
1754-
1755 \end_inset
1756 </cell>
1757 </row>
1758@@ -5652,7 +5328,7 @@ $PATH
1759 \begin_layout Standard
1760 \align center
1761 \begin_inset Tabular
1762-<lyxtabular version="3" rows="9" columns="4">
1763+<lyxtabular version="3" rows="6" columns="4">
1764 <features tabularvalignment="middle">
1765 <column alignment="block" valignment="top" width="0.5cm">
1766 <column alignment="block" valignment="top" width="4.8cm">
1767@@ -5930,203 +5606,13 @@ include
1768 </cell>
1769 </row>
1770 <row>
1771-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
1772+<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
1773 \begin_inset Text
1774
1775 \begin_layout Plain Layout
1776 5
1777 \end_layout
1778
1779-\end_inset
1780-</cell>
1781-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1782-\begin_inset Text
1783-
1784-\begin_layout Plain Layout
1785-
1786-\emph on
1787-$DATADIR/
1788-\emph default
1789-
1790-\begin_inset Newline newline
1791-\end_inset
1792-
1793-
1794-\emph on
1795-$INCLUDE_DIR_SUFFIX
1796-\end_layout
1797-
1798-\end_inset
1799-</cell>
1800-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
1801-\begin_inset Text
1802-
1803-\begin_layout Plain Layout
1804-/usr/local/share/
1805-\begin_inset Newline newline
1806-\end_inset
1807-
1808-sdcc/include
1809-\end_layout
1810-
1811-\end_inset
1812-</cell>
1813-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1814-\begin_inset Text
1815-
1816-\begin_layout Plain Layout
1817-(not on Win32)
1818-\end_layout
1819-
1820-\end_inset
1821-</cell>
1822-</row>
1823-<row>
1824-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1825-\begin_inset Text
1826-
1827-\begin_layout Plain Layout
1828-6
1829-\end_layout
1830-
1831-\end_inset
1832-</cell>
1833-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1834-\begin_inset Text
1835-
1836-\begin_layout Plain Layout
1837-$SDCC_HOME/
1838-\begin_inset Newline newline
1839-\end_inset
1840-
1841-
1842-\emph on
1843-$PREFIX2DATA_DIR/
1844-\emph default
1845-
1846-\begin_inset Newline newline
1847-\end_inset
1848-
1849-
1850-\emph on
1851-non-free/
1852-\emph default
1853-
1854-\begin_inset Newline newline
1855-\end_inset
1856-
1857-
1858-\emph on
1859-$INCLUDE_DIR_SUFFIX
1860-\end_layout
1861-
1862-\end_inset
1863-</cell>
1864-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1865-\begin_inset Text
1866-
1867-\begin_layout Plain Layout
1868-$SDCC_HOME/share/
1869-\begin_inset Newline newline
1870-\end_inset
1871-
1872-sdcc/non-free/include
1873-\end_layout
1874-
1875-\end_inset
1876-</cell>
1877-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1878-\begin_inset Text
1879-
1880-\begin_layout Plain Layout
1881-$SDCC_HOME
1882-\backslash
1883-non-free
1884-\backslash
1885-include
1886-\end_layout
1887-
1888-\end_inset
1889-</cell>
1890-</row>
1891-<row>
1892-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1893-\begin_inset Text
1894-
1895-\begin_layout Plain Layout
1896-7
1897-\end_layout
1898-
1899-\end_inset
1900-</cell>
1901-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1902-\begin_inset Text
1903-
1904-\begin_layout Plain Layout
1905-path(argv[0])/
1906-\begin_inset Newline newline
1907-\end_inset
1908-
1909-
1910-\emph on
1911-$BIN2DATADIR/
1912-\emph default
1913-
1914-\begin_inset Newline newline
1915-\end_inset
1916-
1917-
1918-\emph on
1919-non-free/
1920-\emph default
1921-
1922-\begin_inset Newline newline
1923-\end_inset
1924-
1925-
1926-\emph on
1927-$INCLUDE_DIR_SUFFIX
1928-\end_layout
1929-
1930-\end_inset
1931-</cell>
1932-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
1933-\begin_inset Text
1934-
1935-\begin_layout Plain Layout
1936-path(argv[0])/../
1937-\begin_inset Newline newline
1938-\end_inset
1939-
1940-sdcc/non-free/include
1941-\end_layout
1942-
1943-\end_inset
1944-</cell>
1945-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
1946-\begin_inset Text
1947-
1948-\begin_layout Plain Layout
1949-path(argv[0])
1950-\backslash
1951-..
1952-\backslash
1953-non-free
1954-\backslash
1955-include
1956-\end_layout
1957-
1958-\end_inset
1959-</cell>
1960-</row>
1961-<row>
1962-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
1963-\begin_inset Text
1964-
1965-\begin_layout Plain Layout
1966-8
1967-\end_layout
1968-
1969 \end_inset
1970 </cell>
1971 <cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
1972@@ -6142,21 +5628,13 @@ $DATADIR/
1973 \end_inset
1974
1975
1976-\emph on
1977-non-free/
1978-\emph default
1979-
1980-\begin_inset Newline newline
1981-\end_inset
1982-
1983-
1984 \emph on
1985 $INCLUDE_DIR_SUFFIX
1986 \end_layout
1987
1988 \end_inset
1989 </cell>
1990-<cell alignment="center" valignment="top" topline="true" bottomline="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@@ -6164,7 +5642,7 @@ $INCLUDE_DIR_SUFFIX
1996 \begin_inset Newline newline
1997 \end_inset
1998
1999-sdcc/non-free/include
2000+sdcc/include
2001 \end_layout
2002
2003 \end_inset
2004@@ -6262,7 +5740,7 @@ model
2005 \begin_layout Standard
2006 \align center
2007 \begin_inset Tabular
2008-<lyxtabular version="3" rows="10" columns="4">
2009+<lyxtabular version="3" rows="6" columns="4">
2010 <features tabularvalignment="middle">
2011 <column alignment="block" valignment="top" width="0.5cm">
2012 <column alignment="block" valignment="top" width="4.5cm">
2013@@ -6542,7 +6020,7 @@ lib
2014 </cell>
2015 </row>
2016 <row>
2017-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
2018+<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2019 \begin_inset Text
2020
2021 \begin_layout Plain Layout
2022@@ -6551,7 +6029,7 @@ lib
2023
2024 \end_inset
2025 </cell>
2026-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2027+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2028 \begin_inset Text
2029
2030 \begin_layout Plain Layout
2031@@ -6582,7 +6060,7 @@ $LIB_DIR_SUFFIX/
2032
2033 \end_inset
2034 </cell>
2035-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
2036+<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2037 \begin_inset Text
2038
2039 \begin_layout Plain Layout
2040@@ -6597,7 +6075,7 @@ lib/
2041
2042 \end_inset
2043 </cell>
2044-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2045+<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2046 \begin_inset Text
2047
2048 \begin_layout Plain Layout
2049@@ -6620,308 +6098,6 @@ lib
2050 <model>
2051 \end_layout
2052
2053-\end_inset
2054-</cell>
2055-</row>
2056-<row>
2057-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2058-\begin_inset Text
2059-
2060-\begin_layout Plain Layout
2061-6
2062-\end_layout
2063-
2064-\end_inset
2065-</cell>
2066-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2067-\begin_inset Text
2068-
2069-\begin_layout Plain Layout
2070-
2071-\emph on
2072-$DATADIR/non-free/
2073-\emph default
2074-
2075-\begin_inset Newline newline
2076-\end_inset
2077-
2078-
2079-\emph on
2080-$LIB_DIR_SUFFIX/
2081-\emph default
2082-
2083-\begin_inset Newline newline
2084-\end_inset
2085-
2086-
2087-\emph on
2088-<model>
2089-\end_layout
2090-
2091-\end_inset
2092-</cell>
2093-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2094-\begin_inset Text
2095-
2096-\begin_layout Plain Layout
2097-/usr/local/share/sdcc/
2098-\begin_inset Newline newline
2099-\end_inset
2100-
2101-lib/
2102-\emph on
2103-<model>
2104-\end_layout
2105-
2106-\end_inset
2107-</cell>
2108-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2109-\begin_inset Text
2110-
2111-\begin_layout Plain Layout
2112-(not on Win32)
2113-\end_layout
2114-
2115-\end_inset
2116-</cell>
2117-</row>
2118-<row>
2119-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2120-\begin_inset Text
2121-
2122-\begin_layout Plain Layout
2123-7
2124-\end_layout
2125-
2126-\end_inset
2127-</cell>
2128-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2129-\begin_inset Text
2130-
2131-\begin_layout Plain Layout
2132-$SDCC_HOME/
2133-\begin_inset Newline newline
2134-\end_inset
2135-
2136-
2137-\emph on
2138-$PREFIX2DATA_DIR/
2139-\emph default
2140-
2141-\begin_inset Newline newline
2142-\end_inset
2143-
2144-
2145-\emph on
2146-non-free/
2147-\emph default
2148-
2149-\begin_inset Newline newline
2150-\end_inset
2151-
2152-
2153-\emph on
2154-$LIB_DIR_SUFFIX/
2155-\emph default
2156-
2157-\begin_inset Newline newline
2158-\end_inset
2159-
2160-
2161-\emph on
2162-<model>
2163-\end_layout
2164-
2165-\end_inset
2166-</cell>
2167-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2168-\begin_inset Text
2169-
2170-\begin_layout Plain Layout
2171-$SDCC_HOME/share/sdcc/
2172-\begin_inset Newline newline
2173-\end_inset
2174-
2175-non-free/lib/
2176-\emph on
2177-<model>
2178-\end_layout
2179-
2180-\end_inset
2181-</cell>
2182-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2183-\begin_inset Text
2184-
2185-\begin_layout Plain Layout
2186-$SDCC_HOME
2187-\backslash
2188-
2189-\begin_inset Newline newline
2190-\end_inset
2191-
2192-lib
2193-\backslash
2194-non-free
2195-\emph on
2196-
2197-\backslash
2198-<model>
2199-\end_layout
2200-
2201-\end_inset
2202-</cell>
2203-</row>
2204-<row>
2205-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2206-\begin_inset Text
2207-
2208-\begin_layout Plain Layout
2209-8
2210-\end_layout
2211-
2212-\end_inset
2213-</cell>
2214-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2215-\begin_inset Text
2216-
2217-\begin_layout Plain Layout
2218-path(argv[0])/
2219-\begin_inset Newline newline
2220-\end_inset
2221-
2222-
2223-\emph on
2224-$BIN2DATADIR/
2225-\emph default
2226-
2227-\begin_inset Newline newline
2228-\end_inset
2229-
2230-
2231-\emph on
2232-non-free/
2233-\emph default
2234-
2235-\begin_inset Newline newline
2236-\end_inset
2237-
2238-
2239-\emph on
2240-$LIB_DIR_SUFFIX/
2241-\emph default
2242-
2243-\begin_inset Newline newline
2244-\end_inset
2245-
2246-
2247-\emph on
2248-<model>
2249-\end_layout
2250-
2251-\end_inset
2252-</cell>
2253-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2254-\begin_inset Text
2255-
2256-\begin_layout Plain Layout
2257-path(argv[0])/../sdcc/
2258-\begin_inset Newline newline
2259-\end_inset
2260-
2261-non-free/lib/
2262-\emph on
2263-<model>
2264-\end_layout
2265-
2266-\end_inset
2267-</cell>
2268-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2269-\begin_inset Text
2270-
2271-\begin_layout Plain Layout
2272-path(argv[0])
2273-\backslash
2274-..
2275-\backslash
2276-
2277-\begin_inset Newline newline
2278-\end_inset
2279-
2280-lib
2281-\backslash
2282-non-free
2283-\emph on
2284-
2285-\backslash
2286-<model>
2287-\end_layout
2288-
2289-\end_inset
2290-</cell>
2291-</row>
2292-<row>
2293-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2294-\begin_inset Text
2295-
2296-\begin_layout Plain Layout
2297-9
2298-\end_layout
2299-
2300-\end_inset
2301-</cell>
2302-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2303-\begin_inset Text
2304-
2305-\begin_layout Plain Layout
2306-
2307-\emph on
2308-$DATADIR/non-free/
2309-\emph default
2310-
2311-\begin_inset Newline newline
2312-\end_inset
2313-
2314-
2315-\emph on
2316-$LIB_DIR_SUFFIX/
2317-\emph default
2318-
2319-\begin_inset Newline newline
2320-\end_inset
2321-
2322-
2323-\emph on
2324-<model>
2325-\end_layout
2326-
2327-\end_inset
2328-</cell>
2329-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2330-\begin_inset Text
2331-
2332-\begin_layout Plain Layout
2333-/usr/local/share/sdcc/
2334-\begin_inset Newline newline
2335-\end_inset
2336-
2337-non-free/lib/
2338-\begin_inset Newline newline
2339-\end_inset
2340-
2341-
2342-\emph on
2343-<model>
2344-\end_layout
2345-
2346-\end_inset
2347-</cell>
2348-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2349-\begin_inset Text
2350-
2351-\begin_layout Plain Layout
2352-(not on Win32)
2353-\end_layout
2354-
2355 \end_inset
2356 </cell>
2357 </row>
2358@@ -9201,14 +8377,6 @@ In <installdir>/share/sdcc/include
2359 the include files
2360 \end_layout
2361
2362-\begin_layout Standard
2363-In <installdir>/share/sdcc/non-free/include
2364-\end_layout
2365-
2366-\begin_layout Itemize
2367-the non-free include files
2368-\end_layout
2369-
2370 \begin_layout Standard
2371 In <installdir>/share/sdcc/lib
2372 \end_layout
2373@@ -9217,14 +8385,6 @@ In <installdir>/share/sdcc/lib
2374 the src and target subdirectories with the precompiled relocatables.
2375 \end_layout
2376
2377-\begin_layout Standard
2378-In <installdir>/share/sdcc/non-free/lib
2379-\end_layout
2380-
2381-\begin_layout Itemize
2382-the src and target subdirectories with the non-free precompiled relocatables.
2383-\end_layout
2384-
2385 \begin_layout Standard
2386 In <installdir>/share/sdcc/doc
2387 \end_layout
2388@@ -16452,66 +15612,6 @@ splint
2389 myprogram.c
2390 \end_layout
2391
2392-\begin_layout Labeling
2393-\labelwidthstring 00.00.0000
2394-
2395-\series bold
2396--
2397-\begin_inset ERT
2398-status collapsed
2399-
2400-\begin_layout Plain Layout
2401-
2402-
2403-\backslash
2404-/
2405-\end_layout
2406-
2407-\end_inset
2408-
2409--use-non-free
2410-\series default
2411-
2412-\begin_inset Index idx
2413-status collapsed
2414-
2415-\begin_layout Plain Layout
2416--
2417-\begin_inset ERT
2418-status collapsed
2419-
2420-\begin_layout Plain Layout
2421-
2422-
2423-\backslash
2424-/
2425-\end_layout
2426-
2427-\end_inset
2428-
2429--use-non-free
2430-\end_layout
2431-
2432-\end_inset
2433-
2434-
2435-\begin_inset CommandInset label
2436-LatexCommand label
2437-name "lyx:--use-non-free"
2438-
2439-\end_inset
2440-
2441- Search / include non-free licensed libraries and header files, located
2442- under the non-free directory - see section
2443-\begin_inset CommandInset ref
2444-LatexCommand ref
2445-reference "subsec:Search-Paths"
2446-
2447-\end_inset
2448-
2449-
2450-\end_layout
2451-
2452 \begin_layout Subsection
2453 Linker Options
2454 \begin_inset Index idx
2455@@ -46758,66 +45858,9 @@ http://sourceforge.net/projects/gputils
2456 Pic device specific header and c source files are automatically generated
2457 from MPLAB include files, which are published by Microchip with a special
2458 requirement that they are only to be used with authentic Microchip devices.
2459- This reqirement prevents to publish generated header and c source files
2460- under the GPL compatible license, so they are located in non-free directory
2461- (see section
2462-\begin_inset CommandInset ref
2463-LatexCommand ref
2464-reference "subsec:Search-Paths"
2465-
2466-\end_inset
2467-
2468-).
2469- In order to include them in include and library search paths, the
2470-\series bold
2471--
2472-\begin_inset ERT
2473-status collapsed
2474-
2475-\begin_layout Plain Layout
2476-
2477-
2478-\backslash
2479-/
2480-\end_layout
2481-
2482-\end_inset
2483-
2484--use-non-free
2485-\begin_inset Index idx
2486-status collapsed
2487-
2488-\begin_layout Plain Layout
2489--
2490-\begin_inset ERT
2491-status collapsed
2492-
2493-\begin_layout Plain Layout
2494-
2495-
2496-\backslash
2497-/
2498-\end_layout
2499-
2500-\end_inset
2501-
2502--use-non-free
2503-\end_layout
2504-
2505-\end_inset
2506-
2507-
2508-\series default
2509- command line option should be defined.
2510-\begin_inset Newline newline
2511-\end_inset
2512-
2513-
2514-\begin_inset Newline newline
2515-\end_inset
2516-
2517-NOTE: the compiled code, which use non-free pic device specific libraries,
2518- is not GPL compatible!
2519+ As this restriction is incompatible with the goal of software freedom,
2520+ header files and libraries generated from these files are not included
2521+ in the SDCC package distributed with Guix.
2522 \begin_inset Newline newline
2523 \end_inset
2524
2525@@ -46871,7 +45914,7 @@ Makefile
2526 \begin_inset space ~
2527 \end_inset
2528
2529-sdcc -V --use-non-free -mpic14 -p16f877 -c $<
2530+sdcc -V -mpic14 -p16f877 -c $<
2531 \begin_inset Newline newline
2532 \end_inset
2533
2534@@ -46965,7 +46008,7 @@ Makefile
2535 \begin_inset space ~
2536 \end_inset
2537
2538-sdcc -S -V --use-non-free -mpic14 -p16f877 $<
2539+sdcc -S -V -mpic14 -p16f877 $<
2540 \begin_inset Newline newline
2541 \end_inset
2542
2543@@ -47247,47 +46290,6 @@ status collapsed
2544 \begin_layout Plain Layout
2545
2546
2547-\backslash
2548-/
2549-\end_layout
2550-
2551-\end_inset
2552-
2553--use-non-free
2554-\begin_inset Index idx
2555-status collapsed
2556-
2557-\begin_layout Plain Layout
2558-PIC14!Options!-
2559-\begin_inset ERT
2560-status collapsed
2561-
2562-\begin_layout Plain Layout
2563-
2564-
2565-\backslash
2566-/
2567-\end_layout
2568-
2569-\end_inset
2570-
2571--use-non-free
2572-\end_layout
2573-
2574-\end_inset
2575-
2576- make non-free device headers and libraries available in the compiler's
2577- search paths (implicit -I and -L options)
2578-\end_layout
2579-
2580-\begin_layout Description
2581--
2582-\begin_inset ERT
2583-status collapsed
2584-
2585-\begin_layout Plain Layout
2586-
2587-
2588 \backslash
2589 /
2590 \end_layout
2591@@ -48160,47 +47162,6 @@ status collapsed
2592 -all-callee-saves
2593 \end_layout
2594
2595-\begin_layout Description
2596--
2597-\begin_inset ERT
2598-status collapsed
2599-
2600-\begin_layout Plain Layout
2601-
2602-
2603-\backslash
2604-/
2605-\end_layout
2606-
2607-\end_inset
2608-
2609--use-non-free
2610-\begin_inset Index idx
2611-status collapsed
2612-
2613-\begin_layout Plain Layout
2614-PIC16!Options!-
2615-\begin_inset ERT
2616-status collapsed
2617-
2618-\begin_layout Plain Layout
2619-
2620-
2621-\backslash
2622-/
2623-\end_layout
2624-
2625-\end_inset
2626-
2627--use-non-free
2628-\end_layout
2629-
2630-\end_inset
2631-
2632- Make non-free device headers and libraries available in the compiler's
2633- search paths (implicit -I and -L options).
2634-\end_layout
2635-
2636 \begin_layout Subsection
2637 Port Specific Options
2638 \begin_inset Index idx
2639@@ -49477,188 +48438,6 @@ Linker
2640 \end_inset
2641
2642
2643-\end_layout
2644-
2645-\begin_layout Standard
2646-If the
2647-\series bold
2648--
2649-\begin_inset ERT
2650-status collapsed
2651-
2652-\begin_layout Plain Layout
2653-
2654-
2655-\backslash
2656-/
2657-\end_layout
2658-
2659-\end_inset
2660-
2661--use-non-free
2662-\begin_inset Index idx
2663-status collapsed
2664-
2665-\begin_layout Plain Layout
2666--
2667-\begin_inset ERT
2668-status collapsed
2669-
2670-\begin_layout Plain Layout
2671-
2672-
2673-\backslash
2674-/
2675-\end_layout
2676-
2677-\end_inset
2678-
2679--use-non-free
2680-\end_layout
2681-
2682-\end_inset
2683-
2684-
2685-\series default
2686- command line option is specified, non-free directories are searched:
2687-\begin_inset Newline newline
2688-\end_inset
2689-
2690-
2691-\begin_inset Separator latexpar
2692-\end_inset
2693-
2694-
2695-\end_layout
2696-
2697-\begin_layout Standard
2698-\align center
2699-\begin_inset Tabular
2700-<lyxtabular version="3" rows="3" columns="4">
2701-<features tabularvalignment="middle">
2702-<column alignment="center" valignment="top">
2703-<column alignment="center" valignment="top">
2704-<column alignment="center" valignment="top">
2705-<column alignment="center" valignment="top">
2706-<row>
2707-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2708-\begin_inset Text
2709-
2710-\begin_layout Plain Layout
2711-Directory
2712-\end_layout
2713-
2714-\end_inset
2715-</cell>
2716-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2717-\begin_inset Text
2718-
2719-\begin_layout Plain Layout
2720-Description
2721-\end_layout
2722-
2723-\end_inset
2724-</cell>
2725-<cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
2726-\begin_inset Text
2727-
2728-\begin_layout Plain Layout
2729-Target
2730-\end_layout
2731-
2732-\end_inset
2733-</cell>
2734-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2735-\begin_inset Text
2736-
2737-\begin_layout Plain Layout
2738-Command prefix
2739-\end_layout
2740-
2741-\end_inset
2742-</cell>
2743-</row>
2744-<row>
2745-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
2746-\begin_inset Text
2747-
2748-\begin_layout Plain Layout
2749-PREFIX/sdcc/non-free/include/pic16
2750-\end_layout
2751-
2752-\end_inset
2753-</cell>
2754-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2755-\begin_inset Text
2756-
2757-\begin_layout Plain Layout
2758-PIC16 specific non-free headers
2759-\end_layout
2760-
2761-\end_inset
2762-</cell>
2763-<cell alignment="center" valignment="top" topline="true" usebox="none">
2764-\begin_inset Text
2765-
2766-\begin_layout Plain Layout
2767-Compiler
2768-\end_layout
2769-
2770-\end_inset
2771-</cell>
2772-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
2773-\begin_inset Text
2774-
2775-\begin_layout Plain Layout
2776--I
2777-\end_layout
2778-
2779-\end_inset
2780-</cell>
2781-</row>
2782-<row>
2783-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
2784-\begin_inset Text
2785-
2786-\begin_layout Plain Layout
2787-PREFIX/sdcc/non-free/lib/pic16
2788-\end_layout
2789-
2790-\end_inset
2791-</cell>
2792-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2793-\begin_inset Text
2794-
2795-\begin_layout Plain Layout
2796-PIC16 specific non-free libraries
2797-\end_layout
2798-
2799-\end_inset
2800-</cell>
2801-<cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
2802-\begin_inset Text
2803-
2804-\begin_layout Plain Layout
2805-Linker
2806-\end_layout
2807-
2808-\end_inset
2809-</cell>
2810-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
2811-\begin_inset Text
2812-
2813-\begin_layout Plain Layout
2814--L
2815-\end_layout
2816-
2817-\end_inset
2818-</cell>
2819-</row>
2820-</lyxtabular>
2821-
2822-\end_inset
2823-
2824-
2825 \end_layout
2826
2827 \begin_layout Subsection
2828@@ -50354,66 +49133,9 @@ name "subsec:PIC16_Header-Files-and-Libraries"
2829 Pic device specific header and c source files are automatically generated
2830 from MPLAB include files, which are published by Microchip with a special
2831 requirement that they are only to be used with authentic Microchip devices.
2832- This requirement prevents to publish generated header and c source files
2833- under the GPL compatible license, so they are located in the non-free directory
2834- (see section
2835-\begin_inset CommandInset ref
2836-LatexCommand ref
2837-reference "subsec:Search-Paths"
2838-
2839-\end_inset
2840-
2841-).
2842- In order to include them in include and library search paths, the
2843-\series bold
2844--
2845-\begin_inset ERT
2846-status collapsed
2847-
2848-\begin_layout Plain Layout
2849-
2850-
2851-\backslash
2852-/
2853-\end_layout
2854-
2855-\end_inset
2856-
2857--use-non-free
2858-\begin_inset Index idx
2859-status collapsed
2860-
2861-\begin_layout Plain Layout
2862--
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--use-non-free
2876-\end_layout
2877-
2878-\end_inset
2879-
2880-
2881-\series default
2882- command line option should be defined.
2883-\begin_inset Newline newline
2884-\end_inset
2885-
2886-
2887-\begin_inset Newline newline
2888-\end_inset
2889-
2890-NOTE: the compiled code, which use non-free pic device specific libraries,
2891- is not GPL compatible!
2892+ As this restriction is incompatible with the goal of software freedom,
2893+ header files and libraries generated from these files are not included
2894+ in the SDCC package distributed with Guix.
2895 \end_layout
2896
2897 \begin_layout Subsection
2898@@ -50659,195 +49381,6 @@ vfprintf.c
2899 should also work, but is untested.
2900 \end_layout
2901
2902-\begin_layout Subsection
2903-Adding New Devices to the Port
2904-\end_layout
2905-
2906-\begin_layout Standard
2907-Adding support for a new 16
2908-\begin_inset ERT
2909-status collapsed
2910-
2911-\begin_layout Plain Layout
2912-
2913-
2914-\backslash
2915-,
2916-\end_layout
2917-
2918-\end_inset
2919-
2920-bit PIC MCU requires the following steps:
2921-\end_layout
2922-
2923-\begin_layout Enumerate
2924-Create picDEVICE.c and picDEVICE.h from pDEVICE.inc using
2925-\begin_inset Newline newline
2926-\end_inset
2927-
2928-
2929-\family typewriter
2930-perl /path/to/sdcc/support/scripts/inc2h-pic16.pl
2931-\backslash
2932-
2933-\begin_inset Newline newline
2934-\end_inset
2935-
2936-/path/to/gputils/header/pDEVICE.inc
2937-\end_layout
2938-
2939-\begin_layout Enumerate
2940-
2941-\family typewriter
2942-mv picDEVICE.h /path/to/sdcc/device/non-free/include/pic16
2943-\end_layout
2944-
2945-\begin_layout Enumerate
2946-
2947-\family typewriter
2948-mv picDEVICE.c /path/to/sdcc/device/non-free/lib/pic16/libdev
2949-\end_layout
2950-
2951-\begin_layout Enumerate
2952-Either
2953-\begin_inset Separator latexpar
2954-\end_inset
2955-
2956-
2957-\end_layout
2958-
2959-\begin_deeper
2960-\begin_layout Enumerate
2961-add the new device to
2962-\family typewriter
2963-/path/to/sdcc/device/lib/pic16/libio/*.ignore
2964-\family default
2965- to suppress building any of the I/O libraries for the new device
2966-\begin_inset Foot
2967-status collapsed
2968-
2969-\begin_layout Plain Layout
2970-In fact, the
2971-\family typewriter
2972-.ignore
2973-\family default
2974- files are only used when auto-generating
2975-\family typewriter
2976-Makefile.am
2977-\family default
2978- using the
2979-\family typewriter
2980-.../libio/mkmk.sh
2981-\family default
2982- script.
2983-\end_layout
2984-
2985-\end_inset
2986-
2987-, or
2988-\end_layout
2989-
2990-\begin_layout Enumerate
2991-add the device (family) to
2992-\family typewriter
2993-/path/to/sdcc/support/scripts/pic18fam-h-gen.pl
2994-\family default
2995- to assign I/O styles, run the
2996-\family typewriter
2997-pic18fam-h-gen.pl
2998-\family default
2999- script to generate
3000-\family typewriter
3001-pic18fam.h.gen
3002-\family default
3003-, replace your existing
3004-\family typewriter
3005-pic18fam.h
3006-\family default
3007- with the generated file, and (if required) implement new I/O styles in
3008-
3009-\family typewriter
3010-/path/to/sdcc/device/include/pic16/{adc,i2c,usart}.h
3011-\family default
3012- and
3013-\family typewriter
3014-/path/to/sdcc/device/lib/pic16/libio/*/*.
3015-\end_layout
3016-
3017-\end_deeper
3018-\begin_layout Enumerate
3019-Edit
3020-\family typewriter
3021-/path/to/sdcc/device/include/pic16/pic18fregs.h
3022-\family default
3023-
3024-\begin_inset Newline newline
3025-\end_inset
3026-
3027-The file format is self-explanatory, just add
3028-\begin_inset Newline newline
3029-\end_inset
3030-
3031-
3032-\family typewriter
3033-#elif defined(picDEVICE)
3034-\begin_inset Newline newline
3035-\end_inset
3036-
3037-#
3038-\begin_inset ERT
3039-status collapsed
3040-
3041-\begin_layout Plain Layout
3042-
3043-
3044-\backslash
3045-
3046-\backslash
3047-
3048-\end_layout
3049-
3050-\end_inset
3051-
3052-include <picDEVICE.h>
3053-\family default
3054-
3055-\begin_inset Newline newline
3056-\end_inset
3057-
3058-at the right place (keep the file sorted, please).
3059-\end_layout
3060-
3061-\begin_layout Enumerate
3062-Edit
3063-\family typewriter
3064-/path/to/sdcc/device/include/pic16devices.txt
3065-\begin_inset Newline newline
3066-\end_inset
3067-
3068-
3069-\family default
3070-Copy and modify an existing entry or create a new one and insert it at the
3071- correct place (keep the file sorted, please).
3072-\end_layout
3073-
3074-\begin_layout Enumerate
3075-
3076-\family typewriter
3077-( cd /path/to/sdcc/device/non-free/lib/pic16 && sh update.sh )
3078-\end_layout
3079-
3080-\begin_layout Enumerate
3081-Recompile the pic16 libraries as described in
3082-\begin_inset CommandInset ref
3083-LatexCommand ref
3084-reference "subsec:pic16Libraries"
3085-
3086-\end_inset
3087-
3088- or just configure and build sdcc again from scratch (recommended).
3089-\end_layout
3090-
3091 \begin_layout Subsection
3092 Memory Models
3093 \end_layout
3094@@ -75717,6 +74250,12 @@ This document was initially written by Sandeep Dutta and updated by SDCC
3095 developers.
3096 \end_layout
3097
3098+\begin_layout Standard
3099+It has been modified from the original to reflect the removal of non-free
3100+ components and related functionality in the SDCC package distributed with
3101+ GNU Guix.
3102+\end_layout
3103+
3104 \begin_layout Standard
3105 All product names mentioned herein may be trademarks
3106 \begin_inset Index idx
3107diff --git a/sdcc.spec b/sdcc.spec
3108index ccb3217..292b642 100644
3109--- a/sdcc.spec
3110+++ b/sdcc.spec
3111@@ -89,9 +89,7 @@ rm -rf $RPM_BUILD_ROOT
3112 %files common
3113 %defattr(-,root,root)
3114 /usr/share/sdcc/include
3115-/usr/share/sdcc/non-free/include
3116 /usr/share/sdcc/lib
3117-/usr/share/sdcc/non-free/lib
3118
3119 %files doc
3120 %defattr(-,root,root)
3121@@ -104,6 +102,8 @@ rm -rf $RPM_BUILD_ROOT
3122 - version updated to 4.2.0
3123 * Sat Feb 20 2021 - pkk AT spth.de
3124 - version updated to 4.0.0
3125+* Tue Dec 08 2020 - simon AT simonsouth.net
3126+- removed non-free include and lib directories
3127 * Sat Jan 18 2020 - pkk AT spth.de
3128 - version updated to 4.0.0
3129 * Fri Apr 05 2019 - krauseph AT informatik.uni-freiburg.de
3130diff --git a/sdcc_vc.h.in b/sdcc_vc.h.in
3131index 8cf401b..19f5113 100644
3132--- a/sdcc_vc.h.in
3133+++ b/sdcc_vc.h.in
3134@@ -23,8 +23,6 @@
3135
3136 #define INCLUDE_DIR_SUFFIX "\\include"
3137 #define LIB_DIR_SUFFIX "\\lib"
3138-#define NON_FREE_INCLUDE_DIR_SUFFIX "\\non-free\\include"
3139-#define NON_FREE_LIB_DIR_SUFFIX "\\non-free\\lib"
3140
3141 #define BIN2DATA_DIR "\\.."
3142 #define PREFIX2BIN_DIR "\\bin"
3143diff --git a/sdccconf_in.h b/sdccconf_in.h
3144index 9e6e3c7..8681ceb 100644
3145--- a/sdccconf_in.h
3146+++ b/sdccconf_in.h
3147@@ -100,12 +100,6 @@
3148 /* XXX */
3149 #undef LIB_DIR_SUFFIX
3150
3151-/* XXX */
3152-#undef NON_FREE_INCLUDE_DIR_SUFFIX
3153-
3154-/* XXX */
3155-#undef NON_FREE_LIB_DIR_SUFFIX
3156-
3157 /* Define to 1 to disable the AVR port */
3158 #undef OPT_DISABLE_AVR
3159
3160@@ -133,9 +127,6 @@
3161 /* XXX */
3162 #undef OPT_DISABLE_MOS65C02
3163
3164-/* XXX */
3165-#undef OPT_DISABLE_NON_FREE
3166-
3167 /* XXX */
3168 #undef OPT_DISABLE_PACKIHX
3169
3170diff --git a/src/SDCCglobl.h b/src/SDCCglobl.h
3171index 9f0e52a..02a5fb8 100644
3172--- a/src/SDCCglobl.h
3173+++ b/src/SDCCglobl.h
3174@@ -290,7 +290,6 @@ struct options
3175 int stack_size; /* MCS51/DS390 - Tells the linker to allocate this space for stack */
3176 int acall_ajmp; /* MCS51 - Use acall/ajmp instead of lcall/ljmp */
3177 int no_ret_without_call; /* MCS51 - Do not use ret independent of acall/lcall */
3178- int use_non_free; /* Search / include non-free licensed libraries and header files */
3179 /* starting address of the segments */
3180 int xstack_loc; /* initial location of external stack */
3181 int stack_loc; /* initial value of internal stack pointer */
3182diff --git a/src/SDCCmain.c b/src/SDCCmain.c
3183index e7e8bd6..3b25061 100644
3184--- a/src/SDCCmain.c
3185+++ b/src/SDCCmain.c
3186@@ -143,7 +143,6 @@ char buffer[PATH_MAX * 2];
3187 #define OPTION_DATA_SEG "--dataseg"
3188 #define OPTION_DOLLARS_IN_IDENT "--fdollars-in-identifiers"
3189 #define OPTION_SIGNED_CHAR "--fsigned-char"
3190-#define OPTION_USE_NON_FREE "--use-non-free"
3191 #define OPTION_PEEP_RETURN "--peep-return"
3192 #define OPTION_NO_PEEP_RETURN "--no-peep-return"
3193 #define OPTION_NO_OPTSDCC_IN_ASM "--no-optsdcc-in-asm"
3194@@ -195,7 +194,6 @@ static const OPTION optionsTable[] = {
3195 {0, OPTION_STD, NULL, "Determine the language standard (c89, c99, c11, c23, sdcc89 etc.)"},
3196 {0, OPTION_DOLLARS_IN_IDENT, &options.dollars_in_ident, "Permit '$' as an identifier character"},
3197 {0, OPTION_SIGNED_CHAR, &options.signed_char, "Make \"char\" signed by default"},
3198- {0, OPTION_USE_NON_FREE, &options.use_non_free, "Search / include non-free licensed libraries and header files"},
3199
3200 {0, NULL, NULL, "Code generation options"},
3201 {'m', NULL, NULL, "Set the port to use e.g. -mz80."},
3202@@ -2231,10 +2229,6 @@ preProcess (char **envp)
3203 else
3204 addSet (&preArgvSet, Safe_strdup ("-D__SDCC_CHAR_UNSIGNED"));
3205
3206- /* set the macro for non-free */
3207- if (options.use_non_free)
3208- addSet (&preArgvSet, Safe_strdup ("-D__SDCC_USE_NON_FREE"));
3209-
3210 /* set the macro for large model */
3211 switch (options.model)
3212 {
3213@@ -2478,12 +2472,6 @@ setIncludePath (void)
3214 * 6. - $SDCC_HOME/PREFIX2DATA_DIR/INCLUDE_DIR_SUFFIX
3215 * 7. - path(argv[0])/BIN2DATA_DIR/INCLUDE_DIR_SUFFIX
3216 * 8. - DATADIR/INCLUDE_DIR_SUFFIX (only on *nix)
3217- * 9. - $SDCC_HOME/PREFIX2DATA_DIR/NON_FREE_INCLUDE_DIR_SUFFIX/target
3218- * 10. - path(argv[0])/BIN2DATA_DIR/NON_FREE_INCLUDE_DIR_SUFFIX/target
3219- * 11. - DATADIR/NON_FREE_INCLUDE_DIR_SUFFIX/target (only on *nix)
3220- * 12. - $SDCC_HOME/PREFIX2DATA_DIR/NON_FREE_INCLUDE_DIR_SUFFIX
3221- * 13. - path(argv[0])/BIN2DATA_DIR/NON_FREE_INCLUDE_DIR_SUFFIX
3222- * 14. - DATADIR/NON_FREE_INCLUDE_DIR_SUFFIX (only on *nix)
3223 */
3224
3225 if (!options.nostdinc)
3226@@ -2499,17 +2487,6 @@ setIncludePath (void)
3227 includeDirsSet = processStrSet (includeDirsSet, NULL, port->target, NULL);
3228 mergeSets (&includeDirsSet, tempSet);
3229
3230- if (options.use_non_free)
3231- {
3232- set *tempSet1;
3233-
3234- tempSet = processStrSet (dataDirsSet, NULL, NON_FREE_INCLUDE_DIR_SUFFIX, NULL);
3235- tempSet1 = processStrSet (tempSet, NULL, DIR_SEPARATOR_STRING, NULL);
3236- tempSet1 = processStrSet (tempSet1, NULL, port->target, NULL);
3237- mergeSets (&tempSet1, tempSet);
3238- mergeSets (&includeDirsSet, tempSet1);
3239- }
3240-
3241 if ((p = getenv (SDCC_INCLUDE_NAME)) != NULL)
3242 {
3243 struct dbuf_s dbuf;
3244@@ -2534,9 +2511,6 @@ setLibPath (void)
3245 * 3. - $SDCC_HOME/PREFIX2DATA_DIR/LIB_DIR_SUFFIX/<model>
3246 * 4. - path(argv[0])/BIN2DATA_DIR/LIB_DIR_SUFFIX/<model>
3247 * 5. - DATADIR/LIB_DIR_SUFFIX/<model> (only on *nix)
3248- * 6. - $SDCC_HOME/PREFIX2DATA_DIR/NON_FREE_LIB_DIR_SUFFIX/<model>
3249- * 7. - path(argv[0])/BIN2DATA_DIR/NON_FREE_LIB_DIR_SUFFIX/<model>
3250- * 8. - DATADIR/NON_FREE_LIB_DIR_SUFFIX/<model> (only on *nix)
3251 */
3252
3253 if (!options.nostdlib)
3254@@ -2553,13 +2527,6 @@ setLibPath (void)
3255 dbuf_makePath (&dbuf, LIB_DIR_SUFFIX, port->general.get_model ? port->general.get_model () : targetname);
3256 libDirsSet = processStrSet (dataDirsSet, NULL, dbuf_c_str (&dbuf), NULL);
3257
3258- if (options.use_non_free)
3259- {
3260- dbuf_set_length (&dbuf, 0);
3261- dbuf_makePath (&dbuf, NON_FREE_LIB_DIR_SUFFIX, port->general.get_model ? port->general.get_model () : targetname);
3262- mergeSets (&libDirsSet, processStrSet (dataDirsSet, NULL, dbuf_c_str (&dbuf), NULL));
3263- }
3264-
3265 if ((p = getenv (SDCC_LIB_NAME)) != NULL)
3266 {
3267 addSetHead (&libDirsSet, Safe_strdup (p));
3268diff --git a/src/pic14/main.c b/src/pic14/main.c
3269index 304c79b..9cbb9e8 100644
3270--- a/src/pic14/main.c
3271+++ b/src/pic14/main.c
3272@@ -42,7 +42,6 @@ static OPTION _pic14_poptions[] =
3273 { 0, "--no-pcode-opt", &pic14_options.disable_df, "disable (slightly faulty) optimization on pCode" },
3274 { 0, OPTION_STACK_SIZE, &options.stack_size, "sets the size if the argument passing stack (default: 16, minimum: 4)", CLAT_INTEGER },
3275 { 0, "--no-extended-instructions", &pic14_options.no_ext_instr, "forbid use of the extended instruction set (e.g., ADDFSR)" },
3276- { 0, "--no-warn-non-free", &pic14_options.no_warn_non_free, "suppress warning on absent --use-non-free option" },
3277 { 0, NULL, NULL, NULL }
3278 };
3279
3280@@ -180,16 +179,6 @@ _pic14_finaliseOptions (void)
3281 addSet (&preArgvSet, Safe_strdup (dbuf_detach_c_str (&dbuf)));
3282 }
3283
3284- if (!pic14_options.no_warn_non_free && !options.use_non_free)
3285- {
3286- fprintf(stderr,
3287- "WARNING: Command line option --use-non-free not present.\n"
3288- " When compiling for PIC14/PIC16, please provide --use-non-free\n"
3289- " to get access to device headers and libraries.\n"
3290- " If you do not use these, you may provide --no-warn-non-free\n"
3291- " to suppress this warning (not recommended).\n");
3292- } // if
3293-
3294 }
3295
3296 static void
3297diff --git a/src/pic14/main.h b/src/pic14/main.h
3298index 4275b65..0dc8c86 100644
3299--- a/src/pic14/main.h
3300+++ b/src/pic14/main.h
3301@@ -5,7 +5,6 @@ typedef struct {
3302 unsigned int isLibrarySource:1;
3303 int disable_df;
3304 int no_ext_instr;
3305- int no_warn_non_free;
3306 } pic14_options_t;
3307
3308 extern pic14_options_t pic14_options;
3309diff --git a/src/pic16/device.h b/src/pic16/device.h
3310index 41a1b79..9c642e3 100644
3311--- a/src/pic16/device.h
3312+++ b/src/pic16/device.h
3313@@ -99,7 +99,6 @@ typedef struct {
3314 int gstack;
3315 unsigned int debgen;
3316 int xinst;
3317- int no_warn_non_free;
3318 } pic16_options_t;
3319
3320 extern pic16_options_t pic16_options;
3321diff --git a/src/pic16/main.c b/src/pic16/main.c
3322index 9557a10..d650e66 100644
3323--- a/src/pic16/main.c
3324+++ b/src/pic16/main.c
3325@@ -660,7 +660,6 @@ OPTION pic16_optionsTable[]= {
3326 { 0, "--pcode-verbose", &pic16_pcode_verbose, "dump pcode related info"},
3327 { 0, "--calltree", &pic16_options.dumpcalltree, "dump call tree in .calltree file"},
3328 { 0, "--gstack", &pic16_options.gstack, "trace stack pointer push/pop to overflow"},
3329- { 0, "--no-warn-non-free", &pic16_options.no_warn_non_free, "suppress warning on absent --use-non-free option" },
3330 { 0, NULL, NULL, NULL}
3331 };
3332
3333@@ -945,16 +944,6 @@ _pic16_finaliseOptions (void)
3334 addSet (&asmOptionsSet, Safe_strdup ("-D__STACK_MODEL_SMALL"));
3335 }
3336
3337- if (!pic16_options.no_warn_non_free && !options.use_non_free)
3338- {
3339- fprintf(stderr,
3340- "WARNING: Command line option --use-non-free not present.\n"
3341- " When compiling for PIC14/PIC16, please provide --use-non-free\n"
3342- " to get access to device headers and libraries.\n"
3343- " If you do not use these, you may provide --no-warn-non-free\n"
3344- " to suppress this warning (not recommended).\n");
3345- } // if
3346-
3347 dbuf_destroy (&dbuf);
3348 }
3349
3350@@ -984,7 +973,6 @@ _pic16_setDefaultOptions (void)
3351 pic16_options.ip_stack = 1; /* set to 1 to enable ipop/ipush for stack */
3352 pic16_options.gstack = 0;
3353 pic16_options.debgen = 0;
3354- pic16_options.no_warn_non_free = 0;
3355 }
3356
3357 static const char *
3358diff --git a/src/regression/Makefile b/src/regression/Makefile
3359index 634e970..9a7a78a 100644
3360--- a/src/regression/Makefile
3361+++ b/src/regression/Makefile
3362@@ -107,12 +107,12 @@ endif
3363 CC = $(top_builddir)/bin/sdcc
3364
3365 # compiler options
3366-CFLAGS = --no-warn-non-free -m$(ARCH) -p$(DEV) --fsigned-char --i-code-in-asm --fverbose-asm --std-c99
3367-CFLAGS += --nostdinc -I$(top_srcdir)/device/include/$(ARCH) -I$(top_srcdir)/device/non-free/include/$(ARCH) -I$(top_srcdir)/device/include
3368+CFLAGS = -m$(ARCH) -p$(DEV) --fsigned-char --i-code-in-asm --fverbose-asm --std-c99
3369+CFLAGS += --nostdinc -I$(top_srcdir)/device/include/$(ARCH) -I$(top_srcdir)/device/include
3370
3371 # linker options (for sdcc)
3372 CFLAGS += -Wl,-l,-O2
3373-CFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/$(ARCH) -L$(top_builddir)/device/non-free/lib/build/$(ARCH)
3374+CFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/$(ARCH)
3375
3376 # linker libraries
3377 LIB_SUFFIX = $(LIB_E)$(LIB_O)$(LIB_X)
3378diff --git a/support/regression/ports/pic14/spec.mk b/support/regression/ports/pic14/spec.mk
3379index b0b0867..2d5cdd3 100644
3380--- a/support/regression/ports/pic14/spec.mk
3381+++ b/support/regression/ports/pic14/spec.mk
3382@@ -16,13 +16,9 @@ EMU = ${WINE} ${GPSIM}
3383
3384 ifndef SDCC_BIN_PATH
3385 ifndef CROSSCOMPILING
3386- SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic14 -I$(top_srcdir)/device/non-free/include/pic14 -I$(top_srcdir)
3387- LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic14 -L$(top_builddir)/device/non-free/lib/build/pic14
3388- else
3389- SDCCFLAGS += --use-non-free
3390+ SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic14 -I$(top_srcdir)
3391+ LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic14
3392 endif
3393-else
3394- SDCCFLAGS += --use-non-free
3395 endif
3396
3397 ifdef CROSSCOMPILING
3398@@ -30,7 +26,6 @@ ifdef CROSSCOMPILING
3399 endif
3400
3401 SDCCFLAGS += -mpic14 -pp16f877 --less-pedantic
3402-SDCCFLAGS += --no-warn-non-free
3403 LINKFLAGS += libsdcc.lib libm.lib
3404
3405 OBJEXT = .o
3406diff --git a/support/regression/ports/pic16/spec.mk b/support/regression/ports/pic16/spec.mk
3407index 15b4028..3b79cfe 100644
3408--- a/support/regression/ports/pic16/spec.mk
3409+++ b/support/regression/ports/pic16/spec.mk
3410@@ -16,13 +16,9 @@ EMU_INPUT = -c $(PORTS_DIR)/pic16/gpsim.cmd
3411
3412 ifndef SDCC_BIN_PATH
3413 ifndef CROSSCOMPILING
3414- SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic16 -I$(top_srcdir)/device/non-free/include/pic16 -I$(top_srcdir)
3415- LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic16 -L$(top_builddir)/device/non-free/lib/build/pic16
3416- else
3417- SDCCFLAGS += --use-non-free
3418+ SDCCFLAGS += --nostdinc -I$(top_srcdir)/device/include/pic16 -I$(top_srcdir)
3419+ LINKFLAGS += --nostdlib -L$(top_builddir)/device/lib/build/pic16
3420 endif
3421-else
3422- SDCCFLAGS += --use-non-free
3423 endif
3424
3425 ifdef CROSSCOMPILING
3426@@ -31,7 +27,6 @@ endif
3427
3428 SDCCFLAGS += -mpic16 -pp18f452 --less-pedantic -Wl,-q
3429 SDCCFLAGS += --no-peep
3430-SDCCFLAGS += --no-warn-non-free
3431 LINKFLAGS += libsdcc.lib libc18f.lib libm18f.lib
3432
3433 OBJEXT = .o
3434diff --git a/support/scripts/cinc2h.pl b/support/scripts/cinc2h.pl
3435index 8558135..30d72b7 100755
3436--- a/support/scripts/cinc2h.pl
3437+++ b/support/scripts/cinc2h.pl
3438@@ -39,58 +39,10 @@
3439
3440 -------------------------------------------------
3441
3442- Steps to add a new target device to SDCC/PIC16:
3443- (Following Raphael Neider <rneider AT web.de>)
3444-
3445- 1. Create the picDEVICE.c and picDEVICE.h from pDEVICE.inc using
3446- ./cinc2h.pl -p 18f4520 -cb -cp -gp "path/to/gputils_source" -o "path/to/output"
3447-
3448- 2. mv picDEVICE.h $SDCC/device/non-free/include/pic16
3449- 3. mv picDEVICE.c $SDCC/device/non-free/lib/pic16/libdev
3450- 4. either
3451-
3452- (a) adjust $SDCC/device/lib/pic16/libio/*.ignore
3453- if the device does not support ADC, I2C, or USART
3454- --- OR ---
3455- (b) adjust
3456- * SDCC/scripts/pic18fam-h-gen.pl
3457- * SDCC/device/include/pic16/adc.h (if required)
3458- * SDCC/device/include/pic16/usart.h (if required)
3459- * SDCC/device/lib/pic16/libio/*/* (if required)
3460- to add the new device to the appropriate I/O style
3461- and implement new styles (if required).
3462-
3463- Having modified pic18fam-h-gen.pl, you need to run the
3464- script to generate pic18fam.h.gen, which in turn must
3465- then replace your .../include/pic16/pic18fam.h to take
3466- effect; see pic18fam-h-gen.pl for usage information.
3467- 6. edit $SDCC/device/include/pic16/pic18fregs.h
3468- 7. edit $SDCC/device/include/pic16/pic16devices.txt
3469- 8. run cd $SDCC/device/non-free/lib/pic16 && sh update.sh
3470- to regenerate .../libdev/Makefile.am and processors.ac
3471-
3472- The file format of steps 6 and 7 is self explanatory, in most
3473- if not all cases you can copy and paste another device's records
3474- and adjust them to the newly added device.
3475-
3476- -------------------------------------------------
3477-
3478- Steps to add a new target device to SDCC/PIC14:
3479-
3480- 1. Create the picDEVICE.c and picDEVICE.h from pDEVICE.inc using
3481- ./cinc2h.pl -p 16f1503 -cb -cp -gp "path/to/gputils_source" -o "path/to/output"
3482-
3483- 2. mv picDEVICE.h $SDCC/device/non-free/include/pic14
3484- 3. mv picDEVICE.c $SDCC/device/non-free/lib/pic14/libdev
3485- 4. add DEVICE to $SDCC/device/non-free/lib/pic14/libdev/devices.txt
3486- (The names of the enhanced devices the "# enhanced cores" line
3487- after follow.)
3488-
3489- 5. edit $SDCC/device/include/pic14/pic14devices.txt
3490-
3491- The file format of step 5 is self explanatory, in most if not all
3492- cases you can copy and paste another device's records and adjust
3493- them to the newly added device.
3494+ For its inclusion in the SDCC package distributed with GNU Guix
3495+ (https://guix.gnu.org/) this file has been modified from the
3496+ original to remove instructions on its use with non-free software
3497+ and to update the output of the print_license subroutine below.
3498
3499 $Id: cinc2h.pl 9450 2016-01-09 16:47:43Z molnarkaroly $
3500 =cut
3501@@ -1345,10 +1297,9 @@ sub print_license($)
3502 * Microchip header (.inc) and linker script (.lkr) files Microchip
3503 * requires that "The header files should state that they are only to be
3504 * used with authentic Microchip devices" which makes them incompatible
3505- * with the GPL. Pic device libraries and header files are located at
3506- * non-free/lib and non-free/include directories respectively.
3507- * Sdcc should be run with the --use-non-free command line option in
3508- * order to include non-free header files and libraries.
3509+ * with the GPL. These non-free libraries and header files (and the
3510+ * build and run-time options that enable their use) are omitted in the
3511+ * SDCC package distributed with GNU Guix.
3512 *
3513 * See http://sdcc.sourceforge.net/ for the latest information on sdcc.
3514 */
3515diff --git a/support/scripts/pic14-header-parser.pl b/support/scripts/pic14-header-parser.pl
3516index 4413c25..57c6076 100755
3517--- a/support/scripts/pic14-header-parser.pl
3518+++ b/support/scripts/pic14-header-parser.pl
3519@@ -63,9 +63,7 @@ use constant P_SHOW_ONLY_NAME => 3;
3520
3521 my @default_paths =
3522 (
3523- '/usr/share/sdcc/non-free/include',
3524 '/usr/share/sdcc/include',
3525- '/usr/local/share/sdcc/non-free/include',
3526 '/usr/local/share/sdcc/include'
3527 );
3528
3529diff --git a/support/scripts/pic16-header-parser.pl b/support/scripts/pic16-header-parser.pl
3530index 6db417a..4b35225 100755
3531--- a/support/scripts/pic16-header-parser.pl
3532+++ b/support/scripts/pic16-header-parser.pl
3533@@ -62,9 +62,7 @@ use constant P_SHOW_ONLY_NAME => 3;
3534
3535 my @default_paths =
3536 (
3537- '/usr/share/sdcc/non-free/include',
3538 '/usr/share/sdcc/include',
3539- '/usr/local/share/sdcc/non-free/include',
3540 '/usr/local/share/sdcc/include'
3541 );
3542
3543diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi
3544index 37393d7..997b2fe 100644
3545--- a/support/scripts/sdcc.nsi
3546+++ b/support/scripts/sdcc.nsi
3547@@ -487,11 +487,6 @@ ${Section} "SDCC include files" SEC05
3548
3549 SetOutPath "$INSTDIR\include"
3550 File "${DEV_ROOT}\include\*.h"
3551-
3552- SetOutPath "$INSTDIR\non-free\include\pic14"
3553- File "${DEV_ROOT}\non-free\include\pic14\*.h"
3554- SetOutPath "$INSTDIR\non-free\include\pic16"
3555- File "${DEV_ROOT}\non-free\include\pic16\*.h"
3556 ${SectionEnd}
3557
3558 ${Section} "SDCC DS390 library" SEC06
3559@@ -589,18 +584,12 @@ ${Section} "SDCC PIC16 library" SEC21
3560 SetOutPath "$INSTDIR\lib\pic16"
3561 File "${DEV_ROOT}\lib\pic16\*.o"
3562 File "${DEV_ROOT}\lib\pic16\*.lib"
3563-
3564- SetOutPath "$INSTDIR\non-free\lib\pic16"
3565- File "${DEV_ROOT}\non-free\lib\pic16\*.lib"
3566 ${SectionEnd}
3567
3568 ${Section} "SDCC PIC14 library" SEC22
3569 SectionIn 1 2
3570 SetOutPath "$INSTDIR\lib\pic14"
3571 File "${DEV_ROOT}\lib\pic14\*.lib"
3572-
3573- SetOutPath "$INSTDIR\non-free\lib\pic14"
3574- File "${DEV_ROOT}\non-free\lib\pic14\*.lib"
3575 ${SectionEnd}
3576
3577 ${Section} "SDCC STM8 medium model library" SEC23
3578@@ -709,10 +698,6 @@ ${Section} "SDCC library sources" SEC25
3579 File "${DEV_ROOT}\lib\src\pic14\libsdcc\enhanced\*.inc"
3580 # File "${DEV_ROOT}\lib\src\pic14\libsdcc\Makefile"
3581
3582- SetOutPath "$INSTDIR\non-free\lib\src\pic14\libdev"
3583- File "${DEV_ROOT}\non-free\lib\src\pic14\libdev\*.c"
3584-# File "${DEV_ROOT}\non-free\lib\src\pic14\libdev\Makefile"
3585-
3586 SetOutPath "$INSTDIR\lib\src\pic14\libm"
3587 # File "${DEV_ROOT}\lib\src\pic14\libm\*.c"
3588
3589@@ -764,10 +749,6 @@ ${Section} "SDCC library sources" SEC25
3590 File "${DEV_ROOT}\lib\src\pic16\libc\utils\*.S"
3591 # File "${DEV_ROOT}\lib\src\pic16\libc\utils\Makefile"
3592
3593- SetOutPath "$INSTDIR\non-free\lib\src\pic16\libdev"
3594- File "${DEV_ROOT}\non-free\lib\src\pic16\libdev\*.c"
3595-# File "${DEV_ROOT}\non-free\lib\src\pic16\libdev\Makefile"
3596-
3597 SetOutPath "$INSTDIR\lib\src\pic16\libio"
3598 File "${DEV_ROOT}\lib\src\pic16\libio\*.ignore"
3599 # File "${DEV_ROOT}\lib\src\pic16\libio\Makefile"
3600@@ -1169,13 +1150,9 @@ ${Section} Uninstall SECUNINSTALL
3601
3602 Delete "$INSTDIR\lib\pic14\*.lib"
3603
3604- Delete "$INSTDIR\non-free\lib\pic14\*.lib"
3605-
3606 Delete "$INSTDIR\lib\pic16\*.o"
3607 Delete "$INSTDIR\lib\pic16\*.lib"
3608
3609- Delete "$INSTDIR\non-free\lib\pic16\*.lib"
3610-
3611 Delete "$INSTDIR\lib\hc08\*.lib"
3612
3613 Delete "$INSTDIR\lib\s08\*.lib"
3614@@ -1259,9 +1236,7 @@ ${Section} Uninstall SECUNINSTALL
3615 Delete "$INSTDIR\include\pic14\*.h"
3616 Delete "$INSTDIR\include\pic14\*.txt"
3617 Delete "$INSTDIR\include\pic14\*.inc"
3618- Delete "$INSTDIR\non-free\include\pic14\*.h"
3619 Delete "$INSTDIR\include\pic16\*.h"
3620- Delete "$INSTDIR\non-free\include\pic16\*.h"
3621 Delete "$INSTDIR\include\pic16\*.txt"
3622 Delete "$INSTDIR\include\mcs51\*.h"
3623 Delete "$INSTDIR\include\hc08\*.h"
3624@@ -1334,9 +1309,7 @@ ${Section} Uninstall SECUNINSTALL
3625 Delete "$INSTDIR\uninstall.exe"
3626
3627 RMDir /r "$INSTDIR\lib\src\pic14"
3628- RMDir /r "$INSTDIR\non-free\lib\src\pic14"
3629 RMDir /r "$INSTDIR\lib\src\pic16"
3630- RMDir /r "$INSTDIR\non-free\lib\src\pic16"
3631 RMDir "$INSTDIR\lib\src\small"
3632 RMDir "$INSTDIR\lib\src\medium"
3633 RMDir "$INSTDIR\lib\src\large"
3634@@ -1367,12 +1340,9 @@ ${Section} Uninstall SECUNINSTALL
3635 RMDir "$INSTDIR\lib\src\mos65c02"
3636 RMDir "$INSTDIR\lib\src\s08-stack-auto"
3637 RMDir "$INSTDIR\lib\src"
3638- RMDir "$INSTDIR\non-free\lib\src"
3639
3640 RMDir "$INSTDIR\lib\pic14"
3641- RMDir "$INSTDIR\non-free\lib\pic14"
3642 RMDir "$INSTDIR\lib\pic16"
3643- RMDir "$INSTDIR\non-free\lib\pic16"
3644 RMDir "$INSTDIR\lib\z80"
3645 RMDir "$INSTDIR\lib\z180"
3646 RMDir "$INSTDIR\lib\r2k"
3647@@ -1403,15 +1373,12 @@ ${Section} Uninstall SECUNINSTALL
3648 RMDir "$INSTDIR\lib\mos65c02"
3649 RMDir "$INSTDIR\lib\s08-stack-auto"
3650 RMDir "$INSTDIR\lib"
3651- RMDir "$INSTDIR\non-free\lib"
3652
3653 RMDir "$INSTDIR\include\asm\z80"
3654 RMDir "$INSTDIR\include\asm\r2k"
3655 RMDir "$INSTDIR\include\asm\r3ka"
3656 RMDir "$INSTDIR\include\asm\pic16"
3657- RMDir "$INSTDIR\non-free\include\asm\pic16"
3658 RMDir "$INSTDIR\include\asm\pic14"
3659- RMDir "$INSTDIR\non-free\include\asm\pic14"
3660 RMDir "$INSTDIR\include\asm\mcs51"
3661 RMDir "$INSTDIR\include\asm\sm83"
3662 RMDir "$INSTDIR\include\asm\ds390"
3663@@ -1420,17 +1387,12 @@ ${Section} Uninstall SECUNINSTALL
3664 RMDir "$INSTDIR\include\asm"
3665 RMDir "$INSTDIR\include\z180"
3666 RMDir "$INSTDIR\include\pic14"
3667- RMDir "$INSTDIR\non-free\include\pic14"
3668 RMDir "$INSTDIR\include\pic16"
3669- RMDir "$INSTDIR\non-free\include\pic16"
3670 RMDir "$INSTDIR\include\mcs51"
3671 RMDir "$INSTDIR\include\hc08"
3672 RMDir "$INSTDIR\include\ds400"
3673 RMDir "$INSTDIR\include\ds390"
3674 RMDir "$INSTDIR\include"
3675- RMDir "$INSTDIR\non-free\include"
3676-
3677- RMDir "$INSTDIR\non-free"
3678
3679 !ifdef FULL_DOC
3680 RMDir /r "$INSTDIR\doc"
3681diff --git a/support/scripts/sdcc_cygwin_mingw32 b/support/scripts/sdcc_cygwin_mingw32
3682index 5575663..2588d4f 100755
3683--- a/support/scripts/sdcc_cygwin_mingw32
3684+++ b/support/scripts/sdcc_cygwin_mingw32
3685@@ -6,9 +6,7 @@
3686 --datarootdir="/sdcc" \
3687 docdir="\${datarootdir}/doc" \
3688 include_dir_suffix="include" \
3689-non_free_include_dir_suffix="non-free/include" \
3690 lib_dir_suffix="lib" \
3691-non_free_lib_dir_suffix="non-free/lib" \
3692 sdccconf_h_dir_separator="\\\\" \
3693 CC="gcc -mno-cygwin" \
3694 CXX="g++ -mno-cygwin"
3695diff --git a/support/scripts/sdcc_mingw32 b/support/scripts/sdcc_mingw32
3696index 96e3280..050761e 100755
3697--- a/support/scripts/sdcc_mingw32
3698+++ b/support/scripts/sdcc_mingw32
3699@@ -19,9 +19,7 @@ export SDCCCONFIGUREFLAGS=" \
3700 --datarootdir=/sdcc \
3701 docdir=\${datarootdir}/doc \
3702 include_dir_suffix=include \
3703-non_free_include_dir_suffix=non-free/include \
3704 lib_dir_suffix=lib \
3705-non_free_lib_dir_suffix=non-free/lib \
3706 sdccconf_h_dir_separator=\\\\ \
3707 --disable-device-lib \
3708 --host=i586-mingw32msvc --build=unknown-unknown-linux-gnu"