From patchwork Mon Feb 12 15:51:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 60208 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C266C27BBE2; Mon, 12 Feb 2024 16:19:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5DF4927BBE9 for ; Mon, 12 Feb 2024 16:19:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZZ15-0006UY-08; Mon, 12 Feb 2024 11:18:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZZ13-0006UP-I7 for guix-patches@gnu.org; Mon, 12 Feb 2024 11:18:45 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZZ13-0002NY-AM for guix-patches@gnu.org; Mon, 12 Feb 2024 11:18:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZZ1K-00071K-5Z for guix-patches@gnu.org; Mon, 12 Feb 2024 11:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69077] [PATCH] gnu: sdcc: Update to 4.4.0. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Feb 2024 16:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69077 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69077@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170775470926835 (code B ref -1); Mon, 12 Feb 2024 16:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Feb 2024 16:18:29 +0000 Received: from localhost ([127.0.0.1]:39782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZZ0j-0006yU-Bw for submit@debbugs.gnu.org; Mon, 12 Feb 2024 11:18:29 -0500 Received: from lists.gnu.org ([2001:470:142::17]:57432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZZ0d-0006xI-Va for submit@debbugs.gnu.org; Mon, 12 Feb 2024 11:18:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZYbE-0006qs-Qr for guix-patches@gnu.org; Mon, 12 Feb 2024 10:52:04 -0500 Received: from mailout.easymail.ca ([64.68.200.34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZYbA-0005wv-5A for guix-patches@gnu.org; Mon, 12 Feb 2024 10:52:04 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 596B56A55B for ; Mon, 12 Feb 2024 15:51:56 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ikSXNOa6YqXm for ; Mon, 12 Feb 2024 15:51:54 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 80ABC65E41 for ; Mon, 12 Feb 2024 15:51:54 +0000 (UTC) From: Simon South Date: Mon, 12 Feb 2024 10:51:41 -0500 Message-ID: <5bb3832c5cc675105b5eb9a5e02f5d003812629f.1707753037.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=64.68.200.34; envelope-from=simon@simonsouth.net; helo=mailout.easymail.ca X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm (sdcc): Update to 4.4.0. * gnu/packages/patches/sdcc-disable-non-free-code.patch: Update to match new version. Change-Id: Ie35c590a7f3004bc9f081d99b7ce019ac66cf3c0 --- gnu/packages/embedded.scm | 4 +- .../patches/sdcc-disable-non-free-code.patch | 244 +++++++++--------- 2 files changed, 124 insertions(+), 124 deletions(-) base-commit: bb92a4d7bc71197a51eea9075387c5313f299085 diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 313675814a..b758e445af 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1637,7 +1637,7 @@ (define-public ucsim (define-public sdcc (package (name "sdcc") - (version "4.3.0") + (version "4.4.0") (source (origin (method url-fetch) (uri (string-append @@ -1645,7 +1645,7 @@ (define-public sdcc "/" version "/sdcc-src-" version ".tar.bz2")) (sha256 (base32 - "1kckr20jqa4rp4qcw38lwagmw3yfm3z0xb4kygd0608847qc0vra")) + "0xbaj3vx5cp3na1kmyhy4jvhcqwrg648scjbykgq0xmibqb1535f")) (modules '((guix build utils))) (snippet #~(begin diff --git a/gnu/packages/patches/sdcc-disable-non-free-code.patch b/gnu/packages/patches/sdcc-disable-non-free-code.patch index 7602ead9af..6dcfbee1ab 100644 --- a/gnu/packages/patches/sdcc-disable-non-free-code.patch +++ b/gnu/packages/patches/sdcc-disable-non-free-code.patch @@ -15,10 +15,10 @@ remove instructions that encourage the use of SDCC with non-free software. diff --git a/Makefile.common.in b/Makefile.common.in -index 9cd116c..6bbe9fb 100644 +index 8469079..174ed91 100644 --- a/Makefile.common.in +++ b/Makefile.common.in -@@ -77,7 +77,6 @@ OPT_DISABLE_PACKIHX = @OPT_DISABLE_PACKIHX@ +@@ -78,7 +78,6 @@ OPT_DISABLE_PACKIHX = @OPT_DISABLE_PACKIHX@ OPT_DISABLE_SDBINUTILS = @OPT_DISABLE_SDBINUTILS@ OPT_DISABLE_SDCPP = @OPT_DISABLE_SDCPP@ OPT_DISABLE_UCSIM = @OPT_DISABLE_UCSIM@ @@ -27,10 +27,10 @@ index 9cd116c..6bbe9fb 100644 SLIB = $(top_builddir)/support/util diff --git a/Makefile.in b/Makefile.in -index 6d035ec..12f1fad 100644 +index 3287e30..69511e1 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -105,9 +105,6 @@ endif +@@ -104,9 +104,6 @@ endif ifeq ($(OPT_DISABLE_DEVICE_LIB), 0) TARGETS += sdcc-device-lib PKGS += device/lib @@ -40,7 +40,7 @@ index 6d035ec..12f1fad 100644 endif ifeq ($(OPT_DISABLE_PACKIHX), 0) -@@ -128,9 +125,6 @@ endif +@@ -127,9 +124,6 @@ endif TARGETS += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts PKGS += $(SDCC_LIBS) src device/include @@ -50,7 +50,7 @@ index 6d035ec..12f1fad 100644 PKGS += $(SDCC_AS) sdas/linksrc $(SDCC_SCRIPTS) PORTS = $(shell cat ports.build) -@@ -168,21 +162,12 @@ sdcc-sdbinutils: +@@ -167,21 +161,12 @@ sdcc-sdbinutils: sdcc-device-inc: $(MAKE) -C device/include @@ -73,7 +73,7 @@ index 6d035ec..12f1fad 100644 # doc depends on latex and latex2html diff --git a/configure b/configure -index 9de81c6..2620e3c 100755 +index b509c84..c7ce7fc 100755 --- a/configure +++ b/configure @@ -659,7 +659,6 @@ LATEX @@ -84,7 +84,7 @@ index 9de81c6..2620e3c 100755 OPT_DISABLE_SDBINUTILS OPT_DISABLE_SDCDB OPT_DISABLE_SDCPP -@@ -692,10 +691,7 @@ OPT_DISABLE_Z80 +@@ -693,10 +692,7 @@ OPT_DISABLE_Z80 OPT_DISABLE_MCS51 SVN_REVISION GIT_REVISION @@ -95,7 +95,7 @@ index 9de81c6..2620e3c 100755 include_dir_suffix inclib_dir_suffix LIB_TYPE -@@ -824,7 +820,6 @@ enable_packihx +@@ -828,7 +824,6 @@ enable_packihx enable_sdcpp enable_sdcdb enable_sdbinutils @@ -103,7 +103,7 @@ index 9de81c6..2620e3c 100755 enable_doc enable_libgc ' -@@ -845,10 +840,7 @@ sdccconf_h_dir_separator +@@ -849,10 +844,7 @@ sdccconf_h_dir_separator LIB_TYPE inclib_dir_suffix include_dir_suffix @@ -114,7 +114,7 @@ index 9de81c6..2620e3c 100755 docdir' ac_subdirs_all='support/cpp support/packihx -@@ -856,9 +848,7 @@ sim/ucsim +@@ -860,9 +852,7 @@ sim/ucsim debugger/mcs51 support/sdbinutils device/lib/pic14 @@ -125,7 +125,7 @@ index 9de81c6..2620e3c 100755 # Initialize some variables set by options. ac_init_help= -@@ -1512,7 +1502,6 @@ Optional Features: +@@ -1517,7 +1507,6 @@ Optional Features: --disable-sdcpp Disables building sdcpp --disable-sdcdb Disables building sdcdb --disable-sdbinutils Disables configuring and building of sdbinutils @@ -133,7 +133,7 @@ index 9de81c6..2620e3c 100755 --enable-doc Enables building the documentation --enable-libgc Use the Bohem memory allocator. Lower runtime footprint. -@@ -1541,16 +1530,8 @@ Some influential environment variables: +@@ -1551,16 +1540,8 @@ Some influential environment variables: appended to datadir to define SDCC's include/lib directory include_dir_suffix appended to datadir to define SDCC's include directory @@ -150,7 +150,7 @@ index 9de81c6..2620e3c 100755 docdir documentation installation directory Use these variables to override the choices made by `configure' or to help -@@ -7426,19 +7407,6 @@ if test "${include_dir_suffix}" = ""; then +@@ -7869,19 +7850,6 @@ if test "${include_dir_suffix}" = ""; then include_dir_suffix="${inclib_dir_suffix}/include" fi @@ -170,7 +170,7 @@ index 9de81c6..2620e3c 100755 # lib_dir_suffix: # *nix default: "sdcc/lib" -@@ -7446,13 +7414,6 @@ if test "${lib_dir_suffix}" = ""; then +@@ -7889,13 +7857,6 @@ if test "${lib_dir_suffix}" = ""; then lib_dir_suffix="${inclib_dir_suffix}/lib" fi @@ -184,7 +184,7 @@ index 9de81c6..2620e3c 100755 # docdir: # *nix default: "${datadir}/sdcc/doc" -@@ -7605,22 +7566,6 @@ esac +@@ -8048,22 +8009,6 @@ esac printf "%s\n" "#define INCLUDE_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_inc_dir_suffix}\"" >>confdefs.h @@ -207,7 +207,7 @@ index 9de81c6..2620e3c 100755 norm_lib_dir_suffix=${lib_dir_suffix} case ":$norm_lib_dir_suffix:" in -@@ -7638,22 +7583,6 @@ esac +@@ -8081,22 +8026,6 @@ esac printf "%s\n" "#define LIB_DIR_SUFFIX DIR_SEPARATOR_STRING \"${norm_lib_dir_suffix}\"" >>confdefs.h @@ -230,7 +230,7 @@ index 9de81c6..2620e3c 100755 # relative paths for _lcl_i in expanded_bindir:expanded_datadir:bin2data_dir; do -@@ -8769,27 +8698,6 @@ printf "%s\n" "#define OPT_DISABLE_SDBINUTILS $OPT_DISABLE_SDBINUTILS" >>confdef +@@ -9237,27 +9166,6 @@ printf "%s\n" "#define OPT_DISABLE_SDBINUTILS $OPT_DISABLE_SDBINUTILS" >>confdef @@ -258,7 +258,7 @@ index 9de81c6..2620e3c 100755 # Check whether --enable-doc was given. if test ${enable_doc+y} -@@ -9217,20 +9125,12 @@ if test $OPT_DISABLE_PIC14 = 0; then +@@ -9685,20 +9593,12 @@ if test $OPT_DISABLE_PIC14 = 0; then test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/lib/pic14" @@ -278,8 +278,8 @@ index 9de81c6..2620e3c 100755 - fi - 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; then -@@ -9307,8 +9207,6 @@ fi + 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 +@@ -9775,8 +9675,6 @@ fi test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/Makefile" @@ -288,7 +288,7 @@ index 9de81c6..2620e3c 100755 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" -@@ -9324,10 +9222,6 @@ ac_config_files="$ac_config_files bin/sdranlib" +@@ -9792,10 +9690,6 @@ ac_config_files="$ac_config_files bin/sdranlib" ac_config_files="$ac_config_files bin/sdobjcopy" @@ -299,7 +299,7 @@ index 9de81c6..2620e3c 100755 cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -@@ -10068,7 +9962,6 @@ do +@@ -10538,7 +10432,6 @@ do "device/lib/pdk15-stack-auto/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/pdk15-stack-auto/Makefile" ;; "sdas/aspdk16/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/aspdk16/Makefile" ;; "device/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/Makefile" ;; @@ -307,7 +307,7 @@ index 9de81c6..2620e3c 100755 "main.mk") CONFIG_FILES="$CONFIG_FILES main.mk:main_in.mk" ;; "bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; -@@ -10088,7 +9981,6 @@ do +@@ -10558,7 +10451,6 @@ do "bin/sdnm") CONFIG_FILES="$CONFIG_FILES bin/sdnm" ;; "bin/sdranlib") CONFIG_FILES="$CONFIG_FILES bin/sdranlib" ;; "bin/sdobjcopy") CONFIG_FILES="$CONFIG_FILES bin/sdobjcopy" ;; @@ -315,7 +315,7 @@ index 9de81c6..2620e3c 100755 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac -@@ -10905,54 +10797,6 @@ esac +@@ -11375,54 +11267,6 @@ esac incPath3=`echo "$incPath3" | sed 's,\\\\\\\\,\\\\,g'` @@ -370,7 +370,7 @@ index 9de81c6..2620e3c 100755 libPath1=`echo "/${prefix2data_dir}/${norm_lib_dir_suffix}" | sed 's,/\./,/,g'` case ":$libPath1:" in -@@ -11002,54 +10846,6 @@ esac +@@ -11472,54 +11316,6 @@ esac libPath3=`echo "$libPath3" | sed 's,\\\\\\\\,\\\\,g'` @@ -425,7 +425,7 @@ index 9de81c6..2620e3c 100755 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: sdcc ${VERSION} is now configured for -@@ -11091,7 +10887,6 @@ sdcc ${VERSION} is now configured for +@@ -11562,7 +11358,6 @@ sdcc ${VERSION} is now configured for mos6502 ${enable_mos6502_port} mos65c02 ${enable_mos65c02_port} @@ -433,7 +433,7 @@ index 9de81c6..2620e3c 100755 Disable packihx: ${OPT_DISABLE_PACKIHX} Disable ucsim: ${OPT_DISABLE_UCSIM} Disable device lib: ${OPT_DISABLE_DEVICE_LIB} -@@ -11106,9 +10901,6 @@ sdcc ${VERSION} is now configured for +@@ -11577,9 +11372,6 @@ sdcc ${VERSION} is now configured for include/library files: ${datadir}/${inclib_dir_suffix} include files: ${datadir}/${include_dir_suffix} library files: ${datadir}/${lib_dir_suffix} @@ -443,7 +443,7 @@ index 9de81c6..2620e3c 100755 documentation: ${docdir} prefix: ${prefix} -@@ -11120,15 +10912,9 @@ sdcc ${VERSION} is now configured for +@@ -11591,15 +11383,9 @@ sdcc ${VERSION} is now configured for include files: ${incPath1} path(argv[0])${incPath2} ${incPath3} @@ -459,7 +459,7 @@ index 9de81c6..2620e3c 100755 " >&5 printf "%s\n" " sdcc ${VERSION} is now configured for -@@ -11171,7 +10957,6 @@ sdcc ${VERSION} is now configured for +@@ -11643,7 +11429,6 @@ sdcc ${VERSION} is now configured for mos6502 ${enable_mos6502_port} mos65c02 ${enable_mos65c02_port} @@ -467,7 +467,7 @@ index 9de81c6..2620e3c 100755 Disable packihx: ${OPT_DISABLE_PACKIHX} Disable ucsim: ${OPT_DISABLE_UCSIM} Disable device lib: ${OPT_DISABLE_DEVICE_LIB} -@@ -11186,9 +10971,6 @@ sdcc ${VERSION} is now configured for +@@ -11658,9 +11443,6 @@ sdcc ${VERSION} is now configured for include/library files: ${datadir}/${inclib_dir_suffix} include files: ${datadir}/${include_dir_suffix} library files: ${datadir}/${lib_dir_suffix} @@ -477,7 +477,7 @@ index 9de81c6..2620e3c 100755 documentation: ${docdir} prefix: ${prefix} -@@ -11200,15 +10982,9 @@ sdcc ${VERSION} is now configured for +@@ -11672,15 +11454,9 @@ sdcc ${VERSION} is now configured for include files: ${incPath1} path(argv[0])${incPath2} ${incPath3} @@ -494,10 +494,10 @@ index 9de81c6..2620e3c 100755 # End of configure/configure.in diff --git a/configure.ac b/configure.ac -index ead779c..a3578fe 100644 +index adf5060..bd5a036 100644 --- a/configure.ac +++ b/configure.ac -@@ -564,19 +564,6 @@ if test "${include_dir_suffix}" = ""; then +@@ -542,19 +542,6 @@ if test "${include_dir_suffix}" = ""; then include_dir_suffix="${inclib_dir_suffix}/include" fi @@ -517,7 +517,7 @@ index ead779c..a3578fe 100644 # lib_dir_suffix: # *nix default: "sdcc/lib" AC_ARG_VAR([lib_dir_suffix], [appended to datadir to define SDCC's library root directory]) -@@ -584,13 +571,6 @@ if test "${lib_dir_suffix}" = ""; then +@@ -562,13 +549,6 @@ if test "${lib_dir_suffix}" = ""; then lib_dir_suffix="${inclib_dir_suffix}/lib" fi @@ -531,7 +531,7 @@ index ead779c..a3578fe 100644 # docdir: # *nix default: "${datadir}/sdcc/doc" AC_ARG_VAR([docdir], [documentation installation directory]) -@@ -631,19 +611,11 @@ norm_inc_dir_suffix=${include_dir_suffix} +@@ -609,19 +589,11 @@ norm_inc_dir_suffix=${include_dir_suffix} adl_NORMALIZE_PATH([norm_inc_dir_suffix], [$sdccconf_h_dir_separator]) AC_DEFINE_UNQUOTED(INCLUDE_DIR_SUFFIX, DIR_SEPARATOR_STRING "${norm_inc_dir_suffix}", [XXX]) @@ -551,7 +551,7 @@ index ead779c..a3578fe 100644 # relative paths adl_COMPUTE_RELATIVE_PATHS([expanded_bindir:expanded_datadir:bin2data_dir]) -@@ -836,7 +808,6 @@ AC_DO_DISABLER(packihx, PACKIHX, [Disables building packihx]) +@@ -815,7 +787,6 @@ AC_DO_DISABLER(packihx, PACKIHX, [Disables building packihx]) AC_DO_DISABLER(sdcpp, SDCPP, [Disables building sdcpp]) AC_DO_DISABLER(sdcdb, SDCDB, [Disables building sdcdb]) AC_DO_DISABLER(sdbinutils, SDBINUTILS, [Disables configuring and building of sdbinutils]) @@ -559,7 +559,7 @@ index ead779c..a3578fe 100644 AC_DO_ENABLER(doc, DOC, [Enables building the documentation]) AC_CHECK_PROG([LYX], [lyx], [lyx], [:]) -@@ -915,16 +886,10 @@ if test $OPT_DISABLE_PIC14 = 0; then +@@ -895,16 +866,10 @@ if test $OPT_DISABLE_PIC14 = 0; then AC_CONFIG_FILES(src/pic14/Makefile) test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/lib/pic14) fi @@ -574,9 +574,9 @@ index ead779c..a3578fe 100644 - test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/non-free/lib/pic16) -fi - 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; then + 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 AC_CONFIG_FILES([src/z80/Makefile]) -@@ -988,7 +953,6 @@ fi +@@ -969,7 +934,6 @@ fi test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/Makefile]) @@ -584,7 +584,7 @@ index ead779c..a3578fe 100644 AC_CONFIG_FILES([main.mk:main_in.mk bin/Makefile -@@ -1010,9 +974,6 @@ AC_CONFIG_FILES([bin/sdar], [chmod +x bin/sdar]) +@@ -991,9 +955,6 @@ AC_CONFIG_FILES([bin/sdar], [chmod +x bin/sdar]) AC_CONFIG_FILES([bin/sdnm], [chmod +x bin/sdnm]) AC_CONFIG_FILES([bin/sdranlib], [chmod +x bin/sdranlib]) AC_CONFIG_FILES([bin/sdobjcopy], [chmod +x bin/sdobjcopy]) @@ -594,7 +594,7 @@ index ead779c..a3578fe 100644 AC_OUTPUT # I found no better place -@@ -1030,16 +991,10 @@ adl_NORMALIZE_PATH_MSG(/${prefix2bin_dir}, [binPath], [ +@@ -1011,16 +972,10 @@ adl_NORMALIZE_PATH_MSG(/${prefix2bin_dir}, [binPath], [ adl_NORMALIZE_PATH_MSG(/${prefix2data_dir}/${norm_inc_dir_suffix}, [incPath1], [$dirch]) adl_NORMALIZE_PATH_MSG(/${bin2data_dir}/${norm_inc_dir_suffix}, [incPath2], [$dirch]) adl_NORMALIZE_PATH_MSG(${expanded_datadir}/${norm_inc_dir_suffix}, [incPath3], [$dirch]) @@ -611,7 +611,7 @@ index ead779c..a3578fe 100644 AC_MSG_RESULT([ sdcc ${VERSION} is now configured for -@@ -1082,7 +1037,6 @@ sdcc ${VERSION} is now configured for +@@ -1064,7 +1019,6 @@ sdcc ${VERSION} is now configured for mos6502 ${enable_mos6502_port} mos65c02 ${enable_mos65c02_port} @@ -619,7 +619,7 @@ index ead779c..a3578fe 100644 Disable packihx: ${OPT_DISABLE_PACKIHX} Disable ucsim: ${OPT_DISABLE_UCSIM} Disable device lib: ${OPT_DISABLE_DEVICE_LIB} -@@ -1097,9 +1051,6 @@ sdcc ${VERSION} is now configured for +@@ -1079,9 +1033,6 @@ sdcc ${VERSION} is now configured for include/library files: ${datadir}/${inclib_dir_suffix} include files: ${datadir}/${include_dir_suffix} library files: ${datadir}/${lib_dir_suffix} @@ -629,7 +629,7 @@ index ead779c..a3578fe 100644 documentation: ${docdir} prefix: ${prefix} -@@ -1111,14 +1062,8 @@ sdcc ${VERSION} is now configured for +@@ -1093,14 +1044,8 @@ sdcc ${VERSION} is now configured for include files: ${incPath1} path(argv[[0]])${incPath2} ${incPath3} @@ -1003,7 +1003,7 @@ index db0d421..9e90d7a 100644 .SUFFIXES: diff --git a/device/lib/pic16/libc/Makefile.in b/device/lib/pic16/libc/Makefile.in -index ae76fdd..75fc04a 100644 +index 74147d2..bed548b 100644 --- a/device/lib/pic16/libc/Makefile.in +++ b/device/lib/pic16/libc/Makefile.in @@ -88,10 +88,7 @@ PRE_UNINSTALL = : @@ -1018,7 +1018,7 @@ index ae76fdd..75fc04a 100644 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) -@@ -383,8 +380,7 @@ libc18f_a_SOURCES = ctype/iscntrl.c ctype/isdigit.c ctype/isgraph.c \ +@@ -384,8 +381,7 @@ libc18f_a_SOURCES = ctype/iscntrl.c ctype/isdigit.c ctype/isgraph.c \ string/strpbrk.c string/strrchr.c string/strspn.c \ string/strstr.c string/strtok.c string/strupr.c \ utils/cnvfrac.S utils/cnvint.S utils/cvtdec.S @@ -1028,7 +1028,7 @@ index ae76fdd..75fc04a 100644 #AM_CFLAGS += --no-optimize-goto #AM_CFLAGS += --debug-ralloc -@@ -398,11 +394,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \ +@@ -399,11 +395,10 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)/../../include/pic16 \ #AM_CFLAGS += --noinduction #AM_CFLAGS += --nojtbound #AM_CFLAGS += --noloopreverse @@ -1248,7 +1248,7 @@ index 5c2fce7..8d70807 100644 .SUFFIXES: diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt -index 3711c71..9e500a2 100644 +index 8dfadb6..dd17528 100644 --- a/doc/INSTALL.txt +++ b/doc/INSTALL.txt @@ -18,9 +18,7 @@ To install: @@ -1282,7 +1282,7 @@ index 3711c71..9e500a2 100644 You can test the install by entering: diff --git a/doc/README.txt b/doc/README.txt -index cd1ef3f..5a0d0a8 100644 +index e62177b..4d09afb 100644 --- a/doc/README.txt +++ b/doc/README.txt @@ -37,10 +37,9 @@ Exception are pic device libraries and header files which are derived @@ -1300,10 +1300,10 @@ index cd1ef3f..5a0d0a8 100644 However: Many think that the Microchip requirement is not legally enforceable, arguing that the header files only contain noncopyrightable facts. diff --git a/doc/sdccman.lyx b/doc/sdccman.lyx -index a57bf15..d6f30c7 100644 +index efaf738..0ad1ba7 100644 --- a/doc/sdccman.lyx +++ b/doc/sdccman.lyx -@@ -1150,54 +1150,9 @@ A possible exception are pic device libraries and header files which are +@@ -1151,54 +1151,9 @@ A possible exception are pic device libraries and header files which are to be used with authentic Microchip devices" which makes them incompatible with the GPL, if Microchip has any copyright in them (which might depend on local copyright laws). @@ -1361,7 +1361,7 @@ index a57bf15..d6f30c7 100644 \end_layout \begin_layout Itemize -@@ -1260,23 +1215,6 @@ makebin: +@@ -1261,23 +1216,6 @@ makebin: zlib/libpng License \end_layout @@ -1385,7 +1385,7 @@ index a57bf15..d6f30c7 100644 \end_deeper \begin_layout Itemize libraries: -@@ -3062,18 +3000,6 @@ include_dir_suffix environment variable, see table below +@@ -3194,18 +3132,6 @@ include_dir_suffix environment variable, see table below \end_inset @@ -1404,7 +1404,7 @@ index a57bf15..d6f30c7 100644 \begin_inset space ~ \end_inset -@@ -3086,22 +3012,6 @@ lib_dir_suffix environment variable, see table below +@@ -3218,22 +3144,6 @@ lib_dir_suffix environment variable, see table below \end_inset @@ -1427,7 +1427,7 @@ index a57bf15..d6f30c7 100644 \begin_inset space ~ \end_inset -@@ -3600,7 +3510,7 @@ These defaults are: +@@ -3876,7 +3786,7 @@ These defaults are: \begin_layout Standard \align center \begin_inset Tabular @@ -1436,7 +1436,7 @@ index a57bf15..d6f30c7 100644 -@@ -3884,68 +3794,6 @@ sdcc/include +@@ -4160,68 +4070,6 @@ sdcc/include include \end_layout @@ -1505,7 +1505,7 @@ index a57bf15..d6f30c7 100644 \end_inset -@@ -3956,7 +3804,7 @@ lib +@@ -4232,7 +4080,7 @@ lib \begin_layout Plain Layout \emph on @@ -1514,7 +1514,7 @@ index a57bf15..d6f30c7 100644 \end_layout \end_inset -@@ -3965,7 +3813,7 @@ NON_FREE_LIB_DIR_SUFFIX +@@ -4241,7 +4089,7 @@ NON_FREE_LIB_DIR_SUFFIX \begin_inset Text \begin_layout Plain Layout @@ -1523,7 +1523,7 @@ index a57bf15..d6f30c7 100644 \end_layout \end_inset -@@ -3974,7 +3822,7 @@ sdcc/non-free/lib +@@ -4250,7 +4098,7 @@ sdcc/non-free/lib \begin_inset Text \begin_layout Plain Layout @@ -1532,7 +1532,7 @@ index a57bf15..d6f30c7 100644 \end_layout \end_inset -@@ -4373,20 +4221,6 @@ include +@@ -4649,20 +4497,6 @@ include \end_inset @@ -1553,7 +1553,7 @@ index a57bf15..d6f30c7 100644 \backslash \begin_inset Newline newline -@@ -4401,20 +4235,6 @@ lib +@@ -4677,20 +4511,6 @@ lib \end_inset @@ -1574,7 +1574,7 @@ index a57bf15..d6f30c7 100644 \backslash \begin_inset Newline newline -@@ -4595,20 +4415,6 @@ include +@@ -4871,20 +4691,6 @@ include \end_inset @@ -1595,7 +1595,7 @@ index a57bf15..d6f30c7 100644 \backslash \begin_inset Newline newline -@@ -4623,20 +4429,6 @@ lib +@@ -4899,20 +4705,6 @@ lib \end_inset @@ -1616,7 +1616,7 @@ index a57bf15..d6f30c7 100644 \backslash \begin_inset Newline newline -@@ -4733,7 +4525,7 @@ Install paths +@@ -5009,7 +4801,7 @@ Install paths \begin_layout Standard \align center \begin_inset Tabular @@ -1625,7 +1625,7 @@ index a57bf15..d6f30c7 100644 -@@ -4889,64 +4681,6 @@ include +@@ -5165,64 +4957,6 @@ include \begin_inset Text @@ -1690,7 +1690,7 @@ index a57bf15..d6f30c7 100644 \begin_layout Plain Layout Library file** \end_layout -@@ -4996,64 +4730,6 @@ sdcc +@@ -5272,64 +5006,6 @@ sdcc lib \end_layout @@ -1755,7 +1755,7 @@ index a57bf15..d6f30c7 100644 \end_inset -@@ -5376,7 +5052,7 @@ $PATH +@@ -5652,7 +5328,7 @@ $PATH \begin_layout Standard \align center \begin_inset Tabular @@ -1764,7 +1764,7 @@ index a57bf15..d6f30c7 100644 -@@ -5654,203 +5330,13 @@ include +@@ -5930,203 +5606,13 @@ include @@ -1969,7 +1969,7 @@ index a57bf15..d6f30c7 100644 \end_inset -@@ -5866,21 +5352,13 @@ $DATADIR/ +@@ -6142,21 +5628,13 @@ $DATADIR/ \end_inset @@ -1992,7 +1992,7 @@ index a57bf15..d6f30c7 100644 \begin_inset Text \begin_layout Plain Layout -@@ -5888,7 +5366,7 @@ $INCLUDE_DIR_SUFFIX +@@ -6164,7 +5642,7 @@ $INCLUDE_DIR_SUFFIX \begin_inset Newline newline \end_inset @@ -2001,7 +2001,7 @@ index a57bf15..d6f30c7 100644 \end_layout \end_inset -@@ -5986,7 +5464,7 @@ model +@@ -6262,7 +5740,7 @@ model \begin_layout Standard \align center \begin_inset Tabular @@ -2010,7 +2010,7 @@ index a57bf15..d6f30c7 100644 -@@ -6266,7 +5744,7 @@ lib +@@ -6542,7 +6020,7 @@ lib @@ -2019,7 +2019,7 @@ index a57bf15..d6f30c7 100644 \begin_inset Text \begin_layout Plain Layout -@@ -6275,7 +5753,7 @@ lib +@@ -6551,7 +6029,7 @@ lib \end_inset @@ -2028,7 +2028,7 @@ index a57bf15..d6f30c7 100644 \begin_inset Text \begin_layout Plain Layout -@@ -6306,7 +5784,7 @@ $LIB_DIR_SUFFIX/ +@@ -6582,7 +6060,7 @@ $LIB_DIR_SUFFIX/ \end_inset @@ -2037,7 +2037,7 @@ index a57bf15..d6f30c7 100644 \begin_inset Text \begin_layout Plain Layout -@@ -6321,7 +5799,7 @@ lib/ +@@ -6597,7 +6075,7 @@ lib/ \end_inset @@ -2046,7 +2046,7 @@ index a57bf15..d6f30c7 100644 \begin_inset Text \begin_layout Plain Layout -@@ -6344,308 +5822,6 @@ lib +@@ -6620,308 +6098,6 @@ lib \end_layout @@ -2355,7 +2355,7 @@ index a57bf15..d6f30c7 100644 \end_inset -@@ -8923,14 +8099,6 @@ In /share/sdcc/include +@@ -9201,14 +8377,6 @@ In /share/sdcc/include the include files \end_layout @@ -2370,7 +2370,7 @@ index a57bf15..d6f30c7 100644 \begin_layout Standard In /share/sdcc/lib \end_layout -@@ -8939,14 +8107,6 @@ In /share/sdcc/lib +@@ -9217,14 +8385,6 @@ In /share/sdcc/lib the src and target subdirectories with the precompiled relocatables. \end_layout @@ -2385,7 +2385,7 @@ index a57bf15..d6f30c7 100644 \begin_layout Standard In /share/sdcc/doc \end_layout -@@ -16096,66 +15256,6 @@ splint +@@ -16452,66 +15612,6 @@ splint myprogram.c \end_layout @@ -2452,7 +2452,7 @@ index a57bf15..d6f30c7 100644 \begin_layout Subsection Linker Options \begin_inset Index idx -@@ -45880,66 +44980,9 @@ http://sourceforge.net/projects/gputils +@@ -46758,66 +45858,9 @@ http://sourceforge.net/projects/gputils Pic device specific header and c source files are automatically generated from MPLAB include files, which are published by Microchip with a special requirement that they are only to be used with authentic Microchip devices. @@ -2522,7 +2522,7 @@ index a57bf15..d6f30c7 100644 \begin_inset Newline newline \end_inset -@@ -45993,7 +45036,7 @@ Makefile +@@ -46871,7 +45914,7 @@ Makefile \begin_inset space ~ \end_inset @@ -2531,7 +2531,7 @@ index a57bf15..d6f30c7 100644 \begin_inset Newline newline \end_inset -@@ -46087,7 +45130,7 @@ Makefile +@@ -46965,7 +46008,7 @@ Makefile \begin_inset space ~ \end_inset @@ -2540,7 +2540,7 @@ index a57bf15..d6f30c7 100644 \begin_inset Newline newline \end_inset -@@ -46369,47 +45412,6 @@ status collapsed +@@ -47247,47 +46290,6 @@ status collapsed \begin_layout Plain Layout @@ -2588,7 +2588,7 @@ index a57bf15..d6f30c7 100644 \backslash / \end_layout -@@ -47282,47 +46284,6 @@ status collapsed +@@ -48160,47 +47162,6 @@ status collapsed -all-callee-saves \end_layout @@ -2636,7 +2636,7 @@ index a57bf15..d6f30c7 100644 \begin_layout Subsection Port Specific Options \begin_inset Index idx -@@ -48599,188 +47560,6 @@ Linker +@@ -49477,188 +48438,6 @@ Linker \end_inset @@ -2825,7 +2825,7 @@ index a57bf15..d6f30c7 100644 \end_layout \begin_layout Subsection -@@ -49476,66 +48255,9 @@ name "subsec:PIC16_Header-Files-and-Libraries" +@@ -50354,66 +49133,9 @@ name "subsec:PIC16_Header-Files-and-Libraries" Pic device specific header and c source files are automatically generated from MPLAB include files, which are published by Microchip with a special requirement that they are only to be used with authentic Microchip devices. @@ -2895,7 +2895,7 @@ index a57bf15..d6f30c7 100644 \end_layout \begin_layout Subsection -@@ -49781,195 +48503,6 @@ vfprintf.c +@@ -50659,195 +49381,6 @@ vfprintf.c should also work, but is untested. \end_layout @@ -3091,7 +3091,7 @@ index a57bf15..d6f30c7 100644 \begin_layout Subsection Memory Models \end_layout -@@ -74714,6 +73247,12 @@ This document was initially written by Sandeep Dutta and updated by SDCC +@@ -75717,6 +74250,12 @@ This document was initially written by Sandeep Dutta and updated by SDCC developers. \end_layout @@ -3105,7 +3105,7 @@ index a57bf15..d6f30c7 100644 All product names mentioned herein may be trademarks \begin_inset Index idx diff --git a/sdcc.spec b/sdcc.spec -index b784cbc..f180b51 100644 +index ccb3217..292b642 100644 --- a/sdcc.spec +++ b/sdcc.spec @@ -89,9 +89,7 @@ rm -rf $RPM_BUILD_ROOT @@ -3118,7 +3118,7 @@ index b784cbc..f180b51 100644 %files doc %defattr(-,root,root) -@@ -102,6 +100,8 @@ rm -rf $RPM_BUILD_ROOT +@@ -104,6 +102,8 @@ rm -rf $RPM_BUILD_ROOT - version updated to 4.2.0 * Sat Feb 20 2021 - pkk AT spth.de - version updated to 4.0.0 @@ -3141,7 +3141,7 @@ index 8cf401b..19f5113 100644 #define BIN2DATA_DIR "\\.." #define PREFIX2BIN_DIR "\\bin" diff --git a/sdccconf_in.h b/sdccconf_in.h -index ca8d69f..980af8d 100644 +index 9e6e3c7..8681ceb 100644 --- a/sdccconf_in.h +++ b/sdccconf_in.h @@ -100,12 +100,6 @@ @@ -3168,10 +3168,10 @@ index ca8d69f..980af8d 100644 #undef OPT_DISABLE_PACKIHX diff --git a/src/SDCCglobl.h b/src/SDCCglobl.h -index 87981f4..e2701f2 100644 +index 9f0e52a..02a5fb8 100644 --- a/src/SDCCglobl.h +++ b/src/SDCCglobl.h -@@ -287,7 +287,6 @@ struct options +@@ -290,7 +290,6 @@ struct options int stack_size; /* MCS51/DS390 - Tells the linker to allocate this space for stack */ int acall_ajmp; /* MCS51 - Use acall/ajmp instead of lcall/ljmp */ int no_ret_without_call; /* MCS51 - Do not use ret independent of acall/lcall */ @@ -3180,7 +3180,7 @@ index 87981f4..e2701f2 100644 int xstack_loc; /* initial location of external stack */ int stack_loc; /* initial value of internal stack pointer */ diff --git a/src/SDCCmain.c b/src/SDCCmain.c -index 6b50572..089c42f 100644 +index e7e8bd6..3b25061 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -143,7 +143,6 @@ char buffer[PATH_MAX * 2]; @@ -3191,15 +3191,15 @@ index 6b50572..089c42f 100644 #define OPTION_PEEP_RETURN "--peep-return" #define OPTION_NO_PEEP_RETURN "--no-peep-return" #define OPTION_NO_OPTSDCC_IN_ASM "--no-optsdcc-in-asm" -@@ -193,7 +192,6 @@ static const OPTION optionsTable[] = { - {0, OPTION_STD, NULL, "Determine the language standard (c89, c99, c11, c2x, sdcc89 etc.)"}, +@@ -195,7 +194,6 @@ static const OPTION optionsTable[] = { + {0, OPTION_STD, NULL, "Determine the language standard (c89, c99, c11, c23, sdcc89 etc.)"}, {0, OPTION_DOLLARS_IN_IDENT, &options.dollars_in_ident, "Permit '$' as an identifier character"}, {0, OPTION_SIGNED_CHAR, &options.signed_char, "Make \"char\" signed by default"}, - {0, OPTION_USE_NON_FREE, &options.use_non_free, "Search / include non-free licensed libraries and header files"}, {0, NULL, NULL, "Code generation options"}, {'m', NULL, NULL, "Set the port to use e.g. -mz80."}, -@@ -2207,10 +2205,6 @@ preProcess (char **envp) +@@ -2231,10 +2229,6 @@ preProcess (char **envp) else addSet (&preArgvSet, Safe_strdup ("-D__SDCC_CHAR_UNSIGNED")); @@ -3210,7 +3210,7 @@ index 6b50572..089c42f 100644 /* set the macro for large model */ switch (options.model) { -@@ -2454,12 +2448,6 @@ setIncludePath (void) +@@ -2478,12 +2472,6 @@ setIncludePath (void) * 6. - $SDCC_HOME/PREFIX2DATA_DIR/INCLUDE_DIR_SUFFIX * 7. - path(argv[0])/BIN2DATA_DIR/INCLUDE_DIR_SUFFIX * 8. - DATADIR/INCLUDE_DIR_SUFFIX (only on *nix) @@ -3223,7 +3223,7 @@ index 6b50572..089c42f 100644 */ if (!options.nostdinc) -@@ -2475,17 +2463,6 @@ setIncludePath (void) +@@ -2499,17 +2487,6 @@ setIncludePath (void) includeDirsSet = processStrSet (includeDirsSet, NULL, port->target, NULL); mergeSets (&includeDirsSet, tempSet); @@ -3241,7 +3241,7 @@ index 6b50572..089c42f 100644 if ((p = getenv (SDCC_INCLUDE_NAME)) != NULL) { struct dbuf_s dbuf; -@@ -2510,9 +2487,6 @@ setLibPath (void) +@@ -2534,9 +2511,6 @@ setLibPath (void) * 3. - $SDCC_HOME/PREFIX2DATA_DIR/LIB_DIR_SUFFIX/ * 4. - path(argv[0])/BIN2DATA_DIR/LIB_DIR_SUFFIX/ * 5. - DATADIR/LIB_DIR_SUFFIX/ (only on *nix) @@ -3251,7 +3251,7 @@ index 6b50572..089c42f 100644 */ if (!options.nostdlib) -@@ -2529,13 +2503,6 @@ setLibPath (void) +@@ -2553,13 +2527,6 @@ setLibPath (void) dbuf_makePath (&dbuf, LIB_DIR_SUFFIX, port->general.get_model ? port->general.get_model () : targetname); libDirsSet = processStrSet (dataDirsSet, NULL, dbuf_c_str (&dbuf), NULL); @@ -3266,7 +3266,7 @@ index 6b50572..089c42f 100644 { addSetHead (&libDirsSet, Safe_strdup (p)); diff --git a/src/pic14/main.c b/src/pic14/main.c -index ab4bcdf..1747fd6 100644 +index 304c79b..9cbb9e8 100644 --- a/src/pic14/main.c +++ b/src/pic14/main.c @@ -42,7 +42,6 @@ static OPTION _pic14_poptions[] = @@ -3319,7 +3319,7 @@ index 41a1b79..9c642e3 100644 extern pic16_options_t pic16_options; diff --git a/src/pic16/main.c b/src/pic16/main.c -index 8809e2c..53c700e 100644 +index 9557a10..d650e66 100644 --- a/src/pic16/main.c +++ b/src/pic16/main.c @@ -660,7 +660,6 @@ OPTION pic16_optionsTable[]= { @@ -3404,10 +3404,10 @@ index b0b0867..2d5cdd3 100644 OBJEXT = .o diff --git a/support/regression/ports/pic16/spec.mk b/support/regression/ports/pic16/spec.mk -index 541608a..6e7238f 100644 +index 15b4028..3b79cfe 100644 --- a/support/regression/ports/pic16/spec.mk +++ b/support/regression/ports/pic16/spec.mk -@@ -12,13 +12,9 @@ endif +@@ -16,13 +16,9 @@ EMU_INPUT = -c $(PORTS_DIR)/pic16/gpsim.cmd ifndef SDCC_BIN_PATH ifndef CROSSCOMPILING @@ -3423,7 +3423,7 @@ index 541608a..6e7238f 100644 endif ifdef CROSSCOMPILING -@@ -27,7 +23,6 @@ endif +@@ -31,7 +27,6 @@ endif SDCCFLAGS += -mpic16 -pp18f452 --less-pedantic -Wl,-q SDCCFLAGS += --no-peep @@ -3541,10 +3541,10 @@ index 6db417a..4b35225 100755 ); diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi -index 8309df1..c0cc223 100644 +index 37393d7..997b2fe 100644 --- a/support/scripts/sdcc.nsi +++ b/support/scripts/sdcc.nsi -@@ -491,11 +491,6 @@ ${Section} "SDCC include files" SEC05 +@@ -487,11 +487,6 @@ ${Section} "SDCC include files" SEC05 SetOutPath "$INSTDIR\include" File "${DEV_ROOT}\include\*.h" @@ -3556,7 +3556,7 @@ index 8309df1..c0cc223 100644 ${SectionEnd} ${Section} "SDCC DS390 library" SEC06 -@@ -593,18 +588,12 @@ ${Section} "SDCC PIC16 library" SEC21 +@@ -589,18 +584,12 @@ ${Section} "SDCC PIC16 library" SEC21 SetOutPath "$INSTDIR\lib\pic16" File "${DEV_ROOT}\lib\pic16\*.o" File "${DEV_ROOT}\lib\pic16\*.lib" @@ -3575,7 +3575,7 @@ index 8309df1..c0cc223 100644 ${SectionEnd} ${Section} "SDCC STM8 medium model library" SEC23 -@@ -713,10 +702,6 @@ ${Section} "SDCC library sources" SEC25 +@@ -709,10 +698,6 @@ ${Section} "SDCC library sources" SEC25 File "${DEV_ROOT}\lib\src\pic14\libsdcc\enhanced\*.inc" # File "${DEV_ROOT}\lib\src\pic14\libsdcc\Makefile" @@ -3586,7 +3586,7 @@ index 8309df1..c0cc223 100644 SetOutPath "$INSTDIR\lib\src\pic14\libm" # File "${DEV_ROOT}\lib\src\pic14\libm\*.c" -@@ -768,10 +753,6 @@ ${Section} "SDCC library sources" SEC25 +@@ -764,10 +749,6 @@ ${Section} "SDCC library sources" SEC25 File "${DEV_ROOT}\lib\src\pic16\libc\utils\*.S" # File "${DEV_ROOT}\lib\src\pic16\libc\utils\Makefile" @@ -3597,7 +3597,7 @@ index 8309df1..c0cc223 100644 SetOutPath "$INSTDIR\lib\src\pic16\libio" File "${DEV_ROOT}\lib\src\pic16\libio\*.ignore" # File "${DEV_ROOT}\lib\src\pic16\libio\Makefile" -@@ -1137,13 +1118,9 @@ ${Section} Uninstall SECUNINSTALL +@@ -1169,13 +1150,9 @@ ${Section} Uninstall SECUNINSTALL Delete "$INSTDIR\lib\pic14\*.lib" @@ -3611,7 +3611,7 @@ index 8309df1..c0cc223 100644 Delete "$INSTDIR\lib\hc08\*.lib" Delete "$INSTDIR\lib\s08\*.lib" -@@ -1219,9 +1196,7 @@ ${Section} Uninstall SECUNINSTALL +@@ -1259,9 +1236,7 @@ ${Section} Uninstall SECUNINSTALL Delete "$INSTDIR\include\pic14\*.h" Delete "$INSTDIR\include\pic14\*.txt" Delete "$INSTDIR\include\pic14\*.inc" @@ -3621,7 +3621,7 @@ index 8309df1..c0cc223 100644 Delete "$INSTDIR\include\pic16\*.txt" Delete "$INSTDIR\include\mcs51\*.h" Delete "$INSTDIR\include\hc08\*.h" -@@ -1298,9 +1273,7 @@ ${Section} Uninstall SECUNINSTALL +@@ -1334,9 +1309,7 @@ ${Section} Uninstall SECUNINSTALL Delete "$INSTDIR\uninstall.exe" RMDir /r "$INSTDIR\lib\src\pic14" @@ -3631,9 +3631,9 @@ index 8309df1..c0cc223 100644 RMDir "$INSTDIR\lib\src\small" RMDir "$INSTDIR\lib\src\medium" RMDir "$INSTDIR\lib\src\large" -@@ -1328,12 +1301,9 @@ ${Section} Uninstall SECUNINSTALL - RMDir "$INSTDIR\lib\src\mos6502" - RMDir "$INSTDIR\lib\src\z80n" +@@ -1367,12 +1340,9 @@ ${Section} Uninstall SECUNINSTALL + RMDir "$INSTDIR\lib\src\mos65c02" + RMDir "$INSTDIR\lib\src\s08-stack-auto" RMDir "$INSTDIR\lib\src" - RMDir "$INSTDIR\non-free\lib\src" @@ -3644,9 +3644,9 @@ index 8309df1..c0cc223 100644 RMDir "$INSTDIR\lib\z80" RMDir "$INSTDIR\lib\z180" RMDir "$INSTDIR\lib\r2k" -@@ -1361,15 +1331,12 @@ ${Section} Uninstall SECUNINSTALL - RMDir "$INSTDIR\lib\mos6502" - RMDir "$INSTDIR\lib\z80n" +@@ -1403,15 +1373,12 @@ ${Section} Uninstall SECUNINSTALL + RMDir "$INSTDIR\lib\mos65c02" + RMDir "$INSTDIR\lib\s08-stack-auto" RMDir "$INSTDIR\lib" - RMDir "$INSTDIR\non-free\lib" @@ -3660,7 +3660,7 @@ index 8309df1..c0cc223 100644 RMDir "$INSTDIR\include\asm\mcs51" RMDir "$INSTDIR\include\asm\sm83" RMDir "$INSTDIR\include\asm\ds390" -@@ -1378,17 +1345,12 @@ ${Section} Uninstall SECUNINSTALL +@@ -1420,17 +1387,12 @@ ${Section} Uninstall SECUNINSTALL RMDir "$INSTDIR\include\asm" RMDir "$INSTDIR\include\z180" RMDir "$INSTDIR\include\pic14"