summaryrefslogtreecommitdiff
path: root/lang/sdcc/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/sdcc/files')
-rw-r--r--lang/sdcc/files/patch-Makefile.in8
-rw-r--r--lang/sdcc/files/patch-configure.in18
-rw-r--r--lang/sdcc/files/patch-device-lib-Makefile.in12
-rw-r--r--lang/sdcc/files/patch-device-lib-pic-Makefile.common.in32
-rw-r--r--lang/sdcc/files/patch-device-lib-pic-Makefile.rules11
-rw-r--r--lang/sdcc/files/patch-device-lib-pic16-Makefile.common.in32
-rw-r--r--lang/sdcc/files/patch-device-lib-pic16-Makefile.rules11
-rw-r--r--lang/sdcc/files/patch-device-lib-pic16-libio-Makefile11
-rw-r--r--lang/sdcc/files/patch-pic30
-rw-r--r--lang/sdcc/files/patch-sim-ucsim-cmd.src-Makefile.in11
10 files changed, 51 insertions, 125 deletions
diff --git a/lang/sdcc/files/patch-Makefile.in b/lang/sdcc/files/patch-Makefile.in
index 4815ced1f3a4..b19a02683593 100644
--- a/lang/sdcc/files/patch-Makefile.in
+++ b/lang/sdcc/files/patch-Makefile.in
@@ -1,12 +1,12 @@
---- Makefile.in.orig Thu May 11 22:06:55 2006
-+++ Makefile.in Thu Jun 29 16:05:04 2006
+--- Makefile.in.orig Fri Sep 15 08:52:50 2006
++++ Makefile.in Thu Oct 12 18:14:59 2006
@@ -27,6 +27,10 @@
ifeq ($(OPT_DISABLE_MCS51), 0)
- SDCC_ASLINK += as/mcs51
+ SDCC_ASLINK += as/mcs51 as/link/mcs51
SDCC_MISC += debugger/mcs51
+else
+ifeq ($(OPT_DISABLE_DS390), 0)
-+SDCC_ASLINK += as/mcs51
++SDCC_ASLINK += as/mcs51 as/link/mcs51
+endif
endif
diff --git a/lang/sdcc/files/patch-configure.in b/lang/sdcc/files/patch-configure.in
index 85ea08513d55..3138ab8cd5c6 100644
--- a/lang/sdcc/files/patch-configure.in
+++ b/lang/sdcc/files/patch-configure.in
@@ -1,21 +1,25 @@
---- configure.in.orig Thu May 11 22:06:55 2006
-+++ configure.in Wed Jun 28 22:22:07 2006
-@@ -634,6 +634,10 @@
+--- configure.in.orig Tue Nov 21 16:27:08 2006
++++ configure.in Wed Dec 13 16:32:58 2006
+@@ -629,6 +629,11 @@
test $OPT_DISABLE_AVR = 0 && AC_CONFIG_FILES([src/avr/Makefile])
+if test $OPT_DISABLE_DS390 = 0 -o $OPT_DISABLE_MCS51 = 0; then
-+ AC_CONFIG_FILES([as/mcs51/Makefile])
++ AC_CONFIG_FILES([as/mcs51/Makefile
++ as/link/mcs51/Makefile])
+fi
+
if test $OPT_DISABLE_DS390 = 0; then
AC_CONFIG_FILES([src/ds390/Makefile])
test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/ds390/Makefile])
-@@ -652,7 +656,6 @@
+@@ -647,9 +652,7 @@
+ fi
if test $OPT_DISABLE_MCS51 = 0; then
- AC_CONFIG_FILES([src/mcs51/Makefile
+- AC_CONFIG_FILES([src/mcs51/Makefile
- as/mcs51/Makefile
- debugger/mcs51/Makefile])
+- as/link/mcs51/Makefile])
++ AC_CONFIG_FILES([src/mcs51/Makefile])
test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/mcs51/Makefile
device/lib/small/Makefile
+ device/lib/medium/Makefile
diff --git a/lang/sdcc/files/patch-device-lib-Makefile.in b/lang/sdcc/files/patch-device-lib-Makefile.in
index 9d0730ac6ceb..590ba7ab1e6f 100644
--- a/lang/sdcc/files/patch-device-lib-Makefile.in
+++ b/lang/sdcc/files/patch-device-lib-Makefile.in
@@ -1,6 +1,6 @@
---- device/lib/Makefile.in.orig Sat Jun 17 16:43:52 2006
-+++ device/lib/Makefile.in Wed Jun 28 19:08:03 2006
-@@ -337,23 +337,6 @@
+--- device/lib/Makefile.in.orig 2007-09-28 16:29:43.000000000 +0200
++++ device/lib/Makefile.in 2007-09-28 16:30:14.000000000 +0200
+@@ -345,23 +345,6 @@
# ---------------------------------------------------
install: all installdirs
$(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir)
@@ -14,17 +14,17 @@
- \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
- -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'build' -o -name 'bin' -o \
- -name 'Makefile*' \) \
-- -exec rm -r {} \; ; \
+- -exec rm -rf {}+ \; ; \
- done
- find $(sdcc_libdir)/src/mcs51 -depth \
- \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
- -name '*.lst' -o -name '.svn' -o -name 'build' -o -name 'bin' -o \
- -name 'Makefile*' \) \
-- -exec rm -r {} \;
+- -exec rm -rf {}+ \;
# Deleting all the installed files
# --------------------------------
-@@ -374,14 +357,6 @@
+@@ -382,14 +365,6 @@
# ---------------------------------
installdirs:
[ -d $(sdcc_libdir) ] || mkdir -p $(sdcc_libdir)
diff --git a/lang/sdcc/files/patch-device-lib-pic-Makefile.common.in b/lang/sdcc/files/patch-device-lib-pic-Makefile.common.in
deleted file mode 100644
index 5841fddbebe9..000000000000
--- a/lang/sdcc/files/patch-device-lib-pic-Makefile.common.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- device/lib/pic/Makefile.common.in.orig Mon May 1 22:47:12 2006
-+++ device/lib/pic/Makefile.common.in Wed Jun 28 17:27:29 2006
-@@ -12,7 +12,6 @@
- ### $Id: Makefile.common.in 4148 2006-05-01 20:47:12Z tecodev $
- ###
-
--SHELL = bash
-
- #################################################
- ### verboseness
-@@ -24,10 +23,10 @@
- #################################################
- ### compiler switches
- # ARCH might be overwritten in libio
--ARCH ?= 877
-+PICARCH ?= 877
-
- CFLAGS ?=
--CFLAGS += -mpic14 -p16f$(ARCH)
-+CFLAGS += -mpic14 -p16f$(PICARCH)
- CFLAGS += --std-c99
- CFLAGS += -I. -I$(top_srcdir)/../../include/pic
-
-@@ -54,7 +53,7 @@
- #################################################
- ### assembler switches
- ASFLAGS ?=
--ASFLAGS += -pp16f$(ARCH)
-+ASFLAGS += -pp16f$(PICARCH)
- ASFLAGS += -I$(top_srcdir)/../../include/pic
- ASFLAGS += -I. -I$(srcdir)
-
diff --git a/lang/sdcc/files/patch-device-lib-pic-Makefile.rules b/lang/sdcc/files/patch-device-lib-pic-Makefile.rules
deleted file mode 100644
index 2cca46ac5f16..000000000000
--- a/lang/sdcc/files/patch-device-lib-pic-Makefile.rules
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/lib/pic/Makefile.rules.orig Mon May 1 22:47:12 2006
-+++ device/lib/pic/Makefile.rules Thu Jun 29 00:39:50 2006
-@@ -56,7 +56,7 @@
- ifneq (,$(strip $(SUBDIRS)))
- recurse : force
- $(Q)+for DIR in $(SUBDIRS) ; do \
-- $(GREP) "^$${ARCH}$$" "$${DIR}.ignore" &> /dev/null || ( \
-+ $(GREP) "^$${PICARCH}$$" "$${DIR}.ignore" 2>&1 /dev/null || ( \
- $(MKDIR) "$(top_builddir)$(builddir)/$${DIR}"; \
- $(MAKE) -C "$${DIR}" builddir="$(builddir)/$${DIR}" $(MAKECMDGOALS); \
- ) || exit 1; \
diff --git a/lang/sdcc/files/patch-device-lib-pic16-Makefile.common.in b/lang/sdcc/files/patch-device-lib-pic16-Makefile.common.in
deleted file mode 100644
index 6e9a61f39a43..000000000000
--- a/lang/sdcc/files/patch-device-lib-pic16-Makefile.common.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- device/lib/pic16/Makefile.common.in.orig Mon May 1 22:47:12 2006
-+++ device/lib/pic16/Makefile.common.in Wed Jun 28 17:35:09 2006
-@@ -16,7 +16,6 @@
- ### $Id: Makefile.common.in 4148 2006-05-01 20:47:12Z tecodev $
- ###
-
--SHELL = bash
-
- #################################################
- ### verboseness
-@@ -27,10 +26,10 @@
-
- #################################################
- ### compiler switches
--ARCH ?= 452 # might be overwritten in libio
-+PICARCH ?= 452 # might be overwritten in libio
-
- CFLAGS ?=
--CFLAGS += -mpic16 -p18f$(ARCH)
-+CFLAGS += -mpic16 -p18f$(PICARCH)
- CFLAGS += --std-c99
- CFLAGS += -I. -I$(top_srcdir)/../../include/pic16
-
-@@ -63,7 +62,7 @@
- #################################################
- ### assembler switches
- ASFLAGS ?=
--ASFLAGS += -pp18f$(ARCH)
-+ASFLAGS += -pp18f$(PICARCH)
- ASFLAGS += -I$(top_srcdir)/../../include/pic16
- ASFLAGS += -I$(srcdir)
-
diff --git a/lang/sdcc/files/patch-device-lib-pic16-Makefile.rules b/lang/sdcc/files/patch-device-lib-pic16-Makefile.rules
deleted file mode 100644
index ee9903adff1b..000000000000
--- a/lang/sdcc/files/patch-device-lib-pic16-Makefile.rules
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/lib/pic16/Makefile.rules.orig Mon May 1 22:47:12 2006
-+++ device/lib/pic16/Makefile.rules Thu Jun 29 00:40:44 2006
-@@ -58,7 +58,7 @@
- ifneq (,$(strip $(SUBDIRS)))
- recurse : force
- $(Q)+for DIR in $(SUBDIRS) ; do \
-- $(GREP) "^$${ARCH}$$" "$(srcdir)/$${DIR}.ignore" &> /dev/null || ( \
-+ $(GREP) "^$${PICARCH}$$" "$(srcdir)/$${DIR}.ignore" 2>&1 /dev/null || ( \
- $(MKDIR) "$(top_builddir)$(builddir)/$${DIR}"; \
- $(MAKE) -C "$${DIR}" builddir="$(builddir)/$${DIR}" $(MAKECMDGOALS); \
- ) || exit 1; \
diff --git a/lang/sdcc/files/patch-device-lib-pic16-libio-Makefile b/lang/sdcc/files/patch-device-lib-pic16-libio-Makefile
deleted file mode 100644
index ba1c24193692..000000000000
--- a/lang/sdcc/files/patch-device-lib-pic16-libio-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/lib/pic16/libio/Makefile.in.orig Mon May 1 22:47:12 2006
-+++ device/lib/pic16/libio/Makefile.in Wed Jun 28 17:40:48 2006
-@@ -38,7 +38,7 @@
- | while read arch; do \
- [ "x$${arch}" = "x" ] \
- || ( $(MKDIR) "$(top_builddir)$(builddir)/$${arch}"; \
-- $(MAKE) MKLIB=libio18f$${arch}.lib builddir=$(builddir)/$${arch} ARCH=$${arch} IO_ARCH=$${arch} $(MAKECMDGOALS); ) \
-+ $(MAKE) MKLIB=libio18f$${arch}.lib builddir=$(builddir)/$${arch} PICARCH=$${arch} IO_ARCH=$${arch} $(MAKECMDGOALS); ) \
- || exit 1; \
- done
-
diff --git a/lang/sdcc/files/patch-pic b/lang/sdcc/files/patch-pic
new file mode 100644
index 000000000000..ae0cb0071b87
--- /dev/null
+++ b/lang/sdcc/files/patch-pic
@@ -0,0 +1,30 @@
+--- src/pic/device.c 2007/09/18 22:04:53 4919
++++ src/pic/device.c 2007/09/27 22:48:03 4920
+@@ -278,10 +278,14 @@
+ /* read line by line */
+ pic_buf[sizeof(pic_buf)-1] = '\0';
+ while (fgets(pic_buf, sizeof(pic_buf)-1, pic_file) != NULL && !done) {
++ unsigned llen;
++ llen = strlen (pic_buf);
+
+ /* remove trailing spaces */
+- while (isspace(pic_buf[strlen(pic_buf)-1]))
+- pic_buf[strlen(pic_buf)-1] = '\0';
++ while (llen && isspace(pic_buf[llen-1])) {
++ pic_buf[llen-1] = '\0';
++ llen--;
++ }
+
+ /* remove leading spaces */
+ for (pic_buf_pos = pic_buf; isspace(*pic_buf_pos); pic_buf_pos++)
+--- src/pic/pcoderegs.c 2007/09/18 22:04:53 4919
++++ src/pic/pcoderegs.c 2007/09/27 22:48:03 4920
+@@ -848,7 +848,7 @@
+
+ }
+ }
+- rset1 = rset1->next;
++ rset1 = rset2;
+ }
+ }
+ }
diff --git a/lang/sdcc/files/patch-sim-ucsim-cmd.src-Makefile.in b/lang/sdcc/files/patch-sim-ucsim-cmd.src-Makefile.in
deleted file mode 100644
index 6edf30962522..000000000000
--- a/lang/sdcc/files/patch-sim-ucsim-cmd.src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sim/ucsim/cmd.src/Makefile.in.orig Mon Apr 24 23:19:58 2006
-+++ sim/ucsim/cmd.src/Makefile.in Wed Jun 28 17:19:54 2006
-@@ -45,7 +45,7 @@
- cmduc.o cmdstat.o cmdmem.o \
- cmdpars.o cmdlex.o
-
--DEVEL = $(shell ( bash -c "test -e $(top_builddir)devel && echo yes" ))
-+DEVEL = no
-
- # Compiling entire program or any subproject
- # ------------------------------------------
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 01:08:30 +0000