| 1 |
vapier 10/10/08 09:38:44 |
| 2 |
|
| 3 |
Added: sdcc-2.9.0-getline.patch sdcc-2.9.0-gcc44.patch |
| 4 |
sdcc-2.9.0-headers.patch sdcc-9999-build.patch |
| 5 |
sdcc-2.9.0-build.patch |
| 6 |
Log: |
| 7 |
Version bump #270621 by Karl Hiramoto. Merge & clean up the sdcc-svn package and fix #251876 #255659 by Diego E. Pettenò in the process. |
| 8 |
|
| 9 |
(Portage version: 2.2_rc86/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/files/sdcc-2.9.0-getline.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: sdcc-2.9.0-getline.patch |
| 18 |
=================================================================== |
| 19 |
upstream has reworked their code, so just do a minimal hack for the older ver |
| 20 |
|
| 21 |
http://bugs.gentoo.org/270621 |
| 22 |
|
| 23 |
--- sdcc/as/link/getline.h |
| 24 |
+++ sdcc/as/link/getline.h |
| 25 |
@@ -30,6 +30,9 @@ |
| 26 |
|
| 27 |
#include <stdio.h> |
| 28 |
|
| 29 |
+#undef getline /* just in case */ |
| 30 |
+#define getline sdcc_getline |
| 31 |
+ |
| 32 |
#ifdef __cplusplus |
| 33 |
extern "C" |
| 34 |
{ |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.1 dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch?rev=1.1&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/files/sdcc-2.9.0-gcc44.patch?rev=1.1&content-type=text/plain |
| 42 |
|
| 43 |
Index: sdcc-2.9.0-gcc44.patch |
| 44 |
=================================================================== |
| 45 |
like fix already in upstream |
| 46 |
|
| 47 |
* sim/ucsim/cmd.src/cmdlex.cc: regenerated, |
| 48 |
fix for parch #3038644: Fix for GCC-4.4 compile error |
| 49 |
|
| 50 |
--- trunk/sdcc/sim/ucsim/cmd.src/cmdlex.cc 2010/08/04 15:21:39 5910 |
| 51 |
+++ trunk/sdcc/sim/ucsim/cmd.src/cmdlex.cc 2010/08/04 17:17:09 5911 |
| 52 |
@@ -85,6 +85,7 @@ |
| 53 |
#include <errno.h> |
| 54 |
#include <cstdlib> |
| 55 |
#include <cstring> |
| 56 |
+#include <cstdio> |
| 57 |
/* end standard C++ headers. */ |
| 58 |
|
| 59 |
#ifdef __cplusplus |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.1 dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch?rev=1.1&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/files/sdcc-2.9.0-headers.patch?rev=1.1&content-type=text/plain |
| 67 |
|
| 68 |
Index: sdcc-2.9.0-headers.patch |
| 69 |
=================================================================== |
| 70 |
fix from upstream for implicit decls |
| 71 |
|
| 72 |
--- trunk/sdcc/debugger/mcs51/sdcdb.c 2009/09/20 11:50:19 5517 |
| 73 |
+++ trunk/sdcc/debugger/mcs51/sdcdb.c 2010/04/14 16:18:37 5813 |
| 74 |
@@ -34,6 +34,10 @@ |
| 75 |
#include <readline/readline.h> |
| 76 |
#include <readline/history.h> |
| 77 |
#endif /* HAVE_LIBREADLINE */ |
| 78 |
+#ifdef HAVE_UNISTD_H |
| 79 |
+#include <unistd.h> |
| 80 |
+#endif |
| 81 |
+#include <sys/wait.h> |
| 82 |
|
| 83 |
#ifdef SDCDB_DEBUG |
| 84 |
int sdcdbDebug = 0; |
| 85 |
@@ -1609,7 +1609,7 @@ static void parseCmdLine (int argc, char **argv) |
| 86 |
} |
| 87 |
|
| 88 |
if (strncmp(argv[i],"-cd=",4) == 0) { |
| 89 |
- chdir(argv[i][4]); |
| 90 |
+ chdir(&argv[i][4]); |
| 91 |
continue; |
| 92 |
} |
| 93 |
|
| 94 |
--- trunk/sdcc/debugger/mcs51/config.h.in |
| 95 |
+++ trunk/sdcc/debugger/mcs51/config.h.in |
| 96 |
@@ -15,6 +15,10 @@ |
| 97 |
|
| 98 |
#undef HAVE_LIBREADLINE |
| 99 |
|
| 100 |
+#undef HAVE_UNISTD_H |
| 101 |
+ |
| 102 |
+#undef HAVE_SYS_WAIT_H |
| 103 |
+ |
| 104 |
#endif |
| 105 |
|
| 106 |
/* End of config.h */ |
| 107 |
|
| 108 |
fix from upstream for collision between "link" in unistd.h and local "link" |
| 109 |
|
| 110 |
--- trunk/sdcc/debugger/mcs51/symtab.h 2006/09/16 14:10:20 4379 |
| 111 |
+++ trunk/sdcc/debugger/mcs51/symtab.h 2010/04/14 16:18:37 5813 |
| 112 |
@@ -106,13 +106,13 @@ |
| 113 |
short num_elem; /* # of elems if type==array */ |
| 114 |
short ptr_const :1; /* pointer is constant */ |
| 115 |
short ptr_volatile:1; /* pointer is volatile */ |
| 116 |
- struct link *tspec; /* pointer type specifier */ |
| 117 |
+ struct st_link *tspec; /* pointer type specifier */ |
| 118 |
} declarator ; |
| 119 |
|
| 120 |
#define DECLARATOR 0 |
| 121 |
#define SPECIFIER 1 |
| 122 |
|
| 123 |
-typedef struct link { |
| 124 |
+typedef struct st_link { |
| 125 |
unsigned class : 1 ; /* DECLARATOR or SPECIFIER */ |
| 126 |
unsigned tdef : 1 ; /* current link created by */ |
| 127 |
/* typedef if this flag is set*/ |
| 128 |
@@ -121,8 +121,8 @@ |
| 129 |
declarator d ; /* if CLASS == DECLARATOR */ |
| 130 |
} select ; |
| 131 |
|
| 132 |
- struct link *next ; /* next element on the chain */ |
| 133 |
-} link ; |
| 134 |
+ struct st_link *next ; /* next element on the chain */ |
| 135 |
+} st_link ; |
| 136 |
|
| 137 |
typedef struct symbol { |
| 138 |
char *name ; |
| 139 |
@@ -136,8 +136,8 @@ |
| 140 |
unsigned addr ; /* address if the symbol */ |
| 141 |
unsigned eaddr ; /* end address for functions */ |
| 142 |
char addr_type ; /* which address space */ |
| 143 |
- link *type ; /* start of type chain */ |
| 144 |
- link *etype ; /* end of type chain */ |
| 145 |
+ st_link *type ; /* start of type chain */ |
| 146 |
+ st_link *etype ; /* end of type chain */ |
| 147 |
char scopetype ; /* 'G' global, 'F' - file, 'L' local */ |
| 148 |
char *sname ; /* if 'F' or 'L' then scope name */ |
| 149 |
char *rname ; /* real name i.e. mangled beyond recognition */ |
| 150 |
@@ -242,6 +242,6 @@ |
| 151 |
DEFSETFUNC(moduleWithName); |
| 152 |
DEFSETFUNC(moduleWithCName); |
| 153 |
DEFSETFUNC(moduleWithAsmName); |
| 154 |
-unsigned int getSize (link *); |
| 155 |
+unsigned int getSize (st_link *); |
| 156 |
|
| 157 |
#endif |
| 158 |
|
| 159 |
--- a/sdcc/debugger/mcs51/symtab.c |
| 160 |
+++ b/sdcc/debugger/mcs51/symtab.c |
| 161 |
@@ -31,7 +31,7 @@ DEFSETFUNC(symWithRName); |
| 162 |
/*------------------------------------------------------------------*/ |
| 163 |
/* getSize - returns size of a type chain in bits */ |
| 164 |
/*------------------------------------------------------------------*/ |
| 165 |
-unsigned int getSize ( link *p ) |
| 166 |
+unsigned int getSize ( st_link *p ) |
| 167 |
{ |
| 168 |
/* if nothing return 0 */ |
| 169 |
if ( ! p ) |
| 170 |
@@ -127,8 +127,8 @@ static char *parseTypeInfo (symbol *sym, char *s) |
| 171 |
/* bp now points to '}' ... go past it */ |
| 172 |
s = ++bp; |
| 173 |
while (*s != ')') { /* till we reach the end */ |
| 174 |
- link *type; |
| 175 |
- type = Safe_calloc(1,sizeof(link)); |
| 176 |
+ st_link *type; |
| 177 |
+ type = Safe_calloc(1,sizeof(st_link)); |
| 178 |
if (*s == ',') s++; |
| 179 |
|
| 180 |
/* is a declarator */ |
| 181 |
--- a/sdcc/debugger/mcs51/cmd.c |
| 182 |
+++ b/sdcc/debugger/mcs51/cmd.c |
| 183 |
@@ -327,8 +327,8 @@ static char *warranty= |
| 184 |
"POSSIBILITY OF SUCH DAMAGES.\n"; |
| 185 |
#endif |
| 186 |
|
| 187 |
-static void printTypeInfo(link *); |
| 188 |
-static void printValAggregates (symbol *,link *,char,unsigned int,int); |
| 189 |
+static void printTypeInfo(st_link *); |
| 190 |
+static void printValAggregates (symbol *,st_link *,char,unsigned int,int); |
| 191 |
static int printOrSetSymValue (symbol *sym, context *cctxt, |
| 192 |
int flg, int dnum, int fmt, |
| 193 |
char *rs, char *val, char cmp); |
| 194 |
@@ -2323,7 +2323,7 @@ int cmdListSrc (char *s, context *cctxt) |
| 195 |
return 0; |
| 196 |
} |
| 197 |
|
| 198 |
-static unsigned long getValBasic(symbol *sym, link *type, char *val) |
| 199 |
+static unsigned long getValBasic(symbol *sym, st_link *type, char *val) |
| 200 |
{ |
| 201 |
char *s; |
| 202 |
union |
| 203 |
@@ -2347,7 +2347,7 @@ static unsigned long getValBasic(symbol *sym, link *type, char *val) |
| 204 |
{ |
| 205 |
if (IS_INTEGRAL(type)) |
| 206 |
{ |
| 207 |
- link *etype; |
| 208 |
+ st_link *etype; |
| 209 |
if ( type->next ) |
| 210 |
etype = type->next; |
| 211 |
else |
| 212 |
@@ -2460,7 +2460,7 @@ static void printFmtInteger(char *deffmt,int fmt, long val, |
| 213 |
/*-----------------------------------------------------------------*/ |
| 214 |
/* printValBasic - print value of basic types */ |
| 215 |
/*-----------------------------------------------------------------*/ |
| 216 |
-static void printValBasic(symbol *sym, link *type, |
| 217 |
+static void printValBasic(symbol *sym, st_link *type, |
| 218 |
char mem, unsigned addr,int size, int fmt) |
| 219 |
{ |
| 220 |
union { |
| 221 |
@@ -2484,7 +2484,7 @@ static void printValBasic(symbol *sym, link *type, |
| 222 |
else |
| 223 |
if (IS_INTEGRAL(type)) |
| 224 |
{ |
| 225 |
- link *etype; |
| 226 |
+ st_link *etype; |
| 227 |
if ( type->next ) |
| 228 |
etype = type->next; |
| 229 |
else |
| 230 |
@@ -2534,10 +2534,10 @@ static void printValFunc (symbol *sym, int fmt) |
| 231 |
/*-----------------------------------------------------------------*/ |
| 232 |
/* printArrayValue - will print the values of array elements */ |
| 233 |
/*-----------------------------------------------------------------*/ |
| 234 |
-static void printArrayValue (symbol *sym, link *type, |
| 235 |
+static void printArrayValue (symbol *sym, st_link *type, |
| 236 |
char space, unsigned int addr, int fmt) |
| 237 |
{ |
| 238 |
- link *elem_type = type->next; |
| 239 |
+ st_link *elem_type = type->next; |
| 240 |
int i; |
| 241 |
|
| 242 |
fprintf(stdout,"{"); |
| 243 |
@@ -2558,7 +2558,7 @@ static void printArrayValue (symbol *sym, link *type, |
| 244 |
/*-----------------------------------------------------------------*/ |
| 245 |
/* printStructValue - prints structures elements */ |
| 246 |
/*-----------------------------------------------------------------*/ |
| 247 |
-static void printStructValue (symbol *sym, link *type, |
| 248 |
+static void printStructValue (symbol *sym, st_link *type, |
| 249 |
char space, unsigned int addr, int fmt) |
| 250 |
{ |
| 251 |
symbol *fields = SPEC_STRUCT(type)->fields; |
| 252 |
@@ -2581,7 +2581,7 @@ static void printStructValue (symbol *sym, link *type, |
| 253 |
/*-----------------------------------------------------------------*/ |
| 254 |
/* printValAggregates - print value of aggregates */ |
| 255 |
/*-----------------------------------------------------------------*/ |
| 256 |
-static void printValAggregates (symbol *sym, link *type, |
| 257 |
+static void printValAggregates (symbol *sym, st_link *type, |
| 258 |
char space,unsigned int addr, int fmt) |
| 259 |
{ |
| 260 |
|
| 261 |
@@ -2606,7 +2606,7 @@ static int printOrSetSymValue (symbol *sym, context *cctxt, |
| 262 |
static char fmtChar[] = " todx "; |
| 263 |
static int stack = 1; |
| 264 |
symbol *fields; |
| 265 |
- link *type; |
| 266 |
+ st_link *type; |
| 267 |
unsigned int addr; |
| 268 |
int size, n; |
| 269 |
char *s, *s2; |
| 270 |
@@ -2808,7 +2808,7 @@ static void printStructInfo (structdef *sdef) |
| 271 |
/*-----------------------------------------------------------------*/ |
| 272 |
/* printTypeInfo - print out the type information */ |
| 273 |
/*-----------------------------------------------------------------*/ |
| 274 |
-static void printTypeInfo(link *p) |
| 275 |
+static void printTypeInfo(st_link *p) |
| 276 |
{ |
| 277 |
if (!p) |
| 278 |
return ; |
| 279 |
|
| 280 |
|
| 281 |
|
| 282 |
1.1 dev-embedded/sdcc/files/sdcc-9999-build.patch |
| 283 |
|
| 284 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/files/sdcc-9999-build.patch?rev=1.1&view=markup |
| 285 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/files/sdcc-9999-build.patch?rev=1.1&content-type=text/plain |
| 286 |
|
| 287 |
Index: sdcc-9999-build.patch |
| 288 |
=================================================================== |
| 289 |
fix parallel build issues |
| 290 |
|
| 291 |
--- sdcc/device/lib/Makefile.in |
| 292 |
+++ sdcc/device/lib/Makefile.in |
| 293 |
@@ -349,40 +349,23 @@ |
| 294 |
cp -f $(PORT)/bin/*.* $(SDCCPORTDIR); \ |
| 295 |
fi |
| 296 |
|
| 297 |
-$(LIB_FILES): $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_SDCC) |
| 298 |
ifeq ($(LIB_TYPE), SDCCLIB) |
| 299 |
- ../../bin/sdcclib -a $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT) |
| 300 |
- ../../bin/sdcclib -a $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT) |
| 301 |
- ../../bin/sdcclib -a $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG) |
| 302 |
- ../../bin/sdcclib -a $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC) |
| 303 |
+ mklib = ../../bin/sdcclib -a $@ $^ |
| 304 |
else |
| 305 |
ifeq ($(LIB_TYPE), AR) |
| 306 |
- $(AR_S) -cq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT) |
| 307 |
- $(AR_S) -cq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT) |
| 308 |
- $(AR_S) -cq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG) |
| 309 |
- $(AR_S) -cq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC) |
| 310 |
+ mklib = $(AR_S) -cq $@ $^ |
| 311 |
else |
| 312 |
ifeq ($(LIB_TYPE), RANLIB) |
| 313 |
- $(AR_S) -cq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libfloat.lib |
| 314 |
- $(AR_S) -cq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libint.lib |
| 315 |
- $(AR_S) -cq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/liblong.lib |
| 316 |
- $(AR_S) -cq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libsdcc.lib |
| 317 |
+ mklib = $(AR_S) -cq $@ $^ && $(top_builddir)/bin/asranlib $@ |
| 318 |
else |
| 319 |
- rm -f $(SDCCPORTDIR)/libfloat.lib |
| 320 |
- for i in $(notdir $(basename $(OBJECTS_FLOAT))); do echo $$i >> $(SDCCPORTDIR)/libfloat.lib; done |
| 321 |
- cp $(OBJECTS_FLOAT) $(SDCCPORTDIR) |
| 322 |
- rm -f $(SDCCPORTDIR)/libint.lib |
| 323 |
- for i in $(notdir $(basename $(OBJECTS_INT))); do echo $$i >> $(SDCCPORTDIR)/libint.lib; done |
| 324 |
- cp $(OBJECTS_INT) $(SDCCPORTDIR) |
| 325 |
- rm -f $(SDCCPORTDIR)/liblong.lib |
| 326 |
- for i in $(notdir $(basename $(OBJECTS_LONG))); do echo $$i >> $(SDCCPORTDIR)/liblong.lib; done |
| 327 |
- cp $(OBJECTS_LONG) $(SDCCPORTDIR) |
| 328 |
- rm -f $(SDCCPORTDIR)/libsdcc.lib |
| 329 |
- for i in $(notdir $(basename $(OBJECTS_SDCC))); do echo $$i >> $(SDCCPORTDIR)/libsdcc.lib; done |
| 330 |
- cp $(OBJECTS_SDCC) $(SDCCPORTDIR) |
| 331 |
+ mklib = for i in $(notdir $(basename $^)); do echo $$i; done >> $@ && cp $^ $(SDCCPORTDIR) |
| 332 |
endif |
| 333 |
endif |
| 334 |
endif |
| 335 |
+$(SDCCPORTDIR)/libfloat.lib: $(OBJECTS_FLOAT); $(mklib) |
| 336 |
+$(SDCCPORTDIR)/libint.lib: $(OBJECTS_INT); $(mklib) |
| 337 |
+$(SDCCPORTDIR)/liblong.lib: $(OBJECTS_LONG); $(mklib) |
| 338 |
+$(SDCCPORTDIR)/libsdcc.lib: $(OBJECTS_SDCC); $(mklib) |
| 339 |
|
| 340 |
clean_intermediate: |
| 341 |
rm -f $(SDCCPORTDIR)/*.lst $(SDCCPORTDIR)/*.sym |
| 342 |
|
| 343 |
|
| 344 |
|
| 345 |
1.1 dev-embedded/sdcc/files/sdcc-2.9.0-build.patch |
| 346 |
|
| 347 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch?rev=1.1&view=markup |
| 348 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/files/sdcc-2.9.0-build.patch?rev=1.1&content-type=text/plain |
| 349 |
|
| 350 |
Index: sdcc-2.9.0-build.patch |
| 351 |
=================================================================== |
| 352 |
fix parallel build issues |
| 353 |
|
| 354 |
--- sdcc/device/lib/Makefile.in |
| 355 |
+++ sdcc/device/lib/Makefile.in |
| 356 |
@@ -347,37 +347,21 @@ |
| 357 |
cp -f $(PORT)/bin/*.* $(SDCCPORTDIR); \ |
| 358 |
fi |
| 359 |
|
| 360 |
-$(LIB_FILES): $(OBJECTS_FLOAT) $(OBJECTS_INT) $(OBJECTS_LONG) $(OBJECTS_SDCC) |
| 361 |
ifeq ($(LIB_TYPE), SDCCLIB) |
| 362 |
- ../../bin/sdcclib -a $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT) |
| 363 |
- ../../bin/sdcclib -a $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT) |
| 364 |
- ../../bin/sdcclib -a $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG) |
| 365 |
- ../../bin/sdcclib -a $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC) |
| 366 |
+mklib = ../../bin/sdcclib -a $@ $^ |
| 367 |
else ifeq ($(LIB_TYPE), AR) |
| 368 |
- ar -Scq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT) |
| 369 |
- ar -Scq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT) |
| 370 |
- ar -Scq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG) |
| 371 |
- ar -Scq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC) |
| 372 |
+mklib = ar -Scq $@ $^ |
| 373 |
else ifeq ($(LIB_TYPE), RANLIB) |
| 374 |
- ar -Scq $(SDCCPORTDIR)/libfloat.lib $(OBJECTS_FLOAT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libfloat.lib |
| 375 |
- ar -Scq $(SDCCPORTDIR)/libint.lib $(OBJECTS_INT); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libint.lib |
| 376 |
- ar -Scq $(SDCCPORTDIR)/liblong.lib $(OBJECTS_LONG); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/liblong.lib |
| 377 |
- ar -Scq $(SDCCPORTDIR)/libsdcc.lib $(OBJECTS_SDCC); $(top_builddir)/bin/asranlib $(SDCCPORTDIR)/libsdcc.lib |
| 378 |
+mklib = ar -Scq $@ $^ && $(top_builddir)/bin/asranlib $@ |
| 379 |
else |
| 380 |
- rm -f $(SDCCPORTDIR)/libfloat.lib |
| 381 |
- for i in $(notdir $(basename $(OBJECTS_FLOAT))); do echo $$i >> $(SDCCPORTDIR)/libfloat.lib; done |
| 382 |
- cp $(OBJECTS_FLOAT) $(SDCCPORTDIR) |
| 383 |
- rm -f $(SDCCPORTDIR)/libint.lib |
| 384 |
- for i in $(notdir $(basename $(OBJECTS_INT))); do echo $$i >> $(SDCCPORTDIR)/libint.lib; done |
| 385 |
- cp $(OBJECTS_INT) $(SDCCPORTDIR) |
| 386 |
- rm -f $(SDCCPORTDIR)/liblong.lib |
| 387 |
- for i in $(notdir $(basename $(OBJECTS_LONG))); do echo $$i >> $(SDCCPORTDIR)/liblong.lib; done |
| 388 |
- cp $(OBJECTS_LONG) $(SDCCPORTDIR) |
| 389 |
- rm -f $(SDCCPORTDIR)/libsdcc.lib |
| 390 |
- for i in $(notdir $(basename $(OBJECTS_SDCC))); do echo $$i >> $(SDCCPORTDIR)/libsdcc.lib; done |
| 391 |
- cp $(OBJECTS_SDCC) $(SDCCPORTDIR) |
| 392 |
+mklib = for i in $(notdir $(basename $^)); do echo $$i; done >> $@; cp $^ $(SDCCPORTDIR) |
| 393 |
endif |
| 394 |
|
| 395 |
+$(SDCCPORTDIR)/libfloat.lib: $(OBJECTS_FLOAT); $(mklib) |
| 396 |
+$(SDCCPORTDIR)/libint.lib: $(OBJECTS_INT); $(mklib) |
| 397 |
+$(SDCCPORTDIR)/liblong.lib: $(OBJECTS_LONG); $(mklib) |
| 398 |
+$(SDCCPORTDIR)/libsdcc.lib: $(OBJECTS_SDCC); $(mklib) |
| 399 |
+ |
| 400 |
clean_intermediate: |
| 401 |
rm -f $(SDCCPORTDIR)/*.lst $(SDCCPORTDIR)/*.sym |
Archives