[LLVMdev] Fixes for windows version

Reid Spencer reid at x10sys.com
Mon Nov 15 09:29:15 PST 2004


Morten,

I've applied these patches. Thanks for the updates!

Reid.

On Mon, 2004-11-15 at 01:26, Morten Ofstad wrote:
> Hi,
> 
> when I updated the sources today there were several small problems that 
> stopped the windows version from compiling, here are the patches
> 
> m.
> 
> 
> ______________________________________________________________________
> Index: lib/System/Win32/Signals.cpp
> ===================================================================
> RCS file: /var/cvs/llvm/llvm/lib/System/Win32/Signals.cpp,v
> retrieving revision 1.10
> diff -u -r1.10 Signals.cpp
> --- lib/System/Win32/Signals.cpp	5 Nov 2004 22:15:36 -0000	1.10
> +++ lib/System/Win32/Signals.cpp	15 Nov 2004 08:35:34 -0000
> @@ -72,7 +72,7 @@
>  }
>  
>  // RemoveFileOnSignal - The public API
> -void sys::RemoveFileOnSignal(const std::string &Filename) {
> +void sys::RemoveFileOnSignal(const sys::Path &Filename) {
>    RegisterHandler();
>  
>    if (CleanupExecuted)
> @@ -81,7 +81,7 @@
>    if (FilesToRemove == NULL)
>      FilesToRemove = new std::vector<sys::Path>;
>  
> -  FilesToRemove->push_back(sys::Path(Filename));
> +  FilesToRemove->push_back(sys::Path(Filename.get()));
>  
>    LeaveCriticalSection(&CriticalSection);
>  }
> Index: lib/System/Win32/Win32.h
> ===================================================================
> RCS file: /var/cvs/llvm/llvm/lib/System/Win32/Win32.h,v
> retrieving revision 1.1
> diff -u -r1.1 Win32.h
> --- lib/System/Win32/Win32.h	15 Sep 2004 05:48:11 -0000	1.1
> +++ lib/System/Win32/Win32.h	15 Nov 2004 08:45:47 -0000
> @@ -31,3 +31,6 @@
>    throw s;
>  }
>  
> +inline void ThrowErrno(const std::string& prefix) {
> +    ThrowError(prefix + ": " + strerror(errno));
> +}
> Index: lib/Transforms/Scalar/ScalarReplAggregates.cpp
> ===================================================================
> RCS file: /var/cvs/llvm/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp,v
> retrieving revision 1.28
> diff -u -r1.28 ScalarReplAggregates.cpp
> --- lib/Transforms/Scalar/ScalarReplAggregates.cpp	14 Nov 2004 05:00:19 -0000	1.28
> +++ lib/Transforms/Scalar/ScalarReplAggregates.cpp	15 Nov 2004 08:38:35 -0000
> @@ -336,7 +336,7 @@
>    for (Value::use_iterator UI = AI->use_begin(), E = AI->use_end();
>         UI != E; ) {
>      GetElementPtrInst *GEPI = cast<GetElementPtrInst>(*UI++);
> -    gep_type_iterator I = gep_type_begin(GEPI), E = gep_type_end(GEPI);
> +    gep_type_iterator I = gep_type_begin(GEPI);
>      ++I;
>  
>      if (const ArrayType *AT = dyn_cast<ArrayType>(*I)) {
> Index: win32/Support/Support.vcproj
> ===================================================================
> RCS file: /var/cvs/llvm/llvm/win32/Support/Support.vcproj,v
> retrieving revision 1.2
> diff -u -r1.2 Support.vcproj
> --- win32/Support/Support.vcproj	6 Nov 2004 17:07:36 -0000	1.2
> +++ win32/Support/Support.vcproj	15 Nov 2004 08:56:40 -0000
> @@ -183,6 +183,111 @@
>  			Name="Header Files"
>  			Filter="h;hpp;hxx;hm;inl;inc;xsd"
>  			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
> +			<File
> +				RelativePath="..\..\include\llvm\Support\AIXDataTypesFix.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\Annotation.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\CallSite.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\Casting.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\CFG.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\CommandLine.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\Compressor.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\ConstantRange.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\DataTypes.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\Debug.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\DOTGraphTraits.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\DynamicLinker.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\ELF.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\FileUtilities.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\GetElementPtrTypeIterator.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\GraphWriter.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\InstIterator.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\InstVisitor.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\LeakDetector.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\Linker.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\MallocAllocator.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\Mangler.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\MathExtras.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\PassNameParser.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\PatternMatch.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\PluginLoader.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\SlowOperationInformer.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\StableBasicBlockNumbering.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\SystemUtils.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\ThreadSupport-NoSupport.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\ThreadSupport-PThreads.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\Timer.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\ToolRunner.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\type_traits.h">
> +			</File>
> +			<File
> +				RelativePath="..\..\include\llvm\Support\TypeInfo.h">
> +			</File>
>  		</Filter>
>  	</Files>
>  	<Globals>
> Index: win32/System/System.vcproj
> ===================================================================
> RCS file: /var/cvs/llvm/llvm/win32/System/System.vcproj,v
> retrieving revision 1.2
> diff -u -r1.2 System.vcproj
> --- win32/System/System.vcproj	6 Nov 2004 17:07:36 -0000	1.2
> +++ win32/System/System.vcproj	15 Nov 2004 08:25:56 -0000
> @@ -230,15 +230,13 @@
>  			<File
>  				RelativePath="..\..\lib\System\Win32\Signals.cpp">
>  				<FileConfiguration
> -					Name="Debug|Win32"
> -					ExcludedFromBuild="TRUE">
> +					Name="Debug|Win32">
>  					<Tool
>  						Name="VCCLCompilerTool"
>  						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
>  				</FileConfiguration>
>  				<FileConfiguration
> -					Name="Release|Win32"
> -					ExcludedFromBuild="TRUE">
> +					Name="Release|Win32">
>  					<Tool
>  						Name="VCCLCompilerTool"
>  						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
> Index: win32/VMCore/VMCore.vcproj
> ===================================================================
> RCS file: /var/cvs/llvm/llvm/win32/VMCore/VMCore.vcproj,v
> retrieving revision 1.2
> diff -u -r1.2 VMCore.vcproj
> --- win32/VMCore/VMCore.vcproj	6 Nov 2004 17:07:36 -0000	1.2
> +++ win32/VMCore/VMCore.vcproj	15 Nov 2004 08:29:11 -0000
> @@ -142,9 +142,6 @@
>  				RelativePath="..\..\lib\VMCore\LeakDetector.cpp">
>  			</File>
>  			<File
> -				RelativePath="..\..\lib\VMCore\Linker.cpp">
> -			</File>
> -			<File
>  				RelativePath="..\..\lib\VMCore\Mangler.cpp">
>  			</File>
>  			<File
> 
> ______________________________________________________________________
> _______________________________________________
> LLVM Developers mailing list
> LLVMdev at cs.uiuc.edu         http://llvm.cs.uiuc.edu
> http://mail.cs.uiuc.edu/mailman/listinfo/llvmdev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20041115/e6c20d71/attachment.sig>


More information about the llvm-dev mailing list