summaryrefslogtreecommitdiff
path: root/dev-embedded/sdcc/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-05-11 16:02:49 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-05-11 16:02:49 +0100
commit88ebe56470c37b02a044e1091cad6b2df0f3be8f (patch)
treed80b2d9337c01c4a0fe11a2ef9691fc3153ed6d3 /dev-embedded/sdcc/files
parent4645b6f17f0da81e9fe84081fb126a37102ba153 (diff)
gentoo resync : 11.05.2018
Diffstat (limited to 'dev-embedded/sdcc/files')
-rw-r--r--dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch74
-rw-r--r--dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch9
-rw-r--r--dev-embedded/sdcc/files/sdcc-2.9.0-build.patch51
-rw-r--r--dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch15
-rw-r--r--dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch16
-rw-r--r--dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch209
6 files changed, 0 insertions, 374 deletions
diff --git a/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch b/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch
deleted file mode 100644
index cd920e988d9b..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.8.0-flags.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -Nadur sdcc-orig/configure.in sdcc/configure.in
---- sdcc-orig/configure.in 2008-04-20 15:24:14.000000000 +0200
-+++ sdcc/configure.in 2008-04-20 15:27:18.000000000 +0200
-@@ -320,17 +320,6 @@
- M_OR_MM=$sdcc_cv_MM
- AC_SUBST(M_OR_MM)
-
--# This is the first time when CFLAGS are set/modified!!
--adl_DD_COPT(CC, ggdb)
--if test "$sdcc_cv_CCggdb" = "yes"; then
-- CFLAGS="-ggdb ${CFLAGS}"
--fi
--
--adl_DD_COPT(CC, pipe)
--if test "$sdcc_cv_CCpipe" = "yes"; then
-- CFLAGS="-pipe $CFLAGS"
--fi
--
-
- # Checks for typedefs, structures, and compiler characteristics.
- # ===========================================================================
-diff -Nadur sdcc-orig/debugger/mcs51/configure.in sdcc/debugger/mcs51/configure.in
---- sdcc-orig/debugger/mcs51/configure.in 2008-04-20 15:24:19.000000000 +0200
-+++ sdcc/debugger/mcs51/configure.in 2008-04-20 15:26:53.000000000 +0200
-@@ -148,17 +148,6 @@
- M_OR_MM=$sdcc_cv_MM
- AC_SUBST(M_OR_MM)
-
--# This is the first time when CFLAGS are set/modified!!
--adl_DD_COPT(CC, ggdb)
--if test "$sdcc_cv_CCggdb" = "yes"; then
-- CFLAGS="-ggdb ${CFLAGS}"
--fi
--
--adl_DD_COPT(CC, pipe)
--if test "$sdcc_cv_CCpipe" = "yes"; then
-- CFLAGS="-pipe $CFLAGS"
--fi
--
-
- # Set standard installation paths
- # ===========================================================================
-diff -Nadur sdcc-orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in
---- sdcc-orig/sim/ucsim/configure.in 2008-04-20 15:24:11.000000000 +0200
-+++ sdcc/sim/ucsim/configure.in 2008-04-20 15:26:06.000000000 +0200
-@@ -514,28 +514,6 @@
- M_OR_MM=$ucsim_cv_MM
- AC_SUBST(M_OR_MM)
-
--# This is the first time when CFLAGS are set/modified!!
--
--DD_COPT(CXX, ggdb)
--DD_COPT(CXX, gstabs)
--if test "$ucsim_cv_CXXgstabs" = "yes"; then
-- gopt="-gstabs+ -g3"
--elif test "$ucsim_cv_CXXggdb" = "yes"; then
-- gopt="-ggdb -g3"
--else
-- gopt="-g"
--fi
--if test "$CXXFLAGS"x = x ;then
-- CXXFLAGS="$gopt"
--else
-- CXXFLAGS="$CXXFLAGS $gopt"
--fi
--
--DD_COPT(CXX, pipe)
--if test "$ucsim_cv_CXXpipe" = "yes"; then
-- CXXFLAGS="$CXXFLAGS -pipe"
--fi
--
- PICOPT=""
- SHAREDLIB="no"
- DD_COPT_NO_IGNORE(CXX, fPIC)
diff --git a/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch b/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch
deleted file mode 100644
index 8d0ddf045195..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.8.0-gcc44.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ur sdcc.orig/sim/ucsim/cmd.src/cmdlex.cc sdcc/sim/ucsim/cmd.src/cmdlex.cc
---- sdcc.orig/sim/ucsim/cmd.src/cmdlex.cc 2004-07-16 19:32:30.000000000 +0300
-+++ sdcc/sim/ucsim/cmd.src/cmdlex.cc 2009-08-10 11:09:58.000000000 +0300
-@@ -1,3 +1,5 @@
-+#include <stdio.h>
-+
- #line 2 "cmdlex.cc"
-
- #line 4 "cmdlex.cc"
diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch
deleted file mode 100644
index b944b00d83a5..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-fix parallel build issues
-
---- sdcc/device/lib/Makefile.in
-+++ sdcc/device/lib/Makefile.in
-@@ -347,37 +347,21 @@
- cp -f $(PORT)/bin/*.* $(SDCCPORTDIR); \
- fi
-
--$(LIB_FILES): $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_SDCC)
- ifeq ($(LIB_TYPE), SDCCLIB)
-- ../../bin/sdcclib -a $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
-- ../../bin/sdcclib -a $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT)
-- ../../bin/sdcclib -a $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG)
-- ../../bin/sdcclib -a $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
-+mklib = ../../bin/sdcclib -a $@ $^
- else ifeq ($(LIB_TYPE), AR)
-- ar -Scq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT)
-- ar -Scq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT)
-- ar -Scq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG)
-- ar -Scq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC)
-+mklib = ar -Scq $@ $^
- else ifeq ($(LIB_TYPE), RANLIB)
-- ar -Scq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libfloat.lib
-- ar -Scq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libint.lib
-- ar -Scq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/liblong.lib
-- ar -Scq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libsdcc.lib
-+mklib = ar -Scq $@ $^ && $(top_builddir)/bin/asranlib $@
- else
-- rm -f $(SDCCPORTDIR)/libfloat.lib
-- for i in $(notdir $(basename $(OBJECTS_FLOAT))); do echo $$i >> $(SDCCPORTDIR)/libfloat.lib; done
-- cp $(OBJECTS_FLOAT) $(SDCCPORTDIR)
-- rm -f $(SDCCPORTDIR)/libint.lib
-- for i in $(notdir $(basename $(OBJECTS_INT))); do echo $$i >> $(SDCCPORTDIR)/libint.lib; done
-- cp $(OBJECTS_INT) $(SDCCPORTDIR)
-- rm -f $(SDCCPORTDIR)/liblong.lib
-- for i in $(notdir $(basename $(OBJECTS_LONG))); do echo $$i >> $(SDCCPORTDIR)/liblong.lib; done
-- cp $(OBJECTS_LONG) $(SDCCPORTDIR)
-- rm -f $(SDCCPORTDIR)/libsdcc.lib
-- for i in $(notdir $(basename $(OBJECTS_SDCC))); do echo $$i >> $(SDCCPORTDIR)/libsdcc.lib; done
-- cp $(OBJECTS_SDCC) $(SDCCPORTDIR)
-+mklib = for i in $(notdir $(basename $^)); do echo $$i; done >> $@; cp $^ $(SDCCPORTDIR)
- endif
-
-+$(SDCCPORTDIR)/libfloat.lib: $(OBJECTS_FLOAT); $(mklib)
-+$(SDCCPORTDIR)/libint.lib: $(OBJECTS_INT); $(mklib)
-+$(SDCCPORTDIR)/liblong.lib: $(OBJECTS_LONG); $(mklib)
-+$(SDCCPORTDIR)/libsdcc.lib: $(OBJECTS_SDCC); $(mklib)
-+
- clean_intermediate:
- rm -f $(SDCCPORTDIR)/*.lst $(SDCCPORTDIR)/*.sym
-
diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch
deleted file mode 100644
index fb4ac7918c51..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-like fix already in upstream
-
-* sim/ucsim/cmd.src/cmdlex.cc: regenerated,
- fix for parch #3038644: Fix for GCC-4.4 compile error
-
---- trunk/sdcc/sim/ucsim/cmd.src/cmdlex.cc 2010/08/04 15:21:39 5910
-+++ trunk/sdcc/sim/ucsim/cmd.src/cmdlex.cc 2010/08/04 17:17:09 5911
-@@ -85,6 +85,7 @@
- #include <errno.h>
- #include <cstdlib>
- #include <cstring>
-+#include <cstdio>
- /* end standard C++ headers. */
-
- #ifdef __cplusplus
diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch
deleted file mode 100644
index f7ca6237cf57..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-upstream has reworked their code, so just do a minimal hack for the older ver
-
-http://bugs.gentoo.org/270621
-
---- sdcc/as/link/getline.h
-+++ sdcc/as/link/getline.h
-@@ -30,6 +30,9 @@
-
- #include <stdio.h>
-
-+#undef getline /* just in case */
-+#define getline sdcc_getline
-+
- #ifdef __cplusplus
- extern "C"
- {
diff --git a/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch b/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch
deleted file mode 100644
index 58d10299aa8f..000000000000
--- a/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-fix from upstream for implicit decls
-
---- trunk/sdcc/debugger/mcs51/sdcdb.c 2009/09/20 11:50:19 5517
-+++ trunk/sdcc/debugger/mcs51/sdcdb.c 2010/04/14 16:18:37 5813
-@@ -34,6 +34,10 @@
- #include <readline/readline.h>
- #include <readline/history.h>
- #endif /* HAVE_LIBREADLINE */
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <sys/wait.h>
-
- #ifdef SDCDB_DEBUG
- int sdcdbDebug = 0;
-@@ -1609,7 +1609,7 @@ static void parseCmdLine (int argc, char **argv)
- }
-
- if (strncmp(argv[i],"-cd=",4) == 0) {
-- chdir(argv[i][4]);
-+ chdir(&argv[i][4]);
- continue;
- }
-
---- trunk/sdcc/debugger/mcs51/config.h.in
-+++ trunk/sdcc/debugger/mcs51/config.h.in
-@@ -15,6 +15,10 @@
-
- #undef HAVE_LIBREADLINE
-
-+#undef HAVE_UNISTD_H
-+
-+#undef HAVE_SYS_WAIT_H
-+
- #endif
-
- /* End of config.h */
-
-fix from upstream for collision between "link" in unistd.h and local "link"
-
---- trunk/sdcc/debugger/mcs51/symtab.h 2006/09/16 14:10:20 4379
-+++ trunk/sdcc/debugger/mcs51/symtab.h 2010/04/14 16:18:37 5813
-@@ -106,13 +106,13 @@
- short num_elem; /* # of elems if type==array */
- short ptr_const :1; /* pointer is constant */
- short ptr_volatile:1; /* pointer is volatile */
-- struct link *tspec; /* pointer type specifier */
-+ struct st_link *tspec; /* pointer type specifier */
- } declarator ;
-
- #define DECLARATOR 0
- #define SPECIFIER 1
-
--typedef struct link {
-+typedef struct st_link {
- unsigned class : 1 ; /* DECLARATOR or SPECIFIER */
- unsigned tdef : 1 ; /* current link created by */
- /* typedef if this flag is set*/
-@@ -121,8 +121,8 @@
- declarator d ; /* if CLASS == DECLARATOR */
- } select ;
-
-- struct link *next ; /* next element on the chain */
--} link ;
-+ struct st_link *next ; /* next element on the chain */
-+} st_link ;
-
- typedef struct symbol {
- char *name ;
-@@ -136,8 +136,8 @@
- unsigned addr ; /* address if the symbol */
- unsigned eaddr ; /* end address for functions */
- char addr_type ; /* which address space */
-- link *type ; /* start of type chain */
-- link *etype ; /* end of type chain */
-+ st_link *type ; /* start of type chain */
-+ st_link *etype ; /* end of type chain */
- char scopetype ; /* 'G' global, 'F' - file, 'L' local */
- char *sname ; /* if 'F' or 'L' then scope name */
- char *rname ; /* real name i.e. mangled beyond recognition */
-@@ -242,6 +242,6 @@
- DEFSETFUNC(moduleWithName);
- DEFSETFUNC(moduleWithCName);
- DEFSETFUNC(moduleWithAsmName);
--unsigned int getSize (link *);
-+unsigned int getSize (st_link *);
-
- #endif
-
---- a/sdcc/debugger/mcs51/symtab.c
-+++ b/sdcc/debugger/mcs51/symtab.c
-@@ -31,7 +31,7 @@ DEFSETFUNC(symWithRName);
- /*------------------------------------------------------------------*/
- /* getSize - returns size of a type chain in bits */
- /*------------------------------------------------------------------*/
--unsigned int getSize ( link *p )
-+unsigned int getSize ( st_link *p )
- {
- /* if nothing return 0 */
- if ( ! p )
-@@ -127,8 +127,8 @@ static char *parseTypeInfo (symbol *sym, char *s)
- /* bp now points to '}' ... go past it */
- s = ++bp;
- while (*s != ')') { /* till we reach the end */
-- link *type;
-- type = Safe_calloc(1,sizeof(link));
-+ st_link *type;
-+ type = Safe_calloc(1,sizeof(st_link));
- if (*s == ',') s++;
-
- /* is a declarator */
---- a/sdcc/debugger/mcs51/cmd.c
-+++ b/sdcc/debugger/mcs51/cmd.c
-@@ -327,8 +327,8 @@ static char *warranty=
- "POSSIBILITY OF SUCH DAMAGES.\n";
- #endif
-
--static void printTypeInfo(link *);
--static void printValAggregates (symbol *,link *,char,unsigned int,int);
-+static void printTypeInfo(st_link *);
-+static void printValAggregates (symbol *,st_link *,char,unsigned int,int);
- static int printOrSetSymValue (symbol *sym, context *cctxt,
- int flg, int dnum, int fmt,
- char *rs, char *val, char cmp);
-@@ -2323,7 +2323,7 @@ int cmdListSrc (char *s, context *cctxt)
- return 0;
- }
-
--static unsigned long getValBasic(symbol *sym, link *type, char *val)
-+static unsigned long getValBasic(symbol *sym, st_link *type, char *val)
- {
- char *s;
- union
-@@ -2347,7 +2347,7 @@ static unsigned long getValBasic(symbol *sym, link *type, char *val)
- {
- if (IS_INTEGRAL(type))
- {
-- link *etype;
-+ st_link *etype;
- if ( type->next )
- etype = type->next;
- else
-@@ -2460,7 +2460,7 @@ static void printFmtInteger(char *deffmt,int fmt, long val,
- /*-----------------------------------------------------------------*/
- /* printValBasic - print value of basic types */
- /*-----------------------------------------------------------------*/
--static void printValBasic(symbol *sym, link *type,
-+static void printValBasic(symbol *sym, st_link *type,
- char mem, unsigned addr,int size, int fmt)
- {
- union {
-@@ -2484,7 +2484,7 @@ static void printValBasic(symbol *sym, link *type,
- else
- if (IS_INTEGRAL(type))
- {
-- link *etype;
-+ st_link *etype;
- if ( type->next )
- etype = type->next;
- else
-@@ -2534,10 +2534,10 @@ static void printValFunc (symbol *sym, int fmt)
- /*-----------------------------------------------------------------*/
- /* printArrayValue - will print the values of array elements */
- /*-----------------------------------------------------------------*/
--static void printArrayValue (symbol *sym, link *type,
-+static void printArrayValue (symbol *sym, st_link *type,
- char space, unsigned int addr, int fmt)
- {
-- link *elem_type = type->next;
-+ st_link *elem_type = type->next;
- int i;
-
- fprintf(stdout,"{");
-@@ -2558,7 +2558,7 @@ static void printArrayValue (symbol *sym, link *type,
- /*-----------------------------------------------------------------*/
- /* printStructValue - prints structures elements */
- /*-----------------------------------------------------------------*/
--static void printStructValue (symbol *sym, link *type,
-+static void printStructValue (symbol *sym, st_link *type,
- char space, unsigned int addr, int fmt)
- {
- symbol *fields = SPEC_STRUCT(type)->fields;
-@@ -2581,7 +2581,7 @@ static void printStructValue (symbol *sym, link *type,
- /*-----------------------------------------------------------------*/
- /* printValAggregates - print value of aggregates */
- /*-----------------------------------------------------------------*/
--static void printValAggregates (symbol *sym, link *type,
-+static void printValAggregates (symbol *sym, st_link *type,
- char space,unsigned int addr, int fmt)
- {
-
-@@ -2606,7 +2606,7 @@ static int printOrSetSymValue (symbol *sym, context *cctxt,
- static char fmtChar[] = " todx ";
- static int stack = 1;
- symbol *fields;
-- link *type;
-+ st_link *type;
- unsigned int addr;
- int size, n;
- char *s, *s2;
-@@ -2808,7 +2808,7 @@ static void printStructInfo (structdef *sdef)
- /*-----------------------------------------------------------------*/
- /* printTypeInfo - print out the type information */
- /*-----------------------------------------------------------------*/
--static void printTypeInfo(link *p)
-+static void printTypeInfo(st_link *p)
- {
- if (!p)
- return ;