From 99273b4d35539d61db5491ef1cd5db278082606c Mon Sep 17 00:00:00 2001 From: richardbarry Date: Thu, 7 Nov 2013 10:16:15 +0000 Subject: [PATCH] Ensure PIC32MX MPLAB 8 project builds with XC. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2083 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcp | 10 +++++----- FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcs | 6 +++--- FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcw | Bin 1120768 -> 1120768 bytes 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcp b/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcp index 114b2dc51..a00a23a43 100644 --- a/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcp +++ b/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcp @@ -184,13 +184,13 @@ file_036=..\..\Source\include\queue.h file_037=..\..\Source\include\semphr.h file_038=PIC32MX_MPLAB.map [SUITE_INFO] -suite_guid={14495C23-81F8-43F3-8A44-859C583D7760} +suite_guid={62D235D8-2DB2-49CD-AF24-5489A6015337} suite_state= [TOOL_SETTINGS] -TS{CB0AF4B8-4022-429D-8F99-8A56782B2C6D}=--keep-locals --gdwarf-2 -TS{9C698E0A-CBC9-4EFF-AE7D-B569F93E7322}=-g -DMPLAB_PIC32MX_PORT -Wall -fomit-frame-pointer -TS{77F59DA1-3C53-4677-AC5F-A03EB0125170}=--defsym=_min_heap_size=0 --defsym=_min_heap_size=0 -Map="$(BINDIR_)$(TARGETBASE).map" -o"$(BINDIR_)$(TARGETBASE).$(TARGETSUFFIX)" -O3 -TS{0396C0A1-9052-4E4F-8B84-EF0162B1B4E9}= +TS{6F324298-6323-4781-8C43-43FA5E6F3646}=-gdwarf-2 +TS{1F324EFA-C0BA-4A8F-A85A-B21644939CAD}=-g +TS{29D3B6CC-DCAB-4659-8011-FFF75BB7F8D7}=-o"$(BINDIR_)$(TARGETBASE).$(TARGETSUFFIX)" -Map="$(BINDIR_)$(TARGETBASE).map" +TS{AD4C3FBD-B6BB-4F50-AB4E-35BF132D4D60}= [INSTRUMENTED_TRACE] enable=0 transport=0 diff --git a/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcs b/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcs index 602146595..60a686152 100644 --- a/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcs +++ b/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcs @@ -2,6 +2,6 @@ MagicCookie={0b13fe8c-dfe0-40eb-8900-6712719559a7} Version=1.0 [TOOL_LOC_STAMPS] -tool_loc{92E15EC6-5E91-4BF4-B5FA-C80AD2601AA7}=C:\devtools\Microchip\xc32\v1.21\bin\xc32-ar.exe -tool_loc{430F471F-7ECB-4852-A80D-DEF9A5C8E751}=C:\devtools\Microchip\xc32\v1.21\bin\xc32-gcc.exe -tool_loc{C68E5105-1196-4333-A0BF-3DC57271E614}=C:\devtools\Microchip\xc32\v1.21\bin\xc32-ld.exe +tool_loc{E9F2995B-2477-4B57-BEC5-E9F3A4D67DB7}=C:\devtools\Microchip\xc32\v1.21\bin\xc32-as.exe +tool_loc{DBB2B82D-3E10-4401-85A6-C9CB169D3E05}=C:\devtools\Microchip\xc32\v1.21\bin\xc32-gcc.exe +tool_loc{A90E7C70-81C8-4500-B1F8-8560038BEFC0}=C:\devtools\Microchip\xc32\v1.21\bin\xc32-ld.exe diff --git a/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcw b/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.mcw index e216e37efdcb22c6ddc2f1b45800b868943e160e..e6a4550855008da415d43df25ade44fca4564fe4 100644 GIT binary patch delta 12804 zcmeHOeN0nV6u-B9+R_hRt>w$XsK_R;SwKLULnuldY*^~Y7P8^wqg7N87aBBLEk>Pg z;skHTHQOJGOE$M<)eT%t+@eI6u(=6r{2_CR%t=Df%@5q7(XBi8wN>zA!=$Acdy~_1 z-?{gmckb_WIVLdGwUYD*gJ4C6IKC!HZ~JGOzg z8}Lk;IuENzLQ!aA3D%G3&uE|g24TwHN;r2T~njd?g>_6lBbFy?BqSULDaIC^ve_CTR^$xPc{1Zn+et$ zv8#;)SlnM~K_!zg)haTP3nL2^Dg!em4qCLZR#L6C7C1|XQG+!ctjdR$*^tkbgrG&h zS=kh4y>%>brs+dVlptgBH4Wqo#V0`~$ks!7A2BN@V-wk-Ou-kMTb0jsc^ix_InNu^y_#&Uf}=OBO~ z*c3W}+ZTeEft%JvSs4nhB0J*tkxbLmkqo7umqc0_zNevoEV2G>d()0ctw|GE4;l8H z;;>#Q^!zY6IcO>j%9Y6lSsxi^4%77MLXb?3kql&gps$lv%P_}j_PX`38!;Q$HCbaW zBqvnh^X3vVZc!+yE0vSH(sdTwVNfKbYqlc&yH0 zpm}M=)l9~S$#P5j<;Q@t#K0&{y^8BVr|aR{g@<1bvhpnWNxkeUxIC!AvECZRS9diq zZnvX0kc%ZQgF2@5%SrK4ZEnHJ1;X9gc;tZg12IdU2Py(fU}QiJAuZ6hRjwXw2IZ_4 ztKZ?an6xcjIBD=*n2F3f#@U@apb_LrR{2KTh(k3LDLvTj!gjb&y#V#oAyP3^z@Le2 zd3K>5@) z9}EJk=o6cPJudto#6uAtH#*`1J!V#-X%+KGr^Vfp|Ex2U_q7UT@2XxzH?B zgoe()M(o9vW_@I4TQoW^fEUbShdVo^Rj*>3&9B~Ny`1u>%;l-A2ye9caU`;VI0^#( zup-ya*YTFSz8FU=VtE4Al+izjpnHn_KM%ZjPE32suzut}5ZaCY2ZK7zcsY zft#ZKbM1-#U5(fAZFaT+gwRx!jM7mm$?kj(%SbDiGR6Q>jwa{emm1r61?{llgRrEC zYjCW%7ezU;Te+LqVQl3t27Utw1P}-y5I`V+KmdV97y+u!!G}IddXW=RMJBIs=yT!a zPV`D{YsW1y5aVNj#sW!zq(DJHG9WpS!qIU{X+9}Zucg!5f};wAiG};8V#igyI4{Gx z3OEzRo>wDw9S5Ar*f9c@>fXH~luJS0Yse5bK3N&mp&zsb$9rAr6W{tkDe;9;`FB3B zbdxWX-t>ji>XSa`{smtsE&JXFmY(s2(gi;RC$M?GCwXI(p7epv*{8g3=Mf+1OlkMN zouB$Z=cEqr+xfl^bdK-zzMb1UgVSbv!_mb*dP&hbZz&q^mZB9ud8uo^c}bDuwXWa> zo#)sh9T4$bM1@b$wPHR`iIX6FMF6ogP_83TV!j|)i4s6Ib&#A|)cl$|I@G+899Jh( z%Xq#n+Oy*QfDQe?&a~^~;;?sG13S~gNl(Bly)m5Elb)c+VeKP6$~)9a4|_&(L>Cd^ z(Zx delta 11302 zcmeHN4Qx|Y6u!58qwDW`bS=!eg~}Ew=(f%cm^h)hjdTXK1*TbaLK*FtFdT*g11eOJ z5Cy}=CA_I5jz|>Ll;Nf|VF@EjGMz}lNj87N5KI<8nAtS^OzS!Q0YU^4(@yDnlhbq0 z{rT=W=id9?y|2gBTHtCeXs+R8?TMW>UHVbBg4;xMTdr`K5|$&&Y3Nn4UYP)-V%0LC zp?5Z94b;TytI}CU{4}Z1yjH9&r%&-2q=M9vmBc}o<1hOuK1FzQU;cVR^aNAi3*D3r z#hav-N5`{F`9$s`nVPZ+dEzvzkwXiYK~lO`LP$2`&6JQ`wcXTtWDU`Q4C3`91arLx z=9bUZ_b+gh_QErC8&|Nty5WiSDEBkHBGuRorRUG-oyhI4Cp)nQ)4|u0oyZNoKu=~> z7zM1nTp!T2pluCdjfz~3Og%|im%{ciDvMo^kMrkzK9oag=y-~gJU!k&1hXk~B#DLW zEoHH!%*xIwCrvD~x{2d=E!lS@$+=1z=p+MX{6p)9#1e!S*aO^HR;Ch)Q57TfXvJRf z2B!-+rq4)&^YWCFbT;&y33-c5Po4vgb?Lr(=P2Na^qvD03a08E>|@mj@d z)e~qTdqbT~&$b*^KP0(6`2+l~bX?16;b+S7^;vOA&?B2&(GJ{bknkHHTq!ijTLyIL zbA*tCV0H<5t;JN?MHQIqJ2Z=c8#J~tNrQXz1Qp!4F2#vn2voVr;2t*J_Fyu4>HDf= zC;GP=?8Aii*6+(zF_%r3+z1(*CnGicD?>k6&YErI@}_vDzpROkwvW{{W$4LO1tkh7 z>jS(VY?fy?>h=b4a3ItHWmab|kAu}mr0hF;4ck_g#r9XqnS61s+J`!)UDA>tFKP*E zuQFRf_G@OEe}-;_ioi^`{WFmZWk@;wf%1On6l!m2OH;Mo(!PI-o0LMiR7P-k;+;Yy z%vx=*_?FFEjT++K;DD9`q5K$7#X@WxSk4BJn_nT4z1c+aDu81vZ107EEzpj2RF|dR zJW5DAZOb57N!%woV3sFRJpa02qBHiwnwW7IQ5zi}mGncH$zi@pcX{ z+|2>ZwbX15xfU11znS>$HND(lphC;pno~V$Iw7bKD#Z@$PV)@TqAH53!*I9NA(}1J zYz+4r5o@2JFWu2k{4IX+_=+gyhJ7)M$4cpL=B+YWZ_y_@_NsWw7BFvNq|F;G(z$g1 z2zxG!&`05&cXpKSq`N-RqSWpU6?DUx+rRIk)aq^X>4-bzykn)Cgb{S8+g};gul_^D z!(^V=yNH^H|KxV5I$+qMaSQN-SMTo5lXC(t?m=qDdlM zMbo66B*l|uiMvKUW=q_K*l)}OF%QH%5c5FH12GTW!ydqw{U`66p5!E=YC5limpgZX zGP9c7>>ZKO3*dLE1bX7;i0>-k{> zFjKwZ*YoWNU?v<7zn)u;YbNK1<8>rG5hkE@;Q|^67tqpg!(`f-FaddB zm?MtZzv^brfO#h8AXdx(yc*(^P6dOa(y#&oph7`WsUYoIcp46&7!*bQ?b|MDnR4+| z2>)uF90-ZpnaG<(?|f>GqIiace+caw*3Wowy{PoxCp>Vy7`%rsN+amAC(KzL{j`HG f5LEZUeu)PPJ!VBmH-8MDpqm{%yvNZaY&HK4gd7+0 -- 2.39.5