From 37d362b0dd1756873d9cdc9259c82de82f4c47f3 Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 9 May 2011 09:02:12 +0000 Subject: [PATCH] - update msp430-libc to 20110213 please note that this includes the standard ti headers, so you may need to fix your includes when updating. but all the ti-provided code will now work with msp430-gcc --- devel/msp430/libc/Makefile | 16 +- devel/msp430/libc/distinfo | 15 +- devel/msp430/libc/patches/patch-Makefile | 18 +- devel/msp430/libc/pkg/PLIST | 373 +++++++++++++++++++---- 4 files changed, 337 insertions(+), 85 deletions(-) diff --git a/devel/msp430/libc/Makefile b/devel/msp430/libc/Makefile index 66bc03dbc52..49fb7865e86 100644 --- a/devel/msp430/libc/Makefile +++ b/devel/msp430/libc/Makefile @@ -1,23 +1,27 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2010/12/01 09:06:53 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2011/05/09 09:02:12 jasper Exp $ COMMENT= GNU libc for msp430 -V= 20101113 +V= ti_20110213 DISTNAME= ${TARGET}-libc-$V +PKGNAME= ${TARGET}-libc-${V:S/ti_//} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mspgcc4/} -#PATCHFILES= msp430-libc.patch:0 -RUN_DEPENDS= devel/msp430/binutils \ - devel/msp430/gcc -BUILD_DEPENDS= ${RUN_DEPENDS} +RUN_DEPENDS= devel/msp430/gcc>=4.4.5 +BUILD_DEPENDS= archivers/gtar \ + ${RUN_DEPENDS} MAKE_ENV= PREFIX=${PREFIX} +TAR= ${LOCALBASE}/bin/gtar + WRKDIST= ${WRKDIR}/${DISTNAME}/src/ CONFIGURE_STYLE= # This space intentionally left blank. +NO_REGRESS= Yes + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/msp430-libc/ ${INSTALL_DATA} ${WRKSRC}/../doc/devheaders.txt \ diff --git a/devel/msp430/libc/distinfo b/devel/msp430/libc/distinfo index eb7d05f6bb5..283ae62ce96 100644 --- a/devel/msp430/libc/distinfo +++ b/devel/msp430/libc/distinfo @@ -1,10 +1,5 @@ -MD5 (msp430/msp430-libc-20101113.tar.bz2) = lYmqbfDrsSZHfL8R4ORLkA== -MD5 (msp430/msp430-libc.patch) = h5zjt4QY6HO3ThlagSQjrg== -RMD160 (msp430/msp430-libc-20101113.tar.bz2) = Mzq5E0umbx+YvNxmHSsxSG/9m7M= -RMD160 (msp430/msp430-libc.patch) = JoQ4yki9e6R5NesNm1ug1ImA80c= -SHA1 (msp430/msp430-libc-20101113.tar.bz2) = WDRdrSEM0oH27oGOXionjh7I8+8= -SHA1 (msp430/msp430-libc.patch) = hsxn9IZH6FcLBwXpI00o7lsfDO4= -SHA256 (msp430/msp430-libc-20101113.tar.bz2) = 4dpyw4p33NBKL3/lLKrDNzG3PHLnrmFMLVuPFIOAb7Q= -SHA256 (msp430/msp430-libc.patch) = rf2njXSJLxk5Dt9gT5vvRhFT+QxYBGIMojiQGkkoxpc= -SIZE (msp430/msp430-libc-20101113.tar.bz2) = 185061 -SIZE (msp430/msp430-libc.patch) = 4991 +MD5 (msp430/msp430-libc-ti_20110213.tar.bz2) = ccFSRDCgBzkebxAFMSPSPw== +RMD160 (msp430/msp430-libc-ti_20110213.tar.bz2) = 59kQGW5QghbLAYL4iMFmuPtcuxA= +SHA1 (msp430/msp430-libc-ti_20110213.tar.bz2) = BtOR/DDU5Jnf5wgFVsINK7enA+o= +SHA256 (msp430/msp430-libc-ti_20110213.tar.bz2) = ZEc24bkmvcAGkt7yHL7JmN5mAWEssVoRT3OopX1lJVg= +SIZE (msp430/msp430-libc-ti_20110213.tar.bz2) = 1841227 diff --git a/devel/msp430/libc/patches/patch-Makefile b/devel/msp430/libc/patches/patch-Makefile index 2d3aea08a6e..606c42f38b1 100644 --- a/devel/msp430/libc/patches/patch-Makefile +++ b/devel/msp430/libc/patches/patch-Makefile @@ -1,25 +1,25 @@ -$OpenBSD: patch-Makefile,v 1.1.1.1 2010/12/01 09:06:53 jasper Exp $ +$OpenBSD: patch-Makefile,v 1.2 2011/05/09 09:02:12 jasper Exp $ Fix the install-crt target to create the target directory and don't execute the ${INSTALL} with a trailing '/' for last crt file which would make it a (non-existing) directory. ---- Makefile.orig Mon Nov 29 23:41:41 2010 -+++ Makefile Mon Nov 29 23:50:09 2010 -@@ -25,7 +25,7 @@ override AS = msp430-gcc -x assembler-with-cpp +--- Makefile.orig Mon Apr 25 22:57:41 2011 ++++ Makefile Mon Apr 25 22:57:43 2011 +@@ -24,7 +24,7 @@ override CC = msp430-gcc + override AS = msp430-gcc -x assembler-with-cpp override AR = msp430-ar RM = rm - MD = mkdir -p $@ -INSTALL = install -c -m644 $^/ +INSTALL = install -c -m644 $^ - COMMON := $(LIB_OPTIONS) - # make sure we can find our header files (not the installed ones) -@@ -88,8 +88,9 @@ build-crt: makedir-crt $(CRT_OBJS) + #HDR_VENDOR := legacy + HDR_VENDOR := ti +@@ -90,8 +90,9 @@ build-crt: makedir-crt $(CRT_OBJS) clean-crt: ${RM} -f $(CRT_OBJS) --install-crt: $(CRT_OBJS) ${libdir} +-install-crt: $(CRT_OBJS) $(libdir) - ${INSTALL} +install-crt: $(CRT_OBJS) + mkdir -p ${libdir} diff --git a/devel/msp430/libc/pkg/PLIST b/devel/msp430/libc/pkg/PLIST index 06d4dc78ff3..da591e2dd6c 100644 --- a/devel/msp430/libc/pkg/PLIST +++ b/devel/msp430/libc/pkg/PLIST @@ -1,9 +1,16 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2010/12/01 09:06:53 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.2 2011/05/09 09:02:12 jasper Exp $ msp430/include/ msp430/include/bits/ msp430/include/bits/byteswap.h msp430/include/byteswap.h -msp430/include/cc430_.h +msp430/include/cc430f5133.h +msp430/include/cc430f5135.h +msp430/include/cc430f5137.h +msp430/include/cc430f6125.h +msp430/include/cc430f6126.h +msp430/include/cc430f6127.h +msp430/include/cc430f6135.h +msp430/include/cc430f6137.h msp430/include/cc430x513x.h msp430/include/cc430x612x.h msp430/include/cc430x613x.h @@ -11,61 +18,274 @@ msp430/include/ctype.h msp430/include/debug.h msp430/include/endian.h msp430/include/errno.h +msp430/include/in430.h msp430/include/io.h msp430/include/iomacros.h msp430/include/isr_compat.h msp430/include/limits.h msp430/include/math.h -msp430/include/msp430/ -msp430/include/msp430/adc10.h -msp430/include/msp430/adc12.h -msp430/include/msp430/adc12_plus.h -msp430/include/msp430/aes.h -msp430/include/msp430/basic_clock.h -msp430/include/msp430/basic_timer.h -msp430/include/msp430/common.h -msp430/include/msp430/compa.h -msp430/include/msp430/compb.h -msp430/include/msp430/crc16.h -msp430/include/msp430/dac12.h -msp430/include/msp430/dma.h -msp430/include/msp430/dmax.h -msp430/include/msp430/eprom.h -msp430/include/msp430/esp430e.h -msp430/include/msp430/flash.h -msp430/include/msp430/flash_5xx.h -msp430/include/msp430/gpio.h -msp430/include/msp430/gpio_5xxx.h -msp430/include/msp430/iostructures.h -msp430/include/msp430/lcd.h -msp430/include/msp430/lcd_a.h -msp430/include/msp430/lcd_b.h -msp430/include/msp430/mpy.h -msp430/include/msp430/mpy32.h -msp430/include/msp430/opamp.h -msp430/include/msp430/pmcontrol.h -msp430/include/msp430/pmm.h -msp430/include/msp430/ref.h -msp430/include/msp430/rf1a.h -msp430/include/msp430/rtc.h -msp430/include/msp430/scanif.h -msp430/include/msp430/sd16.h -msp430/include/msp430/sfr.h -msp430/include/msp430/slopeadc.h -msp430/include/msp430/svs.h -msp430/include/msp430/sys.h -msp430/include/msp430/system_clock.h -msp430/include/msp430/timer8.h -msp430/include/msp430/timera.h -msp430/include/msp430/timerb.h -msp430/include/msp430/timerport.h -msp430/include/msp430/tlv.h -msp430/include/msp430/unified_clock_system.h -msp430/include/msp430/usart.h -msp430/include/msp430/usci.h -msp430/include/msp430/usci_5xx.h -msp430/include/msp430/usi.h -msp430/include/msp430/wdt_a.h +msp430/include/msp430c091.h +msp430/include/msp430c092.h +msp430/include/msp430c111.h +msp430/include/msp430c1111.h +msp430/include/msp430c112.h +msp430/include/msp430c1121.h +msp430/include/msp430c1331.h +msp430/include/msp430c1351.h +msp430/include/msp430c311s.h +msp430/include/msp430c312.h +msp430/include/msp430c313.h +msp430/include/msp430c314.h +msp430/include/msp430c315.h +msp430/include/msp430c323.h +msp430/include/msp430c325.h +msp430/include/msp430c336.h +msp430/include/msp430c337.h +msp430/include/msp430c412.h +msp430/include/msp430c413.h +msp430/include/msp430cg4616.h +msp430/include/msp430cg4617.h +msp430/include/msp430cg4618.h +msp430/include/msp430cg4619.h +msp430/include/msp430e112.h +msp430/include/msp430e313.h +msp430/include/msp430e315.h +msp430/include/msp430e325.h +msp430/include/msp430e337.h +msp430/include/msp430f110.h +msp430/include/msp430f1101.h +msp430/include/msp430f1101a.h +msp430/include/msp430f1111.h +msp430/include/msp430f1111a.h +msp430/include/msp430f112.h +msp430/include/msp430f1121.h +msp430/include/msp430f1121a.h +msp430/include/msp430f1122.h +msp430/include/msp430f1132.h +msp430/include/msp430f122.h +msp430/include/msp430f1222.h +msp430/include/msp430f123.h +msp430/include/msp430f1232.h +msp430/include/msp430f133.h +msp430/include/msp430f135.h +msp430/include/msp430f147.h +msp430/include/msp430f1471.h +msp430/include/msp430f148.h +msp430/include/msp430f1481.h +msp430/include/msp430f149.h +msp430/include/msp430f1491.h +msp430/include/msp430f155.h +msp430/include/msp430f156.h +msp430/include/msp430f157.h +msp430/include/msp430f1610.h +msp430/include/msp430f1611.h +msp430/include/msp430f1612.h +msp430/include/msp430f167.h +msp430/include/msp430f168.h +msp430/include/msp430f169.h +msp430/include/msp430f2001.h +msp430/include/msp430f2002.h +msp430/include/msp430f2003.h +msp430/include/msp430f2011.h +msp430/include/msp430f2012.h +msp430/include/msp430f2013.h +msp430/include/msp430f2101.h +msp430/include/msp430f2111.h +msp430/include/msp430f2112.h +msp430/include/msp430f2121.h +msp430/include/msp430f2122.h +msp430/include/msp430f2131.h +msp430/include/msp430f2132.h +msp430/include/msp430f2232.h +msp430/include/msp430f2234.h +msp430/include/msp430f2252.h +msp430/include/msp430f2254.h +msp430/include/msp430f2272.h +msp430/include/msp430f2274.h +msp430/include/msp430f233.h +msp430/include/msp430f2330.h +msp430/include/msp430f235.h +msp430/include/msp430f2350.h +msp430/include/msp430f2370.h +msp430/include/msp430f2410.h +msp430/include/msp430f2416.h +msp430/include/msp430f2417.h +msp430/include/msp430f2418.h +msp430/include/msp430f2419.h +msp430/include/msp430f247.h +msp430/include/msp430f2471.h +msp430/include/msp430f248.h +msp430/include/msp430f2481.h +msp430/include/msp430f249.h +msp430/include/msp430f2491.h +msp430/include/msp430f2616.h +msp430/include/msp430f2617.h +msp430/include/msp430f2618.h +msp430/include/msp430f2619.h +msp430/include/msp430f412.h +msp430/include/msp430f413.h +msp430/include/msp430f4132.h +msp430/include/msp430f415.h +msp430/include/msp430f4152.h +msp430/include/msp430f417.h +msp430/include/msp430f423.h +msp430/include/msp430f423a.h +msp430/include/msp430f425.h +msp430/include/msp430f4250.h +msp430/include/msp430f425a.h +msp430/include/msp430f4260.h +msp430/include/msp430f427.h +msp430/include/msp430f4270.h +msp430/include/msp430f427a.h +msp430/include/msp430f435.h +msp430/include/msp430f4351.h +msp430/include/msp430f436.h +msp430/include/msp430f4361.h +msp430/include/msp430f437.h +msp430/include/msp430f4371.h +msp430/include/msp430f438.h +msp430/include/msp430f439.h +msp430/include/msp430f447.h +msp430/include/msp430f448.h +msp430/include/msp430f4481.h +msp430/include/msp430f449.h +msp430/include/msp430f4491.h +msp430/include/msp430f4616.h +msp430/include/msp430f46161.h +msp430/include/msp430f4617.h +msp430/include/msp430f46171.h +msp430/include/msp430f4618.h +msp430/include/msp430f46181.h +msp430/include/msp430f4619.h +msp430/include/msp430f46191.h +msp430/include/msp430f47126.h +msp430/include/msp430f47127.h +msp430/include/msp430f47163.h +msp430/include/msp430f47166.h +msp430/include/msp430f47167.h +msp430/include/msp430f47173.h +msp430/include/msp430f47176.h +msp430/include/msp430f47177.h +msp430/include/msp430f47183.h +msp430/include/msp430f47186.h +msp430/include/msp430f47187.h +msp430/include/msp430f47193.h +msp430/include/msp430f47196.h +msp430/include/msp430f47197.h +msp430/include/msp430f477.h +msp430/include/msp430f478.h +msp430/include/msp430f4783.h +msp430/include/msp430f4784.h +msp430/include/msp430f479.h +msp430/include/msp430f4793.h +msp430/include/msp430f4794.h +msp430/include/msp430f5131.h +msp430/include/msp430f5132.h +msp430/include/msp430f5151.h +msp430/include/msp430f5152.h +msp430/include/msp430f5171.h +msp430/include/msp430f5172.h +msp430/include/msp430f5304.h +msp430/include/msp430f5308.h +msp430/include/msp430f5309.h +msp430/include/msp430f5310.h +msp430/include/msp430f5418.h +msp430/include/msp430f5418a.h +msp430/include/msp430f5419.h +msp430/include/msp430f5419a.h +msp430/include/msp430f5435.h +msp430/include/msp430f5435a.h +msp430/include/msp430f5436.h +msp430/include/msp430f5436a.h +msp430/include/msp430f5437.h +msp430/include/msp430f5437a.h +msp430/include/msp430f5438.h +msp430/include/msp430f5438a.h +msp430/include/msp430f5500.h +msp430/include/msp430f5501.h +msp430/include/msp430f5502.h +msp430/include/msp430f5503.h +msp430/include/msp430f5504.h +msp430/include/msp430f5505.h +msp430/include/msp430f5506.h +msp430/include/msp430f5507.h +msp430/include/msp430f5508.h +msp430/include/msp430f5509.h +msp430/include/msp430f5510.h +msp430/include/msp430f5513.h +msp430/include/msp430f5514.h +msp430/include/msp430f5515.h +msp430/include/msp430f5517.h +msp430/include/msp430f5519.h +msp430/include/msp430f5521.h +msp430/include/msp430f5522.h +msp430/include/msp430f5524.h +msp430/include/msp430f5525.h +msp430/include/msp430f5526.h +msp430/include/msp430f5527.h +msp430/include/msp430f5528.h +msp430/include/msp430f5529.h +msp430/include/msp430f5630.h +msp430/include/msp430f5631.h +msp430/include/msp430f5632.h +msp430/include/msp430f5633.h +msp430/include/msp430f5634.h +msp430/include/msp430f5635.h +msp430/include/msp430f5636.h +msp430/include/msp430f5637.h +msp430/include/msp430f5638.h +msp430/include/msp430f6630.h +msp430/include/msp430f6631.h +msp430/include/msp430f6632.h +msp430/include/msp430f6633.h +msp430/include/msp430f6634.h +msp430/include/msp430f6635.h +msp430/include/msp430f6636.h +msp430/include/msp430f6637.h +msp430/include/msp430f6638.h +msp430/include/msp430fe423.h +msp430/include/msp430fe4232.h +msp430/include/msp430fe423a.h +msp430/include/msp430fe4242.h +msp430/include/msp430fe425.h +msp430/include/msp430fe4252.h +msp430/include/msp430fe425a.h +msp430/include/msp430fe427.h +msp430/include/msp430fe4272.h +msp430/include/msp430fe427a.h +msp430/include/msp430fg4250.h +msp430/include/msp430fg4260.h +msp430/include/msp430fg4270.h +msp430/include/msp430fg437.h +msp430/include/msp430fg438.h +msp430/include/msp430fg439.h +msp430/include/msp430fg4616.h +msp430/include/msp430fg4617.h +msp430/include/msp430fg4618.h +msp430/include/msp430fg4619.h +msp430/include/msp430fg477.h +msp430/include/msp430fg478.h +msp430/include/msp430fg479.h +msp430/include/msp430fw423.h +msp430/include/msp430fw425.h +msp430/include/msp430fw427.h +msp430/include/msp430g2001.h +msp430/include/msp430g2101.h +msp430/include/msp430g2111.h +msp430/include/msp430g2121.h +msp430/include/msp430g2131.h +msp430/include/msp430g2201.h +msp430/include/msp430g2211.h +msp430/include/msp430g2221.h +msp430/include/msp430g2231.h +msp430/include/msp430l092.h +msp430/include/msp430p112.h +msp430/include/msp430p313.h +msp430/include/msp430p315.h +msp430/include/msp430p315s.h +msp430/include/msp430p325.h +msp430/include/msp430p337.h +msp430/include/msp430x09x.h msp430/include/msp430x11x.h msp430/include/msp430x11x1.h msp430/include/msp430x11x2.h @@ -89,22 +309,40 @@ msp430/include/msp430x23x0.h msp430/include/msp430x241x.h msp430/include/msp430x24x.h msp430/include/msp430x24x1.h -msp430/include/msp430x261x.h +msp430/include/msp430x26x.h msp430/include/msp430x31x.h msp430/include/msp430x32x.h msp430/include/msp430x33x.h +msp430/include/msp430x415.h +msp430/include/msp430x417.h msp430/include/msp430x41x.h +msp430/include/msp430x41x2.h msp430/include/msp430x42x.h msp430/include/msp430x42x0.h msp430/include/msp430x43x.h +msp430/include/msp430x43x1.h msp430/include/msp430x44x.h -msp430/include/msp430x47xx.h -msp430/include/msp430x54xx.h -msp430/include/msp430xE42x.h -msp430/include/msp430xG42x0.h -msp430/include/msp430xG43x.h -msp430/include/msp430xG461x.h -msp430/include/msp430xW42x.h +msp430/include/msp430x44x1.h +msp430/include/msp430x461x1.h +msp430/include/msp430x46x.h +msp430/include/msp430x471x3.h +msp430/include/msp430x471x6.h +msp430/include/msp430x471x7.h +msp430/include/msp430x47x.h +msp430/include/msp430x47x3.h +msp430/include/msp430x47x4.h +msp430/include/msp430x54x.h +msp430/include/msp430x54xa.h +msp430/include/msp430x551x.h +msp430/include/msp430x552x.h +msp430/include/msp430xe42x.h +msp430/include/msp430xe42x2.h +msp430/include/msp430xe42xa.h +msp430/include/msp430xg42x0.h +msp430/include/msp430xg43x.h +msp430/include/msp430xg46x.h +msp430/include/msp430xg47x.h +msp430/include/msp430xw42x.h msp430/include/setjmp.h msp430/include/signal.h msp430/include/stdint.h @@ -122,6 +360,7 @@ msp430/include/sys/inttypes.h msp430/include/sys/reent.h msp430/include/sys/types.h msp430/include/sys/unistd.h +msp430/include/xms430f5438.h msp430/lib/crt430x110.o msp430/lib/crt430x1101.o msp430/lib/crt430x1111.o @@ -223,12 +462,16 @@ msp430/lib/crt430x4371.o msp430/lib/crt430x447.o msp430/lib/crt430x448.o msp430/lib/crt430x449.o +msp430/lib/crt430x47163.o msp430/lib/crt430x47166.o msp430/lib/crt430x47167.o +msp430/lib/crt430x47173.o msp430/lib/crt430x47176.o msp430/lib/crt430x47177.o +msp430/lib/crt430x47183.o msp430/lib/crt430x47186.o msp430/lib/crt430x47187.o +msp430/lib/crt430x47193.o msp430/lib/crt430x47196.o msp430/lib/crt430x47197.o msp430/lib/crt430x4783.o @@ -241,6 +484,16 @@ msp430/lib/crt430x5435.o msp430/lib/crt430x5436.o msp430/lib/crt430x5437.o msp430/lib/crt430x5438.o +msp430/lib/crt430x5500.o +msp430/lib/crt430x5501.o +msp430/lib/crt430x5502.o +msp430/lib/crt430x5503.o +msp430/lib/crt430x5504.o +msp430/lib/crt430x5505.o +msp430/lib/crt430x5506.o +msp430/lib/crt430x5507.o +msp430/lib/crt430x5508.o +msp430/lib/crt430x5509.o msp430/lib/crt430x5510.o msp430/lib/crt430x5513.o msp430/lib/crt430x5514.o