haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

sdcc: bump version

Browse Source 
* enable build for pic controllers
This commit is contained in:
Gerasim Troeglazov
2020-10-01 11:51:59 +10:00
parent 8abe49f576
commit 5cb2c022b7
2 changed files with 109 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
dev-embedded/sdcc/patches/sdcc-3.6.0.patchset → dev-embedded/sdcc/patches/sdcc-4.0.0.patchset
View File

@@ -1,16 +1,16 @@
From a95501e57f35c71394748a6656e52581ab2a4932 Mon Sep 17 00:00:00 2001
From 9421b1eb4a2587be35b5c491d84649296df53f83 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Sep 2014 12:25:39 +0200
Subject: let sdbinutils know about Haiku.
diff --git a/support/sdbinutils/bfd/config.bfd b/support/sdbinutils/bfd/config.bfd
index a1a8311..2e2f99d 100644
index 6d34c6d..5ae2396 100644
--- a/support/sdbinutils/bfd/config.bfd
+++ b/support/sdbinutils/bfd/config.bfd
@@ -725,6 +725,9 @@ case "${targ}" in
@@ -853,6 +853,9 @@ case "${targ}" in
targ_defvec=i386_elf32_vec
targ_selvecs="i386_pe_vec i386_pei_vec"
targ_selvecs="iamcu_elf32_vec i386_pe_vec i386_pei_vec"
;;
+ i[3-7]86-*-haiku*)
+ targ_defvec=i386_elf32_vec
@@ -19,20 +19,20 @@ index a1a8311..2e2f99d 100644
targ_defvec=i386_pei_vec
targ_selvecs="i386_pe_vec"
--
2.7.0
2.28.0
From 33d4dfa0af15f64b9ef9313f53fd1594907814e7 Mon Sep 17 00:00:00 2001
From 217b64d2826422ea2e093d676c631a0c55204230 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Sep 2014 12:26:14 +0200
Subject: Missing include.
diff --git a/sim/ucsim/cmd.src/newcmdposixcl.h b/sim/ucsim/cmd.src/newcmdposixcl.h
index 5050d2f..ef3ed70 100644
index b76fa1f..f6ba7d4 100644
--- a/sim/ucsim/cmd.src/newcmdposixcl.h
+++ b/sim/ucsim/cmd.src/newcmdposixcl.h
@@ -32,6 +32,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
@@ -33,6 +33,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include "newcmdcl.h"
#include "cmdutil.h"
@@ -41,17 +41,17 @@ index 5050d2f..ef3ed70 100644
/*
* Command fd console
--
2.7.0
2.28.0
From 75bb84c28fb9bcee9236d5490112e5a5a0edb3be Mon Sep 17 00:00:00 2001
From db63032c9179edd11a1480b188697617fa866b1d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Sep 2014 12:59:31 +0200
Subject: strings.h fix.
diff --git a/sim/ucsim/pobj.cc b/sim/ucsim/pobj.cc
index e809980..166d8b1 100644
index dbf8d84..16775a2 100644
--- a/sim/ucsim/pobj.cc
+++ b/sim/ucsim/pobj.cc
@@ -29,6 +29,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
@@ -63,144 +63,17 @@ index e809980..166d8b1 100644
#include "pstr.h"
/*#include "pobjt.h"*/
--
2.7.0
2.28.0
From aa034f022a15f189c4d20c36578e8423b77ba5ea Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Sep 2014 12:59:16 +0200
Subject: Remove hardcoded -lm
diff --git a/sdas/as6808/Makefile.in b/sdas/as6808/Makefile.in
index 9ed2faf..407699d 100644
--- a/sdas/as6808/Makefile.in
+++ b/sdas/as6808/Makefile.in
@@ -37,7 +37,7 @@ VPATH = @srcdir@
CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/util
CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS)
LDFLAGS = @LDFLAGS@
-LIBS = -lm
+LIBS =
OBJDIR = obj
diff --git a/sdas/as8051/Makefile.in b/sdas/as8051/Makefile.in
index 121110b..5df8be3 100644
--- a/sdas/as8051/Makefile.in
+++ b/sdas/as8051/Makefile.in
@@ -37,7 +37,7 @@ VPATH = @srcdir@
CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/util
CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS)
LDFLAGS = @LDFLAGS@
-LIBS = -lm
+LIBS =
OBJDIR = obj
diff --git a/sdas/as8xcxxx/Makefile.in b/sdas/as8xcxxx/Makefile.in
index 5dbfade..2070d1f 100644
--- a/sdas/as8xcxxx/Makefile.in
+++ b/sdas/as8xcxxx/Makefile.in
@@ -37,7 +37,7 @@ VPATH = @srcdir@
CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/util
CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS)
LDFLAGS = @LDFLAGS@
-LIBS = -lm
+LIBS =
OBJDIR = obj
diff --git a/sdas/asgb/Makefile.in b/sdas/asgb/Makefile.in
index e6da6ac..fe65407 100644
--- a/sdas/asgb/Makefile.in
+++ b/sdas/asgb/Makefile.in
@@ -37,7 +37,7 @@ VPATH = @srcdir@
CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/util
CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS)
LDFLAGS = @LDFLAGS@
-LIBS = -lm
+LIBS =
OBJDIR = obj
diff --git a/sdas/asrab/Makefile.in b/sdas/asrab/Makefile.in
index 2924ab4..fa52fe2 100644
--- a/sdas/asrab/Makefile.in
+++ b/sdas/asrab/Makefile.in
@@ -37,7 +37,7 @@ VPATH = @srcdir@
CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/util
CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS)
LDFLAGS = @LDFLAGS@
-LIBS = -lm
+LIBS =
OBJDIR = obj
diff --git a/sdas/asstm8/Makefile.in b/sdas/asstm8/Makefile.in
index 812b484..4a056f7 100755
--- a/sdas/asstm8/Makefile.in
+++ b/sdas/asstm8/Makefile.in
@@ -37,7 +37,7 @@ VPATH = @srcdir@
CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/util
CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS)
LDFLAGS = @LDFLAGS@
-LIBS = -lm
+LIBS =
OBJDIR = obj
diff --git a/sdas/astlcs90/Makefile.in b/sdas/astlcs90/Makefile.in
index c3e6a21..e50587b 100644
--- a/sdas/astlcs90/Makefile.in
+++ b/sdas/astlcs90/Makefile.in
@@ -37,7 +37,7 @@ VPATH = @srcdir@
CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/util
CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS)
LDFLAGS = @LDFLAGS@
-LIBS = -lm
+LIBS =
OBJDIR = obj
diff --git a/sdas/asz80/Makefile.in b/sdas/asz80/Makefile.in
index d8cc0e1..6aa7532 100644
--- a/sdas/asz80/Makefile.in
+++ b/sdas/asz80/Makefile.in
@@ -37,7 +37,7 @@ VPATH = @srcdir@
CPPFLAGS = @CPPFLAGS@ -DSDCDB -DNOICE -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/util
CFLAGS = @CFLAGS@ @WALL_FLAG@ $(CPPFLAGS)
LDFLAGS = @LDFLAGS@
-LIBS = -lm
+LIBS =
OBJDIR = obj
diff --git a/src/Makefile.in b/src/Makefile.in
index fc22c22..ebf63f1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -15,7 +15,7 @@ PORTS = $(shell cat ../ports.build)
ALLPORTS = $(shell cat ../ports.all)
PORT_LIBS = $(PORTS:%=%/port.a)
-LIBS = -lm @LIBS@
+LIBS = @LIBS@
CFLAGS = @CFLAGS@ @WALL_FLAG@
CXXFLAGS = @CXXFLAGS@ @WALL_FLAG@
--
2.7.0
From f28f97241c95b6434d9a326d8349f25cd16bebfb Mon Sep 17 00:00:00 2001
From cf7f9990c4d823ebe164ce636bebe69d7b3b5095 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 22 Jan 2016 21:01:19 +0100
Subject: Import Kevin Thacker patch for runtime relocation support.
diff --git a/sdas/linksrc/Makefile.in b/sdas/linksrc/Makefile.in
index 56537a5..35f1922 100644
index baea80e..51d2330 100644
--- a/sdas/linksrc/Makefile.in
+++ b/sdas/linksrc/Makefile.in
@@ -47,7 +47,7 @@ ASXXLIBSRC = strcmpi.c
@@ -240,7 +113,7 @@ index bb83900..bfaa197 100644
int jflag; /* NoICE output flag
*/
diff --git a/sdas/linksrc/lkmain.c b/sdas/linksrc/lkmain.c
index 1cc7a45..9d6f916 100644
index 4938268..fb2591c 100644
--- a/sdas/linksrc/lkmain.c
+++ b/sdas/linksrc/lkmain.c
@@ -233,6 +233,7 @@ main(int argc, char *argv[])
@@ -251,7 +124,7 @@ index 1cc7a45..9d6f916 100644
for(i=1; i<argc; i++) {
ip = ib;
@@ -960,6 +961,11 @@ parse()
@@ -986,6 +987,11 @@ parse()
}
return(0);
@@ -264,7 +137,7 @@ index 1cc7a45..9d6f916 100644
if (is_sdld() && !(TARGET_IS_Z80 || TARGET_IS_GB)) {
iramsav();
diff --git a/sdas/linksrc/lkrloc3.c b/sdas/linksrc/lkrloc3.c
index cf184f2..6f11cdc 100644
index 4d7f244..bdbdb35 100644
--- a/sdas/linksrc/lkrloc3.c
+++ b/sdas/linksrc/lkrloc3.c
@@ -31,6 +31,7 @@
@@ -285,8 +158,8 @@ index cf184f2..6f11cdc 100644
error = 0;
mode = (int) eval();
@@ -390,6 +394,95 @@ relr3(void)
reli -= paga + pags;
@@ -447,6 +451,95 @@ relr3(void)
rtofst += 3;
}
+ /* KevT 28-05-2005 */
@@ -381,7 +254,7 @@ index cf184f2..6f11cdc 100644
/*
* R3_BYTE or R3_WORD operation
*/
@@ -755,6 +848,12 @@ rele3()
@@ -812,6 +905,12 @@ rele3()
if (uflag != 0) {
lkulist(0);
}
@@ -675,16 +548,14 @@ index 0000000..ca1cfd4
+void freerelrec();
+void relrecwrite();
--
2.7.0
2.28.0
From b56f61aea4312e943ecf79e65846f55f4a83827e Mon Sep 17 00:00:00 2001
From 4055b2ae93ba84419f77792118ea6f68e60f00fd Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 15 Jan 2017 20:50:32 +0100
Subject: sdcpp: add missing include path
This prevents the configure script from detecting some things, and later
on the build fails.
diff --git a/support/cpp/configure.ac b/support/cpp/configure.ac
index cbf4e07..34435cb 100644
@@ -700,5 +571,30 @@ index cbf4e07..34435cb 100644
malloc realloc calloc free clock, , ,[
#include "ansidecl.h"
--
2.7.0
2.28.0
From 480f4b5aa7e4eec82149acc01e47a072ff1847c9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 30 Sep 2020 19:00:21 +1000
Subject: Add x64 support
diff --git a/support/sdbinutils/bfd/config.bfd b/support/sdbinutils/bfd/config.bfd
index 5ae2396..52c91b0 100644
--- a/support/sdbinutils/bfd/config.bfd
+++ b/support/sdbinutils/bfd/config.bfd
@@ -811,6 +811,10 @@ case "${targ}" in
want64=true
targ_underscore=no
;;
+ x86_64-*-haiku*)
+ targ_defvec=x86_64_elf64_vec
+ want64=true
+ ;;
x86_64-*-rdos*)
targ_defvec=x86_64_elf64_vec
want64=true
--
2.28.0

68
dev-embedded/sdcc/sdcc-3.6.0.recipe → dev-embedded/sdcc/sdcc-4.0.0.recipe
View File

@@ -7,14 +7,14 @@ Rabbit 3000A, TLCS-90) and STMicroelectronics STM8. Work is in progress on \
supporting the Microchip PIC16 and PIC18 targets. It can be retargeted for \
other microprocessors."
HOMEPAGE="http://sdcc.sourceforge.net"
COPYRIGHT="1999-2016 Sandeep Dutta"
COPYRIGHT="1999-2020 Sandeep Dutta"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="http://sourceforge.net/projects/sdcc/files/sdcc/$portVersion/sdcc-src-$portVersion.tar.bz2"
CHECKSUM_SHA256="e85dceb11e01ffefb545ec389da91265130c91953589392dddd2e5ec0b7ca374"
PATCHES="sdcc-3.6.0.patchset"
CHECKSUM_SHA256="489180806fc20a3911ba4cf5ccaf1875b68910d7aed3f401bbd0695b0bef4e10"
PATCHES="sdcc-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 !x86_64"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
@@ -29,12 +29,15 @@ PROVIDES="
cmd:sdas6808
cmd:sdas8051
cmd:sdasgb
cmd:sdaspdk13
cmd:sdaspdk14
cmd:sdaspdk15
cmd:sdaspdk16
cmd:sdasrab
cmd:sdasstm8
cmd:sdastlcs90
cmd:sdasz80
cmd:sdcc = $portVersion
cmd:sdcclib
cmd:sdcdb
cmd:sdcdb.el
cmd:sdcdbsrc.el
@@ -42,31 +45,43 @@ PROVIDES="
cmd:sdld
cmd:sdld6808
cmd:sdldgb
cmd:sdldpdk
cmd:sdldstm8
cmd:sdldz80
cmd:sdnm
cmd:sdobjcopy
cmd:sdranlib
cmd:shc08
cmd:spdk
cmd:sst7
cmd:sstm8
cmd:stlcs
cmd:sz80
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libreadline$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libboost_graph$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libreadline$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
cmd:autoconf
cmd:autoreconf
cmd:automake
cmd:bison
cmd:find
cmd:flex
cmd:gcc$secondaryArchSuffix
cmd:gpasm
cmd:gperf
cmd:ld$secondaryArchSuffix
cmd:make
cmd:makeinfo
@@ -74,15 +89,54 @@ BUILD_PREREQUIRES="
BUILD()
{
pushd device/lib/pic16
autoreconf -f
popd
pushd device/non-free/lib/pic16
autoreconf -f
popd
pushd device/lib/pic14
autoreconf -f
popd
pushd device/non-free/lib/pic14
autoreconf -f
popd
pushd support/cpp
autoconf
popd
mkdir -p build
pushd build
# The PIC14/16 ports need gputils. Enable them when we have a recipe for it.
CFLAGS="-DO_ASYNC=0" \
runConfigure ../configure --disable-pic14-port --disable-pic16-port --bindir=$prefix/bin
LDFLAGS="-lnetwork" \
runConfigure ../configure \
--bindir=$prefix/bin \
--enable-avr-port \
--enable-mcs51-port \
--enable-z80-port \
--enable-z180-port \
--enable-r3ka-port \
--enable-gbz80-port \
--enable-tlcs90-port \
--enable-ez80-z80-port \
--enable-ds390-port \
--enable-ds400-port \
--enable-pic14-port \
--enable-pic16-port \
--enable-hc08-port \
--enable-s08-port \
--enable-stm8-port \
--enable-pdk13-port \
--enable-pdk14-port \
--enable-pdk15-port \
--enable-pdk16-port \
--disable-doc \
--without-ccache
make $jobArgs
popd
}