From 14c48571ae607277d11132c5e085d3ec1f12d236 Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Wed, 21 Jul 2010 02:46:15 +0000 Subject: [PATCH] Sync EDKII BaseTools to BaseTools project r1997 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10680 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Bin/Win32/BootSectImage.exe | Bin 393216 -> 393216 bytes BaseTools/Bin/Win32/EfiLdrImage.exe | Bin 421888 -> 421888 bytes BaseTools/Bin/Win32/EfiRom.exe | Bin 446464 -> 446464 bytes BaseTools/Bin/Win32/GenBootSector.exe | Bin 425984 -> 425984 bytes BaseTools/Bin/Win32/GenCrc32.exe | Bin 425984 -> 425984 bytes BaseTools/Bin/Win32/GenDepex.exe | Bin 615624 -> 615750 bytes BaseTools/Bin/Win32/GenFds.exe | Bin 1472661 -> 1473739 bytes BaseTools/Bin/Win32/GenFfs.exe | Bin 430080 -> 430080 bytes BaseTools/Bin/Win32/GenFv.exe | Bin 479232 -> 479232 bytes BaseTools/Bin/Win32/GenFw.exe | Bin 495616 -> 495616 bytes BaseTools/Bin/Win32/GenPage.exe | Bin 421888 -> 421888 bytes BaseTools/Bin/Win32/GenSec.exe | Bin 446464 -> 446464 bytes BaseTools/Bin/Win32/GenVtf.exe | Bin 446464 -> 446464 bytes BaseTools/Bin/Win32/LzmaCompress.exe | Bin 397312 -> 397312 bytes BaseTools/Bin/Win32/Split.exe | Bin 425984 -> 425984 bytes BaseTools/Bin/Win32/TianoCompress.exe | Bin 434176 -> 434176 bytes BaseTools/Bin/Win32/VfrCompile.exe | Bin 1187840 -> 1187840 bytes BaseTools/Bin/Win32/VolInfo.exe | Bin 471040 -> 471040 bytes BaseTools/Bin/Win32/build.exe | Bin 2614386 -> 2615464 bytes BaseTools/BuildEnv | 23 +-- BaseTools/Conf/build_rule.template | 2 +- BaseTools/Conf/tools_def.template | 195 +++++++++--------- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 2 +- BaseTools/Source/Python/AutoGen/GenDepex.py | 9 +- BaseTools/Source/Python/GenFds/FdfParser.py | 23 ++- BaseTools/Source/Python/GenFds/GuidSection.py | 21 +- BaseTools/gcc/mingw-gcc-build.py | 36 ---- 27 files changed, 148 insertions(+), 163 deletions(-) diff --git a/BaseTools/Bin/Win32/BootSectImage.exe b/BaseTools/Bin/Win32/BootSectImage.exe index c26151c3ea8bc175bf7e863528931965626e1ed0..244f0c5deff832d2ca9e0be2eb6aa4987caa9747 100755 GIT binary patch delta 61 zcmZo@kZ5R-nDBu4d82FNnA2V-#%<>T|w*C4;7T!GqixX$9EbhDL(`B)G Q-qga)9oxUmW#vf%0JG5^$N&HU delta 61 zcmZo@kZ5R-nDBr(RA0UEaqDBo*2he(kD0eVX88yf+kX8a3-2BQo%<@`J?Y{OJ9FF4 P{Ix8x-u`7SD^C&tM{pZJ diff --git a/BaseTools/Bin/Win32/EfiLdrImage.exe b/BaseTools/Bin/Win32/EfiLdrImage.exe index 5db9b26aa54e035b05f6b85b8f61f9b8440fd69a..3881789d32882464ebfb6023203cdb7289e397f6 100755 GIT binary patch delta 64 zcmZp8AldLha>4`V7mcosk6RxzwmxQReazhYm}To@){g-o;qBK0S@%8=ka(=&Enmy$ T)ucG3h-0p!==LQ>Y%#U~`1~An delta 64 zcmZp8AldLha>4`VFn#sL$E}YUTOTvEK4xxx%(C?{>&F0)@b>G0ta~2_Fzj_y U>%Kryt`*H)o3<}8VvDf_0J=dOa{vGU diff --git a/BaseTools/Bin/Win32/EfiRom.exe b/BaseTools/Bin/Win32/EfiRom.exe index f1902977ce45c69e8cccaa0044d721439c48c7ca..b3bde7eacdb947a24052ceffabae563f2c65f43a 100755 GIT binary patch delta 64 zcmZozAl$h)pII02-Gb)&Kwi delta 64 zcmZozAl%$2k;qBKavi^M_&~ka#kAMI9 Uy;fOo-79MH@&5KFMQk#$0QRvUJpcdz diff --git a/BaseTools/Bin/Win32/GenBootSector.exe b/BaseTools/Bin/Win32/GenBootSector.exe index 4afef9c8c9c3407e3a7a1dd2a36b8623336e3832..061d5b68394c636e9c2bc80f0230236421497556 100755 GIT binary patch delta 64 zcmZo@kZNd(D7}*1h)xHXbfw^wMN? TYuT#0D|AYS#P%%)Y(D+~>r5S5 delta 64 zcmZo@kZNd)v|;KGVfnP93vx TX#ZKO&E1zQxqXWPn~y&Lm2MkX diff --git a/BaseTools/Bin/Win32/GenCrc32.exe b/BaseTools/Bin/Win32/GenCrc32.exe index fd8213873e25c64e43cb47f8e94bf0315f138eca..3896e63b210c893356f19bb8e4fc9a5dc82110fb 100755 GIT binary patch delta 64 zcmZo@kZNdDE0)}s#uj&$azo&LPT TXHC|kq#j$xtnF)z*g|{(5)dC< delta 64 zcmZo@kZNdpP5@fvuyp$`Y-?_y#0D0>(K`SD->o;E(k96 TYIa+jQy;rdar+u0wh&(crQ;kf diff --git a/BaseTools/Bin/Win32/GenDepex.exe b/BaseTools/Bin/Win32/GenDepex.exe index e34ccddb375183fd75dcfd1944dcd7d01e469381..6f6c73028baef411447078647588af0700a43319 100755 GIT binary patch delta 838 zcmZ8eOGs2<6h8lP?#vv=v~sMphlyC?kdZcF4=l^5OiCsnGd^aVnLE%moKfdi7LHl= zfTTs6PK%@m6i6*H0v81pfmp4?78#+?vcg)lFpB70vQ7Wbch7&$ckXxokALD-(fI44 zf%EDyPI@xk*T3)JOG9rLZ3I}fk!L-)%=Yf=-rBJr9=uqb=>PzyV2>bqkFV6@RdshP zzX3h!Ob4hw8yLCJ2Vks#K?Nxd`ZUN$)Cz-;*bBQDx**VpSxDtWxuY$k>V`=*ofC0hGnq0fKNB!R4&Rnku+_VUo&i)njDUs zMrVv`{peK=KIg}6ny*L7{M3)7YCnG#!m(6kX(cM33j(+?Q6oGb zzzfQIslOQoX#$%-6W9d~fs^~2Y2^P0@wQNn`pp9^v|G*b%NDA%eb5njQwpqlf(V!t2 z>!~)PCU*tN&5dug#V)bFu*SKxUHUitV56NjR(>3gbWKS%_&qI{M13|KJlTLYf=o2S( gDl06jAutoiV)4?hQ_;GEn%(kJE_+^#RRl<~KlowdF#rGn delta 702 zcmZ9KUr5tY6vyv5+i&ft4Ih^HCyfY28m(|@n?*MNQ0apv&28#7fBOTia<1)%XiSi_ zdK%(`o}fQaK_CS|NkRlsL1n!(%*aB5-olrJCI=vE;e{zS+u znvB;8tyH8G-tNW%FtOc@Q&?HX3vQg}CmyT@1Aq5mok0UxiH9?Xu$Vi&Xo3cgc(De| ze9em$CJm*zKiM%TrQ<5kd+|El^b$p4kZh6|d9914{~yM^Zfb!M zUhk#`h_kbY4uGFWddR5@4pIL)2_)!<4Ij|Zq0 z-w*I}sc?$dr4`rSv7?vldFr$xT**kHDH_uLCVBHp$FU>|X&xPcO^7w0r_Q5XR6DB8S205A4^ku#u omc6|G%qwB4+A(v4gw}sD60^pKLhY?e_V)>!+^e#m2Og5A-w>+OZvX%Q diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe index 69aed97aaef93ec02a12a5802cc9829be0785e62..64e6673f72d01f65b29e73e087ba0ead3d5d092e 100755 GIT binary patch delta 18774 zcmb_^34ByV^8b62Wb%5FNhZn6+P<10)mQ&EbD+b66s_Lrl ze)+@6OW*zF(rZ@9t8}XZRt2sKTBTnV{G5_;V7&RBe~!C%@JltvX2}x$jFKc3+H0p* zx4Rte*{xUBJbTJ$m@_!Pqy`K4zy63h_;bCi1JmQCkzg8XQQ-Y~=D@qgmkfqI2b3>{ z1xX7Mq{c+4GEtK4l4RFQ3zDS9WT`S)dzPgIDN<#ML}i#xl`2!=ksV=uI%-3txgkC(z!l08nUMFQe|S;IRddjjVr`tn9d z_9V_q_GOKf>?xd;>dP7>IYvwNK2n2DYMCy{j!}}muXL>}RgRIa#Jr7i7E)2rR}o~d6bAv(DPW__vb6ERq#Mj^n>*F_~j`5~pR-b{HGSawJm zFW111L&_!k1kAF@aA-<+6m(>X2uS`)36U4TfUlI1aw?=6gJUS)q*r6{&CB4kLDcjO&~Zdb>!oRu z(G{M(N0bHkoE4Uktr$@fZSsyjq-hD!DTmJq8XBLkgbl0A?n z8_TLfVYMYPHqDKdCAUDBU8WY7PtVOOurU*;c{Q3K3f})7XD1zkk12}=shB0XLlI`T zv@a-ct*&w8JKNnvM2pL<$A9V^Zb$PX8;>jrRu?He)uuF_oHy|WmlZ*h!)4L+f1Qv` zGQ4?Ac`RfU7I)TP_=7T5{sNx*K{*vS74y|%f>MGKf@uT=@X~Q*pqvEX97kFE4l+(C zJ2IK)JOXBX4!xL5P)5LgXp;8F%@IRY9^DYHVj z7QN9;xR0Mw3~~x2Ek?>>{;8}s`CjAh)d<-BPbEc9&3CJ}yN}R=IE|Vy5G<#a`{TIp z9z;=F-D({_t(fHTYkySAExnAo+pFBc%V(6}puGC(_F_oQMt%G(K2pGrAC;B=S$9i+ zQo`g4xalWlc3f}$dFTJ^Ps${DKJ}0Qm!47jo4UW-D_J3OBfNb^S(+V0V+=&lB$4LP zO^=OEmz!m+y0z8OZ1*ZFwEe8)$Ss~{epc4YD6g~6DzPMw+0heKMuIChRX~l}vpNWkf?;mPm%d-{K5K|Ed^e7o`8H43dL96~8L) z%Kp*WNEOs17<^ty2&bw{Z&_`v%i)F-XO&b)o+I=oRU@OYy}GW+(d@p(v*x@qSw@Sv z|2O5vOs0!RkVCEI6OahH4G1oGb-UZO*y*lU%ixv^C`fFsZ1D62RDzA3;}?|Oy0{7W zrj3Vjd1q~vbXYBieL9g4!kUyr8M$ylC+6!}t16%_KqO_8WTLTQ{QLy9cmk(naH zvn5j4Wc{P``eU#!O5}8=lguJI`FBPHGtFXbW)oHBg_Bk$m4%e#Q*9<-!U`#s4!IYU zXn4;o40@Vs1Cv;>Dox zJV#71ca%W{(kN^sqnawUQ_4c{ECDN03Z*h(MuJF^y-IaQf{2xOc{V4AyX9;a0-nI_ z^kyRg>nh8M--MGW;Djwm!gky+WQ9Hk?mwhN!253qy;9_w*|NaVJixOnNlcWJchb8T zZFnXmr--z{%wbjZBQaIZZU4u97g@8~@m3VQ+NWK`I_`jGM$BG9xl!162+1y!L20VmRgkXORl zG;ywECl>dlsyBj|mWvHuW9En2pi56Gdc$OgyVSA7UDo;-wDl9m^{i5(U|Ul}N~mTm z(y8MzSd$_88j>*WmJwQE^&uqzkZ;DI$qSwKKYNa4h%xeL<_

G1Q8IY!LV78+_u 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 E4;|*Ni~s-t delta 17727 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 diff --git a/BaseTools/Bin/Win32/GenFfs.exe b/BaseTools/Bin/Win32/GenFfs.exe index 285d4bbd94f7619b08eddc808a00f9e87455d9f8..accb54930442a90b1705908d36bc0b8736699aae 100755 GIT binary patch delta 64 zcmZozAl0xyYQh8NH;t~1k6RxzwmxQReazhYm}To@){hAw;qBKGS@%8=n0VEC51YQD U&!+qn^GYAFsBd55#1`WV0RP<{U;qFB delta 64 zcmZozAl0xyYQh8ND1G(D$E}YUTOTvEK4xxx%(C?{>&FC;@b>G8ta~2_MCJ%MY~AtIF*6XeY@h4LYQ7kxWc&4xtY04p cvGy!w$JrrHD3%;vio(-Zda{ diff --git a/BaseTools/Bin/Win32/GenFw.exe b/BaseTools/Bin/Win32/GenFw.exe index 03719134b0a87d947b3c55a2a8ed6d7d3b7f1630..3ae5b6a9a6c835ca1842e496af6b358072b0ef82 100755 GIT binary patch delta 67 zcmZozAlI-!Zo&iRkBzR4k6RxzwmxQReazhYn5FeG>(<9?jDjGU?au|-be{@nG;1&| X;63NJgl+EPYa32K+OG1Q?amAU9bO-5 delta 67 zcmZozAlI-!Zo&iRSbg=z$E}YUTOTvEK4xxx%+mUpb?aj`MnRCw_UD3Zx=#fhKGy7d X!1dK@>Fw=zzcs$k*{<@P?amAU^yVNP diff --git a/BaseTools/Bin/Win32/GenPage.exe b/BaseTools/Bin/Win32/GenPage.exe index 3024bc025381faf1c13ea349d97ee5c759d07ad8..6f707b277f4fd9eb4c98844f0c1e23249f464de8 100755 GIT binary patch delta 64 zcmZp8AldLha>4`VkBzR4k6RxzwmxQReazhYm}To@){g-o;qBK0S@%8=sJeJ%g(wrN U^UnW2OfODWY2UuYh%Lqz04JIsng9R* delta 64 zcmZp8AldLha>4`VIDPfT$E}YUTOTvEK4xxx%(C?{>&F0)@b>G0ta~2_ByU=*zWvNQ U-{rekU0(d4ZRYkRMr<**0O`{om;e9( diff --git a/BaseTools/Bin/Win32/GenSec.exe b/BaseTools/Bin/Win32/GenSec.exe index 1f8402af6d7981ca2f636b708b436271913d3c74..a8a9927fe6153ed5bcb60a22ccad26d75ea77fd5 100755 GIT binary patch delta 64 zcmZozAlG9B#rjI- U4vpJc6y#&FQo;qBKavaWp~An&5lIsL>X Ur)`&?+e}!x`{DK}MQk~-0K^v_)Bpeg diff --git a/BaseTools/Bin/Win32/GenVtf.exe b/BaseTools/Bin/Win32/GenVtf.exe index d6823f42689db1fd5765ddde4046bb670d7800c8..0f6889b32df08a0ac461a672581595551088fd77 100755 GIT binary patch delta 64 zcmZozAlz>% delta 64 zcmZozAl&pco;qBKKvi3d{FtF7#w>mS= UfB792uZ`|L%eI#^v-S7@0IswgfdBvi diff --git a/BaseTools/Bin/Win32/LzmaCompress.exe b/BaseTools/Bin/Win32/LzmaCompress.exe index 18fe77e3463f504e55fca5d8c20ce53f8bf2038a..640254ad0d5cbf6854bf098e84bb18c46ea19556 100755 GIT binary patch delta 64 zcmZozAknZuV!{LF?~SgFk6RxzwmxQReazhYm}To@){hDx;qBKIS?6vPxTe;jzU_&d UPs7oU#J`QZOSZRMX05RS0RE~UtN;K2 delta 64 zcmZozAknZuV!{LFWPSC<$E}YUTOTvEK4xxx%(C?{>qiBU@b>G9taCRCJhD82R@Dar9!>uLpL=;b T^yl*hnNQvIbGwWa+Y?&={SF?N delta 64 zcmZo@kZNdJbL(fu*3V3>pP5@fvuyp$`Y{0{y#0A1tLg)R126WJMfYa< THVLd~XWcp>cDsxd+Y?&=v7sEk diff --git a/BaseTools/Bin/Win32/TianoCompress.exe b/BaseTools/Bin/Win32/TianoCompress.exe index 7c10f9a13402f9f53180f1cda012c884bce91375..6339837c15d68d28b29ec56f1895f8b44b5bcbfa 100755 GIT binary patch delta 64 zcmZoTAk}a{YQh8NAC0b!k6RxzwmxQReazhYm}To@){hM!;qBKOS&FI=@b>GCtY;qxbi|knJ~s~a U+2!$W%@xs$54LYfV)L;D0LUsH0{{R3 diff --git a/BaseTools/Bin/Win32/VfrCompile.exe b/BaseTools/Bin/Win32/VfrCompile.exe index e8f663ab6ac39d1b7d791b2e2050696687d628fc..375fd67c483d01eb5314b6942ce7745e0c1edb2d 100755 GIT binary patch delta 105 zcmZoT;L&ivW5Nq&wkFrc*R8J^TVFG^zGiNH&C>dswe>Yy>udJb*Bq^{Ia^dswe>Yy>udJb*Bq^{Ia^0yfkn6H;RU7a5a4Ik hSmk>YK&=+v)Aeex1-G2e27Vy~Y#=f)w;u2Y;yS9-ezvS&9e12E9XOy@b>2qS(m;McpPGXCDEzG faZk7Vj}`YF>bB20$5yAvlBZx~zFqDE+ar4bHvb}l diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe index 1d17b1276614907c75241c3e60d313066075fa9d..5a8a65892a1930bcc462bf64680635b04c3a5cff 100755 GIT binary patch delta 19470 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 delta 18361 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 diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv index 144be280da..ca8a5781f6 100755 --- a/BaseTools/BuildEnv +++ b/BaseTools/BuildEnv @@ -28,7 +28,7 @@ SetWorkspace() { echo Run this script from the base of your tree. For example: echo " cd /Path/To/Edk/Root" echo " . BaseTools/BuildEnv" - return -1 + return 1 fi # @@ -98,13 +98,6 @@ SetEdkToolsPath() { return 0 fi - # - # Figure out a uniq directory name from the uname command - # - UNAME_DIRNAME=`uname -sm` - UNAME_DIRNAME=${UNAME_DIRNAME// /-} - UNAME_DIRNAME=${UNAME_DIRNAME//\//-} - # # Try $WORKSPACE/Conf/EdkTools # @@ -124,9 +117,9 @@ SetEdkToolsPath() { fi # - # Try $WORKSPACE/BaseTools/Bin/$UNAME_DIRNAME + # Try $WORKSPACE/BaseTools # - if [ -e $WORKSPACE/BaseTools/Bin/$UNAME_DIRNAME ] + if [ -e $WORKSPACE/BaseTools ] then export EDK_TOOLS_PATH=$WORKSPACE/BaseTools return 0 @@ -174,7 +167,7 @@ AddEdkToolsToPath() { # if [ -z "$EDK_TOOLS_PATH" ] then - return -1 + return 1 fi EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory` @@ -183,7 +176,7 @@ AddEdkToolsToPath() { then echo "Unable to find expected bin path under \$EDK_TOOLS_PATH!" echo "> $EDK_TOOLS_PATH_BIN" - return -1 + return 1 fi if [ "${PATH/$EDK_TOOLS_PATH_BIN/}" == "$PATH" ] @@ -227,7 +220,7 @@ ScriptMain() { if [ -z $WORKSPACE ] then echo "Failure setting WORKSPACE" - return -1 + return 1 fi RestorePreviousConfiguration @@ -235,14 +228,14 @@ ScriptMain() { SetEdkToolsPath if [ -z $EDK_TOOLS_PATH ] then - return -1 + return 1 fi AddEdkToolsToPath if [ $? -ne 0 ] then echo "Failure adding EDK Tools into PATH!" - return -1 + return 1 fi StoreCurrentConfiguration diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index ca79bef81f..139289ee17 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -413,7 +413,7 @@ cd $(OUTPUT_DIR)(+)${s_dir} - "$(ASM)" /nologo /c /omf /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${src} + "$(ASM16)" /nologo /c /omf /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${src} "$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,, diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index cf2eec11fd..fa0c48d6ea 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -195,11 +195,12 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G # VS2008 - win32 - Microsoft Visual Studio 2008 Team Suite with Intel ASL # DDK3790 - win32 - Microsoft Windows DDK 3790.1830, Intel EBC, Intel ASL # UNIXGCC - UNIX GCC, No EBC, Intel ASL +# GCC44 - Linux - GCC 4.4 (Native), No EBC, Intel ASL # ELFGCC - Linux ELF GCC, No EBC, Intel ASL # CYGGCC - win32 - CygWin GCC, Intel EBC, Intel ASL # ICC - win32 - Intel C Compiler V9.1, Intel EBC, Intel ASL # ICC11 - win32 - Intel C Compiler V11.1, Intel EBC, Intel ASL -# MYTOOLS - win32 - VS2005 for IA32/X64, WINDDK 3790.1830 for IPF, Intel EBC, Intel ASL +# MYTOOLS - win32 - VS2008 for IA32/X64, WINDDK 3790.1830 for IPF, Intel EBC, Intel ASL # VS2003xASL - win32 - Microsoft Visual Studio .NET 2003, Intel EBC, Microsoft ASL # VS2005xASL - win32 - Microsoft Visual Studio 2005 Team Suite Edition, Intel EBC, Microsoft ASL # VS2008xASL - win32 - Microsoft Visual Studio 2008 Team Suite with Microsoft ASL @@ -294,10 +295,10 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G *_VS2003_IA32_VFRPP_PATH = DEF(VS2003_BIN)\cl.exe *_VS2003_IA32_SLINK_PATH = DEF(VS2003_BIN)\lib.exe *_VS2003_IA32_DLINK_PATH = DEF(VS2003_BIN)\link.exe -*_VS2003_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_VS2003_IA32_APP_PATH = DEF(VS2003_BIN)\cl.exe *_VS2003_IA32_PP_PATH = DEF(VS2003_BIN)\cl.exe *_VS2003_IA32_ASM_PATH = DEF(VS2003_BIN)\ml.exe +*_VS2003_IA32_ASM16_PATH = DEF(VS2003_BIN)\ml.exe *_VS2003_IA32_ASLCC_PATH = DEF(VS2003_BIN)\cl.exe *_VS2003_IA32_ASLPP_PATH = DEF(VS2003_BIN)\cl.exe *_VS2003_IA32_ASLDLINK_PATH = DEF(VS2003_BIN)\link.exe @@ -314,7 +315,6 @@ RELEASE_VS2003_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd *_VS2003_IA32_SLINK_FLAGS = /nologo /LTCG DEBUG_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_VS2003_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # EBC definitions @@ -364,7 +364,6 @@ RELEASE_VS2003_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:RE *_VS2003xASL_IA32_VFRPP_PATH = DEF(VS2003_BIN)\cl.exe *_VS2003xASL_IA32_SLINK_PATH = DEF(VS2003_BIN)\lib.exe *_VS2003xASL_IA32_DLINK_PATH = DEF(VS2003_BIN)\link.exe -*_VS2003xASL_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_VS2003xASL_IA32_APP_PATH = DEF(VS2003_BIN)\cl.exe *_VS2003xASL_IA32_PP_PATH = DEF(VS2003_BIN)\cl.exe *_VS2003xASL_IA32_ASM_PATH = DEF(VS2003_BIN)\ml.exe @@ -385,7 +384,6 @@ RELEASE_VS2003xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd *_VS2003xASL_IA32_SLINK_FLAGS = /nologo /LTCG DEBUG_VS2003xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_VS2003xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_VS2003xASL_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # EBC definitions @@ -426,6 +424,8 @@ RELEASE_VS2003xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP *_VS2005_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h *_VS2005_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2005_*_ASM16_PATH = DEF(VS2005_BIN)\ml.exe + ################## # ASL definitions ################## @@ -446,7 +446,6 @@ RELEASE_VS2003xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OP *_VS2005_IA32_VFRPP_PATH = DEF(VS2005_BIN)\cl.exe *_VS2005_IA32_SLINK_PATH = DEF(VS2005_BIN)\lib.exe *_VS2005_IA32_DLINK_PATH = DEF(VS2005_BIN)\link.exe -*_VS2005_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_VS2005_IA32_APP_PATH = DEF(VS2005_BIN)\cl.exe *_VS2005_IA32_PP_PATH = DEF(VS2005_BIN)\cl.exe *_VS2005_IA32_ASM_PATH = DEF(VS2005_BIN)\ml.exe @@ -461,7 +460,6 @@ RELEASE_VS2005_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE RELEASE_VS2005_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd DEBUG_VS2005_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_VS2005_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_VS2005_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # X64 definitions @@ -508,7 +506,7 @@ RELEASE_VS2005_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /O DEBUG_VS2005_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug RELEASE_VS2005_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 DEBUG_VS2005_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG -RELEASE_VS2005_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb +RELEASE_VS2005_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb ################## # EBC definitions @@ -548,6 +546,8 @@ RELEASE_VS2005_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF *_VS2005xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h *_VS2005xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2005xASL_*_ASM16_PATH = DEF(VS2005_BIN)\ml.exe + ################## # ASL definitions ################## @@ -568,7 +568,6 @@ RELEASE_VS2005_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF *_VS2005xASL_IA32_VFRPP_PATH = DEF(VS2005_BIN)\cl.exe *_VS2005xASL_IA32_SLINK_PATH = DEF(VS2005_BIN)\lib.exe *_VS2005xASL_IA32_DLINK_PATH = DEF(VS2005_BIN)\link.exe -*_VS2005xASL_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_VS2005xASL_IA32_APP_PATH = DEF(VS2005_BIN)\cl.exe *_VS2005xASL_IA32_PP_PATH = DEF(VS2005_BIN)\cl.exe *_VS2005xASL_IA32_ASM_PATH = DEF(VS2005_BIN)\ml.exe @@ -583,7 +582,6 @@ RELEASE_VS2005xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICOD RELEASE_VS2005xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd DEBUG_VS2005xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_VS2005xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_VS2005xASL_IA32_ASMLINK_FLAGS= /nologo /tiny ################## # X64 definitions @@ -630,7 +628,7 @@ RELEASE_VS2005xASL_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /G DEBUG_VS2005xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug RELEASE_VS2005xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 DEBUG_VS2005xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG -RELEASE_VS2005xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb +RELEASE_VS2005xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb ################## # EBC definitions @@ -670,6 +668,8 @@ RELEASE_VS2005xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF. *_VS2005x86_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h *_VS2005x86_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2005x86_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe + ################## # ASL definitions ################## @@ -690,7 +690,6 @@ RELEASE_VS2005xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF. *_VS2005x86_IA32_VFRPP_PATH = DEF(VS2005x86_BIN)\cl.exe *_VS2005x86_IA32_SLINK_PATH = DEF(VS2005x86_BIN)\lib.exe *_VS2005x86_IA32_DLINK_PATH = DEF(VS2005x86_BIN)\link.exe -*_VS2005x86_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_VS2005x86_IA32_APP_PATH = DEF(VS2005x86_BIN)\cl.exe *_VS2005x86_IA32_PP_PATH = DEF(VS2005x86_BIN)\cl.exe *_VS2005x86_IA32_ASM_PATH = DEF(VS2005x86_BIN)\ml.exe @@ -705,7 +704,6 @@ RELEASE_VS2005x86_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE RELEASE_VS2005x86_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd DEBUG_VS2005x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_VS2005x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_VS2005x86_IA32_ASMLINK_FLAGS= /nologo /tiny ################## # X64 definitions @@ -752,7 +750,7 @@ RELEASE_VS2005x86_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy DEBUG_VS2005x86_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug RELEASE_VS2005x86_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 DEBUG_VS2005x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG -RELEASE_VS2005x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb +RELEASE_VS2005x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb ################## # EBC definitions @@ -792,6 +790,8 @@ RELEASE_VS2005x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.I *_VS2005x86xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h *_VS2005x86xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2005x86xASL_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe + ################## # ASL definitions ################## @@ -812,7 +812,6 @@ RELEASE_VS2005x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.I *_VS2005x86xASL_IA32_VFRPP_PATH = DEF(VS2005x86_BIN)\cl.exe *_VS2005x86xASL_IA32_SLINK_PATH = DEF(VS2005x86_BIN)\lib.exe *_VS2005x86xASL_IA32_DLINK_PATH = DEF(VS2005x86_BIN)\link.exe -*_VS2005x86xASL_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_VS2005x86xASL_IA32_APP_PATH = DEF(VS2005x86_BIN)\cl.exe *_VS2005x86xASL_IA32_PP_PATH = DEF(VS2005x86_BIN)\cl.exe *_VS2005x86xASL_IA32_ASM_PATH = DEF(VS2005x86_BIN)\ml.exe @@ -827,7 +826,6 @@ RELEASE_VS2005x86xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNI RELEASE_VS2005x86xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd DEBUG_VS2005x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_VS2005x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_VS2005x86xASL_IA32_ASMLINK_FLAGS= /nologo /tiny ################## # X64 definitions @@ -874,7 +872,7 @@ RELEASE_VS2005x86xASL_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- DEBUG_VS2005x86xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug RELEASE_VS2005x86xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 DEBUG_VS2005x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG -RELEASE_VS2005x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb +RELEASE_VS2005x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb ################## # EBC definitions @@ -916,6 +914,8 @@ RELEASE_VS2005x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R *_VS2008_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h *_VS2008_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2008_*_ASM16_PATH = DEF(VS2008_BIN)\ml.exe + ################## # ASL definitions ################## @@ -936,7 +936,6 @@ RELEASE_VS2005x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R *_VS2008_IA32_VFRPP_PATH = DEF(VS2008_BIN)\cl.exe *_VS2008_IA32_SLINK_PATH = DEF(VS2008_BIN)\lib.exe *_VS2008_IA32_DLINK_PATH = DEF(VS2008_BIN)\link.exe -*_VS2008_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_VS2008_IA32_APP_PATH = DEF(VS2008_BIN)\cl.exe *_VS2008_IA32_PP_PATH = DEF(VS2008_BIN)\cl.exe *_VS2008_IA32_ASM_PATH = DEF(VS2008_BIN)\ml.exe @@ -951,7 +950,6 @@ RELEASE_VS2008_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE RELEASE_VS2008_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd DEBUG_VS2008_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_VS2008_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_VS2008_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # X64 definitions @@ -998,7 +996,7 @@ RELEASE_VS2008_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy /O DEBUG_VS2008_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug RELEASE_VS2008_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 DEBUG_VS2008_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG -RELEASE_VS2008_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb +RELEASE_VS2008_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb ################## # EBC definitions @@ -1038,6 +1036,8 @@ RELEASE_VS2008_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF *_VS2008xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h *_VS2008xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2008xASL_*_ASM16_PATH = DEF(VS2008_BIN)\ml.exe + ################## # ASL definitions ################## @@ -1058,7 +1058,6 @@ RELEASE_VS2008_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF *_VS2008xASL_IA32_VFRPP_PATH = DEF(VS2008_BIN)\cl.exe *_VS2008xASL_IA32_SLINK_PATH = DEF(VS2008_BIN)\lib.exe *_VS2008xASL_IA32_DLINK_PATH = DEF(VS2008_BIN)\link.exe -*_VS2008xASL_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_VS2008xASL_IA32_APP_PATH = DEF(VS2008_BIN)\cl.exe *_VS2008xASL_IA32_PP_PATH = DEF(VS2008_BIN)\cl.exe *_VS2008xASL_IA32_ASM_PATH = DEF(VS2008_BIN)\ml.exe @@ -1073,7 +1072,6 @@ RELEASE_VS2008xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICOD RELEASE_VS2008xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd DEBUG_VS2008xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_VS2008xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_VS2008xASL_IA32_ASMLINK_FLAGS= /nologo /tiny ################## # X64 definitions @@ -1120,7 +1118,7 @@ RELEASE_VS2008xASL_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /G DEBUG_VS2008xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug RELEASE_VS2008xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 DEBUG_VS2008xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb /DEBUG -RELEASE_VS2008xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb +RELEASE_VS2008xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEBUG_DIR)/$(BASE_NAME).map /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb ################## # EBC definitions @@ -1159,6 +1157,8 @@ RELEASE_VS2008xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF. *_VS2008x86_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h *_VS2008x86_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2008x86_*_ASM16_PATH = DEF(VS2008x86_BIN)\ml.exe + ################## # ASL definitions ################## @@ -1182,7 +1182,6 @@ RELEASE_VS2008xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF. *_VS2008x86_IA32_SLINK_PATH = DEF(VS2008x86_BIN)\lib.exe *_VS2008x86_IA32_DLINK_PATH = DEF(VS2008x86_BIN)\link.exe *_VS2008x86_IA32_ASLDLINK_PATH= DEF(VS2008x86_BIN)\link.exe -*_VS2008x86_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe *_VS2008x86_IA32_APP_PATH = DEF(VS2008x86_BIN)\cl.exe *_VS2008x86_IA32_PP_PATH = DEF(VS2008x86_BIN)\cl.exe *_VS2008x86_IA32_ASM_PATH = DEF(VS2008x86_BIN)\ml.exe @@ -1194,7 +1193,6 @@ RELEASE_VS2008x86_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE RELEASE_VS2008x86_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd DEBUG_VS2008x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_VS2008x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_VS2008x86_IA32_ASMLINK_FLAGS= /nologo /tiny ################## # X64 definitions @@ -1259,6 +1257,8 @@ RELEASE_VS2008x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I *_VS2008x86xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h *_VS2008x86xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_VS2008x86xASL_*_ASM16_PATH = DEF(VS2008x86_BIN)\ml.exe + ################## # ASL definitions ################## @@ -1282,7 +1282,6 @@ RELEASE_VS2008x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,I *_VS2008x86xASL_IA32_SLINK_PATH = DEF(VS2008x86_BIN)\lib.exe *_VS2008x86xASL_IA32_DLINK_PATH = DEF(VS2008x86_BIN)\link.exe *_VS2008x86xASL_IA32_ASLDLINK_PATH= DEF(VS2008x86_BIN)\link.exe -*_VS2008x86xASL_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link.exe *_VS2008x86xASL_IA32_APP_PATH = DEF(VS2008x86_BIN)\cl.exe *_VS2008x86xASL_IA32_PP_PATH = DEF(VS2008x86_BIN)\cl.exe *_VS2008x86xASL_IA32_ASM_PATH = DEF(VS2008x86_BIN)\ml.exe @@ -1294,7 +1293,6 @@ RELEASE_VS2008x86xASL_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /D UNI RELEASE_VS2008x86xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Cx /coff /Zd DEBUG_VS2008x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_VS2008x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_VS2008x86xASL_IA32_ASMLINK_FLAGS= /nologo /tiny ################## # X64 definitions @@ -1362,6 +1360,8 @@ RELEASE_VS2008x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R *_DDK3790_*_SLINK_FLAGS = /nologo /LTCG *_DDK3790_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_DDK3790_*_ASM16_PATH = DEF(WINDDK_BIN32)\ml.exe + ################## # ASL definitions ################## @@ -1378,7 +1378,6 @@ RELEASE_VS2008x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:R *_DDK3790_IA32_CC_PATH = DEF(WINDDK_BIN32)\cl.exe *_DDK3790_IA32_SLINK_PATH = DEF(WINDDK_BIN32)\lib.exe *_DDK3790_IA32_DLINK_PATH = DEF(WINDDK_BIN32)\link.exe -*_DDK3790_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_DDK3790_IA32_PP_PATH = DEF(WINDDK_BIN32)\cl.exe *_DDK3790_IA32_VFRPP_PATH = DEF(WINDDK_BIN32)\cl.exe *_DDK3790_IA32_APP_PATH = DEF(WINDDK_BIN32)\cl.exe @@ -1393,7 +1392,6 @@ RELEASE_DDK3790_IA32_CC_FLAGS = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICODE /O RELEASE_DDK3790_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd DEBUG_DDK3790_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_DDK3790_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_DDK3790_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # x64 definitions @@ -1436,7 +1434,7 @@ RELEASE_DDK3790_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- /Gy / DEBUG_DDK3790_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug RELEASE_DDK3790_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 DEBUG_DDK3790_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG -RELEASE_DDK3790_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb +RELEASE_DDK3790_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb ################## # EBC definitions @@ -1472,6 +1470,8 @@ RELEASE_DDK3790_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF *_DDK3790xASL_*_SLINK_FLAGS = /nologo /LTCG *_DDK3790xASL_*_VFRPP_FLAGS = /nologo /E /TC /DVFRCOMPILE /FI$(MODULE_NAME)StrDefs.h +*_DDK3790xASL_*_ASM16_PATH = DEF(WINDDK_BIN32)\ml.exe + ################## # ASL definitions ################## @@ -1488,7 +1488,6 @@ RELEASE_DDK3790_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF *_DDK3790xASL_IA32_CC_PATH = DEF(WINDDK_BIN32)\cl.exe *_DDK3790xASL_IA32_SLINK_PATH = DEF(WINDDK_BIN32)\lib.exe *_DDK3790xASL_IA32_DLINK_PATH = DEF(WINDDK_BIN32)\link.exe -*_DDK3790xASL_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_DDK3790xASL_IA32_PP_PATH = DEF(WINDDK_BIN32)\cl.exe *_DDK3790xASL_IA32_VFRPP_PATH = DEF(WINDDK_BIN32)\cl.exe *_DDK3790xASL_IA32_APP_PATH = DEF(WINDDK_BIN32)\cl.exe @@ -1503,7 +1502,6 @@ RELEASE_DDK3790xASL_IA32_CC_FLAGS = /nologo /c /WX /W4 /Gy /Gs32768 /D UNICOD RELEASE_DDK3790xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd DEBUG_DDK3790xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_DDK3790xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_DDK3790xASL_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # x64 definitions @@ -1546,7 +1544,7 @@ RELEASE_DDK3790xASL_IPF_CC_FLAGS = /nologo /c /WX /GS- /X /W4 /EHs-c- /GR- / DEBUG_DDK3790xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 -d debug RELEASE_DDK3790xASL_IPF_ASM_FLAGS = -N us -X explicit -M ilp64 -N so -W4 DEBUG_DDK3790xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb /DEBUG -RELEASE_DDK3790xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF.ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb +RELEASE_DDK3790xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF,ICF /IGNORE:4086 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:IA64 /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /DRIVER /MAP:$(DEST_DIR_DEBUG)/$(BASE_NAME).map /PDB:$(DEST_DIR_DEBUG)/$(BASE_NAME).pdb ################## # EBC definitions @@ -2070,6 +2068,8 @@ DEFINE GCC44_ASM_FLAGS = DEF(GCC_ASM_FLAGS) *_ICC_*_APP_FLAGS = /nologo /E /TC *_ICC_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_ICC_*_ASM16_PATH = DEF(MS_VS_BIN)\ml.exe + ################## # ASL definitions ################## @@ -2088,7 +2088,6 @@ DEFINE GCC44_ASM_FLAGS = DEF(GCC_ASM_FLAGS) # xilib.exe needs lib.exe from Visual Studio *_ICC_IA32_SLINK_DLL = DEF(MS_VS_BIN) *_ICC_IA32_DLINK_PATH = DEF(ICC_BIN32)\xilink.exe -*_ICC_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_ICC_IA32_PP_PATH = DEF(ICC_BIN32)\icl.exe *_ICC_IA32_VFRPP_PATH = DEF(ICC_BIN32)\icl.exe *_ICC_IA32_APP_PATH = DEF(ICC_BIN32)\icl.exe @@ -2105,7 +2104,6 @@ RELEASE_ICC_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Zd *_ICC_IA32_SLINK_FLAGS = /nologo DEBUG_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_ICC_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_ICC_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # X64 definitions @@ -2197,6 +2195,8 @@ RELEASE_ICC_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT *_ICCxASL_*_APP_FLAGS = /nologo /E /TC *_ICCxASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_ICCxASL_*_ASM16_PATH = DEF(MS_VS_BIN)\ml.exe + ################## # ASL definitions ################## @@ -2215,7 +2215,6 @@ RELEASE_ICC_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT # xilib.exe needs lib.exe from Visual Studio *_ICCxASL_IA32_SLINK_DLL = DEF(MS_VS_BIN) *_ICCxASL_IA32_DLINK_PATH = DEF(ICC_BIN32)\xilink.exe -*_ICCxASL_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_ICCxASL_IA32_PP_PATH = DEF(ICC_BIN32)\icl.exe *_ICCxASL_IA32_VFRPP_PATH = DEF(ICC_BIN32)\icl.exe *_ICCxASL_IA32_APP_PATH = DEF(ICC_BIN32)\icl.exe @@ -2232,7 +2231,6 @@ RELEASE_ICCxASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Zd *_ICCxASL_IA32_SLINK_FLAGS = /nologo DEBUG_ICCxASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_ICCxASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_ICCxASL_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # X64 definitions @@ -2325,6 +2323,8 @@ RELEASE_ICCxASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL *_ICCx86_*_APP_FLAGS = /nologo /E /TC *_ICCx86_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_ICCxASL_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe + ################## # ASL definitions ################## @@ -2343,7 +2343,6 @@ RELEASE_ICCxASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL # xilib.exe needs lib.exe from Visual Studio *_ICCx86_IA32_SLINK_DLL = DEF(VS2005x86_BIN) *_ICCx86_IA32_DLINK_PATH = DEF(ICC_BIN32x86)\xilink.exe -*_ICCx86_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_ICCx86_IA32_PP_PATH = DEF(ICC_BIN32x86)\icl.exe *_ICCx86_IA32_VFRPP_PATH = DEF(ICC_BIN32x86)\icl.exe *_ICCx86_IA32_APP_PATH = DEF(ICC_BIN32x86)\icl.exe @@ -2360,7 +2359,6 @@ RELEASE_ICCx86_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Zd *_ICCx86_IA32_SLINK_FLAGS = /nologo DEBUG_ICCx86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_ICCx86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_ICCx86_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # X64 definitions @@ -2453,6 +2451,8 @@ RELEASE_ICCx86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL / *_ICCx86xASL_*_APP_FLAGS = /nologo /E /TC *_ICCx86xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_ICCx86ASL_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe + ################## # ASL definitions ################## @@ -2471,7 +2471,6 @@ RELEASE_ICCx86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL / # xilib.exe needs lib.exe from Visual Studio *_ICCx86xASL_IA32_SLINK_DLL = DEF(VS2005x86_BIN) *_ICCx86xASL_IA32_DLINK_PATH = DEF(ICC_BIN32x86)\xilink.exe -*_ICCx86xASL_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_ICCx86xASL_IA32_PP_PATH = DEF(ICC_BIN32x86)\icl.exe *_ICCx86xASL_IA32_VFRPP_PATH = DEF(ICC_BIN32x86)\icl.exe *_ICCx86xASL_IA32_APP_PATH = DEF(ICC_BIN32x86)\icl.exe @@ -2488,7 +2487,6 @@ RELEASE_ICCx86xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Zd *_ICCx86xASL_IA32_SLINK_FLAGS = /nologo DEBUG_ICCx86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_ICCx86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_ICCx86xASL_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # X64 definitions @@ -2582,6 +2580,8 @@ RELEASE_ICCx86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /D *_ICC11_*_APP_FLAGS = /nologo /E /TC *_ICC11_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_ICC11_*_ASM16_PATH = DEF(MS_VS_BIN)\ml.exe + ################## # ASL definitions ################## @@ -2600,7 +2600,6 @@ RELEASE_ICCx86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /D # xilib.exe needs lib.exe from Visual Studio *_ICC11_IA32_SLINK_DLL = DEF(MS_VS_BIN) *_ICC11_IA32_DLINK_PATH = DEF(ICC11_BIN32)\xilink.exe -*_ICC11_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_ICC11_IA32_PP_PATH = DEF(ICC11_BIN32)\icl.exe *_ICC11_IA32_VFRPP_PATH = DEF(ICC11_BIN32)\icl.exe *_ICC11_IA32_APP_PATH = DEF(ICC11_BIN32)\icl.exe @@ -2617,7 +2616,6 @@ RELEASE_ICC11_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Zd *_ICC11_IA32_SLINK_FLAGS = /nologo DEBUG_ICC11_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_ICC11_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_ICC11_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # X64 definitions @@ -2711,6 +2709,8 @@ RELEASE_ICC11_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /O *_ICC11xASL_*_APP_FLAGS = /nologo /E /TC *_ICC11xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_ICC11xASL_*_ASM16_PATH = DEF(MS_VS_BIN)\ml.exe + ################## # ASL definitions ################## @@ -2729,7 +2729,6 @@ RELEASE_ICC11_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL /O # xilib.exe needs lib.exe from Visual Studio *_ICC11xASL_IA32_SLINK_DLL = DEF(MS_VS_BIN) *_ICC11xASL_IA32_DLINK_PATH = DEF(ICC11_BIN32)\xilink.exe -*_ICC11xASL_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_ICC11xASL_IA32_PP_PATH = DEF(ICC11_BIN32)\icl.exe *_ICC11xASL_IA32_VFRPP_PATH = DEF(ICC11_BIN32)\icl.exe *_ICC11xASL_IA32_APP_PATH = DEF(ICC11_BIN32)\icl.exe @@ -2746,7 +2745,6 @@ RELEASE_ICC11xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Zd *_ICC11xASL_IA32_SLINK_FLAGS = /nologo DEBUG_ICC11xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_ICC11xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_ICC11xASL_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # X64 definitions @@ -2841,6 +2839,8 @@ RELEASE_ICC11xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DL *_ICC11x86_*_APP_FLAGS = /nologo /E /TC *_ICC11x86_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_ICC11x86_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe + ################## # ASL definitions ################## @@ -2859,7 +2859,6 @@ RELEASE_ICC11xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DL # xilib.exe needs lib.exe from Visual Studio *_ICC11x86_IA32_SLINK_DLL = DEF(VS2005x86_BIN) *_ICC11x86_IA32_DLINK_PATH = DEF(ICC11_BIN32x86)\xilink.exe -*_ICC11x86_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_ICC11x86_IA32_PP_PATH = DEF(ICC11_BIN32x86)\icl.exe *_ICC11x86_IA32_VFRPP_PATH = DEF(ICC11_BIN32x86)\icl.exe *_ICC11x86_IA32_APP_PATH = DEF(ICC11_BIN32x86)\icl.exe @@ -2876,7 +2875,6 @@ RELEASE_ICC11x86_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Zd *_ICC11x86_IA32_SLINK_FLAGS = /nologo DEBUG_ICC11x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_ICC11x86_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_ICC11x86_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # X64 definitions @@ -2971,6 +2969,8 @@ RELEASE_ICC11x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL *_ICC11x86xASL_*_APP_FLAGS = /nologo /E /TC *_ICC11x86xASL_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h +*_ICC11x86xASL_*_ASM16_PATH = DEF(VS2005x86_BIN)\ml.exe + ################## # ASL definitions ################## @@ -2989,7 +2989,6 @@ RELEASE_ICC11x86_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG /DLL # xilib.exe needs lib.exe from Visual Studio *_ICC11x86xASL_IA32_SLINK_DLL = DEF(VS2005x86_BIN) *_ICC11x86xASL_IA32_DLINK_PATH = DEF(ICC11_BIN32x86)\xilink.exe -*_ICC11x86xASL_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe *_ICC11x86xASL_IA32_PP_PATH = DEF(ICC11_BIN32x86)\icl.exe *_ICC11x86xASL_IA32_VFRPP_PATH = DEF(ICC11_BIN32x86)\icl.exe *_ICC11x86xASL_IA32_APP_PATH = DEF(ICC11_BIN32x86)\icl.exe @@ -3006,7 +3005,6 @@ RELEASE_ICC11x86xASL_IA32_ASM_FLAGS = /nologo /c /WX /W3 /Zd *_ICC11x86xASL_IA32_SLINK_FLAGS = /nologo DEBUG_ICC11x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG RELEASE_ICC11x86xASL_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text - *_ICC11x86xASL_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # X64 definitions @@ -3083,8 +3081,8 @@ RELEASE_ICC11x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG #################################################################################### # # MYTOOLS -# IA32 - Microsoft Visual Studio .NET 2003 and Microsoft Windows DDK 3790.1830 for 16-bit linker -# X64 - Microsoft Windows DDK 3790.1830 +# IA32 - Microsoft Visual Studio 2008 Team Suite +# X64 - Microsoft Visual Studio 2008 Team Suite # IPF - Microsoft Windows DDK 3790.1830 # EBC - Intel EFI Byte Code Compiler # @@ -3109,24 +3107,25 @@ RELEASE_ICC11x86xASL_IPF_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /LTCG *_MYTOOLS_*_PP_FLAGS = /nologo /E /TC /FIAutoGen.h *_MYTOOLS_*_SLINK_FLAGS = /nologo /LTCG +*_MYTOOLS_*_ASM16_PATH = DEF(VS2008_BIN)\ml.exe + ################## # IA32 definitions ################## -*_MYTOOLS_IA32_*_DLL = DEF(VS2005_DLL) - -*_MYTOOLS_IA32_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe -*_MYTOOLS_IA32_CC_PATH = DEF(VS2005_BIN)\cl.exe -*_MYTOOLS_IA32_SLINK_PATH = DEF(VS2005_BIN)\lib.exe -*_MYTOOLS_IA32_DLINK_PATH = DEF(VS2005_BIN)\link.exe -*_MYTOOLS_IA32_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe -*_MYTOOLS_IA32_PP_PATH = DEF(VS2005_BIN)\cl.exe -*_MYTOOLS_IA32_VFRPP_PATH = DEF(VS2005_BIN)\cl.exe -*_MYTOOLS_IA32_APP_PATH = DEF(VS2005_BIN)\cl.exe -*_MYTOOLS_IA32_ASM_PATH = DEF(VS2005_BIN)\ml.exe -*_MYTOOLS_IA32_ASLCC_PATH = DEF(VS2005_BIN)\cl.exe -*_MYTOOLS_IA32_ASLPP_PATH = DEF(VS2005_BIN)\cl.exe -*_MYTOOLS_IA32_ASLDLINK_PATH = DEF(VS2005_BIN)\link.exe -*_MYTOOLS_IA32_RC_PATH = DEF(VS2005_BIN)\rc.exe +*_MYTOOLS_IA32_*_DLL = DEF(VS2008_DLL) + +*_MYTOOLS_IA32_MAKE_PATH = DEF(VS2008_BIN)\nmake.exe +*_MYTOOLS_IA32_CC_PATH = DEF(VS2008_BIN)\cl.exe +*_MYTOOLS_IA32_SLINK_PATH = DEF(VS2008_BIN)\lib.exe +*_MYTOOLS_IA32_DLINK_PATH = DEF(VS2008_BIN)\link.exe +*_MYTOOLS_IA32_PP_PATH = DEF(VS2008_BIN)\cl.exe +*_MYTOOLS_IA32_VFRPP_PATH = DEF(VS2008_BIN)\cl.exe +*_MYTOOLS_IA32_APP_PATH = DEF(VS2008_BIN)\cl.exe +*_MYTOOLS_IA32_ASM_PATH = DEF(VS2008_BIN)\ml.exe +*_MYTOOLS_IA32_ASLCC_PATH = DEF(VS2008_BIN)\cl.exe +*_MYTOOLS_IA32_ASLPP_PATH = DEF(VS2008_BIN)\cl.exe +*_MYTOOLS_IA32_ASLDLINK_PATH = DEF(VS2008_BIN)\link.exe +*_MYTOOLS_IA32_RC_PATH = DEF(VS2008_BIN)\rc.exe DEBUG_MYTOOLS_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm RELEASE_MYTOOLS_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF @@ -3134,25 +3133,24 @@ RELEASE_MYTOOLS_IA32_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /Gy RELEASE_MYTOOLS_IA32_ASM_FLAGS = /nologo /c /WX /W3 /coff /Cx /Zd DEBUG_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /DEBUG /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb RELEASE_MYTOOLS_IA32_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF /OPT:ICF=10 /MAP /ALIGN:32 /SECTION:.xdata,D /SECTION:.pdata,D /MACHINE:I386 /LTCG /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:CONSOLE /SAFESEH:NO /BASE:0 /DRIVER /MERGE:.data=.text /MERGE:.rdata=.text /PDB:$(DEBUG_DIR)/$(BASE_NAME).pdb - *_MYTOOLS_IA32_ASMLINK_FLAGS = /nologo /tiny ################## # x64 definitions ################## -*_MYTOOLS_X64_*_DLL = DEF(VS2005_DLL) - -*_MYTOOLS_X64_MAKE_PATH = DEF(VS2005_BIN)\nmake.exe -*_MYTOOLS_X64_CC_PATH = DEF(VS2005_BINX64)\cl.exe -*_MYTOOLS_X64_SLINK_PATH = DEF(VS2005_BINX64)\lib.exe -*_MYTOOLS_X64_DLINK_PATH = DEF(VS2005_BINX64)\link.exe -*_MYTOOLS_X64_PP_PATH = DEF(VS2005_BINX64)\cl.exe -*_MYTOOLS_X64_VFRPP_PATH = DEF(VS2005_BINX64)\cl.exe -*_MYTOOLS_X64_APP_PATH = DEF(VS2005_BINX64)\cl.exe -*_MYTOOLS_X64_ASM_PATH = DEF(VS2005_BINX64)\ml64.exe -*_MYTOOLS_X64_ASLCC_PATH = DEF(VS2005_BINX64)\cl.exe -*_MYTOOLS_X64_ASLPP_PATH = DEF(VS2005_BINX64)\cl.exe -*_MYTOOLS_X64_ASLDLINK_PATH = DEF(VS2005_BINX64)\link.exe -*_MYTOOLS_X64_RC_PATH = DEF(VS2005_BIN)\rc.exe +*_MYTOOLS_X64_*_DLL = DEF(VS2008_DLL) + +*_MYTOOLS_X64_MAKE_PATH = DEF(VS2008_BIN)\nmake.exe +*_MYTOOLS_X64_CC_PATH = DEF(VS2008_BINX64)\cl.exe +*_MYTOOLS_X64_SLINK_PATH = DEF(VS2008_BINX64)\lib.exe +*_MYTOOLS_X64_DLINK_PATH = DEF(VS2008_BINX64)\link.exe +*_MYTOOLS_X64_PP_PATH = DEF(VS2008_BINX64)\cl.exe +*_MYTOOLS_X64_VFRPP_PATH = DEF(VS2008_BINX64)\cl.exe +*_MYTOOLS_X64_APP_PATH = DEF(VS2008_BINX64)\cl.exe +*_MYTOOLS_X64_ASM_PATH = DEF(VS2008_BINX64)\ml64.exe +*_MYTOOLS_X64_ASLCC_PATH = DEF(VS2008_BINX64)\cl.exe +*_MYTOOLS_X64_ASLPP_PATH = DEF(VS2008_BINX64)\cl.exe +*_MYTOOLS_X64_ASLDLINK_PATH = DEF(VS2008_BINX64)\link.exe +*_MYTOOLS_X64_RC_PATH = DEF(VS2008_BIN)\rc.exe DEBUG_MYTOOLS_X64_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm RELEASE_MYTOOLS_X64_CC_FLAGS = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF @@ -3331,17 +3329,17 @@ RELEASE_XCODE32_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-inter *_RVCT31_ARM_ARCHDLINK_FLAGS = *_RVCT31_ARM_PLATFORM_FLAGS = - DEBUG_RVCT31_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map -RELEASE_RVCT31_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map + DEBUG_RVCT31_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map --diag_style=ide +RELEASE_RVCT31_ARM_DLINK_FLAGS = $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list $(DEST_DIR_DEBUG)/$(BASE_NAME).map --diag_style=ide -*_RVCT31_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) --apcs /interwork -*_RVCT31_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E +*_RVCT31_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) --apcs /interwork --diag_style=ide +*_RVCT31_ARM_PP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --diag_style=ide *_RVCT31_ARM_VFRPP_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h *_RVCT31_ARM_MAKE_PATH = nmake -*_RVCT31_ARM_SLINK_FLAGS = --partial -o - DEBUG_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -g -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 -RELEASE_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 +*_RVCT31_ARM_SLINK_FLAGS = --partial --diag_style=ide -o + DEBUG_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -g -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide +RELEASE_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -Ospace -c --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --enum_is_int --preinclude AutoGen.h --diag_warning 167 --diag_style=ide ################## # ARM definitions @@ -3381,16 +3379,16 @@ RELEASE_RVCT31_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -Ospac *_RVCT31CYGWIN_ARM_ARCHDLINK_FLAGS = *_RVCT31CYGWIN_ARM_PLATFORM_FLAGS = - DEBUG_RVCT31CYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` -RELEASE_RVCT31CYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` + DEBUG_RVCT31CYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` --diag_style=ide +RELEASE_RVCT31CYGWIN_ARM_DLINK_FLAGS = "$(DLINKPATH_FLAG)" $(ARCHDLINK_FLAGS) --entry $(IMAGE_ENTRY_POINT) --ro-base 0 --no_scanlib --reloc --no_exceptions --datacompressor off --strict --symbols --map --list `cygpath -m $(DEST_DIR_DEBUG)/$(BASE_NAME).map` --diag_style=ide -*_RVCT31CYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork -*_RVCT31CYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E +*_RVCT31CYGWIN_ARM_ASM_FLAGS = "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) --apcs /interwork --diag_style=ide +*_RVCT31CYGWIN_ARM_PP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --diag_style=ide *_RVCT31CYGWIN_ARM_VFRPP_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h` *_RVCT31CYGWIN_ARM_MAKE_PATH = make -*_RVCT31CYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial -o - DEBUG_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167 -RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167 +*_RVCT31CYGWIN_ARM_SLINK_FLAGS = "$(SLINKPATH_FLAG)" --partial --diag_style=ide -o + DEBUG_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -g -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167 --diag_style=ide +RELEASE_RVCT31CYGWIN_ARM_CC_FLAGS = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --c90 -c -Ospace --no_autoinline --asm --gnu --apcs /interwork --signed_chars --no_unaligned_access --split_sections --preinclude AutoGen.h --diag_warning 167 --diag_style=ide ################## # ARM definitions @@ -3465,8 +3463,11 @@ RELEASE_ARMGCC_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) -mlittle-endian DEBUG_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mfpu=fpa -mlittle-endian -g -O2 -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h RELEASE_ARMGCC_ARM_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mfpu=fpa -mlittle-endian -O2 -mabi=aapcs -mapcs -fno-short-enums -save-temps -combine -fsigned-char -fshort-wchar -fno-strict-aliasing -ffunction-sections -fdata-sections -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h - - +################# +# ASM 16 linker defintions +################# +*_*_*_ASMLINK_PATH = DEF(WINDDK_BIN16)\link16.exe +*_*_*_ASMLINK_FLAGS = /nologo /tiny ################## # VfrCompiler definitions diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index 4ec8b72234..189dc431eb 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c @@ -1823,7 +1823,7 @@ Returns: } // Add opcode for an uncondional branch with no link. AKA B SecEntryPoint - ResetVector[0] |= 0xEA000000; + ResetVector[0] |= 0xEB000000; // Address of PEI Core, if we have one diff --git a/BaseTools/Source/Python/AutoGen/GenDepex.py b/BaseTools/Source/Python/AutoGen/GenDepex.py index b652051ac1..f80824b744 100644 --- a/BaseTools/Source/Python/AutoGen/GenDepex.py +++ b/BaseTools/Source/Python/AutoGen/GenDepex.py @@ -423,7 +423,14 @@ def Main(): Dpx = DependencyExpression(DxsString, Option.ModuleType, Option.Optimize) if Option.OutputFile != None: - Dpx.Generate(Option.OutputFile) + FileChangeFlag = Dpx.Generate(Option.OutputFile) + if not FileChangeFlag and DxsFile: + # + # Touch the output file if its time stamp is older than the original + # DXS file to avoid re-invoke this tool for the dependency check in build rule. + # + if os.stat(DxsFile)[8] > os.stat(Option.OutputFile)[8]: + os.utime(Option.OutputFile, None) else: Dpx.Generate() except BaseException, X: diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py index 69a4898499..c4358cf479 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -43,6 +43,8 @@ import OptRomFileStatement from GenFdsGlobalVariable import GenFdsGlobalVariable from Common.BuildToolError import * from Common import EdkLogger +from Common.Misc import PathClass +from Common.String import NormPath import re import os @@ -205,6 +207,8 @@ class FdfParser: self.__SkippedChars = "" self.__WipeOffArea = [] + if GenFdsGlobalVariable.WorkSpaceDir == '': + GenFdsGlobalVariable.WorkSpaceDir = os.getenv("WORKSPACE") ## __IsWhiteSpace() method # @@ -2145,6 +2149,11 @@ class FdfParser: if not self.__GetNextToken(): raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber) ffsInf.InfFileName = self.__Token + if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1: + #do case sensitive check for file path + ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate() + if ErrorCode != 0: + EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo) if not ffsInf.InfFileName in self.Profile.InfList: self.Profile.InfList.append(ffsInf.InfFileName) @@ -2352,6 +2361,11 @@ class FdfParser: self.__GetSectionData( FfsFileObj, MacroDict) else: FfsFileObj.FileName = self.__Token + if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1: + #do case sensitive check for file path + ErrorCode, ErrorInfo = PathClass(NormPath(FfsFileObj.FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate() + if ErrorCode != 0: + EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo) if not self.__IsToken( "}"): raise Warning("expected '}'", self.FileName, self.CurrentLineNumber) @@ -2597,6 +2611,11 @@ class FdfParser: if not self.__GetNextToken(): raise Warning("expected section file path", self.FileName, self.CurrentLineNumber) DataSectionObj.SectFileName = self.__Token + if DataSectionObj.SectFileName.replace('$(WORKSPACE)', '').find('$') == -1: + #do case sensitive check for file path + ErrorCode, ErrorInfo = PathClass(NormPath(DataSectionObj.SectFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate() + if ErrorCode != 0: + EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo) else: if not self.__GetCglSection(DataSectionObj): return False @@ -2684,8 +2703,8 @@ class FdfParser: def __GetGuidAttrib(self): AttribDict = {} - AttribDict["PROCESSING_REQUIRED"] = False - AttribDict["AUTH_STATUS_VALID"] = False + AttribDict["PROCESSING_REQUIRED"] = "NONE" + AttribDict["AUTH_STATUS_VALID"] = "NONE" if self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID"): AttribKey = self.__Token diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Source/Python/GenFds/GuidSection.py index 0ef5a23716..bd95f56720 100644 --- a/BaseTools/Source/Python/GenFds/GuidSection.py +++ b/BaseTools/Source/Python/GenFds/GuidSection.py @@ -193,16 +193,17 @@ class GuidSection(GuidSectionClassObject) : Attribute = [] HeaderLength = None - if TempFileSize > InputFileSize and TempFileSize % 4 == 0: - FileHandleIn.seek(0) - BufferIn = FileHandleIn.read() - FileHandleOut.seek(0) - BufferOut = FileHandleOut.read() - if BufferIn == BufferOut[TempFileSize - InputFileSize:]: - HeaderLength = str(TempFileSize - InputFileSize) - #auto sec guided attribute with process required - if HeaderLength == None: - Attribute.append('PROCESSING_REQUIRED') + if self.ProcessRequired == "NONE": + if TempFileSize > InputFileSize and TempFileSize % 4 == 0: + FileHandleIn.seek(0) + BufferIn = FileHandleIn.read() + FileHandleOut.seek(0) + BufferOut = FileHandleOut.read() + if BufferIn == BufferOut[TempFileSize - InputFileSize:]: + HeaderLength = str(TempFileSize - InputFileSize) + #auto sec guided attribute with process required + if HeaderLength == None: + Attribute.append('PROCESSING_REQUIRED') FileHandleIn.close() FileHandleOut.close() diff --git a/BaseTools/gcc/mingw-gcc-build.py b/BaseTools/gcc/mingw-gcc-build.py index a5c26a3099..3b2d6dbbd3 100755 --- a/BaseTools/gcc/mingw-gcc-build.py +++ b/BaseTools/gcc/mingw-gcc-build.py @@ -222,27 +222,10 @@ class SourceFiles: 'version': '4.3.0', 'md5': '197ed8468b38db1d3481c3111691d85b', }, - 'mingw_hdr': { - 'url': 'http://sourceforge.net/projects/' + \ - 'mingw-w64/files/mingw-w64/mingw-w64-snapshot/' + \ - 'mingw-w64-v1.0-snapshot-$version.tar.bz2/download', - 'extract-dir': os.path.join('mingw-w64-v1.0-$version', 'mingw-w64-headers'), - 'version': '20100604', - 'md5': '636a84d1ea1a8cd61616738760021d6a', - }, } source_files_ia32 = { 'gcc': source_files_x64['gcc'], - 'mingw_hdr': { - 'url': 'http://sourceforge.net/projects/mingw/files/MinGW/' + \ - 'BaseSystem/RuntimeLibrary/MinGW-RT/' + \ - 'mingwrt-$version/' + \ - 'mingwrt-$version-mingw32-src.tar.gz/download', - 'extract-dir': 'mingwrt-$version-mingw32', - 'version': '3.15.2', - 'md5': '7bf0525f158213f3ac990ea68a5ec34d', - }, } source_files_ipf = source_files_x64.copy() @@ -439,7 +422,6 @@ class Builder: if not self.config.options.skip_binutils: self.BuildModule('binutils') if not self.config.options.skip_gcc: - self.CopyIncludeDirectory() self.BuildModule('gcc') self.MakeSymLinks() @@ -459,24 +441,6 @@ class Builder: "w" ).close() - def CopyIncludeDirectory(self): - linkdst = os.path.join(self.config.prefix, 'mingw') - src = os.path.join( - self.config.src_dir, - self.config.arch, - self.source_files.GetExtractDirOf('mingw_hdr'), - 'include' - ) - dst_parent = os.path.join(self.config.prefix, self.config.target_combo) - dst = os.path.join(dst_parent, 'include') - if not os.path.exists(dst): - if not os.path.exists(dst_parent): - os.makedirs(dst_parent) - print 'Copying headers to', self.config.Relative(dst) - shutil.copytree(src, dst, True) - if not os.path.lexists(linkdst): - print 'Making symlink at', self.config.Relative(linkdst) - os.symlink(self.config.target_combo, linkdst) def BuildModule(self, module): base_dir = os.getcwd() -- 2.39.2