From reid at x10sys.com Mon Dec 20 00:34:13 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 20 Dec 2004 00:34:13 -0600 Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/JIT/Intercept.cpp Message-ID: <200412200634.AAA02557@zion.cs.uiuc.edu> Changes in directory llvm/lib/ExecutionEngine/JIT: Intercept.cpp updated: 1.22 -> 1.23 --- Log message: Be double sure about including sys/stat.h by wrapping the inclusion in an "#if defined(HAVE_SYS_STAT_H)". --- Diffs of the changes: (+3 -0) Index: llvm/lib/ExecutionEngine/JIT/Intercept.cpp diff -u llvm/lib/ExecutionEngine/JIT/Intercept.cpp:1.22 llvm/lib/ExecutionEngine/JIT/Intercept.cpp:1.23 --- llvm/lib/ExecutionEngine/JIT/Intercept.cpp:1.22 Fri Dec 17 13:09:16 2004 +++ llvm/lib/ExecutionEngine/JIT/Intercept.cpp Mon Dec 20 00:34:02 2004 @@ -17,6 +17,7 @@ #include "JIT.h" #include "llvm/System/DynamicLibrary.h" +#include "llvm/Config/config.h" #include using namespace llvm; @@ -47,7 +48,9 @@ // that the dynamic linker can't see. For more info, search for // 'libc_nonshared.a' on Google, or read http://llvm.cs.uiuc.edu/PR274. #if defined(__linux__) +#if defined(HAVE_SYS_STAT_H) #include +#endif void *FunctionPointers[] = { (void *) stat, (void *) fstat, From reid at x10sys.com Mon Dec 20 00:38:24 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 20 Dec 2004 00:38:24 -0600 Subject: [llvm-commits] CVS: llvm/lib/Debugger/SourceFile.cpp Message-ID: <200412200638.AAA02619@zion.cs.uiuc.edu> Changes in directory llvm/lib/Debugger: SourceFile.cpp updated: 1.4 -> 1.5 --- Log message: Remove unnecessary #includes. --- Diffs of the changes: (+0 -6) Index: llvm/lib/Debugger/SourceFile.cpp diff -u llvm/lib/Debugger/SourceFile.cpp:1.4 llvm/lib/Debugger/SourceFile.cpp:1.5 --- llvm/lib/Debugger/SourceFile.cpp:1.4 Tue Dec 14 19:51:56 2004 +++ llvm/lib/Debugger/SourceFile.cpp Mon Dec 20 00:38:12 2004 @@ -12,11 +12,6 @@ //===----------------------------------------------------------------------===// #include "llvm/Debugger/SourceFile.h" -#include "llvm/Support/SlowOperationInformer.h" -#include -#include -#include -#include using namespace llvm; /// readFile - Load Filename @@ -75,4 +70,3 @@ assert(LineEnd >= LineStart && "We somehow got our pointers swizzled!"); } - From reid at x10sys.com Mon Dec 20 10:06:55 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 20 Dec 2004 10:06:55 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Process.cpp Message-ID: <200412201606.KAA15849@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Unix: Process.cpp updated: 1.2 -> 1.3 --- Log message: Consistently use the same #if style. Also, fix a bug testing for sbrk(3) --- Diffs of the changes: (+4 -4) Index: llvm/lib/System/Unix/Process.cpp diff -u llvm/lib/System/Unix/Process.cpp:1.2 llvm/lib/System/Unix/Process.cpp:1.3 --- llvm/lib/System/Unix/Process.cpp:1.2 Sun Dec 19 18:59:28 2004 +++ llvm/lib/System/Unix/Process.cpp Mon Dec 20 10:06:44 2004 @@ -50,11 +50,11 @@ uint64_t Process::GetMallocUsage() { -#ifdef HAVE_MALLINFO +#if defined(HAVE_MALLINFO) struct mallinfo mi; mi = ::mallinfo(); return mi.uordblks; -#elif HAVE_SBRK +#elif defined(HAVE_SBRK) // Note this is only an approximation and more closely resembles // the value returned by mallinfo in the arena field. char * eom = sbrk(0); @@ -71,7 +71,7 @@ uint64_t Process::GetTotalMemoryUsage() { -#ifdef HAVE_MALLINFO +#if defined(HAVE_MALLINFO) struct mallinfo mi = ::mallinfo(); return mi.uordblks + mi.hblkhd; #else @@ -85,7 +85,7 @@ TimeValue& sys_time) { elapsed = TimeValue::now(); -#ifdef HAVE_GETRUSAGE +#if defined(HAVE_GETRUSAGE) struct rusage usage; ::getrusage(RUSAGE_SELF, &usage); user_time.seconds( usage.ru_utime.tv_sec ); From reid at x10sys.com Mon Dec 20 10:33:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 20 Dec 2004 10:33:48 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Process.cpp Message-ID: <200412201633.KAA17738@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Unix: Process.cpp updated: 1.3 -> 1.4 --- Log message: Provide a getrusage based implementation of GetTotalMemoryUsage and use the ru_maxrss field as an approximation. --- Diffs of the changes: (+4 -0) Index: llvm/lib/System/Unix/Process.cpp diff -u llvm/lib/System/Unix/Process.cpp:1.3 llvm/lib/System/Unix/Process.cpp:1.4 --- llvm/lib/System/Unix/Process.cpp:1.3 Mon Dec 20 10:06:44 2004 +++ llvm/lib/System/Unix/Process.cpp Mon Dec 20 10:33:37 2004 @@ -74,6 +74,10 @@ #if defined(HAVE_MALLINFO) struct mallinfo mi = ::mallinfo(); return mi.uordblks + mi.hblkhd; +#elif defined(HAVE_GETRUSAGE) + struct rusage usage; + ::getrusage(RUSAGE_SELF, &usage); + return usage.ru_maxrss; #else #warning Cannot get total memory size on this platform return 0; From reid at x10sys.com Mon Dec 20 13:16:23 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 20 Dec 2004 13:16:23 -0600 Subject: [llvm-commits] CVS: llvm/tools/bugpoint/BugDriver.cpp Message-ID: <200412201916.NAA25836@zion.cs.uiuc.edu> Changes in directory llvm/tools/bugpoint: BugDriver.cpp updated: 1.40 -> 1.41 --- Log message: Allow compilers that can't distinguish between a class instantiation and the declaration of a function to compile this. --- Diffs of the changes: (+2 -1) Index: llvm/tools/bugpoint/BugDriver.cpp diff -u llvm/tools/bugpoint/BugDriver.cpp:1.40 llvm/tools/bugpoint/BugDriver.cpp:1.41 --- llvm/tools/bugpoint/BugDriver.cpp:1.40 Thu Dec 16 17:04:20 2004 +++ llvm/tools/bugpoint/BugDriver.cpp Mon Dec 20 13:16:12 2004 @@ -175,7 +175,8 @@ // Make sure the reference output file gets deleted on exit from this // function, if appropriate. - FileRemover RemoverInstance(sys::Path(ReferenceOutputFile), CreatedOutput); + sys::Path ROF(ReferenceOutputFile); + FileRemover RemoverInstance(ROF, CreatedOutput); // Diff the output of the raw program against the reference output. If it // matches, then we have a miscompilation bug. From reid at x10sys.com Mon Dec 20 15:43:44 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 20 Dec 2004 15:43:44 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Process.cpp Message-ID: <200412202143.PAA02721@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Unix: Process.cpp updated: 1.4 -> 1.5 --- Log message: Implement GetTimeUsage correctly. --- Diffs of the changes: (+8 -4) Index: llvm/lib/System/Unix/Process.cpp diff -u llvm/lib/System/Unix/Process.cpp:1.4 llvm/lib/System/Unix/Process.cpp:1.5 --- llvm/lib/System/Unix/Process.cpp:1.4 Mon Dec 20 10:33:37 2004 +++ llvm/lib/System/Unix/Process.cpp Mon Dec 20 15:43:33 2004 @@ -92,10 +92,14 @@ #if defined(HAVE_GETRUSAGE) struct rusage usage; ::getrusage(RUSAGE_SELF, &usage); - user_time.seconds( usage.ru_utime.tv_sec ); - user_time.microseconds( usage.ru_utime.tv_usec ); - sys_time.seconds( usage.ru_stime.tv_sec ); - sys_time.microseconds( usage.ru_stime.tv_usec ); + user_time = TimeValue( + static_cast( usage.ru_utime.tv_sec ), + static_cast( usage.ru_utime.tv_usec * + TimeValue::NANOSECONDS_PER_MICROSECOND ) ); + sys_time = TimeValue( + static_cast( usage.ru_stime.tv_sec ), + static_cast( usage.ru_stime.tv_usec * + TimeValue::NANOSECONDS_PER_MICROSECOND ) ); #else #warning Cannot get usage times on this platform user_time.seconds(0); From reid at x10sys.com Mon Dec 20 15:44:38 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 20 Dec 2004 15:44:38 -0600 Subject: [llvm-commits] CVS: llvm/lib/Support/Timer.cpp Message-ID: <200412202144.PAA02779@zion.cs.uiuc.edu> Changes in directory llvm/lib/Support: Timer.cpp updated: 1.37 -> 1.38 --- Log message: Fix a bug where system time always equals user time --- Diffs of the changes: (+12 -5) Index: llvm/lib/Support/Timer.cpp diff -u llvm/lib/Support/Timer.cpp:1.37 llvm/lib/Support/Timer.cpp:1.38 --- llvm/lib/Support/Timer.cpp:1.37 Sun Dec 19 21:59:23 2004 +++ llvm/lib/Support/Timer.cpp Mon Dec 20 15:44:27 2004 @@ -105,12 +105,19 @@ sys::TimeValue user(0,0); sys::TimeValue sys(0,0); - sys::Process::GetTimeUsage(now,user,sys); + long MemUsed = 0; + if (Start) { + sys::Process::GetTimeUsage(now,user,sys); + MemUsed = sys::Process::GetMallocUsage(); + } else { + MemUsed = sys::Process::GetMallocUsage(); + sys::Process::GetTimeUsage(now,user,sys); + } - Result.Elapsed = now.seconds() + now.microseconds() / 1000000.0; - Result.UserTime = user.seconds() + user.microseconds() / 1000000.0; - Result.UserTime = sys.seconds() + sys.microseconds() / 1000000.0; - Result.MemUsed = sys::Process::GetMallocUsage(); + Result.Elapsed = now.seconds() + now.microseconds() / 1000000.0; + Result.UserTime = user.seconds() + user.microseconds() / 1000000.0; + Result.SystemTime = sys.seconds() + sys.microseconds() / 1000000.0; + Result.MemUsed = MemUsed; return Result; } From reid at x10sys.com Mon Dec 20 16:21:52 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 20 Dec 2004 16:21:52 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Cygwin/DynamicLibrary.cpp MappedFile.cpp Memory.cpp Path.cpp Process.cpp Program.cpp Signals.cpp SysConfig.cpp TimeValue.cpp Message-ID: <200412202221.QAA03434@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Cygwin: DynamicLibrary.cpp updated: 1.1 -> 1.2 MappedFile.cpp updated: 1.1 -> 1.2 Memory.cpp updated: 1.4 -> 1.5 Path.cpp updated: 1.6 -> 1.7 Process.cpp updated: 1.1 -> 1.2 Program.cpp updated: 1.1 -> 1.2 Signals.cpp updated: 1.1 -> 1.2 SysConfig.cpp updated: 1.1 -> 1.2 TimeValue.cpp updated: 1.3 -> 1.4 --- Log message: Cygwin doesn't like .. through a link, so drop the .. --- Diffs of the changes: (+9 -9) Index: llvm/lib/System/Cygwin/DynamicLibrary.cpp diff -u llvm/lib/System/Cygwin/DynamicLibrary.cpp:1.1 llvm/lib/System/Cygwin/DynamicLibrary.cpp:1.2 --- llvm/lib/System/Cygwin/DynamicLibrary.cpp:1.1 Wed Nov 17 22:33:40 2004 +++ llvm/lib/System/Cygwin/DynamicLibrary.cpp Mon Dec 20 16:21:41 2004 @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// // Include the generic unix implementation -#include "../Unix/DynamicLibrary.cpp" +#include "Unix/DynamicLibrary.cpp" namespace llvm { using namespace sys; Index: llvm/lib/System/Cygwin/MappedFile.cpp diff -u llvm/lib/System/Cygwin/MappedFile.cpp:1.1 llvm/lib/System/Cygwin/MappedFile.cpp:1.2 --- llvm/lib/System/Cygwin/MappedFile.cpp:1.1 Mon Oct 4 06:08:32 2004 +++ llvm/lib/System/Cygwin/MappedFile.cpp Mon Dec 20 16:21:41 2004 @@ -13,6 +13,6 @@ //===----------------------------------------------------------------------===// // Include the generic unix implementation -#include "../Unix/MappedFile.cpp" +#include "Unix/MappedFile.cpp" // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab Index: llvm/lib/System/Cygwin/Memory.cpp diff -u llvm/lib/System/Cygwin/Memory.cpp:1.4 llvm/lib/System/Cygwin/Memory.cpp:1.5 --- llvm/lib/System/Cygwin/Memory.cpp:1.4 Tue Sep 14 22:55:45 2004 +++ llvm/lib/System/Cygwin/Memory.cpp Mon Dec 20 16:21:41 2004 @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// // Include the generic unix implementation -#include "../Unix/Memory.cpp" +#include "Unix/Memory.cpp" #include "llvm/System/Process.h" #include #include Index: llvm/lib/System/Cygwin/Path.cpp diff -u llvm/lib/System/Cygwin/Path.cpp:1.6 llvm/lib/System/Cygwin/Path.cpp:1.7 --- llvm/lib/System/Cygwin/Path.cpp:1.6 Mon Dec 13 12:41:28 2004 +++ llvm/lib/System/Cygwin/Path.cpp Mon Dec 20 16:21:41 2004 @@ -17,7 +17,7 @@ //===----------------------------------------------------------------------===// // Include the generic Unix implementation -#include "../Unix/Path.cpp" +#include "Unix/Path.cpp" namespace llvm { using namespace sys; Index: llvm/lib/System/Cygwin/Process.cpp diff -u llvm/lib/System/Cygwin/Process.cpp:1.1 llvm/lib/System/Cygwin/Process.cpp:1.2 --- llvm/lib/System/Cygwin/Process.cpp:1.1 Fri Sep 10 23:59:30 2004 +++ llvm/lib/System/Cygwin/Process.cpp Mon Dec 20 16:21:41 2004 @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// // Include the generic Unix implementation -#include "../Unix/Process.cpp" +#include "Unix/Process.cpp" //===----------------------------------------------------------------------===// //=== WARNING: Implementation here must contain only Cygwin specific code Index: llvm/lib/System/Cygwin/Program.cpp diff -u llvm/lib/System/Cygwin/Program.cpp:1.1 llvm/lib/System/Cygwin/Program.cpp:1.2 --- llvm/lib/System/Cygwin/Program.cpp:1.1 Sun Aug 29 14:20:41 2004 +++ llvm/lib/System/Cygwin/Program.cpp Mon Dec 20 16:21:41 2004 @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// // Include the generic Unix implementation -#include "../Unix/Program.cpp" +#include "Unix/Program.cpp" //===----------------------------------------------------------------------===// //=== WARNING: Implementation here must contain only Cygwin specific code Index: llvm/lib/System/Cygwin/Signals.cpp diff -u llvm/lib/System/Cygwin/Signals.cpp:1.1 llvm/lib/System/Cygwin/Signals.cpp:1.2 --- llvm/lib/System/Cygwin/Signals.cpp:1.1 Sun Aug 29 14:22:48 2004 +++ llvm/lib/System/Cygwin/Signals.cpp Mon Dec 20 16:21:41 2004 @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// // Include the generic unix implementation -#include "../Unix/Signals.cpp" +#include "Unix/Signals.cpp" namespace llvm { using namespace sys; Index: llvm/lib/System/Cygwin/SysConfig.cpp diff -u llvm/lib/System/Cygwin/SysConfig.cpp:1.1 llvm/lib/System/Cygwin/SysConfig.cpp:1.2 --- llvm/lib/System/Cygwin/SysConfig.cpp:1.1 Tue Aug 31 12:43:29 2004 +++ llvm/lib/System/Cygwin/SysConfig.cpp Mon Dec 20 16:21:41 2004 @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// // Include the generic unix implementation -#include "../Unix/SysConfig.cpp" +#include "Unix/SysConfig.cpp" namespace llvm { using namespace sys; Index: llvm/lib/System/Cygwin/TimeValue.cpp diff -u llvm/lib/System/Cygwin/TimeValue.cpp:1.3 llvm/lib/System/Cygwin/TimeValue.cpp:1.4 --- llvm/lib/System/Cygwin/TimeValue.cpp:1.3 Sun Nov 14 22:47:22 2004 +++ llvm/lib/System/Cygwin/TimeValue.cpp Mon Dec 20 16:21:41 2004 @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// // Include the generic Unix implementation -#include "../Unix/TimeValue.cpp" +#include "Unix/TimeValue.cpp" namespace llvm { using namespace sys; From reid at x10sys.com Mon Dec 20 18:23:02 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 20 Dec 2004 18:23:02 -0600 Subject: [llvm-commits] CVS: llvm/lib/Debugger/SourceFile.cpp Message-ID: <200412210023.SAA05348@zion.cs.uiuc.edu> Changes in directory llvm/lib/Debugger: SourceFile.cpp updated: 1.5 -> 1.6 --- Log message: Include for Cygwin. --- Diffs of the changes: (+2 -0) Index: llvm/lib/Debugger/SourceFile.cpp diff -u llvm/lib/Debugger/SourceFile.cpp:1.5 llvm/lib/Debugger/SourceFile.cpp:1.6 --- llvm/lib/Debugger/SourceFile.cpp:1.5 Mon Dec 20 00:38:12 2004 +++ llvm/lib/Debugger/SourceFile.cpp Mon Dec 20 18:22:51 2004 @@ -12,6 +12,8 @@ //===----------------------------------------------------------------------===// #include "llvm/Debugger/SourceFile.h" +#include + using namespace llvm; /// readFile - Load Filename From reid at x10sys.com Mon Dec 20 21:24:13 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 20 Dec 2004 21:24:13 -0600 Subject: [llvm-commits] CVS: llvm/tools/gccld/gccld.cpp Message-ID: <200412210324.VAA07771@zion.cs.uiuc.edu> Changes in directory llvm/tools/gccld: gccld.cpp updated: 1.93 -> 1.94 --- Log message: Use explicit construction of sys::Path from std::string because the constructor is "explicit". --- Diffs of the changes: (+1 -1) Index: llvm/tools/gccld/gccld.cpp diff -u llvm/tools/gccld/gccld.cpp:1.93 llvm/tools/gccld/gccld.cpp:1.94 --- llvm/tools/gccld/gccld.cpp:1.93 Sat Dec 18 00:53:10 2004 +++ llvm/tools/gccld/gccld.cpp Mon Dec 20 21:24:02 2004 @@ -124,7 +124,7 @@ std::cerr << "Could not find llvm-stub.exe executable!\n"; exit(1); } - sys::CopyFile(OutputFilename, llvmstub); + sys::CopyFile(sys::Path(OutputFilename), sys::Path(llvmstub)); return; #endif From reid at x10sys.com Mon Dec 20 21:27:19 2004 From: reid at x10sys.com (Reid Spencer) Date: Mon, 20 Dec 2004 21:27:19 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Path.cpp Message-ID: <200412210327.VAA07808@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Unix: Path.cpp updated: 1.26 -> 1.27 --- Log message: Put the CopyFile function explicitly in the sys namespace. --- Diffs of the changes: (+1 -1) Index: llvm/lib/System/Unix/Path.cpp diff -u llvm/lib/System/Unix/Path.cpp:1.26 llvm/lib/System/Unix/Path.cpp:1.27 --- llvm/lib/System/Unix/Path.cpp:1.26 Sun Dec 19 18:16:38 2004 +++ llvm/lib/System/Unix/Path.cpp Mon Dec 20 21:27:08 2004 @@ -548,7 +548,7 @@ } void -CopyFile(const sys::Path &Dest, const sys::Path &Src) { +sys::CopyFile(const sys::Path &Dest, const sys::Path &Src) { int inFile = -1; int outFile = -1; try { From jeffc at jolt-lang.org Tue Dec 21 00:49:23 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Tue, 21 Dec 2004 00:49:23 -0600 Subject: [llvm-commits] CVS: llvm/win32/Configure/Configure.vcproj Message-ID: <200412210649.AAA10213@zion.cs.uiuc.edu> Changes in directory llvm/win32/Configure: Configure.vcproj updated: 1.3 -> 1.4 --- Log message: Visual Studio project Configure should place the configured header files in the win32 subtree instead of the src subtree. --- Diffs of the changes: (+12 -10) Index: llvm/win32/Configure/Configure.vcproj diff -u llvm/win32/Configure/Configure.vcproj:1.3 llvm/win32/Configure/Configure.vcproj:1.4 --- llvm/win32/Configure/Configure.vcproj:1.3 Sat Dec 4 13:14:38 2004 +++ llvm/win32/Configure/Configure.vcproj Tue Dec 21 00:49:13 2004 @@ -4,6 +4,7 @@ Version="7.10" Name="Configure" ProjectGUID="{19514E48-456C-4B9D-8637-F2285476461E}" + RootNamespace="Configure" Keyword="Win32Proj"> + CommandLine="..\tools\sed <$(InputPath) >$(ProjectDir)..\llvm\Config\config.h "s/#undef PACKAGE_NAME/#define PACKAGE_NAME \"LLVM (win32 vc7.1)\"/;s/#undef PACKAGE_VERSION/#define PACKAGE_VERSION 1.4/;s/#undef HAVE_WINDOWS_H/#define HAVE_WINDOWS_H 1/;s/#undef HAVE_LIMITS_H/#define HAVE_LIMITS_H 1/;s/#undef HAVE_SYS_STAT_H/#define HAVE_SYS_STAT_H 1/;s/#undef HAVE_STDLIB_H/#define HAVE_STDLIB_H 1/;s/#undef HAVE_STDIO_H/#define HAVE_STDIO_H 1/;s/#undef HAVE_STRING_H/#define HAVE_STRING_H 1/;s/#undef SHLIBEXT/#define SHLIBEXT \".lib\"/;s/#undef error_t/#define error_t int/;s/#undef HAVE_ERRNO_H/#define HAVE_ERRNO_H 1/;s/#undef LTDL_DLOPEN_DEPLIBS/#define LTDL_DLOPEN_DEPLIBS 1/;s/#undef LTDL_OBJDIR/#define LTDL_OBJDIR \"_libs\"/;s/#undef LTDL_SHLIBPATH_VAR/#define LTDL_SHLIBPATH_VAR \"PATH\"/;s/#undef LTDL_SHLIB_EXT/#define LTDL_SHLIB_EXT \".dll\"/;s/#undef LTDL_SYSSEARCHPATH/#define LTDL_SYSSEARCHPATH \"\&qu! ot;/;" +" + Outputs="$(ProjectDir)..\llvm\Config\config.h"/> + Outputs="$(ProjectDir)..\llvm\Support\DataTypes.h"/> + Outputs="$(ProjectDir)..\llvm\ADT\hash_map"/> + Outputs="$(ProjectDir)..\llvm\ADT\hash_set"/> + Outputs="$(ProjectDir)..\llvm\ADT\iterator"/> From reid at x10sys.com Tue Dec 21 01:51:45 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 01:51:45 -0600 Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp Message-ID: <200412210751.BAA10984@zion.cs.uiuc.edu> Changes in directory llvm/lib/Bytecode/Reader: ReaderWrappers.cpp updated: 1.40 -> 1.41 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : Remove unix specific code (use of errno and read) from the reader. Thanks to Jeff Cohen for pointing this out. --- Diffs of the changes: (+7 -10) Index: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp diff -u llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.40 llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.41 --- llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.40 Sun Dec 19 22:52:04 2004 +++ llvm/lib/Bytecode/Reader/ReaderWrappers.cpp Tue Dec 21 01:51:33 2004 @@ -20,6 +20,7 @@ #include "llvm/ADT/StringExtras.h" #include "llvm/System/MappedFile.h" #include +#include using namespace llvm; //===----------------------------------------------------------------------===// @@ -41,10 +42,6 @@ }; } -static std::string ErrnoMessage (int savedErrNum, std::string descr) { - return ::strerror(savedErrNum) + std::string(", while trying to ") + descr; -} - BytecodeFileReader::BytecodeFileReader(const std::string &Filename, llvm::BytecodeHandler* H ) : BytecodeReader(H) @@ -133,14 +130,14 @@ BytecodeStdinReader::BytecodeStdinReader( BytecodeHandler* H ) : BytecodeReader(H) { - int BlockSize; - unsigned char Buffer[4096*4]; + char Buffer[4096*4]; // Read in all of the data from stdin, we cannot mmap stdin... - while ((BlockSize = ::read(0 /*stdin*/, Buffer, 4096*4))) { - if (BlockSize == -1) - throw ErrnoMessage(errno, "read from standard input"); - + while (std::cin.good()) { + std::cin.read(Buffer, 4096*4); + int BlockSize = std::cin.gcount(); + if (0 >= BlockSize) + break; FileData.insert(FileData.end(), Buffer, Buffer+BlockSize); } From jeffc at jolt-lang.org Tue Dec 21 09:40:52 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Tue, 21 Dec 2004 09:40:52 -0600 Subject: [llvm-commits] CVS: llvm/include/llvm/Support/SystemUtils.h Message-ID: <200412211540.JAA22917@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/Support: SystemUtils.h updated: 1.16 -> 1.17 --- Log message: Fix VC++ compilation error --- Diffs of the changes: (+1 -1) Index: llvm/include/llvm/Support/SystemUtils.h diff -u llvm/include/llvm/Support/SystemUtils.h:1.16 llvm/include/llvm/Support/SystemUtils.h:1.17 --- llvm/include/llvm/Support/SystemUtils.h:1.16 Sun Dec 19 11:59:33 2004 +++ llvm/include/llvm/Support/SystemUtils.h Tue Dec 21 09:40:41 2004 @@ -34,7 +34,7 @@ /// RunProgramWithTimeout - This function provides an alternate interface to the /// sys::Program::ExecuteAndWait interface. /// @see sys:Program::ExecuteAndWait -inline int llvm::RunProgramWithTimeout(const sys::Path &ProgramPath, +inline int RunProgramWithTimeout(const sys::Path &ProgramPath, const char **Args, const sys::Path &StdInFile, const sys::Path &StdOutFile, From reid at x10sys.com Tue Dec 21 12:51:05 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 12:51:05 -0600 Subject: [llvm-commits] CVS: llvm/docs/CFEBuildInstrs.html Message-ID: <200412211851.MAA00446@zion.cs.uiuc.edu> Changes in directory llvm/docs: CFEBuildInstrs.html updated: 1.35 -> 1.36 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : Add instructions for using the --program-prefix=llvm so that the CFE build produces llvmgcc instead of gcc. --- Diffs of the changes: (+5 -4) Index: llvm/docs/CFEBuildInstrs.html diff -u llvm/docs/CFEBuildInstrs.html:1.35 llvm/docs/CFEBuildInstrs.html:1.36 --- llvm/docs/CFEBuildInstrs.html:1.35 Tue Dec 14 18:14:01 2004 +++ llvm/docs/CFEBuildInstrs.html Tue Dec 21 12:50:54 2004 @@ -131,7 +131,7 @@
  % cd build
  % ../src/configure --prefix=$CFEINSTALL --disable-threads --disable-nls \
-   --disable-shared --enable-languages=c,c++
+   --disable-shared --enable-languages=c,c++ --program-prefix=llvm
  % gmake all; gmake install
 
@@ -140,7 +140,8 @@
  % cd build
  % ../src/configure --prefix=$CFEINSTALL --disable-threads --disable-nls \
-   --disable-shared --enable-languages=c,c++ --disable-c-mbchar
+   --disable-shared --enable-languages=c,c++ --disable-c-mbchar \
+   --program-prefix=llvm
  % gmake all; gmake install
 
@@ -158,7 +159,7 @@ % cd build % ../src/configure --prefix=$CFEINSTALL --disable-threads --disable-nls \ --disable-shared --enable-languages=c,c++ --host=sparcv9-sun-solaris2.8 \ - --disable-c-mbchar + --disable-c-mbchar --program-prefix=llvm % gmake all; gmake install @@ -325,7 +326,7 @@ Brian Gaeke
LLVM Compiler Infrastructure
- Last modified: $Date: 2004/12/15 00:14:01 $ + Last modified: $Date: 2004/12/21 18:50:54 $ From reid at x10sys.com Tue Dec 21 12:52:19 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 12:52:19 -0600 Subject: [llvm-commits] CVS: llvm/docs/GettingStarted.html Message-ID: <200412211852.MAA00498@zion.cs.uiuc.edu> Changes in directory llvm/docs: GettingStarted.html updated: 1.95 -> 1.96 --- Log message: Remove instructions to make aliases for llvmgcc and llvmg++ as the CFE Build instructions now direct the user to have the CFE generate executables with those names via the --program-prefix=llvm configure option. --- Diffs of the changes: (+1 -3) Index: llvm/docs/GettingStarted.html diff -u llvm/docs/GettingStarted.html:1.95 llvm/docs/GettingStarted.html:1.96 --- llvm/docs/GettingStarted.html:1.95 Tue Dec 14 18:14:01 2004 +++ llvm/docs/GettingStarted.html Tue Dec 21 12:52:08 2004 @@ -552,8 +552,6 @@ of your bytecode libraries. It is optional and provided only a convenience since you can specify the paths using the -L options of the tools. -
alias llvmgcc LLVMGCCDIR/bin/gcc
-
alias llvmg++ LLVMGCCDIR/bin/g++
These aliases allow you to use the LLVM C and C++ front ends without putting them in your PATH or typing in their complete pathnames.
@@ -1491,7 +1489,7 @@ Chris Lattner
Reid Spencer
The LLVM Compiler Infrastructure
- Last modified: $Date: 2004/12/15 00:14:01 $ + Last modified: $Date: 2004/12/21 18:52:08 $ From wanderer at rsu.ru Tue Dec 21 17:49:25 2004 From: wanderer at rsu.ru (Vladimir Merzliakov) Date: Wed, 22 Dec 2004 02:49:25 +0300 Subject: [llvm-commits] CVS: llvm/docs/GettingStarted.html References: <200412211852.MAA00498@zion.cs.uiuc.edu> Message-ID: <002801c4e7b7$b6c87b40$10fcd0c3@cc.rsu.ru> Using last in CFE bootstrap last recomendations ( http://mail.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20041220/022527.html ) in CFEBuildInstrs.html ( --program-prefix=llvm ) break bootstrap at step 5 with error (first xgcc call): /usr/home/wanderer/pkg/build/llvm/objcfe/gcc/xgcc -B/usr/home/wanderer/pkg/build/llvm/objcfe/gcc/ -B/home/wanderer/pkg/build/llvm/night/cfe/i386-unknown-freebsd5.3/bin/ -B/home/wanderer/pkg/build/llvm/night/cfe/i386-unknown-freebsd5.3/lib/ -isystem /home/wanderer/pkg/build/llvm/night/cfe/i386-unknown-freebsd5.3/include -isystem /home/wanderer/pkg/build/llvm/night/cfe/i386-unknown-freebsd5.3/sys-include -O2 -DIN_GCC -DDEFAULT_TARGET_MACHINE=\"i386-unknown-freebsd5.3\" -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -isystem include -fPIC -g -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED -I. -I. -I/home/wanderer/pkg/build/llvm/src/llvm-gcc/gcc -I/home/wanderer/pkg/build/llvm/src/llvm-gcc/gcc/. -I/home/wanderer/pkg/build/llvm/src/llvm-gcc/gcc/../include -DL_muldi3 -c /home/wanderer/pkg/build/llvm/src/llvm-gcc/gcc/libgcc2.c -o libgcc/./_muldi3.o gccas: Unknown command line argument '--traditional-format'. Try: 'gccas --help' gmake[2]: *** [libgcc/./_muldi3.o] Error 1 gmake[2]: Leaving directory `/usr/home/wanderer/pkg/build/llvm/objcfe/gcc' gmake[1]: *** [libgcc.a] Error 2 gmake[1]: Leaving directory `/usr/home/wanderer/pkg/build/llvm/objcfe/gcc' gmake: *** [all-gcc] Error 2 Vladimir From llvm at cs.uiuc.edu Tue Dec 21 18:26:43 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Tue, 21 Dec 2004 18:26:43 -0600 Subject: [llvm-commits] CVS: llvm/win32/Bytecode/ Message-ID: <200412220026.SAA11392@zion.cs.uiuc.edu> Changes in directory llvm/win32/Bytecode: --- Log message: Directory /var/cvs/llvm/llvm/win32/Bytecode added to the repository --- Diffs of the changes: (+0 -0) From jeffc at jolt-lang.org Tue Dec 21 18:27:25 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Tue, 21 Dec 2004 18:27:25 -0600 Subject: [llvm-commits] CVS: llvm/win32/Bytecode/Bytecode.vcproj Message-ID: <200412220027.SAA11413@zion.cs.uiuc.edu> Changes in directory llvm/win32/Bytecode: Bytecode.vcproj added (r1.1) --- Log message: Add project Bytecode to Visual Studio --- Diffs of the changes: (+198 -0) Index: llvm/win32/Bytecode/Bytecode.vcproj diff -c /dev/null llvm/win32/Bytecode/Bytecode.vcproj:1.1 *** /dev/null Tue Dec 21 18:27:24 2004 --- llvm/win32/Bytecode/Bytecode.vcproj Tue Dec 21 18:27:14 2004 *************** *** 0 **** --- 1,198 ---- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From reid at x10sys.com Tue Dec 21 19:26:59 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 19:26:59 -0600 Subject: [llvm-commits] CVS: llvm/tools/llvm-ld/llvm-ld.cpp Message-ID: <200412220126.TAA12287@zion.cs.uiuc.edu> Changes in directory llvm/tools/llvm-ld: llvm-ld.cpp updated: 1.16 -> 1.17 --- Log message: Make parameters to CopyFile use explicit instantiation of sys::Path. --- Diffs of the changes: (+1 -1) Index: llvm/tools/llvm-ld/llvm-ld.cpp diff -u llvm/tools/llvm-ld/llvm-ld.cpp:1.16 llvm/tools/llvm-ld/llvm-ld.cpp:1.17 --- llvm/tools/llvm-ld/llvm-ld.cpp:1.16 Sun Dec 19 12:00:56 2004 +++ llvm/tools/llvm-ld/llvm-ld.cpp Tue Dec 21 19:26:48 2004 @@ -315,7 +315,7 @@ std::cerr << "Could not find llvm-stub.exe executable!\n"; exit(1); } - sys::CopyFile(OutputFilename, llvmstub); + sys::CopyFile(sys::PatheOutputFilename), sys::Path(llvmstub)); return; #endif From reid at x10sys.com Tue Dec 21 19:33:21 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 17:33:21 -0800 Subject: [llvm-commits] CVS: llvm/docs/GettingStarted.html In-Reply-To: <002801c4e7b7$b6c87b40$10fcd0c3@cc.rsu.ru> References: <200412211852.MAA00498@zion.cs.uiuc.edu> <002801c4e7b7$b6c87b40$10fcd0c3@cc.rsu.ru> Message-ID: <1103679201.18677.189.camel@bashful.x10sys.com> Yeah, I noticed that after my commit as well. I have no idea why the configure/makefile magic in gcc is doing this. I'm still working on a solution. Reid. On Tue, 2004-12-21 at 15:49, Vladimir Merzliakov wrote: > Using last in CFE bootstrap last recomendations ( > http://mail.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20041220/022527.html ) > in CFEBuildInstrs.html ( --program-prefix=llvm ) > break bootstrap at step 5 with error (first xgcc call): > > /usr/home/wanderer/pkg/build/llvm/objcfe/gcc/xgcc -B/usr/home/wanderer/pkg/build/llvm/objcfe/gcc/ > -B/home/wanderer/pkg/build/llvm/night/cfe/i386-unknown-freebsd5.3/bin/ -B/home/wanderer/pkg/build/llvm/night/cfe/i386-unknown-freebsd5.3/lib/ > -isystem > /home/wanderer/pkg/build/llvm/night/cfe/i386-unknown-freebsd5.3/include -isystem > /home/wanderer/pkg/build/llvm/night/cfe/i386-unknown-freebsd5.3/sys-include > -O2 -DIN_GCC -DDEFAULT_TARGET_MACHINE=\"i386-unknown-freebsd5.3\" -W -Wall > -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -isystem > include -fPIC -g -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED -I. -I. -I/home/wanderer/pkg/build/llvm/src/llvm-gcc/gcc > -I/home/wanderer/pkg/build/llvm/src/llvm-gcc/gcc/. -I/home/wanderer/pkg/build/llvm/src/llvm-gcc/gcc/../include > -DL_muldi3 -c /home/wanderer/pkg/build/llvm/src/llvm-gcc/gcc/libgcc2.c -o > libgcc/./_muldi3.o > gccas: Unknown command line argument '--traditional-format'. Try: > 'gccas --help' > gmake[2]: *** [libgcc/./_muldi3.o] Error 1 > gmake[2]: Leaving directory `/usr/home/wanderer/pkg/build/llvm/objcfe/gcc' > gmake[1]: *** [libgcc.a] Error 2 > gmake[1]: Leaving directory `/usr/home/wanderer/pkg/build/llvm/objcfe/gcc' > gmake: *** [all-gcc] Error 2 > > > Vladimir > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://mail.cs.uiuc.edu/mailman/listinfo/llvm-commits -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20041221/a222aa07/attachment.bin From reid at x10sys.com Tue Dec 21 19:36:38 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 19:36:38 -0600 Subject: [llvm-commits] CVS: llvm/docs/CFEBuildInstrs.html Message-ID: <200412220136.TAA12750@zion.cs.uiuc.edu> Changes in directory llvm/docs: CFEBuildInstrs.html updated: 1.36 -> 1.37 --- Log message: Revert last changes as they introduce CFE build problems. --- Diffs of the changes: (+4 -5) Index: llvm/docs/CFEBuildInstrs.html diff -u llvm/docs/CFEBuildInstrs.html:1.36 llvm/docs/CFEBuildInstrs.html:1.37 --- llvm/docs/CFEBuildInstrs.html:1.36 Tue Dec 21 12:50:54 2004 +++ llvm/docs/CFEBuildInstrs.html Tue Dec 21 19:36:27 2004 @@ -131,7 +131,7 @@
  % cd build
  % ../src/configure --prefix=$CFEINSTALL --disable-threads --disable-nls \
-   --disable-shared --enable-languages=c,c++ --program-prefix=llvm
+   --disable-shared --enable-languages=c,c++
  % gmake all; gmake install
 
@@ -140,8 +140,7 @@
  % cd build
  % ../src/configure --prefix=$CFEINSTALL --disable-threads --disable-nls \
-   --disable-shared --enable-languages=c,c++ --disable-c-mbchar \
-   --program-prefix=llvm
+   --disable-shared --enable-languages=c,c++ --disable-c-mbchar
  % gmake all; gmake install
 
@@ -159,7 +158,7 @@ % cd build % ../src/configure --prefix=$CFEINSTALL --disable-threads --disable-nls \ --disable-shared --enable-languages=c,c++ --host=sparcv9-sun-solaris2.8 \ - --disable-c-mbchar --program-prefix=llvm + --disable-c-mbchar % gmake all; gmake install @@ -326,7 +325,7 @@ Brian Gaeke
LLVM Compiler Infrastructure
- Last modified: $Date: 2004/12/21 18:50:54 $ + Last modified: $Date: 2004/12/22 01:36:27 $ From brukman at cs.uiuc.edu Tue Dec 21 19:37:44 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 21 Dec 2004 19:37:44 -0600 Subject: [llvm-commits] CVS: llvm/tools/llvm-ld/llvm-ld.cpp Message-ID: <200412220137.TAA12809@zion.cs.uiuc.edu> Changes in directory llvm/tools/llvm-ld: llvm-ld.cpp updated: 1.17 -> 1.18 --- Log message: Fix the Win32 build --- Diffs of the changes: (+1 -1) Index: llvm/tools/llvm-ld/llvm-ld.cpp diff -u llvm/tools/llvm-ld/llvm-ld.cpp:1.17 llvm/tools/llvm-ld/llvm-ld.cpp:1.18 --- llvm/tools/llvm-ld/llvm-ld.cpp:1.17 Tue Dec 21 19:26:48 2004 +++ llvm/tools/llvm-ld/llvm-ld.cpp Tue Dec 21 19:37:33 2004 @@ -315,7 +315,7 @@ std::cerr << "Could not find llvm-stub.exe executable!\n"; exit(1); } - sys::CopyFile(sys::PatheOutputFilename), sys::Path(llvmstub)); + sys::CopyFile(sys::Path(OutputFilename), sys::Path(llvmstub)); return; #endif From reid at x10sys.com Tue Dec 21 19:37:58 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 19:37:58 -0600 Subject: [llvm-commits] CVS: llvm/docs/GettingStarted.html Message-ID: <200412220137.TAA12849@zion.cs.uiuc.edu> Changes in directory llvm/docs: GettingStarted.html updated: 1.96 -> 1.97 --- Log message: Revert last patch until we can figure out how to build executables named llvmgcc and llvmg++ correctly. --- Diffs of the changes: (+3 -1) Index: llvm/docs/GettingStarted.html diff -u llvm/docs/GettingStarted.html:1.96 llvm/docs/GettingStarted.html:1.97 --- llvm/docs/GettingStarted.html:1.96 Tue Dec 21 12:52:08 2004 +++ llvm/docs/GettingStarted.html Tue Dec 21 19:37:47 2004 @@ -552,6 +552,8 @@ of your bytecode libraries. It is optional and provided only a convenience since you can specify the paths using the -L options of the tools. +
alias llvmgcc LLVMGCCDIR/bin/gcc
+
alias llvmg++ LLVMGCCDIR/bin/g++
These aliases allow you to use the LLVM C and C++ front ends without putting them in your PATH or typing in their complete pathnames.
@@ -1489,7 +1491,7 @@ Chris Lattner
Reid Spencer
The LLVM Compiler Infrastructure
- Last modified: $Date: 2004/12/21 18:52:08 $ + Last modified: $Date: 2004/12/22 01:37:47 $ From brukman at cs.uiuc.edu Tue Dec 21 19:50:04 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Tue, 21 Dec 2004 19:50:04 -0600 Subject: [llvm-commits] CVS: llvm/autoconf/.cvsignore Message-ID: <200412220150.TAA13061@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: .cvsignore added (r1.1) --- Log message: Ignore generated files --- Diffs of the changes: (+2 -0) Index: llvm/autoconf/.cvsignore diff -c /dev/null llvm/autoconf/.cvsignore:1.1 *** /dev/null Tue Dec 21 19:50:03 2004 --- llvm/autoconf/.cvsignore Tue Dec 21 19:49:53 2004 *************** *** 0 **** --- 1,2 ---- + aclocal.m4 + autom4te.cache From reid at x10sys.com Tue Dec 21 20:58:53 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 20:58:53 -0600 Subject: [llvm-commits] CVS: llvm/tools/gccas/gccas.cpp Message-ID: <200412220258.UAA19199@zion.cs.uiuc.edu> Changes in directory llvm/tools/gccas: gccas.cpp updated: 1.104 -> 1.105 --- Log message: Support the gas option --traditional-format which, for some reason, gets passed to gccas when the --program-prefix option is used to configure CFE. --- Diffs of the changes: (+3 -0) Index: llvm/tools/gccas/gccas.cpp diff -u llvm/tools/gccas/gccas.cpp:1.104 llvm/tools/gccas/gccas.cpp:1.105 --- llvm/tools/gccas/gccas.cpp:1.104 Thu Dec 2 23:45:58 2004 +++ llvm/tools/gccas/gccas.cpp Tue Dec 21 20:58:43 2004 @@ -54,6 +54,9 @@ cl::opt NoCompress("disable-compression", cl::init(false), cl::desc("Don't ompress the generated bytecode")); + + cl::opt TF("traditional-format", cl::Hidden, + cl::desc("Compatibility option: ignored")); } From reid at x10sys.com Tue Dec 21 23:56:53 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:56:53 -0600 Subject: [llvm-commits] CVS: llvm/autoconf/AutoRegen.sh Message-ID: <200412220556.XAA21508@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: AutoRegen.sh updated: 1.11 -> 1.12 --- Log message: Get rid of old automake stuff --- Diffs of the changes: (+2 -11) Index: llvm/autoconf/AutoRegen.sh diff -u llvm/autoconf/AutoRegen.sh:1.11 llvm/autoconf/AutoRegen.sh:1.12 --- llvm/autoconf/AutoRegen.sh:1.11 Wed Oct 27 18:03:44 2004 +++ llvm/autoconf/AutoRegen.sh Tue Dec 21 23:56:41 2004 @@ -3,17 +3,8 @@ echo "$@" 1>&2 exit 1 } -if test "$1" = --with-automake ; then - outfile=configure_am - configfile=configure.am - with_automake=1 -elif test -z "$1" ; then - outfile=configure - configfile=configure.ac - with_automake=0 -else - die "Invalid option: $1" -fi +outfile=configure +configfile=configure.ac test -d autoconf && test -f autoconf/$configfile && cd autoconf test -f $configfile || die "Can't find 'autoconf' dir; please cd into it first" autoconf --version | egrep '2\.59' > /dev/null From reid at x10sys.com Tue Dec 21 23:57:08 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:08 -0600 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200412220557.XAA21526@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.146 -> 1.147 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Remove --with-llvmgccdir, not needed any more * Search path for llvm-gcc and llvm-gxx * Compute LLVMGCCDIR based on install path of llvm-gcc --- Diffs of the changes: (+13 -42) Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.146 llvm/autoconf/configure.ac:1.147 --- llvm/autoconf/configure.ac:1.146 Sun Dec 19 18:58:14 2004 +++ llvm/autoconf/configure.ac Tue Dec 21 23:56:56 2004 @@ -199,28 +199,6 @@ *) AC_MSG_ERROR([Invalid setting for --enable-doxygen. Use "yes" or "no"]) ;; esac -dnl Find the LLVM GCC-based C/C++ front end -AC_ARG_WITH(llvmgccdir, - AS_HELP_STRING(--with-llvmgccdir,[Location of LLVM GCC front-end]), - AC_SUBST(LLVMGCCDIR,[$withval])) - -dnl Provide some defaults for LLVMGCC for UIUC environments. -if test "x$LLVMGCCDIR" = x ; then - case "$llvm_cv_platform_type" in - Linux) - if test -d /home/vadve/lattner/local/x86/llvm-gcc ; then - AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/x86/llvm-gcc/]) - fi - ;; - SunOS) - if test -d /home/vadve/lattner/local/sparc/llvm-gcc ; then - AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/sparc/llvm-gcc/]) - fi - ;; - esac -fi - - dnl===-----------------------------------------------------------------------=== dnl=== dnl=== SECTION 4: Check for programs we need and that they are the right version @@ -242,6 +220,8 @@ AC_PATH_PROG(DATE, [date], [date]) AC_PATH_PROG(FIND, [find], [find]) AC_PATH_PROG(GREP, [grep], [grep]) +AC_PATH_PROG(LLVMGCC, [llvm-gcc], [llvm-gcc]) +AC_PATH_PROG(LLVMGXX, [llvm-g++], [llvm-g++]) AC_PATH_PROG(MKDIR,[mkdir],[mkdir]) AC_PATH_PROG(MV, [mv], [mv]) AC_PATH_PROG(PAX, [pax], [pax]) @@ -450,21 +430,12 @@ dnl=== dnl===-----------------------------------------------------------------------=== -dnl Figure out if there's an executable llvm-gcc in the llvmgccdir. -AC_CACHE_CHECK([for llvm-gcc],[llvm_cv_llvmgcc], -[llvm_cv_llvmgcc='llvmgcc_not_found' -if test -d "$LLVMGCCDIR" ; then - if test -x "$LLVMGCCDIR/bin/gcc" ; then - llvm_cv_llvmgcc="$LLVMGCCDIR/bin/gcc" - fi -fi]) - dnl See if the llvmgcc executable can compile to LLVM assembly AC_CACHE_CHECK([whether llvm-gcc is sane],[llvm_cv_llvmgcc_sanity], [llvm_cv_llvmgcc_sanity="no" -if test -x "$llvm_cv_llvmgcc" ; then +if test -x "$LLVMGCC" ; then cp /dev/null conftest.c - "$llvm_cv_llvmgcc" -S -o - conftest.c | grep implementation > /dev/null 2>&1 + "$LLVMGCC" -S -o - conftest.c | grep implementation > /dev/null 2>&1 if test $? -eq 0 ; then llvm_cv_llvmgcc_sanity="yes" fi @@ -473,11 +444,12 @@ dnl Since we have a sane llvmgcc, identify it and its sub-tools if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then - AC_SUBST(LLVMGCC,"$llvm_cv_llvmgcc") - llvmcc1path=`"$llvm_cv_llvmgcc" --print-prog-name=cc1` + llvmcc1path=`"$LLVMGCC" --print-prog-name=cc1` AC_SUBST(LLVMCC1,$llvmcc1path) - llvmcc1pluspath=`"$llvm_cv_llvmgcc" --print-prog-name=cc1plus` + llvmcc1pluspath=`"$LLVMGCC" --print-prog-name=cc1plus` AC_SUBST(LLVMCC1PLUS,$llvmcc1pluspath) + llvmgccdir=`echo "$llvmcc1path" | sed 's,/libexec/.*,,'` + AC_SUBST(LLVMGCCDIR,$llvmgccdir) fi dnl Propagate the shared library extension that the libltdl checks did to @@ -572,10 +544,9 @@ dnl Warn loudly if llvm-gcc was not obviously working if test "$llvm_cv_llvmgcc_sanity" = "no" ; then - AC_MSG_WARN([***** llvm C/C++ front end was not found, or does not]) - AC_MSG_WARN([***** appear to be working.]) - AC_MSG_WARN([***** ]) - AC_MSG_WARN([***** Please check configure's --with-llvmgccdir option.]) - AC_MSG_WARN([***** Runtime libraries (in llvm/runtime) will not be built,]) - AC_MSG_WARN([***** but you should be able to build the llvm tools.]) + AC_MSG_WARN([***** llvmgcc/llvmg++ was not found, or does not appear to be ]) + AC_MSG_WARN([***** working. Please make sure you have llvmgcc and llvmg++ in]) + AC_MSG_WARN([***** your path before configuring LLVM. The runtime libraries]) + AC_MSG_WARN([***** (llvm/runtime) will not be built but you should be able to]) + AC_MSG_WARN([***** build the llvm tools.]) fi From reid at x10sys.com Tue Dec 21 23:57:08 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:08 -0600 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200412220557.XAA21529@zion.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.155 -> 1.156 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Remove --with-llvmgccdir, not needed any more * Search path for llvm-gcc and llvm-gxx * Compute LLVMGCCDIR based on install path of llvm-gcc --- Diffs of the changes: (+130 -92) Index: llvm/configure diff -u llvm/configure:1.155 llvm/configure:1.156 --- llvm/configure:1.155 Sun Dec 19 18:59:04 2004 +++ llvm/configure Tue Dec 21 23:56:56 2004 @@ -476,7 +476,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_COPYRIGHT subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS ARCH ENDIAN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT ENABLE_OPTIMIZED JIT ENABLE_DOXYGEN LLVMGCCDIR CPP CXX CXXFLAGS ac_ct_CXX LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON ifGNUmake LN_S CMP CP DATE FIND GREP MKDIR MV PAX RANLIB ac_ct_RANLIB RM SED TAR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA BZIP2 DOT DOXYGEN ETAGS GROFF GZIP POD2HTML POD2MAN RUNTEST TCLSH ZIP EGREP INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL ECHO AR ac_ct_AR STRIP ac_ct_STR! IP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ETAGSFLAGS ALLOCA MMAP_FILE LLVMGCC LLVMCC1 LLVMCC1PLUS SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_COPYRIGHT subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS ARCH ENDIAN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT ENABLE_OPTIMIZED JIT ENABLE_DOXYGEN CPP CXX CXXFLAGS ac_ct_CXX LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON ifGNUmake LN_S CMP CP DATE FIND GREP LLVMGCC LLVMGXX MKDIR MV PAX RANLIB ac_ct_RANLIB RM SED TAR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA BZIP2 DOT DOXYGEN ETAGS GROFF GZIP POD2HTML POD2MAN RUNTEST TCLSH ZIP EGREP INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL ECHO AR ac_ct_AR STRIP ac_c! t_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ETAGSFLAGS ALLOCA MMAP_FILE LLVMCC1 LLVMCC1PLUS LLVMGCCDIR SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1049,7 +1049,6 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-llvmgccdir Location of LLVM GCC front-end --with-tclinclude directory where tcl headers are --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use @@ -2980,32 +2979,6 @@ esac -# Check whether --with-llvmgccdir or --without-llvmgccdir was given. -if test "${with_llvmgccdir+set}" = set; then - withval="$with_llvmgccdir" - LLVMGCCDIR=$withval - -fi; - -if test "x$LLVMGCCDIR" = x ; then - case "$llvm_cv_platform_type" in - Linux) - if test -d /home/vadve/lattner/local/x86/llvm-gcc ; then - LLVMGCCDIR=/home/vadve/lattner/local/x86/llvm-gcc/ - - fi - ;; - SunOS) - if test -d /home/vadve/lattner/local/sparc/llvm-gcc ; then - LLVMGCCDIR=/home/vadve/lattner/local/sparc/llvm-gcc/ - - fi - ;; - esac -fi - - - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4694,6 +4667,86 @@ echo "${ECHO_T}no" >&6 fi +# Extract the first word of "llvm-gcc", so it can be a program name with args. +set dummy llvm-gcc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_LLVMGCC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $LLVMGCC in + [\\/]* | ?:[\\/]*) + ac_cv_path_LLVMGCC="$LLVMGCC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LLVMGCC="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_LLVMGCC" && ac_cv_path_LLVMGCC="llvm-gcc" + ;; +esac +fi +LLVMGCC=$ac_cv_path_LLVMGCC + +if test -n "$LLVMGCC"; then + echo "$as_me:$LINENO: result: $LLVMGCC" >&5 +echo "${ECHO_T}$LLVMGCC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +# Extract the first word of "llvm-g++", so it can be a program name with args. +set dummy llvm-g++; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_LLVMGXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $LLVMGXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_LLVMGXX="$LLVMGXX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LLVMGXX="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_LLVMGXX" && ac_cv_path_LLVMGXX="llvm-g++" + ;; +esac +fi +LLVMGXX=$ac_cv_path_LLVMGXX + +if test -n "$LLVMGXX"; then + echo "$as_me:$LINENO: result: $LLVMGXX" >&5 +echo "${ECHO_T}$LLVMGXX" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + # Extract the first word of "mkdir", so it can be a program name with args. set dummy mkdir; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -8189,7 +8242,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext + echo '#line 10236 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10665,7 +10718,7 @@ # Provide some information about the compiler. -echo "$as_me:10668:" \ +echo "$as_me:10721:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -11722,11 +11775,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11725: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11778: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11729: \$? = $ac_status" >&5 + echo "$as_me:11782: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11965,11 +12018,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11968: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12021: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11972: \$? = $ac_status" >&5 + echo "$as_me:12025: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12025,11 +12078,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12028: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12081: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12032: \$? = $ac_status" >&5 + echo "$as_me:12085: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14210,7 +14263,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:16557: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16508: \$? = $ac_status" >&5 + echo "$as_me:16561: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16561,11 +16614,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16564: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16617: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16568: \$? = $ac_status" >&5 + echo "$as_me:16621: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17922,7 +17975,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:18913: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18864: \$? = $ac_status" >&5 + echo "$as_me:18917: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -18917,11 +18970,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18920: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18973: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18924: \$? = $ac_status" >&5 + echo "$as_me:18977: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20956,11 +21009,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20959: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21012: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20963: \$? = $ac_status" >&5 + echo "$as_me:21016: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -21199,11 +21252,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21202: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21255: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21206: \$? = $ac_status" >&5 + echo "$as_me:21259: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -21259,11 +21312,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21262: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21315: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:21266: \$? = $ac_status" >&5 + echo "$as_me:21319: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -23444,7 +23497,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 -echo $ECHO_N "checking for llvm-gcc... $ECHO_C" >&6 -if test "${llvm_cv_llvmgcc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - llvm_cv_llvmgcc='llvmgcc_not_found' -if test -d "$LLVMGCCDIR" ; then - if test -x "$LLVMGCCDIR/bin/gcc" ; then - llvm_cv_llvmgcc="$LLVMGCCDIR/bin/gcc" - fi -fi -fi -echo "$as_me:$LINENO: result: $llvm_cv_llvmgcc" >&5 -echo "${ECHO_T}$llvm_cv_llvmgcc" >&6 - echo "$as_me:$LINENO: checking whether llvm-gcc is sane" >&5 echo $ECHO_N "checking whether llvm-gcc is sane... $ECHO_C" >&6 if test "${llvm_cv_llvmgcc_sanity+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else llvm_cv_llvmgcc_sanity="no" -if test -x "$llvm_cv_llvmgcc" ; then +if test -x "$LLVMGCC" ; then cp /dev/null conftest.c - "$llvm_cv_llvmgcc" -S -o - conftest.c | grep implementation > /dev/null 2>&1 + "$LLVMGCC" -S -o - conftest.c | grep implementation > /dev/null 2>&1 if test $? -eq 0 ; then llvm_cv_llvmgcc_sanity="yes" fi @@ -29530,14 +29568,15 @@ echo "${ECHO_T}$llvm_cv_llvmgcc_sanity" >&6 if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then - LLVMGCC="$llvm_cv_llvmgcc" - - llvmcc1path=`"$llvm_cv_llvmgcc" --print-prog-name=cc1` + llvmcc1path=`"$LLVMGCC" --print-prog-name=cc1` LLVMCC1=$llvmcc1path - llvmcc1pluspath=`"$llvm_cv_llvmgcc" --print-prog-name=cc1plus` + llvmcc1pluspath=`"$LLVMGCC" --print-prog-name=cc1plus` LLVMCC1PLUS=$llvmcc1pluspath + llvmgccdir=`echo "$llvmcc1path" | sed 's,/libexec/.*,,'` + LLVMGCCDIR=$llvmgccdir + fi SHLIBEXT=$libltdl_cv_shlibext @@ -30372,7 +30411,6 @@ s, at ENABLE_OPTIMIZED@,$ENABLE_OPTIMIZED,;t t s, at JIT@,$JIT,;t t s, at ENABLE_DOXYGEN@,$ENABLE_DOXYGEN,;t t -s, at LLVMGCCDIR@,$LLVMGCCDIR,;t t s, at CPP@,$CPP,;t t s, at CXX@,$CXX,;t t s, at CXXFLAGS@,$CXXFLAGS,;t t @@ -30390,6 +30428,8 @@ s, at DATE@,$DATE,;t t s, at FIND@,$FIND,;t t s, at GREP@,$GREP,;t t +s, at LLVMGCC@,$LLVMGCC,;t t +s, at LLVMGXX@,$LLVMGXX,;t t s, at MKDIR@,$MKDIR,;t t s, at MV@,$MV,;t t s, at PAX@,$PAX,;t t @@ -30431,9 +30471,9 @@ s, at ETAGSFLAGS@,$ETAGSFLAGS,;t t s, at ALLOCA@,$ALLOCA,;t t s, at MMAP_FILE@,$MMAP_FILE,;t t -s, at LLVMGCC@,$LLVMGCC,;t t s, at LLVMCC1@,$LLVMCC1,;t t s, at LLVMCC1PLUS@,$LLVMCC1PLUS,;t t +s, at LLVMGCCDIR@,$LLVMGCCDIR,;t t s, at SHLIBEXT@,$SHLIBEXT,;t t s, at LLVM_PREFIX@,$LLVM_PREFIX,;t t s, at LLVM_BINDIR@,$LLVM_BINDIR,;t t @@ -31382,16 +31422,14 @@ if test "$llvm_cv_llvmgcc_sanity" = "no" ; then - { echo "$as_me:$LINENO: WARNING: ***** llvm C/C++ front end was not found, or does not" >&5 -echo "$as_me: WARNING: ***** llvm C/C++ front end was not found, or does not" >&2;} - { echo "$as_me:$LINENO: WARNING: ***** appear to be working." >&5 -echo "$as_me: WARNING: ***** appear to be working." >&2;} - { echo "$as_me:$LINENO: WARNING: ***** " >&5 -echo "$as_me: WARNING: ***** " >&2;} - { echo "$as_me:$LINENO: WARNING: ***** Please check configure's --with-llvmgccdir option." >&5 -echo "$as_me: WARNING: ***** Please check configure's --with-llvmgccdir option." >&2;} - { echo "$as_me:$LINENO: WARNING: ***** Runtime libraries (in llvm/runtime) will not be built," >&5 -echo "$as_me: WARNING: ***** Runtime libraries (in llvm/runtime) will not be built," >&2;} - { echo "$as_me:$LINENO: WARNING: ***** but you should be able to build the llvm tools." >&5 -echo "$as_me: WARNING: ***** but you should be able to build the llvm tools." >&2;} + { echo "$as_me:$LINENO: WARNING: ***** llvmgcc/llvmg++ was not found, or does not appear to be " >&5 +echo "$as_me: WARNING: ***** llvmgcc/llvmg++ was not found, or does not appear to be " >&2;} + { echo "$as_me:$LINENO: WARNING: ***** working. Please make sure you have llvmgcc and llvmg++ in" >&5 +echo "$as_me: WARNING: ***** working. Please make sure you have llvmgcc and llvmg++ in" >&2;} + { echo "$as_me:$LINENO: WARNING: ***** your path before configuring LLVM. The runtime libraries" >&5 +echo "$as_me: WARNING: ***** your path before configuring LLVM. The runtime libraries" >&2;} + { echo "$as_me:$LINENO: WARNING: ***** (llvm/runtime) will not be built but you should be able to" >&5 +echo "$as_me: WARNING: ***** (llvm/runtime) will not be built but you should be able to" >&2;} + { echo "$as_me:$LINENO: WARNING: ***** build the llvm tools." >&5 +echo "$as_me: WARNING: ***** build the llvm tools." >&2;} fi From reid at x10sys.com Tue Dec 21 23:57:32 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:32 -0600 Subject: [llvm-commits] CVS: llvm/Makefile.rules Message-ID: <200412220557.XAA21557@zion.cs.uiuc.edu> Changes in directory llvm: Makefile.rules updated: 1.276 -> 1.277 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Cleanup LLVMGCXX and LLVMGCC by providing LLVMGXXWITHPATH and LLVMGCCWITHPATH variables that add the $(LLVMToolDir) to the path so the CFE tools can find the right LLVM tools they depend on. * Standardize the name of a variable: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+7 -9) Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.276 llvm/Makefile.rules:1.277 --- llvm/Makefile.rules:1.276 Fri Dec 17 01:45:03 2004 +++ llvm/Makefile.rules Tue Dec 21 23:57:21 2004 @@ -211,6 +211,7 @@ LLVMLibDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/lib LLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/bin LExmplDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/examples +CFERuntimeLibDir := $(LLVMGCCDIR)/lib #-------------------------------------------------------------------- # Full Paths To Compiled Tools and Utilities @@ -235,12 +236,6 @@ ifndef GCCLD GCCLD := $(LLVMToolDir)/gccld$(EXEEXT) endif -ifndef LLVMGCC -LLVMGCC := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/gcc -endif -ifndef LLVMGXX -LLVMGXX := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/g++ -endif ifndef LDIS LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT) endif @@ -250,6 +245,8 @@ ifndef LOPT LOPT := $(LLVMToolDir)/opt$(EXEEXT) endif +LLVMGCCWITHPATH := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCC) +LLVMGXXWITHPATH := PATH=$(LLVMToolDir):$(PATH) $(LLVMGXX) #-------------------------------------------------------------------- # Adjust to user's request @@ -311,7 +308,8 @@ Compile.C = $(CC) $(CPP.Flags) $(CompileCommonOpts) -c $(C.Flags) LTCompile.C = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.C) -BCCompile.C = $(LLVMGCC) $(CPP.Flags) $(CompileCommonOpts) $(C.Flags) -c +BCCompile.C = $(LLVMGCCWITHPATH) $(CPP.Flags) $(CompileCommonOpts) \ + $(C.Flags) -c Compile.CXX = $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c LTCompile.CXX = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.CXX) BCCompile.CXX = $(LLVMGXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c @@ -517,7 +515,7 @@ ifdef MODULE_NAME Module := $(LibDir)/$(MODULE_NAME).bc -LinkModule := $(LLVMGCC) -shared -nostdlib +LinkModule := $(LLVMGCCWITHPATH) -shared -nostdlib ifdef EXPORTED_SYMBOL_FILE LinkMOdule += -Xlinker -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) @@ -615,7 +613,7 @@ all-local:: $(LibName.BCA) ifdef EXPORTED_SYMBOL_FILE -BCLinkLib = $(LLVMGCC) -shared -nostdlib -Xlinker \ +BCLinkLib = $(LLVMGCCWITHPATH) -shared -nostdlib -Xlinker \ -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) $(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \ From reid at x10sys.com Tue Dec 21 23:57:20 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:20 -0600 Subject: [llvm-commits] CVS: llvm/Makefile.config.in Message-ID: <200412220557.XAA21542@zion.cs.uiuc.edu> Changes in directory llvm: Makefile.config.in updated: 1.44 -> 1.45 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Use new configuration variables to compute LLVMGCC and LLVMGXX variables. --- Diffs of the changes: (+9 -7) Index: llvm/Makefile.config.in diff -u llvm/Makefile.config.in:1.44 llvm/Makefile.config.in:1.45 --- llvm/Makefile.config.in:1.44 Thu Dec 16 11:48:14 2004 +++ llvm/Makefile.config.in Tue Dec 21 23:57:09 2004 @@ -94,22 +94,25 @@ # Paths to miscellaneous programs we assume are present RPWD := pwd ECHO := echo + +# Path to location for LLVM C/C++ front-end. You can modify this if you +# want to override the value set by configure. +LLVMGCCDIR := @LLVMGCCDIR@ + # Determine the target for which LLVM should generate code. LLVMGCCARCH := @target@/3.4-llvm # Full pathnames of LLVM C/C++ front-end 'cc1' and 'cc1plus' binaries: -LCC1 = @LLVMCC1@ -LCC1XX = @LLVMCC1PLUS@ +LLVMGCC := @LLVMGCC@ +LLVMGXX := @LLVMGXX@ +LLVMCC1 := @LLVMCC1@ +LLVMCC1PLUS := @LLVMCC1PLUS@ # Path to directory where object files should be stored during a build. # Set OBJ_ROOT to "." if you do not want to use a separate place for # object files. OBJ_ROOT := . -# Path to location for LLVM C/C++ front-end. You can modify this if you -# want to override the value set by configure. -LLVMGCCDIR := @LLVMGCCDIR@ - # These are options that can either be enabled here, or can be enabled on the # make command line (ie, make ENABLE_PROFILING=1): @@ -203,7 +206,6 @@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ -cferuntime_libdir = $(LLVMGCCDIR)/lib includedir = @includedir@ infodir = @infodir@ mandir = @mandir@ From reid at x10sys.com Tue Dec 21 23:57:47 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:47 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libg/Makefile Message-ID: <200412220557.XAA21651@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libg: Makefile updated: 1.7 -> 1.8 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libg/Makefile diff -u llvm/runtime/GCCLibraries/libg/Makefile:1.7 llvm/runtime/GCCLibraries/libg/Makefile:1.8 --- llvm/runtime/GCCLibraries/libg/Makefile:1.7 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libg/Makefile Tue Dec 21 23:57:33 2004 @@ -11,6 +11,6 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = g -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:48 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libcurses/Makefile Message-ID: <200412220557.XAA21654@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libcurses: Makefile updated: 1.5 -> 1.6 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libcurses/Makefile diff -u llvm/runtime/GCCLibraries/libcurses/Makefile:1.5 llvm/runtime/GCCLibraries/libcurses/Makefile:1.6 --- llvm/runtime/GCCLibraries/libcurses/Makefile:1.5 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libcurses/Makefile Tue Dec 21 23:57:33 2004 @@ -11,6 +11,6 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = curses -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:48 -0600 Subject: [llvm-commits] CVS: llvm/runtime/libprofile/Makefile Message-ID: <200412220557.XAA21655@zion.cs.uiuc.edu> Changes in directory llvm/runtime/libprofile: Makefile updated: 1.5 -> 1.6 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/libprofile/Makefile diff -u llvm/runtime/libprofile/Makefile:1.5 llvm/runtime/libprofile/Makefile:1.6 --- llvm/runtime/libprofile/Makefile:1.5 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/libprofile/Makefile Tue Dec 21 23:57:33 2004 @@ -13,6 +13,6 @@ LIBRARYNAME = profile_rt EXTRA_DIST = exported_symbols.lst EXPORTED_SYMBOL_FILE = $(BUILD_SRC_DIR)/exported_symbols.lst -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:58:00 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:58:00 -0600 Subject: [llvm-commits] CVS: llvm/test/Makefile Message-ID: <200412220558.XAA21710@zion.cs.uiuc.edu> Changes in directory llvm/test: Makefile updated: 1.77 -> 1.78 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Use LLVMGCC and LLVMGXX variables instead of computing the name --- Diffs of the changes: (+2 -2) Index: llvm/test/Makefile diff -u llvm/test/Makefile:1.77 llvm/test/Makefile:1.78 --- llvm/test/Makefile:1.77 Sun Dec 12 15:39:49 2004 +++ llvm/test/Makefile Tue Dec 21 23:57:50 2004 @@ -44,8 +44,8 @@ @echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp @echo 'set srcdir $(LLVM_SRC_ROOT)/test' >>site.tmp @echo "set objdir $(LLVM_OBJ_ROOT)/test" >>site.tmp - @echo 'set llvmgcc $(LLVMGCCDIR)/bin/gcc' >> site.tmp - @echo 'set llvmgxx $(LLVMGCCDIR)/bin/g++' >> site.tmp + @echo 'set llvmgcc $(LLVMGCC)' >> site.tmp + @echo 'set llvmgxx $(LLVMGXX)' >> site.tmp @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp @test ! -f site.exp || \ sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp From reid at x10sys.com Tue Dec 21 23:57:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:48 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libucb/Makefile Message-ID: <200412220557.XAA21656@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libucb: Makefile updated: 1.7 -> 1.8 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libucb/Makefile diff -u llvm/runtime/GCCLibraries/libucb/Makefile:1.7 llvm/runtime/GCCLibraries/libucb/Makefile:1.8 --- llvm/runtime/GCCLibraries/libucb/Makefile:1.7 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libucb/Makefile Tue Dec 21 23:57:33 2004 @@ -11,6 +11,6 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = ucb -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:48 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libtermcap/Makefile Message-ID: <200412220557.XAA21657@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libtermcap: Makefile updated: 1.5 -> 1.6 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libtermcap/Makefile diff -u llvm/runtime/GCCLibraries/libtermcap/Makefile:1.5 llvm/runtime/GCCLibraries/libtermcap/Makefile:1.6 --- llvm/runtime/GCCLibraries/libtermcap/Makefile:1.5 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libtermcap/Makefile Tue Dec 21 23:57:33 2004 @@ -11,6 +11,6 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = termcap -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:48 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libgdbm/Makefile Message-ID: <200412220557.XAA21667@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libgdbm: Makefile updated: 1.4 -> 1.5 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libgdbm/Makefile diff -u llvm/runtime/GCCLibraries/libgdbm/Makefile:1.4 llvm/runtime/GCCLibraries/libgdbm/Makefile:1.5 --- llvm/runtime/GCCLibraries/libgdbm/Makefile:1.4 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libgdbm/Makefile Tue Dec 21 23:57:33 2004 @@ -11,7 +11,7 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = gdbm -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:48 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GC/SemiSpace/Makefile Message-ID: <200412220557.XAA21669@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GC/SemiSpace: Makefile updated: 1.4 -> 1.5 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GC/SemiSpace/Makefile diff -u llvm/runtime/GC/SemiSpace/Makefile:1.4 llvm/runtime/GC/SemiSpace/Makefile:1.5 --- llvm/runtime/GC/SemiSpace/Makefile:1.4 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GC/SemiSpace/Makefile Tue Dec 21 23:57:33 2004 @@ -10,7 +10,7 @@ LEVEL = ../../.. BYTECODE_LIBRARY = 1 LIBRARYNAME = gcsemispace -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) EXPORTED_SYMBOL_FILE = $(BUILD_SRC_DIR)/../gc_exported_symbols.lst include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:48 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libutil/Makefile Message-ID: <200412220557.XAA21666@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libutil: Makefile updated: 1.5 -> 1.6 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libutil/Makefile diff -u llvm/runtime/GCCLibraries/libutil/Makefile:1.5 llvm/runtime/GCCLibraries/libutil/Makefile:1.6 --- llvm/runtime/GCCLibraries/libutil/Makefile:1.5 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libutil/Makefile Tue Dec 21 23:57:33 2004 @@ -11,6 +11,6 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = util -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:48 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:48 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libmalloc/Makefile Message-ID: <200412220557.XAA21668@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libmalloc: Makefile updated: 1.6 -> 1.7 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libmalloc/Makefile diff -u llvm/runtime/GCCLibraries/libmalloc/Makefile:1.6 llvm/runtime/GCCLibraries/libmalloc/Makefile:1.7 --- llvm/runtime/GCCLibraries/libmalloc/Makefile:1.6 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libmalloc/Makefile Tue Dec 21 23:57:33 2004 @@ -11,6 +11,6 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = malloc -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:49 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:49 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libutempter/Makefile Message-ID: <200412220557.XAA21670@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libutempter: Makefile updated: 1.6 -> 1.7 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libutempter/Makefile diff -u llvm/runtime/GCCLibraries/libutempter/Makefile:1.6 llvm/runtime/GCCLibraries/libutempter/Makefile:1.7 --- llvm/runtime/GCCLibraries/libutempter/Makefile:1.6 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libutempter/Makefile Tue Dec 21 23:57:33 2004 @@ -11,6 +11,6 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = utempter -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:49 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:49 -0600 Subject: [llvm-commits] CVS: llvm/runtime/libtrace/Makefile Message-ID: <200412220557.XAA21679@zion.cs.uiuc.edu> Changes in directory llvm/runtime/libtrace: Makefile updated: 1.12 -> 1.13 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/libtrace/Makefile diff -u llvm/runtime/libtrace/Makefile:1.12 llvm/runtime/libtrace/Makefile:1.13 --- llvm/runtime/libtrace/Makefile:1.12 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/libtrace/Makefile Tue Dec 21 23:57:33 2004 @@ -10,7 +10,7 @@ LEVEL = ../.. BYTECODE_LIBRARY = 1 LIBRARYNAME = trace -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:49 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:49 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libm/Makefile Message-ID: <200412220557.XAA21671@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libm: Makefile updated: 1.8 -> 1.9 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libm/Makefile diff -u llvm/runtime/GCCLibraries/libm/Makefile:1.8 llvm/runtime/GCCLibraries/libm/Makefile:1.9 --- llvm/runtime/GCCLibraries/libm/Makefile:1.8 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libm/Makefile Tue Dec 21 23:57:33 2004 @@ -11,7 +11,7 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = m -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:49 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:49 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/crtend/Makefile Message-ID: <200412220557.XAA21690@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/crtend: Makefile updated: 1.26 -> 1.27 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/crtend/Makefile diff -u llvm/runtime/GCCLibraries/crtend/Makefile:1.26 llvm/runtime/GCCLibraries/crtend/Makefile:1.27 --- llvm/runtime/GCCLibraries/crtend/Makefile:1.26 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/crtend/Makefile Tue Dec 21 23:57:33 2004 @@ -19,7 +19,7 @@ DONT_BUILD_RELINKED = 1 BYTECODE_LIBRARY = 1 LIBRARYNAME = crtend -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) # Note: We're using FAKE_SOURCES because the comp_*.c don't really exists. # However this makefile builds comp_*.bc and that's what we want in the library. From reid at x10sys.com Tue Dec 21 23:57:49 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:49 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libc/Makefile Message-ID: <200412220557.XAA21681@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libc: Makefile updated: 1.6 -> 1.7 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libc/Makefile diff -u llvm/runtime/GCCLibraries/libc/Makefile:1.6 llvm/runtime/GCCLibraries/libc/Makefile:1.7 --- llvm/runtime/GCCLibraries/libc/Makefile:1.6 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libc/Makefile Tue Dec 21 23:57:33 2004 @@ -11,7 +11,7 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = c -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:49 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:49 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libpthread/Makefile Message-ID: <200412220557.XAA21699@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libpthread: Makefile updated: 1.4 -> 1.5 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libpthread/Makefile diff -u llvm/runtime/GCCLibraries/libpthread/Makefile:1.4 llvm/runtime/GCCLibraries/libpthread/Makefile:1.5 --- llvm/runtime/GCCLibraries/libpthread/Makefile:1.4 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libpthread/Makefile Tue Dec 21 23:57:33 2004 @@ -11,6 +11,6 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = pthread -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:49 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:49 -0600 Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/libgcc/Makefile Message-ID: <200412220557.XAA21693@zion.cs.uiuc.edu> Changes in directory llvm/runtime/GCCLibraries/libgcc: Makefile updated: 1.7 -> 1.8 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/GCCLibraries/libgcc/Makefile diff -u llvm/runtime/GCCLibraries/libgcc/Makefile:1.7 llvm/runtime/GCCLibraries/libgcc/Makefile:1.8 --- llvm/runtime/GCCLibraries/libgcc/Makefile:1.7 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/GCCLibraries/libgcc/Makefile Tue Dec 21 23:57:33 2004 @@ -11,6 +11,6 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = gcc -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Tue Dec 21 23:57:49 2004 From: reid at x10sys.com (Reid Spencer) Date: Tue, 21 Dec 2004 23:57:49 -0600 Subject: [llvm-commits] CVS: llvm/runtime/libdummy/Makefile Message-ID: <200412220557.XAA21694@zion.cs.uiuc.edu> Changes in directory llvm/runtime/libdummy: Makefile updated: 1.6 -> 1.7 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Variable name change: cferuntime_libdir -> CFERuntimeLibDir --- Diffs of the changes: (+1 -1) Index: llvm/runtime/libdummy/Makefile diff -u llvm/runtime/libdummy/Makefile:1.6 llvm/runtime/libdummy/Makefile:1.7 --- llvm/runtime/libdummy/Makefile:1.6 Mon Dec 13 01:40:50 2004 +++ llvm/runtime/libdummy/Makefile Tue Dec 21 23:57:33 2004 @@ -11,7 +11,7 @@ BYTECODE_LIBRARY = 1 DONT_BUILD_RELINKED = 1 LIBRARYNAME = dummy -BYTECODE_DESTINATION = $(cferuntime_libdir) +BYTECODE_DESTINATION = $(CFERuntimeLibDir) include $(LEVEL)/Makefile.common From reid at x10sys.com Wed Dec 22 00:29:18 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 00:29:18 -0600 Subject: [llvm-commits] CVS: llvm/docs/GettingStarted.html Message-ID: <200412220629.AAA22309@zion.cs.uiuc.edu> Changes in directory llvm/docs: GettingStarted.html updated: 1.97 -> 1.98 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * llvmgcc -> llvm-gcc * llvmg++ -> llvm-g++ * remove references to --with-llvmgccdir configure option --- Diffs of the changes: (+18 -23) Index: llvm/docs/GettingStarted.html diff -u llvm/docs/GettingStarted.html:1.97 llvm/docs/GettingStarted.html:1.98 --- llvm/docs/GettingStarted.html:1.97 Tue Dec 21 19:37:47 2004 +++ llvm/docs/GettingStarted.html Wed Dec 22 00:29:07 2004 @@ -113,10 +113,12 @@
  • Remember that you were warned twice about reading the documentation.
  • Install the GCC front end:
      -
    1. cd where-you-want-the-C-front-end-to-live +
    2. cd where-you-want-the-C-front-end-to-live
    3. gunzip --stdout cfrontend.platform.tar.gz | tar -xvf - +
    4. cd cfrontend/platform
      - ./fixheaders
      + ./fixheaders
    5. +
    6. Add the cfrontend's "bin" directory to your PATH variable
  • Get the Source Code @@ -173,9 +175,9 @@ files and run configure to configure the Makefiles and header files for the default platform. Useful options include:
      -
    • --with-llvmgccdir=directory -

      Specify the full pathname of where the LLVM GCC frontend is - installed.

    • +
    • --prefix=directory +

      Specify for directory the full pathname of where you + want the LLVM tools and libraries to be installed.

    • --enable-spec2000=directory

      Enable the SPEC2000 benchmarks for testing. The SPEC2000 benchmarks should be available in @@ -552,11 +554,11 @@ of your bytecode libraries. It is optional and provided only a convenience since you can specify the paths using the -L options of the tools. -

      alias llvmgcc LLVMGCCDIR/bin/gcc
      -
      alias llvmg++ LLVMGCCDIR/bin/g++
      +
      alias llvmgcc='llvm-gcc'
      +
      alias llvmg++='llvm-g++'
      These aliases allow you to use the LLVM C and C++ front ends - without putting them in your PATH or typing in their complete - pathnames.
      + under alternative names. It is assumed that llvm-gcc and llvm-g++ are + in your path. The LLVM makefiles will use llvm-gcc and llvm-g++ directly. @@ -749,13 +751,6 @@

      The following options can be used to set or enable LLVM specific options:

      -
      --with-llvmgccdir=LLVMGCCDIR
      -
      - Path to the location where the LLVM GCC front end binaries and - associated libraries were installed. This must be specified as an - absolute pathname. -

      -
      --with-tclinclude
      Path to the tcl include directory under which the tclsh can be found. Use this if you have multiple tcl installations on your machine and you @@ -1251,21 +1246,21 @@ translates LLVM bytecode to a SPARC or x86 assembly file, or to C code (with the -march=c option).
      -
      llvmgcc
      -
      llvmgcc is a GCC-based C frontend +
      llvm-gcc
      +
      llvm-gcc is a GCC-based C frontend that has been retargeted to emit LLVM code as the machine code output. It works just like any other GCC compiler, taking the typical -c, -S, -E, -o options that are typically used. The source code for the - llvmgcc tool is currently not included in the LLVM CVS tree + llvm-gcc tool is currently not included in the LLVM CVS tree because it is quite large and not very interesting.
      gccas
      -
      This tool is invoked by the llvmgcc frontend as the +
      This tool is invoked by the llvm-gcc frontend as the "assembler" part of the compiler. This tool actually assembles LLVM assembly to LLVM bytecode, performs a variety of optimizations, and outputs LLVM bytecode. Thus when you invoke - llvmgcc -c x.c -o x.o, you are causing gccas to be + llvm-gcc -c x.c -o x.o, you are causing gccas to be run, which writes the x.o file (which is an LLVM bytecode file that can be disassembled or manipulated just like any other bytecode file). The command line interface to gccas is designed to be @@ -1397,7 +1392,7 @@
    • Next, compile the C file into a LLVM bytecode file:

      -

      % llvmgcc hello.c -o hello

      +

      % llvm-gcc hello.c -o hello

      Note that you should have already built the tools and they have to be in your path, at least gccas and gccld.

      @@ -1491,7 +1486,7 @@ Chris Lattner
      Reid Spencer
      The LLVM Compiler Infrastructure
      - Last modified: $Date: 2004/12/22 01:37:47 $ + Last modified: $Date: 2004/12/22 06:29:07 $ From reid at x10sys.com Wed Dec 22 00:40:40 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 00:40:40 -0600 Subject: [llvm-commits] CVS: llvm/docs/CFEBuildInstrs.html Message-ID: <200412220640.AAA22488@zion.cs.uiuc.edu> Changes in directory llvm/docs: CFEBuildInstrs.html updated: 1.37 -> 1.38 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : Rework the CFE build details to include the directions for using the option --program-prefix=llvm- to the CFE's configure script. This ensures that the CFE builds unique executable names and makes it possible to put the $CFEINSTALL/bin directory into one's path. --- Diffs of the changes: (+21 -11) Index: llvm/docs/CFEBuildInstrs.html diff -u llvm/docs/CFEBuildInstrs.html:1.37 llvm/docs/CFEBuildInstrs.html:1.38 --- llvm/docs/CFEBuildInstrs.html:1.37 Tue Dec 21 19:36:27 2004 +++ llvm/docs/CFEBuildInstrs.html Wed Dec 22 00:40:29 2004 @@ -131,7 +131,7 @@
        % cd build
        % ../src/configure --prefix=$CFEINSTALL --disable-threads --disable-nls \
      -   --disable-shared --enable-languages=c,c++
      +   --disable-shared --enable-languages=c,c++ --program-prefix=llvm-
        % gmake all; gmake install
       
      @@ -140,7 +140,8 @@
        % cd build
        % ../src/configure --prefix=$CFEINSTALL --disable-threads --disable-nls \
      -   --disable-shared --enable-languages=c,c++ --disable-c-mbchar
      +   --disable-shared --enable-languages=c,c++ --disable-c-mbchar \
      +   --program-prefix=llvm-
        % gmake all; gmake install
       
      @@ -158,7 +159,7 @@ % cd build % ../src/configure --prefix=$CFEINSTALL --disable-threads --disable-nls \ --disable-shared --enable-languages=c,c++ --host=sparcv9-sun-solaris2.8 \ - --disable-c-mbchar + --disable-c-mbchar --program-prefix=llvm- % gmake all; gmake install @@ -207,9 +208,18 @@
  • +
  • Put $CFEINSTALL/bin into your PATH environment +variable.

    +
      +
    • sh: export PATH=$CFEINSTALL/bin:$PATH
    • +
    • csh: setenv PATH $CFEINSTALL/bin:$PATH
    • +
    • win: set PATH=$CFEINSTALL/bin;$PATH
    • +
    +
  • +
  • Go back into the LLVM source tree proper. Rerun configure, using -the --with-llvmgccdir=$CFEINSTALL option to specify the path -to the newly built GCC front-end.

  • +the same options as the last time. This will cause the configuration to now find +the newly built llvm-gcc and llvm-g++ executables.

  • If you edited header files during the C/C++ front-end build as described in "Fix 1" above, you must now copy those header files from @@ -217,7 +227,7 @@ $CFEINSTALL/lib/gcc/target-triplet/3.4-llvm/include. (This should be the "include" directory in the same directory as the libgcc.a library, which you can find by running -$CFEINSTALL/bin/gcc --print-libgcc-file-name.)

  • +$CFEINSTALL/bin/llvm-gcc --print-libgcc-file-name.)

  • Rebuild your CVS tree. This shouldn't cause the whole thing to be rebuilt, but it should build the runtime libraries. After the tree is @@ -230,9 +240,9 @@

  • Optionally, build a symbol table for the newly installed runtime -libraries. Although this step is optional, you are encouraged to do this as the -symbol tables will make a significant difference in your link times. Use -the llvm-ranlib tool to do this, as follows:

    +libraries. Although this step is optional, you are strongly encouraged to +do this as the symbol tables will make a significant difference in your +link times. Use the llvm-ranlib tool to do this, as follows:

      % cd $CFEINSTALL/lib
      % llvm-ranlib libiberty.a
    @@ -246,8 +256,8 @@
     
  • Test the newly-installed C frontend by one or more of the following means:

      +
    • running the feature & regression tests via make check
    • compiling and running a "hello, LLVM" program in C and C++.
    • -
    • running the regression tests in llvm/test
    • running the tests found in the llvm-test CVS module
  • @@ -325,7 +335,7 @@ Brian Gaeke
    LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/12/22 01:36:27 $ + Last modified: $Date: 2004/12/22 06:40:29 $ From reid at x10sys.com Wed Dec 22 00:45:35 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 00:45:35 -0600 Subject: [llvm-commits] CVS: llvm/docs/TestingGuide.html Message-ID: <200412220645.AAA22602@zion.cs.uiuc.edu> Changes in directory llvm/docs: TestingGuide.html updated: 1.23 -> 1.24 --- Log message: Correct the name of the executables to which llvmgcc and llvmgxx variables point to. --- Diffs of the changes: (+3 -3) Index: llvm/docs/TestingGuide.html diff -u llvm/docs/TestingGuide.html:1.23 llvm/docs/TestingGuide.html:1.24 --- llvm/docs/TestingGuide.html:1.23 Tue Dec 14 18:14:01 2004 +++ llvm/docs/TestingGuide.html Wed Dec 22 00:45:24 2004 @@ -302,8 +302,8 @@
    Path to a script that performs grep -C. Use this since not all platforms support grep -C.
    -
    %llvmgcc
    Full path to the llvmgcc executable.
    -
    %llvmgxx
    Full path to the llvmg++ executable.
    +
    %llvmgcc
    Full path to the llvm-gcc executable.
    +
    %llvmgxx
    Full path to the llvm-g++ executable.

    There are also several scripts in the llvm/test/Scripts directory @@ -512,7 +512,7 @@ John T. Criswell
    The LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/12/15 00:14:01 $ + Last modified: $Date: 2004/12/22 06:45:24 $ From reid at x10sys.com Wed Dec 22 00:47:35 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 00:47:35 -0600 Subject: [llvm-commits] CVS: llvm/docs/CommandGuide/llvmgcc.pod llvmgxx.pod Message-ID: <200412220647.AAA22672@zion.cs.uiuc.edu> Changes in directory llvm/docs/CommandGuide: llvmgcc.pod updated: 1.3 -> 1.4 llvmgxx.pod updated: 1.2 -> 1.3 --- Log message: Fix the names of these executables now that they've been somewhat cast in stone. --- Diffs of the changes: (+16 -16) Index: llvm/docs/CommandGuide/llvmgcc.pod diff -u llvm/docs/CommandGuide/llvmgcc.pod:1.3 llvm/docs/CommandGuide/llvmgcc.pod:1.4 --- llvm/docs/CommandGuide/llvmgcc.pod:1.3 Fri Jul 2 11:06:19 2004 +++ llvm/docs/CommandGuide/llvmgcc.pod Wed Dec 22 00:47:25 2004 @@ -2,26 +2,26 @@ =head1 NAME -llvmgcc - LLVM C front-end +llvm-gcc - LLVM C front-end =head1 SYNOPSIS -B [I] I +B [I] I =head1 DESCRIPTION -The B command is the LLVM C front end. It is a modified +The B command is the LLVM C front end. It is a modified version of gcc that takes C programs and compiles them into LLVM bytecode or assembly language, depending upon the options. -Unless the B<-S> option is specified, B will use the +Unless the B<-S> option is specified, B will use the L program to perform some optimizations and create an -LLVM bytecode file. Unless the B<-c> option is specified, B +LLVM bytecode file. Unless the B<-c> option is specified, B will also use the L program to perform further optimizations and link the resulting bytecode file(s) with support libraries to create an executable program. -Being derived from the GNU Compiler Collection, B has many +Being derived from the GNU Compiler Collection, B has many of gcc's features and accepts most of gcc's options. It handles a number of gcc's extensions to the C programming language. @@ -72,12 +72,12 @@ =head1 EXIT STATUS -If B succeeds, it will exit with 0. Otherwise, if an error +If B succeeds, it will exit with 0. Otherwise, if an error occurs, it will exit with a non-zero value. =head1 SEE ALSO -L, L, L +L, L, L =head1 AUTHORS Index: llvm/docs/CommandGuide/llvmgxx.pod diff -u llvm/docs/CommandGuide/llvmgxx.pod:1.2 llvm/docs/CommandGuide/llvmgxx.pod:1.3 --- llvm/docs/CommandGuide/llvmgxx.pod:1.2 Fri Jul 2 11:06:19 2004 +++ llvm/docs/CommandGuide/llvmgxx.pod Wed Dec 22 00:47:25 2004 @@ -2,26 +2,26 @@ =head1 NAME -llvmg++ - LLVM C++ front-end +llvm-g++ - LLVM C++ front-end =head1 SYNOPSIS -B [I] I +B [I] I =head1 DESCRIPTION -The B command is the LLVM C++ front end. It is a modified +The B command is the LLVM C++ front end. It is a modified version of g++ that takes C++ programs and compiles them into LLVM bytecode or assembly language, depending upon the options. -Unless the B<-S> option is specified, B will use the +Unless the B<-S> option is specified, B will use the L program to perform some optimizations and create an -LLVM bytecode file. Unless the B<-c> option is specified, B +LLVM bytecode file. Unless the B<-c> option is specified, B will also use the L program to perform further optimizations and link the resulting bytecode file(s) with support libraries to create an executable program. -Being derived from the GNU Compiler Collection, B has many +Being derived from the GNU Compiler Collection, B has many of g++'s features and accepts most of g++'s options. It handles a number of g++'s extensions to the C++ programming language. @@ -72,12 +72,12 @@ =head1 EXIT STATUS -If B succeeds, it will exit with 0. Otherwise, if an error +If B succeeds, it will exit with 0. Otherwise, if an error occurs, it will exit with a non-zero value. =head1 SEE ALSO -L, L, L +L, L, L =head1 AUTHORS From reid at x10sys.com Wed Dec 22 00:48:14 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 00:48:14 -0600 Subject: [llvm-commits] CVS: llvm/docs/CommandGuide/llvmgxx.pod Message-ID: <200412220648.AAA22724@zion.cs.uiuc.edu> Changes in directory llvm/docs/CommandGuide: llvmgxx.pod updated: 1.3 -> 1.4 --- Log message: Hopefully fix a link. --- Diffs of the changes: (+1 -1) Index: llvm/docs/CommandGuide/llvmgxx.pod diff -u llvm/docs/CommandGuide/llvmgxx.pod:1.3 llvm/docs/CommandGuide/llvmgxx.pod:1.4 --- llvm/docs/CommandGuide/llvmgxx.pod:1.3 Wed Dec 22 00:47:25 2004 +++ llvm/docs/CommandGuide/llvmgxx.pod Wed Dec 22 00:48:03 2004 @@ -77,7 +77,7 @@ =head1 SEE ALSO -L, L, L +L, L, L =head1 AUTHORS From reid at x10sys.com Wed Dec 22 03:08:05 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 03:08:05 -0600 Subject: [llvm-commits] CVS: llvm/docs/CFEBuildInstrs.html Message-ID: <200412220908.DAA11051@zion.cs.uiuc.edu> Changes in directory llvm/docs: CFEBuildInstrs.html updated: 1.38 -> 1.39 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : * Remove the idiotic windows environment setting, its not needed. * Remove an extraneous "mkdir" instruction. --- Diffs of the changes: (+1 -3) Index: llvm/docs/CFEBuildInstrs.html diff -u llvm/docs/CFEBuildInstrs.html:1.38 llvm/docs/CFEBuildInstrs.html:1.39 --- llvm/docs/CFEBuildInstrs.html:1.38 Wed Dec 22 00:40:29 2004 +++ llvm/docs/CFEBuildInstrs.html Wed Dec 22 03:07:51 2004 @@ -213,7 +213,6 @@

    • sh: export PATH=$CFEINSTALL/bin:$PATH
    • csh: setenv PATH $CFEINSTALL/bin:$PATH
    • -
    • win: set PATH=$CFEINSTALL/bin;$PATH
  • @@ -235,7 +234,6 @@ These are the commands you need.

      % gmake
    - % mkdir $CFEINSTALL/lib
      % gmake -C runtime install-bytecode
     
    @@ -335,7 +333,7 @@ Brian Gaeke
    LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/12/22 06:40:29 $ + Last modified: $Date: 2004/12/22 09:07:51 $ From reid at x10sys.com Wed Dec 22 03:52:41 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 03:52:41 -0600 Subject: [llvm-commits] CVS: llvm/docs/CFEBuildInstrs.html Message-ID: <200412220952.DAA19625@zion.cs.uiuc.edu> Changes in directory llvm/docs: CFEBuildInstrs.html updated: 1.39 -> 1.40 --- Log message: Add a blurb about using the GCC 3.4.3 compiler on Cygwin (which works) for the CFE instead of the default GCC 3.3.3 compiler that comes with Cygwin. --- Diffs of the changes: (+6 -1) Index: llvm/docs/CFEBuildInstrs.html diff -u llvm/docs/CFEBuildInstrs.html:1.39 llvm/docs/CFEBuildInstrs.html:1.40 --- llvm/docs/CFEBuildInstrs.html:1.39 Wed Dec 22 03:07:51 2004 +++ llvm/docs/CFEBuildInstrs.html Wed Dec 22 03:52:30 2004 @@ -66,6 +66,11 @@ (which includes your "home directory", because it lives under the "Documents and Settings" directory). We welcome patches to fix this issue.

    +

    It has been found that the GCC 3.3.3 compiler provided with recent Cygwin +versions is incapable of compiling the LLVM CFE correctly. If your Cygwin +installation includes GCC 3.3.3 we strongly recommend that you download +GCC 3.4.3, build it separately, and use it for compiling LLVM CFE. This has been +shown to work correctly.

    @@ -333,7 +338,7 @@ Brian Gaeke
    LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/12/22 09:07:51 $ + Last modified: $Date: 2004/12/22 09:52:30 $ From reid at x10sys.com Wed Dec 22 03:55:51 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 03:55:51 -0600 Subject: [llvm-commits] CVS: llvm-test/Makefile.rules Message-ID: <200412220955.DAA19687@zion.cs.uiuc.edu> Changes in directory llvm-test: Makefile.rules updated: 1.4 -> 1.5 --- Log message: For PR432: http://llvm.cs.uiuc.edu/PR432 : Use the correct path for llvm-gcc and llvm-g++ --- Diffs of the changes: (+2 -2) Index: llvm-test/Makefile.rules diff -u llvm-test/Makefile.rules:1.4 llvm-test/Makefile.rules:1.5 --- llvm-test/Makefile.rules:1.4 Tue Nov 23 16:55:08 2004 +++ llvm-test/Makefile.rules Wed Dec 22 03:55:40 2004 @@ -252,8 +252,8 @@ #-------------------------------------------------------------------------- # The LLVM GCC front-end in C and C++ flavors # -LLVMGCC := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/gcc -LLVMGXX := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/g++ +LLVMGCC := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/llvm-gcc +LLVMGXX := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/llvm-g++ #-------------------------------------------------------------------------- # The compiled LLVM tools From reid at x10sys.com Wed Dec 22 04:24:54 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 04:24:54 -0600 Subject: [llvm-commits] CVS: llvm/include/llvm/Support/FileUtilities.h Message-ID: <200412221024.EAA20309@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/Support: FileUtilities.h updated: 1.26 -> 1.27 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : Move non-portable FDHandle class to its only user: lib/Debugger --- Diffs of the changes: (+0 -38) Index: llvm/include/llvm/Support/FileUtilities.h diff -u llvm/include/llvm/Support/FileUtilities.h:1.26 llvm/include/llvm/Support/FileUtilities.h:1.27 --- llvm/include/llvm/Support/FileUtilities.h:1.26 Thu Dec 16 17:00:05 2004 +++ llvm/include/llvm/Support/FileUtilities.h Wed Dec 22 04:24:43 2004 @@ -34,44 +34,6 @@ /// void MoveFileOverIfUpdated(const std::string &New, const std::string &Old); -/// FDHandle - Simple handle class to make sure a file descriptor gets closed -/// when the object is destroyed. This handle acts similarly to an -/// std::auto_ptr, in that the copy constructor and assignment operators -/// transfer ownership of the handle. This means that FDHandle's do not have -/// value semantics. -/// -class FDHandle { - int FD; -public: - FDHandle() : FD(-1) {} - FDHandle(int fd) : FD(fd) {} - FDHandle(FDHandle &RHS) : FD(RHS.FD) { - RHS.FD = -1; // Transfer ownership - } - - ~FDHandle() throw(); - - /// get - Get the current file descriptor, without releasing ownership of it. - int get() const { return FD; } - operator int() const { return FD; } - - FDHandle &operator=(int fd) throw(); - - FDHandle &operator=(FDHandle &RHS) { - int fd = RHS.FD; - RHS.FD = -1; // Transfer ownership - return operator=(fd); - } - - /// release - Take ownership of the file descriptor away from the FDHandle - /// object, so that the file is not closed when the FDHandle is destroyed. - int release() { - int Ret = FD; - FD = -1; - return Ret; - } -}; - /// FileRemover - This class is a simple object meant to be stack allocated. /// If an exception is thrown from a region, the object removes the filename /// specified (if deleteIt is true). From reid at x10sys.com Wed Dec 22 04:25:05 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 04:25:05 -0600 Subject: [llvm-commits] CVS: llvm/lib/Debugger/FDHandle.h FDHandle.cpp Message-ID: <200412221025.EAA20333@zion.cs.uiuc.edu> Changes in directory llvm/lib/Debugger: FDHandle.h added (r1.1) FDHandle.cpp added (r1.1) --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : FDHandle class (non-portable) moved here from lib/Support/FileUtilities --- Diffs of the changes: (+96 -0) Index: llvm/lib/Debugger/FDHandle.h diff -c /dev/null llvm/lib/Debugger/FDHandle.h:1.1 *** /dev/null Wed Dec 22 04:25:05 2004 --- llvm/lib/Debugger/FDHandle.h Wed Dec 22 04:24:55 2004 *************** *** 0 **** --- 1,62 ---- + //===- lib/Debugger/FDHandle.h - File Descriptor Handle ---------*- C++ -*-===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by the LLVM research group and is distributed under + // the University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file defines a family of utility functions which are useful for doing + // various things with files. + // + //===----------------------------------------------------------------------===// + + #ifndef LIB_DEBUGGER_FDHANDLE_H + #define LIB_DEBUGGER_FDHANDLE_H + + #include "llvm/System/Path.h" + + namespace llvm { + + /// FDHandle - Simple handle class to make sure a file descriptor gets closed + /// when the object is destroyed. This handle acts similarly to an + /// std::auto_ptr, in that the copy constructor and assignment operators + /// transfer ownership of the handle. This means that FDHandle's do not have + /// value semantics. + /// + class FDHandle { + int FD; + public: + FDHandle() : FD(-1) {} + FDHandle(int fd) : FD(fd) {} + FDHandle(FDHandle &RHS) : FD(RHS.FD) { + RHS.FD = -1; // Transfer ownership + } + + ~FDHandle() throw(); + + /// get - Get the current file descriptor, without releasing ownership of it. + int get() const { return FD; } + operator int() const { return FD; } + + FDHandle &operator=(int fd) throw(); + + FDHandle &operator=(FDHandle &RHS) { + int fd = RHS.FD; + RHS.FD = -1; // Transfer ownership + return operator=(fd); + } + + /// release - Take ownership of the file descriptor away from the FDHandle + /// object, so that the file is not closed when the FDHandle is destroyed. + int release() { + int Ret = FD; + FD = -1; + return Ret; + } + }; + + } // End llvm namespace + + #endif Index: llvm/lib/Debugger/FDHandle.cpp diff -c /dev/null llvm/lib/Debugger/FDHandle.cpp:1.1 *** /dev/null Wed Dec 22 04:25:05 2004 --- llvm/lib/Debugger/FDHandle.cpp Wed Dec 22 04:24:55 2004 *************** *** 0 **** --- 1,34 ---- + //===- Support/FileUtilities.cpp - File System Utilities ------------------===// + // + // The LLVM Compiler Infrastructure + // + // This file was developed by the LLVM research group and is distributed under + // the University of Illinois Open Source License. See LICENSE.TXT for details. + // + //===----------------------------------------------------------------------===// + // + // This file implements a family of utility functions which are useful for doing + // various things with files. + // + //===----------------------------------------------------------------------===// + + #include "FDHandle.h" + #include + + using namespace llvm; + + //===----------------------------------------------------------------------===// + // FDHandle class implementation + // + + FDHandle::~FDHandle() throw() { + if (FD != -1) + ::close(FD); + } + + FDHandle &FDHandle::operator=(int fd) throw() { + if (FD != -1) + ::close(FD); + FD = fd; + return *this; + } From reid at x10sys.com Wed Dec 22 04:25:17 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 04:25:17 -0600 Subject: [llvm-commits] CVS: llvm/lib/Debugger/UnixLocalInferiorProcess.cpp Message-ID: <200412221025.EAA20348@zion.cs.uiuc.edu> Changes in directory llvm/lib/Debugger: UnixLocalInferiorProcess.cpp updated: 1.6 -> 1.7 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : Include local FDHandle.h file now that FDHandle is local to this library and not in lib/System/FileUtilities. --- Diffs of the changes: (+1 -0) Index: llvm/lib/Debugger/UnixLocalInferiorProcess.cpp diff -u llvm/lib/Debugger/UnixLocalInferiorProcess.cpp:1.6 llvm/lib/Debugger/UnixLocalInferiorProcess.cpp:1.7 --- llvm/lib/Debugger/UnixLocalInferiorProcess.cpp:1.6 Wed Sep 1 17:55:35 2004 +++ llvm/lib/Debugger/UnixLocalInferiorProcess.cpp Wed Dec 22 04:25:06 2004 @@ -34,6 +34,7 @@ #include "llvm/ExecutionEngine/ExecutionEngine.h" #include "llvm/Support/FileUtilities.h" #include "llvm/ADT/StringExtras.h" +#include "FDHandle.h" #include #include #include // Unix-specific debugger support From reid at x10sys.com Wed Dec 22 04:24:54 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 04:24:54 -0600 Subject: [llvm-commits] CVS: llvm/lib/Support/FileUtilities.cpp Message-ID: <200412221024.EAA20312@zion.cs.uiuc.edu> Changes in directory llvm/lib/Support: FileUtilities.cpp updated: 1.33 -> 1.34 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : Move non-portable FDHandle class to its only user: lib/Debugger --- Diffs of the changes: (+0 -14) Index: llvm/lib/Support/FileUtilities.cpp diff -u llvm/lib/Support/FileUtilities.cpp:1.33 llvm/lib/Support/FileUtilities.cpp:1.34 --- llvm/lib/Support/FileUtilities.cpp:1.33 Thu Dec 16 17:00:05 2004 +++ llvm/lib/Support/FileUtilities.cpp Wed Dec 22 04:24:43 2004 @@ -63,17 +63,3 @@ std::remove(New.c_str()); } } - -//===----------------------------------------------------------------------===// -// FDHandle class implementation -// - -FDHandle::~FDHandle() throw() { - if (FD != -1) close(FD); -} - -FDHandle &FDHandle::operator=(int fd) throw() { - if (FD != -1) close(FD); - FD = fd; - return *this; -} From reid at x10sys.com Wed Dec 22 07:50:28 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 07:50:28 -0600 Subject: [llvm-commits] CVS: llvm/tools/llvm-ld/llvm-ld.cpp Message-ID: <200412221350.HAA23031@zion.cs.uiuc.edu> Changes in directory llvm/tools/llvm-ld: llvm-ld.cpp updated: 1.18 -> 1.19 --- Log message: Correct compilation for Cygwin. FindExecutable now returns a sys::Path. --- Diffs of the changes: (+3 -3) Index: llvm/tools/llvm-ld/llvm-ld.cpp diff -u llvm/tools/llvm-ld/llvm-ld.cpp:1.18 llvm/tools/llvm-ld/llvm-ld.cpp:1.19 --- llvm/tools/llvm-ld/llvm-ld.cpp:1.18 Tue Dec 21 19:37:33 2004 +++ llvm/tools/llvm-ld/llvm-ld.cpp Wed Dec 22 07:50:17 2004 @@ -310,12 +310,12 @@ // Windows doesn't support #!/bin/sh style shell scripts in .exe files. To // support windows systems, we copy the llvm-stub.exe executable from the // build tree to the destination file. - std::string llvmstub = FindExecutable("llvm-stub.exe", argv[0]); - if (llvmstub.empty()) { + sys::Path llvmstub = FindExecutable("llvm-stub.exe", argv[0]); + if (llvmstub.isEmpty()) { std::cerr << "Could not find llvm-stub.exe executable!\n"; exit(1); } - sys::CopyFile(sys::Path(OutputFilename), sys::Path(llvmstub)); + sys::CopyFile(sys::Path(OutputFilename), llvmstub); return; #endif From reid at x10sys.com Wed Dec 22 10:19:16 2004 From: reid at x10sys.com (Reid Spencer) Date: Wed, 22 Dec 2004 10:19:16 -0600 Subject: [llvm-commits] CVS: llvm/docs/CFEBuildInstrs.html Message-ID: <200412221619.KAA25027@zion.cs.uiuc.edu> Changes in directory llvm/docs: CFEBuildInstrs.html updated: 1.40 -> 1.41 --- Log message: * Remove an unnecessary step. * Correct a path. --- Diffs of the changes: (+2 -10) Index: llvm/docs/CFEBuildInstrs.html diff -u llvm/docs/CFEBuildInstrs.html:1.40 llvm/docs/CFEBuildInstrs.html:1.41 --- llvm/docs/CFEBuildInstrs.html:1.40 Wed Dec 22 03:52:30 2004 +++ llvm/docs/CFEBuildInstrs.html Wed Dec 22 10:19:05 2004 @@ -225,14 +225,6 @@ the same options as the last time. This will cause the configuration to now find the newly built llvm-gcc and llvm-g++ executables.

    -
  • If you edited header files during the C/C++ front-end build as -described in "Fix 1" above, you must now copy those header files from -$CFEINSTALL/target-triplet/sys-include to -$CFEINSTALL/lib/gcc/target-triplet/3.4-llvm/include. -(This should be the "include" directory in the same directory as the -libgcc.a library, which you can find by running -$CFEINSTALL/bin/llvm-gcc --print-libgcc-file-name.)

  • -
  • Rebuild your CVS tree. This shouldn't cause the whole thing to be rebuilt, but it should build the runtime libraries. After the tree is built, install the runtime libraries into your GCC front-end build tree. @@ -251,7 +243,7 @@ % llvm-ranlib libiberty.a % llvm-ranlib libstdc++.a % llvm-ranlib libsupc++.a - % cd $CFEINSTALL/lib/target-triplet/3.4-llvm + % cd $CFEINSTALL/lib/gcc/target-triplet/3.4-llvm % llvm-ranlib libgcc.a % llvm-ranlib libgcov.a @@ -338,7 +330,7 @@ Brian Gaeke
    LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/12/22 09:52:30 $ + Last modified: $Date: 2004/12/22 16:19:05 $ From criswell at cs.uiuc.edu Wed Dec 22 11:17:27 2004 From: criswell at cs.uiuc.edu (John Criswell) Date: Wed, 22 Dec 2004 11:17:27 -0600 Subject: [llvm-commits] CVS: llvm-www/releases/1.4/cfrontend-1.4.i686-redhat-linux-gnu.tar.gz cfrontend-1.4.powerpc-apple-darwin7.6.0.tar.gz cfrontend-1.4.sparc-sun-solaris2.8.tar.gz Message-ID: <200412221717.LAA30894@choi.cs.uiuc.edu> Changes in directory llvm-www/releases/1.4: cfrontend-1.4.i686-redhat-linux-gnu.tar.gz updated: 1.1 -> 1.2 cfrontend-1.4.powerpc-apple-darwin7.6.0.tar.gz updated: 1.1 -> 1.2 cfrontend-1.4.sparc-sun-solaris2.8.tar.gz updated: 1.1 -> 1.2 --- Log message: Rebuilt tarballs with symbolic links named llvm-gcc and llvm-g++ that link to gcc and g++, respectively. This should make the tarballs works with LLVM CVS HEAD. --- Diffs of the changes: (+0 -0) Index: llvm-www/releases/1.4/cfrontend-1.4.i686-redhat-linux-gnu.tar.gz Index: llvm-www/releases/1.4/cfrontend-1.4.powerpc-apple-darwin7.6.0.tar.gz Index: llvm-www/releases/1.4/cfrontend-1.4.sparc-sun-solaris2.8.tar.gz From gaeke at cs.uiuc.edu Wed Dec 22 16:33:44 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed, 22 Dec 2004 16:33:44 -0600 Subject: [llvm-commits] CVS: llvm/tools/bugpoint/ExecutionDriver.cpp Message-ID: <200412222233.QAA31639@zion.cs.uiuc.edu> Changes in directory llvm/tools/bugpoint: ExecutionDriver.cpp updated: 1.50 -> 1.51 --- Log message: Fix the build on PowerPC/Darwin - it thought we were declaring a new function or something. Since FileRemover takes a const reference to sys::Path, we need to pass an actual sys::Path variable. --- Diffs of the changes: (+2 -1) Index: llvm/tools/bugpoint/ExecutionDriver.cpp diff -u llvm/tools/bugpoint/ExecutionDriver.cpp:1.50 llvm/tools/bugpoint/ExecutionDriver.cpp:1.51 --- llvm/tools/bugpoint/ExecutionDriver.cpp:1.50 Thu Dec 16 17:04:20 2004 +++ llvm/tools/bugpoint/ExecutionDriver.cpp Wed Dec 22 16:33:33 2004 @@ -195,7 +195,8 @@ } // Remove the temporary bytecode file when we are done. - FileRemover BytecodeFileRemover(sys::Path(BytecodeFile), CreatedBytecode); + sys::Path BytecodePath (BytecodeFile); + FileRemover BytecodeFileRemover(BytecodePath, CreatedBytecode); if (OutputFile.empty()) OutputFile = "bugpoint-execution-output"; From gaeke at cs.uiuc.edu Wed Dec 22 17:49:49 2004 From: gaeke at cs.uiuc.edu (Brian Gaeke) Date: Wed, 22 Dec 2004 17:49:49 -0600 Subject: [llvm-commits] CVS: llvm-www/testresults/index.html Message-ID: <200412222349.RAA00577@zion.cs.uiuc.edu> Changes in directory llvm-www/testresults: index.html updated: 1.21 -> 1.22 --- Log message: Plant-related change --- Diffs of the changes: (+1 -1) Index: llvm-www/testresults/index.html diff -u llvm-www/testresults/index.html:1.21 llvm-www/testresults/index.html:1.22 --- llvm-www/testresults/index.html:1.21 Fri Dec 3 16:53:36 2004 +++ llvm-www/testresults/index.html Wed Dec 22 17:49:37 2004 @@ -33,7 +33,7 @@

    PowerPC:

      -
    1. PPC: Mac OS X +
    2. PPC: Mac OS X 10.3 "Panther" on PowerPC G5 (dual 1.8Ghz CPU)
    From jeffc at jolt-lang.org Wed Dec 22 21:44:51 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Wed, 22 Dec 2004 21:44:51 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Win32/Process.cpp Message-ID: <200412230344.VAA03910@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Win32: Process.cpp updated: 1.4 -> 1.5 --- Log message: Patch to fix mingw compilation problem contributed by Henrik. --- Diffs of the changes: (+5 -0) Index: llvm/lib/System/Win32/Process.cpp diff -u llvm/lib/System/Win32/Process.cpp:1.4 llvm/lib/System/Win32/Process.cpp:1.5 --- llvm/lib/System/Win32/Process.cpp:1.4 Sun Dec 19 21:24:56 2004 +++ llvm/lib/System/Win32/Process.cpp Wed Dec 22 21:44:40 2004 @@ -22,6 +22,11 @@ //=== and must not be UNIX code //===----------------------------------------------------------------------===// +#ifdef __MINGW +// This ban should be lifted when MinGW 1.0+ has defined this value. +# define _HEAPOK (-2) +#endif + namespace llvm { using namespace sys; From reid at x10sys.com Thu Dec 23 00:22:44 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 00:22:44 -0600 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200412230622.AAA05820@zion.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.156 -> 1.157 --- Log message: Added support for detection of amd64 targets. --- Diffs of the changes: (+33 -30) Index: llvm/configure diff -u llvm/configure:1.156 llvm/configure:1.157 --- llvm/configure:1.156 Tue Dec 21 23:56:56 2004 +++ llvm/configure Thu Dec 23 00:22:33 2004 @@ -1742,7 +1742,8 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else case $target in - i*86-*) llvm_cv_target_arch="x86" ;; + i?86-*) llvm_cv_target_arch="x86" ;; + amd64-*) llvm_cv_target_arch="amd64" ;; sparc*-*) llvm_cv_target_arch="Sparc" ;; powerpc*-*) llvm_cv_target_arch="PowerPC" ;; *) llvm_cv_target_arch="Unknown" ;; @@ -2954,6 +2955,8 @@ ;; PowerPC) JIT=TARGET_HAS_JIT=1 ;; + amd64) JIT= + ;; *) JIT= ;; esac @@ -8242,7 +8245,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext + echo '#line 10239 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10718,7 +10721,7 @@ # Provide some information about the compiler. -echo "$as_me:10721:" \ +echo "$as_me:10724:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -11775,11 +11778,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11778: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11781: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11782: \$? = $ac_status" >&5 + echo "$as_me:11785: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12018,11 +12021,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12021: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12024: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12025: \$? = $ac_status" >&5 + echo "$as_me:12028: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12078,11 +12081,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12081: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12084: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12085: \$? = $ac_status" >&5 + echo "$as_me:12088: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14263,7 +14266,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:16560: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16561: \$? = $ac_status" >&5 + echo "$as_me:16564: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16614,11 +16617,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16617: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16620: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16621: \$? = $ac_status" >&5 + echo "$as_me:16624: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17975,7 +17978,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:18916: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18917: \$? = $ac_status" >&5 + echo "$as_me:18920: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -18970,11 +18973,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18973: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18976: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18977: \$? = $ac_status" >&5 + echo "$as_me:18980: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -21009,11 +21012,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21012: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21015: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21016: \$? = $ac_status" >&5 + echo "$as_me:21019: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -21252,11 +21255,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21255: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21258: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21259: \$? = $ac_status" >&5 + echo "$as_me:21262: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -21312,11 +21315,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21315: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21318: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:21319: \$? = $ac_status" >&5 + echo "$as_me:21322: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -23497,7 +23500,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < Changes in directory llvm/autoconf: configure.ac updated: 1.147 -> 1.148 --- Log message: Added support for detection of amd64 targets. --- Diffs of the changes: (+3 -1) Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.147 llvm/autoconf/configure.ac:1.148 --- llvm/autoconf/configure.ac:1.147 Tue Dec 21 23:56:56 2004 +++ llvm/autoconf/configure.ac Thu Dec 23 00:22:33 2004 @@ -139,7 +139,8 @@ dnl the OS. AC_CACHE_CHECK([target architecture],[llvm_cv_target_arch], [case $target in - i*86-*) llvm_cv_target_arch="x86" ;; + i?86-*) llvm_cv_target_arch="x86" ;; + amd64-*) llvm_cv_target_arch="amd64" ;; sparc*-*) llvm_cv_target_arch="Sparc" ;; powerpc*-*) llvm_cv_target_arch="PowerPC" ;; *) llvm_cv_target_arch="Unknown" ;; @@ -183,6 +184,7 @@ x86) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;; Sparc) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;; PowerPC) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;; + amd64) AC_SUBST(JIT,[[]]) ;; *) AC_SUBST(JIT,[[]]) ;; esac fi From jeffc at jolt-lang.org Thu Dec 23 00:45:43 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Thu, 23 Dec 2004 00:45:43 -0600 Subject: [llvm-commits] CVS: llvm/win32/llvm.sln Message-ID: <200412230645.AAA06188@zion.cs.uiuc.edu> Changes in directory llvm/win32: llvm.sln updated: 1.4 -> 1.5 --- Log message: Allow llc to recognize -march=x86. As it was, it didn't recognize any architecture at all. --- Diffs of the changes: (+2 -0) Index: llvm/win32/llvm.sln diff -u llvm/win32/llvm.sln:1.4 llvm/win32/llvm.sln:1.5 --- llvm/win32/llvm.sln:1.4 Sun Dec 19 11:53:47 2004 +++ llvm/win32/llvm.sln Thu Dec 23 00:45:32 2004 @@ -87,11 +87,13 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llc", "llc\llc.vcproj", "{ADE86BDC-B04C-43DF-B9BB-90492C7B14AC}" ProjectSection(ProjectDependencies) = postProject + {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} + {144EEBF6-8C9B-4473-B715-2C821666AF6C} = {144EEBF6-8C9B-4473-B715-2C821666AF6C} EndProjectSection EndProject Global From jeffc at jolt-lang.org Thu Dec 23 00:45:43 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Thu, 23 Dec 2004 00:45:43 -0600 Subject: [llvm-commits] CVS: llvm/win32/llc/llc.vcproj Message-ID: <200412230645.AAA06191@zion.cs.uiuc.edu> Changes in directory llvm/win32/llc: llc.vcproj updated: 1.1 -> 1.2 --- Log message: Allow llc to recognize -march=x86. As it was, it didn't recognize any architecture at all. --- Diffs of the changes: (+2 -0) Index: llvm/win32/llc/llc.vcproj diff -u llvm/win32/llc/llc.vcproj:1.1 llvm/win32/llc/llc.vcproj:1.2 --- llvm/win32/llc/llc.vcproj:1.1 Sun Dec 19 11:53:47 2004 +++ llvm/win32/llc/llc.vcproj Thu Dec 23 00:45:32 2004 @@ -38,6 +38,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)/llc.exe" LinkIncremental="2" + ForceSymbolReferences="_X86TargetMachineModule" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(OutDir)/llc.pdb" SubSystem="1" @@ -88,6 +89,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)/llc.exe" LinkIncremental="1" + ForceSymbolReferences="_X86TargetMachineModule" GenerateDebugInformation="TRUE" SubSystem="1" OptimizeReferences="2" From brukman at cs.uiuc.edu Thu Dec 23 01:15:07 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu, 23 Dec 2004 01:15:07 -0600 Subject: [llvm-commits] CVS: llvm/docs/GettingStarted.html Message-ID: <200412230715.BAA06755@zion.cs.uiuc.edu> Changes in directory llvm/docs: GettingStarted.html updated: 1.98 -> 1.99 --- Log message: LLVM now builds and runs on Linux/amd64, but we don't have 64-bit codegen yet --- Diffs of the changes: (+6 -1) Index: llvm/docs/GettingStarted.html diff -u llvm/docs/GettingStarted.html:1.98 llvm/docs/GettingStarted.html:1.99 --- llvm/docs/GettingStarted.html:1.98 Wed Dec 22 00:29:07 2004 +++ llvm/docs/GettingStarted.html Thu Dec 23 01:14:56 2004 @@ -256,6 +256,11 @@ x861 GCC + + Linux + amd643 + GCC +

    LLVM has partial support for the following platforms:

    @@ -1486,7 +1491,7 @@ Chris Lattner
    Reid Spencer
    The LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/12/22 06:29:07 $ + Last modified: $Date: 2004/12/23 07:14:56 $ From reid at x10sys.com Thu Dec 23 13:40:05 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 13:40:05 -0600 Subject: [llvm-commits] CVS: llvm/docs/GettingStarted.html Message-ID: <200412231940.NAA08114@zion.cs.uiuc.edu> Changes in directory llvm/docs: GettingStarted.html updated: 1.99 -> 1.100 --- Log message: Be specific about version of GCC and binutils on Cygwin since it matters. --- Diffs of the changes: (+2 -2) Index: llvm/docs/GettingStarted.html diff -u llvm/docs/GettingStarted.html:1.99 llvm/docs/GettingStarted.html:1.100 --- llvm/docs/GettingStarted.html:1.99 Thu Dec 23 01:14:56 2004 +++ llvm/docs/GettingStarted.html Thu Dec 23 13:39:54 2004 @@ -254,7 +254,7 @@ Cygwin/Win32 x861 - GCC + GCC 3.4.X, binutils 2.15 Linux @@ -1491,7 +1491,7 @@ Chris Lattner
    Reid Spencer
    The LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/12/23 07:14:56 $ + Last modified: $Date: 2004/12/23 19:39:54 $ From brukman at cs.uiuc.edu Thu Dec 23 13:46:45 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu, 23 Dec 2004 13:46:45 -0600 Subject: [llvm-commits] CVS: llvm-www/testresults/index.html Message-ID: <200412231946.NAA08311@zion.cs.uiuc.edu> Changes in directory llvm-www/testresults: index.html updated: 1.22 -> 1.23 --- Log message: Reid's Linux tester was moved; new Cygwin tester added --- Diffs of the changes: (+4 -2) Index: llvm-www/testresults/index.html diff -u llvm-www/testresults/index.html:1.22 llvm-www/testresults/index.html:1.23 --- llvm-www/testresults/index.html:1.22 Wed Dec 22 17:49:37 2004 +++ llvm-www/testresults/index.html Thu Dec 23 13:46:35 2004 @@ -20,8 +20,10 @@
  • X86: Linux (Dual Athlon MP 2100+) -- release build
  • -
  • X86: Linux (Dual P4 Xeon @ -2.3GHz) -- release build
  • +
  • X86: Linux (Dual P4 +Xeon @ 2.3GHz) -- release build
  • +
  • X86: Cygwin on Windows +2k, SP3 (Pentium 3 M @ 1.1Ghz) -- debug build
  • X86: FreeBSD 5.3-RC1 -- debug build
  • From reid at x10sys.com Thu Dec 23 13:50:04 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 13:50:04 -0600 Subject: [llvm-commits] CVS: llvm/docs/CFEBuildInstrs.html Message-ID: <200412231950.NAA08399@zion.cs.uiuc.edu> Changes in directory llvm/docs: CFEBuildInstrs.html updated: 1.41 -> 1.42 --- Log message: Add a caution about using experimental versions of gnu binutils when building Cygwin. --- Diffs of the changes: (+10 -2) Index: llvm/docs/CFEBuildInstrs.html diff -u llvm/docs/CFEBuildInstrs.html:1.41 llvm/docs/CFEBuildInstrs.html:1.42 --- llvm/docs/CFEBuildInstrs.html:1.41 Wed Dec 22 10:19:05 2004 +++ llvm/docs/CFEBuildInstrs.html Thu Dec 23 13:49:54 2004 @@ -71,7 +71,15 @@ installation includes GCC 3.3.3 we strongly recommend that you download GCC 3.4.3, build it separately, and use it for compiling LLVM CFE. This has been shown to work correctly.

    - +

    Some versions of Cygwin utilize an experimental version of GNU binutils that +will cause the GNU ld linker to fail an assertion when linking +components of the libstdc++. It is recommended that you replace the entire +binutils package with version 2.15 such that "ld --version" responds +with
    +

    GNU ld version 2.15
    +not with:
    +
    GNU ld version 2.15.91 20040725
    +

    @@ -330,7 +338,7 @@ Brian Gaeke
    LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/12/22 16:19:05 $ + Last modified: $Date: 2004/12/23 19:49:54 $ From brukman at cs.uiuc.edu Thu Dec 23 14:04:26 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu, 23 Dec 2004 14:04:26 -0600 Subject: [llvm-commits] CVS: llvm-www/testresults/index.html Message-ID: <200412232004.OAA08756@zion.cs.uiuc.edu> Changes in directory llvm-www/testresults: index.html updated: 1.23 -> 1.24 --- Log message: * Label all testers with full owner names, and `LLVM' for LLVM-group testers * Labeling tests with arch name under the arch heading is redundant * Update Vladimir Merzliakov's OS version * Cosmetic change: remove colons in architecture headings * Add SunOS version --- Diffs of the changes: (+21 -20) Index: llvm-www/testresults/index.html diff -u llvm-www/testresults/index.html:1.23 llvm-www/testresults/index.html:1.24 --- llvm-www/testresults/index.html:1.23 Thu Dec 23 13:46:35 2004 +++ llvm-www/testresults/index.html Thu Dec 23 14:04:16 2004 @@ -12,37 +12,38 @@ break test cases. This is intended to track, over time, the CVS repository, test suite conformance, and performance of code generated by the compiler.

    -

    X86:

    +

    X86

      - -
    1. X86: Linux (Dual P4 Xeon @ 3.06GHz) -- debug build
    2. - -
    3. X86: Linux (Dual Athlon MP 2100+) -- release build
    4. - -
    5. X86: Linux (Dual P4 + +
    6. Linux (Dual P4 Xeon @ 3.06GHz) -- debug build
    7. + +
    8. Linux (Dual Athlon MP 2100+) -- release build
    9. + +
    10. Linux (Dual P4 Xeon @ 2.3GHz) -- release build
    11. -
    12. X86: Cygwin on Windows +
    13. Cygwin on Windows 2k, SP3 (Pentium 3 M @ 1.1Ghz) -- debug build
    14. - -
    15. X86: -FreeBSD 5.3-RC1 -- debug build
    16. - -
    17. X86: FreeBSD-CURRENT + +
    18. FreeBSD 5.3 (Pentium +3 @ 1.0Ghz) -- debug build
    19. + +
    20. FreeBSD-CURRENT (Single Pentium M @ 2.3GHz) -- release build
    -

    PowerPC:

    +

    PowerPC

      - -
    1. PPC: Mac OS X -10.3 "Panther" on PowerPC G5 (dual 1.8Ghz CPU)
    2. + +
    3. Mac OS X 10.3 +"Panther" on PowerPC G5 (dual 1.8Ghz CPU) -- debug build
    -

    Sparc V9:

    +

    Sparc V9

      - -
    1. Sparc V9: Solaris (Sun Fire V240, dual 1Ghz CPU)
    2. + +
    3. SunOS 5.8 on Sun Fire V240 (dual 1Ghz CPU) -- debug +build
    From reid at x10sys.com Thu Dec 23 15:09:03 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 15:09:03 -0600 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200412232109.PAA09648@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.148 -> 1.149 --- Log message: Update the amd64 target detection checks. Patch contributed by Markus F.X.J. Oberhumer. --- Diffs of the changes: (+6 -6) Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.148 llvm/autoconf/configure.ac:1.149 --- llvm/autoconf/configure.ac:1.148 Thu Dec 23 00:22:33 2004 +++ llvm/autoconf/configure.ac Thu Dec 23 15:08:52 2004 @@ -139,11 +139,11 @@ dnl the OS. AC_CACHE_CHECK([target architecture],[llvm_cv_target_arch], [case $target in - i?86-*) llvm_cv_target_arch="x86" ;; - amd64-*) llvm_cv_target_arch="amd64" ;; - sparc*-*) llvm_cv_target_arch="Sparc" ;; - powerpc*-*) llvm_cv_target_arch="PowerPC" ;; - *) llvm_cv_target_arch="Unknown" ;; + i?86-*) llvm_cv_target_arch="x86" ;; + amd64-* | x86_64-*) llvm_cv_target_arch="AMD64" ;; + sparc*-*) llvm_cv_target_arch="Sparc" ;; + powerpc*-*) llvm_cv_target_arch="PowerPC" ;; + *) llvm_cv_target_arch="Unknown" ;; esac]) if test "$llvm_cv_target_arch" = "Unknown" ; then @@ -184,7 +184,7 @@ x86) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;; Sparc) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;; PowerPC) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;; - amd64) AC_SUBST(JIT,[[]]) ;; + AMD64) AC_SUBST(JIT,[[]]) ;; *) AC_SUBST(JIT,[[]]) ;; esac fi From reid at x10sys.com Thu Dec 23 15:09:03 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 15:09:03 -0600 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200412232109.PAA09649@zion.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.157 -> 1.158 --- Log message: Update the amd64 target detection checks. Patch contributed by Markus F.X.J. Oberhumer. --- Diffs of the changes: (+6 -6) Index: llvm/configure diff -u llvm/configure:1.157 llvm/configure:1.158 --- llvm/configure:1.157 Thu Dec 23 00:22:33 2004 +++ llvm/configure Thu Dec 23 15:08:51 2004 @@ -1742,11 +1742,11 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else case $target in - i?86-*) llvm_cv_target_arch="x86" ;; - amd64-*) llvm_cv_target_arch="amd64" ;; - sparc*-*) llvm_cv_target_arch="Sparc" ;; - powerpc*-*) llvm_cv_target_arch="PowerPC" ;; - *) llvm_cv_target_arch="Unknown" ;; + i?86-*) llvm_cv_target_arch="x86" ;; + amd64-* | x86_64-*) llvm_cv_target_arch="AMD64" ;; + sparc*-*) llvm_cv_target_arch="Sparc" ;; + powerpc*-*) llvm_cv_target_arch="PowerPC" ;; + *) llvm_cv_target_arch="Unknown" ;; esac fi echo "$as_me:$LINENO: result: $llvm_cv_target_arch" >&5 @@ -2955,7 +2955,7 @@ ;; PowerPC) JIT=TARGET_HAS_JIT=1 ;; - amd64) JIT= + AMD64) JIT= ;; *) JIT= ;; From reid at x10sys.com Thu Dec 23 15:13:37 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 15:13:37 -0600 Subject: [llvm-commits] CVS: llvm/lib/Analysis/ValueNumbering.cpp Message-ID: <200412232113.PAA09725@zion.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: ValueNumbering.cpp updated: 1.11 -> 1.12 --- Log message: Try to speed up gccld hot spot in BasicVN::getEqualNumberNodes by making a function call at the core of the loop inline and removing unused stack variables from an often called function. This doesn't improve things much, the real saving will be by reducing the number of calls to this function (100K+ when linking kimwitu++). --- Diffs of the changes: (+2 -3) Index: llvm/lib/Analysis/ValueNumbering.cpp diff -u llvm/lib/Analysis/ValueNumbering.cpp:1.11 llvm/lib/Analysis/ValueNumbering.cpp:1.12 --- llvm/lib/Analysis/ValueNumbering.cpp:1.11 Thu Mar 25 16:56:03 2004 +++ llvm/lib/Analysis/ValueNumbering.cpp Thu Dec 23 15:13:26 2004 @@ -145,8 +145,7 @@ } void BVNImpl::handleBinaryInst(Instruction &I) { - Value *LHS = I.getOperand(0), *RHS = I.getOperand(1); - Function *F = I.getParent()->getParent(); + Value *LHS = I.getOperand(0); for (Value::use_iterator UI = LHS->use_begin(), UE = LHS->use_end(); UI != UE; ++UI) @@ -162,7 +161,7 @@ // using a brute force comparison. This is useful for instructions with an // arbitrary number of arguments. // -static bool IdenticalComplexInst(const Instruction *I1, const Instruction *I2) { +static inline bool IdenticalComplexInst(const Instruction *I1, const Instruction *I2) { assert(I1->getOpcode() == I2->getOpcode()); // Equal if they are in the same function... return I1->getParent()->getParent() == I2->getParent()->getParent() && From reid at x10sys.com Thu Dec 23 15:16:57 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 15:16:57 -0600 Subject: [llvm-commits] CVS: llvm/lib/Debugger/FDHandle.cpp Message-ID: <200412232116.PAA09799@zion.cs.uiuc.edu> Changes in directory llvm/lib/Debugger: FDHandle.cpp updated: 1.1 -> 1.2 --- Log message: Correct the comments and file header. --- Diffs of the changes: (+2 -3) Index: llvm/lib/Debugger/FDHandle.cpp diff -u llvm/lib/Debugger/FDHandle.cpp:1.1 llvm/lib/Debugger/FDHandle.cpp:1.2 --- llvm/lib/Debugger/FDHandle.cpp:1.1 Wed Dec 22 04:24:55 2004 +++ llvm/lib/Debugger/FDHandle.cpp Thu Dec 23 15:16:46 2004 @@ -1,4 +1,4 @@ -//===- Support/FileUtilities.cpp - File System Utilities ------------------===// +//===- lib/Debugger/FDHandle.cpp - File Descriptor Handle -----------------===// // // The LLVM Compiler Infrastructure // @@ -7,8 +7,7 @@ // //===----------------------------------------------------------------------===// // -// This file implements a family of utility functions which are useful for doing -// various things with files. +// This file implements a class for ensuring that Unix file handles get closed. // //===----------------------------------------------------------------------===// From brukman at cs.uiuc.edu Thu Dec 23 15:17:52 2004 From: brukman at cs.uiuc.edu (Misha Brukman) Date: Thu, 23 Dec 2004 15:17:52 -0600 Subject: [llvm-commits] CVS: llvm/lib/Analysis/ValueNumbering.cpp Message-ID: <200412232117.PAA09849@zion.cs.uiuc.edu> Changes in directory llvm/lib/Analysis: ValueNumbering.cpp updated: 1.12 -> 1.13 --- Log message: Wrap at 80 cols --- Diffs of the changes: (+2 -1) Index: llvm/lib/Analysis/ValueNumbering.cpp diff -u llvm/lib/Analysis/ValueNumbering.cpp:1.12 llvm/lib/Analysis/ValueNumbering.cpp:1.13 --- llvm/lib/Analysis/ValueNumbering.cpp:1.12 Thu Dec 23 15:13:26 2004 +++ llvm/lib/Analysis/ValueNumbering.cpp Thu Dec 23 15:17:41 2004 @@ -161,7 +161,8 @@ // using a brute force comparison. This is useful for instructions with an // arbitrary number of arguments. // -static inline bool IdenticalComplexInst(const Instruction *I1, const Instruction *I2) { +static inline bool IdenticalComplexInst(const Instruction *I1, + const Instruction *I2) { assert(I1->getOpcode() == I2->getOpcode()); // Equal if they are in the same function... return I1->getParent()->getParent() == I2->getParent()->getParent() && From reid at x10sys.com Thu Dec 23 16:14:43 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 16:14:43 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Win32/Path.cpp Message-ID: <200412232214.QAA10757@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Win32: Path.cpp updated: 1.21 -> 1.22 --- Log message: Put CopyFile in the sys namespace. --- Diffs of the changes: (+1 -1) Index: llvm/lib/System/Win32/Path.cpp diff -u llvm/lib/System/Win32/Path.cpp:1.21 llvm/lib/System/Win32/Path.cpp:1.22 --- llvm/lib/System/Win32/Path.cpp:1.21 Sat Dec 18 00:42:15 2004 +++ llvm/lib/System/Win32/Path.cpp Thu Dec 23 16:14:32 2004 @@ -573,7 +573,7 @@ } void -CopyFile(const sys::Path &Dest, const sys::Path &Src) { +sys::CopyFile(const sys::Path &Dest, const sys::Path &Src) { if (!::CopyFile(Src.c_str(), Dest.c_str(), false)) ThrowError("Can't copy '" + Src.toString() + "' to '" + Dest.toString() + "'"); From reid at x10sys.com Thu Dec 23 18:15:31 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 18:15:31 -0600 Subject: [llvm-commits] CVS: llvm/autoconf/README.TXT ltmain.sh Message-ID: <200412240015.SAA24346@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: README.TXT updated: 1.2 -> 1.3 ltmain.sh updated: 1.3 -> 1.4 --- Log message: Fix a bug in libtool's ltmain.sh. On Cygwin the "$output.exp" expression expands to a full path name. Substitute $outputname.exp" instead and it makes a viable temporary file name. This gets around the problem with lli on Cygwin linking but not having any "C" library functions linked into it. --- Diffs of the changes: (+13 -12) Index: llvm/autoconf/README.TXT diff -u llvm/autoconf/README.TXT:1.2 llvm/autoconf/README.TXT:1.3 --- llvm/autoconf/README.TXT:1.2 Mon Nov 29 06:28:47 2004 +++ llvm/autoconf/README.TXT Thu Dec 23 18:15:20 2004 @@ -8,20 +8,21 @@ 3. Copy /ltdl.m4 to llvm/autoconf/m4 4. Copy /share/aclocal/libtool.m4 to llvm/autoconf/m4/libtool.m4 5. Copy /share/libtool/ltmain.sh to llvm/autoconf/ltmain.sh - 6. Copy /share/libtool/libltdl/ltdl.c to llvm/lib/System - 7. Copy /share/libtool/libltdl/ltdl.h to llvm/lib/System - 8. Adjust the llvm/autoconf/m4/libtool.m4 file to ensure that the variable + 6. Run sed -e 's/output.exp/outputname.exp/g' on ltmain.sh + 7. Copy /share/libtool/libltdl/ltdl.c to llvm/lib/System + 8. Copy /share/libtool/libltdl/ltdl.h to llvm/lib/System + 9. Adjust the llvm/autoconf/m4/libtool.m4 file to ensure that the variable default_ofile is set to "mklib" instead of "libtool" - 9. Run "autoupdate libtool.m4 ltdl.m4" in the llvm/autoconf/m4 directory. +10. Run "autoupdate libtool.m4 ltdl.m4" in the llvm/autoconf/m4 directory. This should correctly update the macro definitions in the libtool m4 files to match the version of autoconf that LLVM uses. This converts AC_HELP_STRING to AS_HELP_STRING and AC_TRY_LINK to AC_LINK_IFELSE, amongst other things. You may need to manually adjust the files. -10. Run AutoRegen.sh to get the new macros into configure script -11. If there are any warnings from configure, go to step 9. -12. Rebuild LLVM, making sure it reconfigured -13. Test the JIT which uses libltdl -14. If it all works, only THEN commit the changes. +11. Run AutoRegen.sh to get the new macros into configure script +12. If there are any warnings from configure, go to step 9. +13. Rebuild LLVM, making sure it reconfigured +14. Test the JIT which uses libltdl +15. If it all works, only THEN commit the changes. Upgrading autoconf =============================================================================== Index: llvm/autoconf/ltmain.sh diff -u llvm/autoconf/ltmain.sh:1.3 llvm/autoconf/ltmain.sh:1.4 --- llvm/autoconf/ltmain.sh:1.3 Tue Oct 12 19:19:25 2004 +++ llvm/autoconf/ltmain.sh Thu Dec 23 18:15:20 2004 @@ -4327,12 +4327,12 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$output.exp" + export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' else - $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' - $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' + $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi fi From jeffc at jolt-lang.org Thu Dec 23 20:38:45 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Thu, 23 Dec 2004 20:38:45 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Win32/Path.cpp Message-ID: <200412240238.UAA28930@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Win32: Path.cpp updated: 1.22 -> 1.23 --- Log message: Fix VC++ compilation error --- Diffs of the changes: (+7 -2) Index: llvm/lib/System/Win32/Path.cpp diff -u llvm/lib/System/Win32/Path.cpp:1.22 llvm/lib/System/Win32/Path.cpp:1.23 --- llvm/lib/System/Win32/Path.cpp:1.22 Thu Dec 23 16:14:32 2004 +++ llvm/lib/System/Win32/Path.cpp Thu Dec 23 20:38:34 2004 @@ -23,6 +23,9 @@ #include #include +// We need to undo a macro defined in Windows.h, otherwise we won't compile: +#undef CopyFile + static void FlipBackSlashes(std::string& s) { for (size_t i = 0; i < s.size(); i++) if (s[i] == '\\') @@ -574,13 +577,15 @@ void sys::CopyFile(const sys::Path &Dest, const sys::Path &Src) { - if (!::CopyFile(Src.c_str(), Dest.c_str(), false)) + // Can't use CopyFile macro defined in Windows.h because it would mess up the + // above line. We use the expansion it would have in a non-UNICODE build. + if (!::CopyFileA(Src.c_str(), Dest.c_str(), false)) ThrowError("Can't copy '" + Src.toString() + "' to '" + Dest.toString() + "'"); } void -Path::makeUnique( bool reuse_current ) { +Path::makeUnique(bool reuse_current) { if (reuse_current && !exists()) return; // File doesn't exist already, just use it! From reid at x10sys.com Thu Dec 23 21:34:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 21:34:42 -0600 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200412240334.VAA29530@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.149 -> 1.150 --- Log message: Change llvmgcc/llvmg++ to llvm-gcc and llvm-g++ respectively. --- Diffs of the changes: (+3 -3) Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.149 llvm/autoconf/configure.ac:1.150 --- llvm/autoconf/configure.ac:1.149 Thu Dec 23 15:08:52 2004 +++ llvm/autoconf/configure.ac Thu Dec 23 21:34:31 2004 @@ -432,7 +432,7 @@ dnl=== dnl===-----------------------------------------------------------------------=== -dnl See if the llvmgcc executable can compile to LLVM assembly +dnl See if the llvm-gcc executable can compile to LLVM assembly AC_CACHE_CHECK([whether llvm-gcc is sane],[llvm_cv_llvmgcc_sanity], [llvm_cv_llvmgcc_sanity="no" if test -x "$LLVMGCC" ; then @@ -444,7 +444,7 @@ rm conftest.c fi]) -dnl Since we have a sane llvmgcc, identify it and its sub-tools +dnl Since we have a sane llvm-gcc, identify it and its sub-tools if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then llvmcc1path=`"$LLVMGCC" --print-prog-name=cc1` AC_SUBST(LLVMCC1,$llvmcc1path) @@ -546,7 +546,7 @@ dnl Warn loudly if llvm-gcc was not obviously working if test "$llvm_cv_llvmgcc_sanity" = "no" ; then - AC_MSG_WARN([***** llvmgcc/llvmg++ was not found, or does not appear to be ]) + AC_MSG_WARN([***** llvm-gcc/llvm-g++ was not found, or does not appear to be ]) AC_MSG_WARN([***** working. Please make sure you have llvmgcc and llvmg++ in]) AC_MSG_WARN([***** your path before configuring LLVM. The runtime libraries]) AC_MSG_WARN([***** (llvm/runtime) will not be built but you should be able to]) From reid at x10sys.com Thu Dec 23 21:36:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 21:36:42 -0600 Subject: [llvm-commits] CVS: llvm/Makefile.rules Message-ID: <200412240336.VAA29551@zion.cs.uiuc.edu> Changes in directory llvm: Makefile.rules updated: 1.277 -> 1.278 --- Log message: Two corrections: * When reconfiguring, make sure the config.cache file is blown away so that its (old) values don't short-circuit doing the tests. When a reconfigure is done, it should be done from scratch, without the cache. * For dist-check, don't pass --with-llvmgccdir any more because configure doesn't have this option any more. --- Diffs of the changes: (+7 -1) Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.277 llvm/Makefile.rules:1.278 --- llvm/Makefile.rules:1.277 Tue Dec 21 23:57:21 2004 +++ llvm/Makefile.rules Thu Dec 23 21:36:31 2004 @@ -110,6 +110,9 @@ reconfigure: $(Echo) Reconfiguring $(BUILD_OBJ_ROOT) $(Verb) cd $(BUILD_OBJ_ROOT) && \ + if test -w $(BUILD_OBJ_ROOT)/config.cache ; then \ + $(RM) $(BUILD_OBJ_ROOT)/config.cache ; \ + fi ; \ $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \ $(ConfigStatusScript) @@ -117,6 +120,9 @@ $(ConfigStatusScript): $(ConfigureScript) $(Echo) Reconfiguring with $< $(Verb) cd $(BUILD_OBJ_ROOT) && \ + if test -w $(BUILD_OBJ_ROOT)/config.cache ; then \ + $(RM) $(BUILD_OBJ_ROOT)/config.cache ; \ + fi ; \ $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \ $(ConfigStatusScript) @@ -1267,7 +1273,7 @@ gunzip -c $(DistTarGZip) | $(TAR) xf - && \ cd build && \ ../$(DistName)/configure --prefix="$(DistCheckDir)/install" \ - --srcdir=../$(DistName) --with-llvmgccdir="$(LLVMGCCDIR)" && \ + --srcdir=../$(DistName) && \ $(MAKE) all && \ $(MAKE) check && \ $(MAKE) install && \ From reid at x10sys.com Thu Dec 23 21:38:12 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 21:38:12 -0600 Subject: [llvm-commits] CVS: llvm/test/Makefile Message-ID: <200412240338.VAA29583@zion.cs.uiuc.edu> Changes in directory llvm/test: Makefile updated: 1.78 -> 1.79 --- Log message: The dejagnu scripts need a path for llvm-gcc/llvm-g++ as well so use the correct variable to get a "set the path first" invocation of those tools. --- Diffs of the changes: (+2 -2) Index: llvm/test/Makefile diff -u llvm/test/Makefile:1.78 llvm/test/Makefile:1.79 --- llvm/test/Makefile:1.78 Tue Dec 21 23:57:50 2004 +++ llvm/test/Makefile Thu Dec 23 21:38:01 2004 @@ -44,8 +44,8 @@ @echo 'set prcontext "$(TCLSH) $(LLVM_SRC_ROOT)/test/Scripts/prcontext.tcl"' >> site.tmp @echo 'set srcdir $(LLVM_SRC_ROOT)/test' >>site.tmp @echo "set objdir $(LLVM_OBJ_ROOT)/test" >>site.tmp - @echo 'set llvmgcc $(LLVMGCC)' >> site.tmp - @echo 'set llvmgxx $(LLVMGXX)' >> site.tmp + @echo 'set llvmgcc "$(LLVMGCCWITHPATH)"' >> site.tmp + @echo 'set llvmgxx "$(LLVMGXXWITHPATH)"' >> site.tmp @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp @test ! -f site.exp || \ sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp From reid at x10sys.com Thu Dec 23 21:44:35 2004 From: reid at x10sys.com (Reid Spencer) Date: Thu, 23 Dec 2004 21:44:35 -0600 Subject: [llvm-commits] CVS: llvm/test/Makefile.tests Message-ID: <200412240344.VAA29667@zion.cs.uiuc.edu> Changes in directory llvm/test: Makefile.tests updated: 1.90 -> 1.91 --- Log message: Make sure LLVMGCCWITHPATH is used instead of just LLVMGCC so that the CFE tools can find the correct LLVM tools to invoke. --- Diffs of the changes: (+3 -3) Index: llvm/test/Makefile.tests diff -u llvm/test/Makefile.tests:1.90 llvm/test/Makefile.tests:1.91 --- llvm/test/Makefile.tests:1.90 Tue Jul 20 20:31:47 2004 +++ llvm/test/Makefile.tests Thu Dec 23 21:44:24 2004 @@ -50,15 +50,15 @@ # Compile from X.c to Output/X.ll Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES) - -$(LLVMGCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ + -$(LLVMGCCWITHPATH) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ # Compile from X.cpp to Output/X.ll Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES) - -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ + -$(LLVMGXXWITHPATH) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ # Compile from X.cc to Output/X.ll Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES) - -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ + -$(LLVMGXXWITHPATH) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ # LLVM Assemble from Output/X.ll to Output/X.bc. Output/X.ll must have come # from GCC output, so use GCCAS. From llvm at cs.uiuc.edu Thu Dec 23 21:59:59 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Thu, 23 Dec 2004 21:59:59 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Cygwin/DynamicLibrary.cpp Message-ID: <200412240359.VAA29826@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Cygwin: DynamicLibrary.cpp (r1.2) removed --- Log message: Remove these files as they are not being included any more. DynamicLibrary is now implemented via ltdl.cpp which has its own way of dealing with the different platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Thu Dec 23 21:59:58 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Thu, 23 Dec 2004 21:59:58 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Linux/DynamicLibrary.cpp Message-ID: <200412240359.VAA29825@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Linux: DynamicLibrary.cpp (r1.2) removed --- Log message: Remove these files as they are not being included any more. DynamicLibrary is now implemented via ltdl.cpp which has its own way of dealing with the different platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Thu Dec 23 21:59:59 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Thu, 23 Dec 2004 21:59:59 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Interix/DynamicLibrary.cpp Message-ID: <200412240359.VAA29830@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Interix: DynamicLibrary.cpp (r1.1) removed --- Log message: Remove these files as they are not being included any more. DynamicLibrary is now implemented via ltdl.cpp which has its own way of dealing with the different platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Thu Dec 23 21:59:59 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Thu, 23 Dec 2004 21:59:59 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/AIX/DynamicLibrary.cpp Message-ID: <200412240359.VAA29831@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/AIX: DynamicLibrary.cpp (r1.1) removed --- Log message: Remove these files as they are not being included any more. DynamicLibrary is now implemented via ltdl.cpp which has its own way of dealing with the different platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Thu Dec 23 21:59:59 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Thu, 23 Dec 2004 21:59:59 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Win32/DynamicLibrary.cpp Message-ID: <200412240359.VAA29835@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Win32: DynamicLibrary.cpp (r1.4) removed --- Log message: Remove these files as they are not being included any more. DynamicLibrary is now implemented via ltdl.cpp which has its own way of dealing with the different platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Thu Dec 23 21:59:59 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Thu, 23 Dec 2004 21:59:59 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Darwin/DynamicLibrary.cpp Message-ID: <200412240359.VAA29827@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Darwin: DynamicLibrary.cpp (r1.1) removed --- Log message: Remove these files as they are not being included any more. DynamicLibrary is now implemented via ltdl.cpp which has its own way of dealing with the different platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Thu Dec 23 21:59:59 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Thu, 23 Dec 2004 21:59:59 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Unix/DynamicLibrary.cpp Message-ID: <200412240359.VAA29834@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Unix: DynamicLibrary.cpp (r1.4) removed --- Log message: Remove these files as they are not being included any more. DynamicLibrary is now implemented via ltdl.cpp which has its own way of dealing with the different platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Thu Dec 23 21:59:59 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Thu, 23 Dec 2004 21:59:59 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/SunOS/DynamicLibrary.cpp Message-ID: <200412240359.VAA29849@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/SunOS: DynamicLibrary.cpp (r1.1) removed --- Log message: Remove these files as they are not being included any more. DynamicLibrary is now implemented via ltdl.cpp which has its own way of dealing with the different platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Thu Dec 23 21:59:59 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Thu, 23 Dec 2004 21:59:59 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/FreeBSD/DynamicLibrary.cpp Message-ID: <200412240359.VAA29836@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/FreeBSD: DynamicLibrary.cpp (r1.1) removed --- Log message: Remove these files as they are not being included any more. DynamicLibrary is now implemented via ltdl.cpp which has its own way of dealing with the different platforms. --- Diffs of the changes: (+0 -0) From reid at x10sys.com Fri Dec 24 00:03:42 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 24 Dec 2004 00:03:42 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Win32/DynamicLibrary.cpp Message-ID: <200412240603.AAA31007@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Win32: DynamicLibrary.cpp updated: 1.5 -> 1.6 --- Log message: Resurrect this file. --- Diffs of the changes: (+53 -0) Index: llvm/lib/System/Win32/DynamicLibrary.cpp diff -u /dev/null llvm/lib/System/Win32/DynamicLibrary.cpp:1.6 --- /dev/null Fri Dec 24 00:03:41 2004 +++ llvm/lib/System/Win32/DynamicLibrary.cpp Fri Dec 24 00:03:31 2004 @@ -0,0 +1,53 @@ +//===- Win32/DynamicLibrary.cpp - Win32 DL Implementation -------*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file was developed by Reid Spencer and is distributed under the +// University of Illinois Open Source License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file provides the Win32 specific implementation of the DynamicLibrary +// +//===----------------------------------------------------------------------===// + +#include "Win32.h" + +namespace llvm { +using namespace sys; + +//===----------------------------------------------------------------------===// +//=== WARNING: Implementation here must contain only Win32 specific code +//=== and must not be UNIX code +//===----------------------------------------------------------------------===// + +DynamicLibrary::DynamicLibrary() : handle(0) { + handle = (void*) GetModuleHandle(NULL); + + if (handle == 0) { + ThrowError("Can't GetModuleHandle: "); + } +} + +DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) { + handle = LoadLibrary(filename); + + if (handle == 0) { + ThrowError("Can't LoadLibrary: "); + } +} + +DynamicLibrary::~DynamicLibrary() { + assert(handle !=0 && "Invalid DynamicLibrary handle"); + if (handle) + FreeLibrary((HMODULE*)handle); +} + +void *DynamicLibrary::GetAddressOfSymbol(const char *symbolName) { + assert(handle !=0 && "Invalid DynamicLibrary handle"); + return (void*) GetProcAddress((HMODULE*)handle, symbolName); +} + +} + +// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Dec 24 00:29:16 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 24 Dec 2004 00:29:16 -0600 Subject: [llvm-commits] CVS: llvm/include/llvm/Config/config.h.in Message-ID: <200412240629.AAA31222@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/Config: config.h.in updated: 1.41 -> 1.42 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : Create new variables LLVM_ON_UNIX and LLVM_ON_WIN32 so we can start getting rid of reliance upon a symbolic link to switch implementations in lib/System --- Diffs of the changes: (+6 -0) Index: llvm/include/llvm/Config/config.h.in diff -u llvm/include/llvm/Config/config.h.in:1.41 llvm/include/llvm/Config/config.h.in:1.42 --- llvm/include/llvm/Config/config.h.in:1.41 Sun Dec 19 22:08:58 2004 +++ llvm/include/llvm/Config/config.h.in Fri Dec 24 00:29:05 2004 @@ -347,6 +347,12 @@ /* Installation directory for man pages */ #undef LLVM_MANDIR +/* Define if this is Unixish platform */ +#undef LLVM_ON_UNIX + +/* Define if this is Win32ish platform */ +#undef LLVM_ON_WIN32 + /* Installation prefix directory */ #undef LLVM_PREFIX From reid at x10sys.com Fri Dec 24 00:29:16 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 24 Dec 2004 00:29:16 -0600 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200412240629.AAA31225@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.150 -> 1.151 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : Create new variables LLVM_ON_UNIX and LLVM_ON_WIN32 so we can start getting rid of reliance upon a symbolic link to switch implementations in lib/System --- Diffs of the changes: (+47 -15) Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.150 llvm/autoconf/configure.ac:1.151 --- llvm/autoconf/configure.ac:1.150 Thu Dec 23 21:34:31 2004 +++ llvm/autoconf/configure.ac Fri Dec 24 00:29:05 2004 @@ -97,29 +97,61 @@ dnl Determine the platform type and cache its value. This helps us configure dnl the System library to the correct build platform. -AC_CACHE_CHECK([support for generic build operating system], - [llvm_cv_platform_type], +AC_CACHE_CHECK([type of operating system we're on], + [llvm_cv_os_type], [case $build in - *-*-aix*) llvm_cv_platform_type="AIX" ;; - *-*-cygwin*) llvm_cv_platform_type="Cygwin" ;; - *-*-darwin*) llvm_cv_platform_type="Darwin" ;; - *-*-freebsd*) llvm_cv_platform_type="FreeBSD" ;; - *-*-interix*) llvm_cv_platform_type="Interix" ;; - *-*-linux*) llvm_cv_platform_type="Linux" ;; - *-*-solaris*) llvm_cv_platform_type="SunOS" ;; - *-*-win32*) llvm_cv_platform_type="Win32" ;; - *-*-mingw*) llvm_cv_platform_type="Win32" ;; - *) llvm_cv_platform_type="Unknown" ;; + *-*-aix*) + llvm_cv_os_type="AIX" + llvm_cv_platform_type="Unix" ;; + *-*-cygwin*) + llvm_cv_os_type="Cygwin" + llvm_cv_platform_type="Unix" ;; + *-*-darwin*) + llvm_cv_os_type="Darwin" + llvm_cv_platform_type="Unix" ;; + *-*-freebsd*) + llvm_cv_os_type="FreeBSD" + llvm_cv_platform_type="Unix" ;; + *-*-interix*) + llvm_cv_os_type="Interix" + llvm_cv_platform_type="Unix" ;; + *-*-linux*) + llvm_cv_os_type="Linux" + llvm_cv_platform_type="Unix" ;; + *-*-solaris*) + llvm_cv_os_type="SunOS" + llvm_cv_platform_type="Unix" ;; + *-*-win32*) + llvm_cv_os_type="Win32" + llvm_cv_platform_type="Win32" ;; + *-*-mingw*) + llvm_cv_os_type="MingW" + llvm_cv_platform_type="Win32" ;; + *) + llvm_cv_os_type="Unknown" + llvm_cv_platform_type="Unknown" ;; esac]) dnl Make sure we aren't attempting to configure for an unknown system -if test "$llvm_cv_platform_type" = "Unknown" ; then - AC_MSG_ERROR([Operating system platform is unknown, configure can't continue]) +if test "$llvm_cv_os_type" = "Unknown" ; then + AC_MSG_ERROR([Operating system is unknown, configure can't continue]) fi dnl Set the "OS" Makefile variable based on the platform type so the dnl makefile can configure itself to specific build hosts -AC_SUBST(OS,$llvm_cv_platform_type) +AC_SUBST(OS,$llvm_cv_os_type) + +dnl Set the "LLVM_ON_*" variables based on llvm_cvs_platform_type +dnl This is used by lib/System to determine the basic kind of implementation +dnl to use. +case $llvm_cv_platform_type in + Unix) + AC_DEFINE([LLVM_ON_UNIX],[1],[Define if this is Unixish platform]) + ;; + Win32) + AC_DEFINE([LLVM_ON_WIN32],[1],[Define if this is Win32ish platform]) + ;; +esac dnl Make a link from lib/System/platform to lib/System/$llvm_cv_platform_type dnl This helps the #inclusion of the system specific include files From reid at x10sys.com Fri Dec 24 00:29:28 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 24 Dec 2004 00:29:28 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Path.cpp Message-ID: <200412240629.AAA31239@zion.cs.uiuc.edu> Changes in directory llvm/lib/System: Path.cpp updated: 1.13 -> 1.14 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : Use the LLVM_ON_UNIX and LLVM_ON_WIN32 #defines to include the implementation instead of relying upon the "platform" link --- Diffs of the changes: (+7 -1) Index: llvm/lib/System/Path.cpp diff -u llvm/lib/System/Path.cpp:1.13 llvm/lib/System/Path.cpp:1.14 --- llvm/lib/System/Path.cpp:1.13 Tue Dec 14 22:08:15 2004 +++ llvm/lib/System/Path.cpp Fri Dec 24 00:29:17 2004 @@ -99,6 +99,12 @@ } // Include the truly platform-specific parts of this class. -#include "platform/Path.cpp" + +#if defined(LLVM_ON_UNIX) +#include "Unix/Path.cpp" +#endif +#if defined(LLVM_ON_WIN32) +#include "Win32/Path.cpp" +#endif // vim: sw=2 smartindent smarttab tw=80 autoindent expandtab From reid at x10sys.com Fri Dec 24 00:29:16 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 24 Dec 2004 00:29:16 -0600 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200412240629.AAA31228@zion.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.158 -> 1.159 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : Create new variables LLVM_ON_UNIX and LLVM_ON_WIN32 so we can start getting rid of reliance upon a symbolic link to switch implementations in lib/System --- Diffs of the changes: (+90 -53) Index: llvm/configure diff -u llvm/configure:1.158 llvm/configure:1.159 --- llvm/configure:1.158 Thu Dec 23 15:08:51 2004 +++ llvm/configure Fri Dec 24 00:29:05 2004 @@ -1697,36 +1697,73 @@ NONENONEs,x,x, && program_prefix=${target_alias}- -echo "$as_me:$LINENO: checking support for generic build operating system" >&5 -echo $ECHO_N "checking support for generic build operating system... $ECHO_C" >&6 -if test "${llvm_cv_platform_type+set}" = set; then +echo "$as_me:$LINENO: checking type of operating system we're on" >&5 +echo $ECHO_N "checking type of operating system we're on... $ECHO_C" >&6 +if test "${llvm_cv_os_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else case $build in - *-*-aix*) llvm_cv_platform_type="AIX" ;; - *-*-cygwin*) llvm_cv_platform_type="Cygwin" ;; - *-*-darwin*) llvm_cv_platform_type="Darwin" ;; - *-*-freebsd*) llvm_cv_platform_type="FreeBSD" ;; - *-*-interix*) llvm_cv_platform_type="Interix" ;; - *-*-linux*) llvm_cv_platform_type="Linux" ;; - *-*-solaris*) llvm_cv_platform_type="SunOS" ;; - *-*-win32*) llvm_cv_platform_type="Win32" ;; - *-*-mingw*) llvm_cv_platform_type="Win32" ;; - *) llvm_cv_platform_type="Unknown" ;; -esac -fi -echo "$as_me:$LINENO: result: $llvm_cv_platform_type" >&5 -echo "${ECHO_T}$llvm_cv_platform_type" >&6 - -if test "$llvm_cv_platform_type" = "Unknown" ; then - { { echo "$as_me:$LINENO: error: Operating system platform is unknown, configure can't continue" >&5 -echo "$as_me: error: Operating system platform is unknown, configure can't continue" >&2;} + *-*-aix*) + llvm_cv_os_type="AIX" + llvm_cv_platform_type="Unix" ;; + *-*-cygwin*) + llvm_cv_os_type="Cygwin" + llvm_cv_platform_type="Unix" ;; + *-*-darwin*) + llvm_cv_os_type="Darwin" + llvm_cv_platform_type="Unix" ;; + *-*-freebsd*) + llvm_cv_os_type="FreeBSD" + llvm_cv_platform_type="Unix" ;; + *-*-interix*) + llvm_cv_os_type="Interix" + llvm_cv_platform_type="Unix" ;; + *-*-linux*) + llvm_cv_os_type="Linux" + llvm_cv_platform_type="Unix" ;; + *-*-solaris*) + llvm_cv_os_type="SunOS" + llvm_cv_platform_type="Unix" ;; + *-*-win32*) + llvm_cv_os_type="Win32" + llvm_cv_platform_type="Win32" ;; + *-*-mingw*) + llvm_cv_os_type="MingW" + llvm_cv_platform_type="Win32" ;; + *) + llvm_cv_os_type="Unknown" + llvm_cv_platform_type="Unknown" ;; +esac +fi +echo "$as_me:$LINENO: result: $llvm_cv_os_type" >&5 +echo "${ECHO_T}$llvm_cv_os_type" >&6 + +if test "$llvm_cv_os_type" = "Unknown" ; then + { { echo "$as_me:$LINENO: error: Operating system is unknown, configure can't continue" >&5 +echo "$as_me: error: Operating system is unknown, configure can't continue" >&2;} { (exit 1); exit 1; }; } fi -OS=$llvm_cv_platform_type +OS=$llvm_cv_os_type +case $llvm_cv_platform_type in + Unix) + +cat >>confdefs.h <<\_ACEOF +#define LLVM_ON_UNIX 1 +_ACEOF + + ;; + Win32) + +cat >>confdefs.h <<\_ACEOF +#define LLVM_ON_WIN32 1 +_ACEOF + + ;; +esac + ac_config_links="$ac_config_links lib/System/platform:lib/System/$llvm_cv_platform_type" @@ -8245,7 +8282,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext + echo '#line 10276 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10721,7 +10758,7 @@ # Provide some information about the compiler. -echo "$as_me:10724:" \ +echo "$as_me:10761:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -11778,11 +11815,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11781: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11818: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11785: \$? = $ac_status" >&5 + echo "$as_me:11822: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12021,11 +12058,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12024: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12061: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12028: \$? = $ac_status" >&5 + echo "$as_me:12065: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12081,11 +12118,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12084: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12121: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12088: \$? = $ac_status" >&5 + echo "$as_me:12125: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14266,7 +14303,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:16597: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16564: \$? = $ac_status" >&5 + echo "$as_me:16601: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16617,11 +16654,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16620: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16657: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16624: \$? = $ac_status" >&5 + echo "$as_me:16661: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17978,7 +18015,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:18953: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18920: \$? = $ac_status" >&5 + echo "$as_me:18957: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -18973,11 +19010,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18976: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19013: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18980: \$? = $ac_status" >&5 + echo "$as_me:19017: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -21012,11 +21049,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21015: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21052: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21019: \$? = $ac_status" >&5 + echo "$as_me:21056: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -21255,11 +21292,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21258: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21295: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21262: \$? = $ac_status" >&5 + echo "$as_me:21299: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -21315,11 +21352,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21318: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21355: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:21322: \$? = $ac_status" >&5 + echo "$as_me:21359: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -23500,7 +23537,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 -echo "$as_me: WARNING: ***** llvmgcc/llvmg++ was not found, or does not appear to be " >&2;} + { echo "$as_me:$LINENO: WARNING: ***** llvm-gcc/llvm-g++ was not found, or does not appear to be " >&5 +echo "$as_me: WARNING: ***** llvm-gcc/llvm-g++ was not found, or does not appear to be " >&2;} { echo "$as_me:$LINENO: WARNING: ***** working. Please make sure you have llvmgcc and llvmg++ in" >&5 echo "$as_me: WARNING: ***** working. Please make sure you have llvmgcc and llvmg++ in" >&2;} { echo "$as_me:$LINENO: WARNING: ***** your path before configuring LLVM. The runtime libraries" >&5 From reid at x10sys.com Fri Dec 24 00:29:53 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 24 Dec 2004 00:29:53 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Unix/Path.cpp Message-ID: <200412240629.AAA31297@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Unix: Path.cpp updated: 1.27 -> 1.28 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : Merge implementations of isValid and GetTemporaryDirectory into this file. There is not any point having the operating system specific files for such little variation between the Unix family of systems. --- Diffs of the changes: (+89 -0) Index: llvm/lib/System/Unix/Path.cpp diff -u llvm/lib/System/Unix/Path.cpp:1.27 llvm/lib/System/Unix/Path.cpp:1.28 --- llvm/lib/System/Unix/Path.cpp:1.27 Mon Dec 20 21:27:08 2004 +++ llvm/lib/System/Unix/Path.cpp Fri Dec 24 00:29:42 2004 @@ -22,6 +22,7 @@ #include #include #include +#include namespace llvm { using namespace sys; @@ -36,6 +37,21 @@ ThrowErrno(unverified_path + ": path is not valid"); } +bool +Path::isValid() const { + if (path.empty()) + return false; + else if (path.length() >= MAXPATHLEN) + return false; +#if defined(HAVE_REALPATH) + char pathname[MAXPATHLEN]; + if (0 == realpath(path.c_str(), pathname)) + if (errno != EACCES && errno != EIO && errno != ENOENT && errno != ENOTDIR) + return false; +#endif + return true; +} + Path Path::GetRootDirectory() { Path result; @@ -43,6 +59,79 @@ return result; } +Path +Path::GetTemporaryDirectory() { +#if defined(HAVE_MKDTEMP) + // The best way is with mkdtemp but that's not available on many systems, + // Linux and FreeBSD have it. Others probably won't. + char pathname[MAXPATHLEN]; + strcpy(pathname,"/tmp/llvm_XXXXXX"); + if (0 == mkdtemp(pathname)) + ThrowErrno(std::string(pathname) + ": Can't create temporary directory"); + Path result; + result.setDirectory(pathname); + assert(result.isValid() && "mkdtemp didn't create a valid pathname!"); + return result; +#elif defined(HAVE_MKSTEMP) + // If no mkdtemp is available, mkstemp can be used to create a temporary file + // which is then removed and created as a directory. We prefer this over + // mktemp because of mktemp's inherent security and threading risks. We still + // have a slight race condition from the time the temporary file is created to + // the time it is re-created as a directoy. + char pathname[MAXPATHLEN]; + strcpy(pathname, "/tmp/llvm_XXXXXX"); + int fd = 0; + if (-1 == (fd = mkstemp(pathname))) + ThrowErrno(std::string(pathname) + ": Can't create temporary directory"); + ::close(fd); + ::unlink(pathname); // start race condition, ignore errors + if (-1 == ::mkdir(pathname, S_IRWXU)) // end race condition + ThrowErrno(std::string(pathname) + ": Can't create temporary directory"); + Path result; + result.setDirectory(pathname); + assert(result.isValid() && "mkstemp didn't create a valid pathname!"); + return result; +#elif defined(HAVE_MKTEMP) + // If a system doesn't have mkdtemp(3) or mkstemp(3) but it does have + // mktemp(3) then we'll assume that system (e.g. AIX) has a reasonable + // implementation of mktemp(3) and doesn't follow BSD 4.3's lead of replacing + // the XXXXXX with the pid of the process and a letter. That leads to only + // twenty six temporary files that can be generated. + char pathname[MAXPATHLEN]; + strcpy(pathname, "/tmp/llvm_XXXXXX"); + char *TmpName = ::mktemp(pathname); + if (TmpName == 0) + throw std::string(TmpName) + ": Can't create unique directory name"; + if (-1 == ::mkdir(TmpName, S_IRWXU)) + ThrowErrno(std::string(TmpName) + ": Can't create temporary directory"); + Path result; + result.setDirectory(TmpName); + assert(result.isValid() && "mktemp didn't create a valid pathname!"); + return result; +#else + // This is the worst case implementation. tempnam(3) leaks memory unless its + // on an SVID2 (or later) system. On BSD 4.3 it leaks. tmpnam(3) has thread + // issues. The mktemp(3) function doesn't have enough variability in the + // temporary name generated. So, we provide our own implementation that + // increments an integer from a random number seeded by the current time. This + // should be sufficiently unique that we don't have many collisions between + // processes. Generally LLVM processes don't run very long and don't use very + // many temporary files so this shouldn't be a big issue for LLVM. + static time_t num = ::time(0); + char pathname[MAXPATHLEN]; + do { + num++; + sprintf(pathname, "/tmp/llvm_%010u", unsigned(num)); + } while ( 0 == access(pathname, F_OK ) ); + if (-1 == ::mkdir(pathname, S_IRWXU)) + ThrowErrno(std::string(pathname) + ": Can't create temporary directory"); + Path result; + result.setDirectory(pathname); + assert(result.isValid() && "mkstemp didn't create a valid pathname!"); + return result; +#endif +} + static void getPathList(const char*path, std::vector& Paths) { const char* at = path; const char* delim = strchr(at, ':'); From llvm at cs.uiuc.edu Fri Dec 24 00:29:40 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Fri, 24 Dec 2004 00:29:40 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Cygwin/Path.cpp Message-ID: <200412240629.AAA31266@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Cygwin: Path.cpp (r1.7) removed --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : This implementation is no longer needed, its been merged to Unix/Path.cpp since there is such little variation between the platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Fri Dec 24 00:29:41 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Fri, 24 Dec 2004 00:29:41 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Interix/Path.cpp Message-ID: <200412240629.AAA31269@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Interix: Path.cpp (r1.4) removed --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : This implementation is no longer needed, its been merged to Unix/Path.cpp since there is such little variation between the platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Fri Dec 24 00:29:41 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Fri, 24 Dec 2004 00:29:41 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/FreeBSD/Path.cpp Message-ID: <200412240629.AAA31270@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/FreeBSD: Path.cpp (r1.5) removed --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : This implementation is no longer needed, its been merged to Unix/Path.cpp since there is such little variation between the platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Fri Dec 24 00:29:41 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Fri, 24 Dec 2004 00:29:41 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/AIX/Path.cpp Message-ID: <200412240629.AAA31271@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/AIX: Path.cpp (r1.7) removed --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : This implementation is no longer needed, its been merged to Unix/Path.cpp since there is such little variation between the platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Fri Dec 24 00:29:41 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Fri, 24 Dec 2004 00:29:41 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Linux/Path.cpp Message-ID: <200412240629.AAA31284@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Linux: Path.cpp (r1.6) removed --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : This implementation is no longer needed, its been merged to Unix/Path.cpp since there is such little variation between the platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Fri Dec 24 00:29:41 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Fri, 24 Dec 2004 00:29:41 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/SunOS/Path.cpp Message-ID: <200412240629.AAA31279@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/SunOS: Path.cpp (r1.6) removed --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : This implementation is no longer needed, its been merged to Unix/Path.cpp since there is such little variation between the platforms. --- Diffs of the changes: (+0 -0) From llvm at cs.uiuc.edu Fri Dec 24 00:29:41 2004 From: llvm at cs.uiuc.edu (LLVM) Date: Fri, 24 Dec 2004 00:29:41 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Darwin/Path.cpp Message-ID: <200412240629.AAA31278@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Darwin: Path.cpp (r1.6) removed --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : This implementation is no longer needed, its been merged to Unix/Path.cpp since there is such little variation between the platforms. --- Diffs of the changes: (+0 -0) From reid at x10sys.com Fri Dec 24 00:33:05 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 24 Dec 2004 00:33:05 -0600 Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.pl Message-ID: <200412240633.AAA31351@zion.cs.uiuc.edu> Changes in directory llvm/utils: NightlyTest.pl updated: 1.83 -> 1.84 --- Log message: Remove references to LLVMGCCDIR because it was only used to provide a value for the --with-llvmgccdir configure option which is no longer supported. --- Diffs of the changes: (+0 -5) Index: llvm/utils/NightlyTest.pl diff -u llvm/utils/NightlyTest.pl:1.83 llvm/utils/NightlyTest.pl:1.84 --- llvm/utils/NightlyTest.pl:1.83 Fri Dec 17 14:58:34 2004 +++ llvm/utils/NightlyTest.pl Fri Dec 24 00:32:54 2004 @@ -45,8 +45,6 @@ # WEBDIR is the directory into which the test results web page will be written, # AND in which the "index.html" is assumed to be a symlink to the most recent # copy of the results. This directory will be created if it does not exist. -# LLVMGCCDIR is the directory in which the LLVM GCC Front End is installed -# to. This is the same as you would have for a normal LLVM build. # use POSIX qw(strftime); use File::Copy; @@ -282,9 +280,6 @@ print "Unknown option: $_ : ignoring!\n"; } -if ($ENV{'LLVMGCCDIR'}) { - $CONFIGUREARGS .= " --with-llvmgccdir=" . $ENV{'LLVMGCCDIR'}; -} if ($CONFIGUREARGS !~ /--disable-jit/) { $CONFIGUREARGS .= " --enable-jit"; } From reid at x10sys.com Fri Dec 24 00:49:27 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 24 Dec 2004 00:49:27 -0600 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200412240649.AAA31560@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.151 -> 1.152 --- Log message: Make the symbolic link using the correct variable! --- Diffs of the changes: (+2 -2) Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.151 llvm/autoconf/configure.ac:1.152 --- llvm/autoconf/configure.ac:1.151 Fri Dec 24 00:29:05 2004 +++ llvm/autoconf/configure.ac Fri Dec 24 00:49:16 2004 @@ -153,10 +153,10 @@ ;; esac -dnl Make a link from lib/System/platform to lib/System/$llvm_cv_platform_type +dnl Make a link from lib/System/platform to lib/System/$llvm_cv_os_type dnl This helps the #inclusion of the system specific include files dnl for the operating system abstraction library, lib/System. -AC_CONFIG_LINKS(lib/System/platform:lib/System/$llvm_cv_platform_type) +AC_CONFIG_LINKS(lib/System/platform:lib/System/$llvm_cv_os_type) dnl If we are targetting a Sparc machine running Solaris, pretend that it is dnl V9, since that is all that we support at the moment, and autoconf will only From reid at x10sys.com Fri Dec 24 00:49:27 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 24 Dec 2004 00:49:27 -0600 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200412240649.AAA31563@zion.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.159 -> 1.160 --- Log message: Make the symbolic link using the correct variable! --- Diffs of the changes: (+2 -2) Index: llvm/configure diff -u llvm/configure:1.159 llvm/configure:1.160 --- llvm/configure:1.159 Fri Dec 24 00:29:05 2004 +++ llvm/configure Fri Dec 24 00:49:16 2004 @@ -1764,7 +1764,7 @@ ;; esac - ac_config_links="$ac_config_links lib/System/platform:lib/System/$llvm_cv_platform_type" + ac_config_links="$ac_config_links lib/System/platform:lib/System/$llvm_cv_os_type" case $target in @@ -30321,7 +30321,7 @@ "tools/llvmc/ll" ) CONFIG_FILES="$CONFIG_FILES tools/llvmc/ll" ;; "tools/llvmc/c" ) CONFIG_FILES="$CONFIG_FILES tools/llvmc/c" ;; "docs/doxygen.cfg" ) CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;; - "lib/System/platform" ) CONFIG_LINKS="$CONFIG_LINKS lib/System/platform:lib/System/$llvm_cv_platform_type" ;; + "lib/System/platform" ) CONFIG_LINKS="$CONFIG_LINKS lib/System/platform:lib/System/$llvm_cv_os_type" ;; "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; "Makefile.common" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;; "examples/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS examples/Makefile" ;; From jeffc at jolt-lang.org Fri Dec 24 01:57:21 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Fri, 24 Dec 2004 01:57:21 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/Win32/DynamicLibrary.cpp Message-ID: <200412240757.BAA32276@zion.cs.uiuc.edu> Changes in directory llvm/lib/System/Win32: DynamicLibrary.cpp updated: 1.6 -> 1.7 --- Log message: Eliminate use of ltdl.c when doing a VC++ build. Because libtool isn't used, ltdl's LGPL license would infect all of LLVM. --- Diffs of the changes: (+72 -17) Index: llvm/lib/System/Win32/DynamicLibrary.cpp diff -u llvm/lib/System/Win32/DynamicLibrary.cpp:1.6 llvm/lib/System/Win32/DynamicLibrary.cpp:1.7 --- llvm/lib/System/Win32/DynamicLibrary.cpp:1.6 Fri Dec 24 00:03:31 2004 +++ llvm/lib/System/Win32/DynamicLibrary.cpp Fri Dec 24 01:57:09 2004 @@ -2,50 +2,105 @@ // // The LLVM Compiler Infrastructure // -// This file was developed by Reid Spencer and is distributed under the +// This file was developed by Jeff Cohen and is distributed under the // University of Illinois Open Source License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// // -// This file provides the Win32 specific implementation of the DynamicLibrary +// This file provides the Win32 specific implementation of DynamicLibrary. // //===----------------------------------------------------------------------===// #include "Win32.h" +#include + +#pragma comment(lib, "dbghelp.lib") namespace llvm { using namespace sys; //===----------------------------------------------------------------------===// //=== WARNING: Implementation here must contain only Win32 specific code -//=== and must not be UNIX code +//=== and must not be UNIX code. //===----------------------------------------------------------------------===// +static std::vector OpenedHandles; + +BOOL CALLBACK ELM_Callback(PSTR ModuleName, + ULONG ModuleBase, + ULONG ModuleSize, + PVOID UserContext) +{ + OpenedHandles.push_back((HMODULE)ModuleBase); + return TRUE; +} + DynamicLibrary::DynamicLibrary() : handle(0) { - handle = (void*) GetModuleHandle(NULL); - - if (handle == 0) { - ThrowError("Can't GetModuleHandle: "); - } + handle = GetModuleHandle(NULL); + OpenedHandles.push_back((HMODULE)handle); } DynamicLibrary::DynamicLibrary(const char*filename) : handle(0) { - handle = LoadLibrary(filename); + HMODULE a_handle = LoadLibrary(filename); - if (handle == 0) { - ThrowError("Can't LoadLibrary: "); - } + if (a_handle == 0) + ThrowError(std::string(filename) + ": Can't open : "); + + handle = a_handle; + OpenedHandles.push_back(a_handle); } DynamicLibrary::~DynamicLibrary() { - assert(handle !=0 && "Invalid DynamicLibrary handle"); - if (handle) - FreeLibrary((HMODULE*)handle); + if (handle == 0) + return; + + // GetModuleHandle() does not increment the ref count, so we must not free + // the handle to the executable. + if (handle != GetModuleHandle(NULL)) + FreeLibrary((HMODULE)handle); + handle = 0; + + for (std::vector::iterator I = OpenedHandles.begin(), + E = OpenedHandles.end(); I != E; ++I) { + if (*I == handle) { + // Note: don't use the swap/pop_back trick here. Order is important. + OpenedHandles.erase(I); + } + } +} + +void DynamicLibrary::LoadLibraryPermanently(const char* filename) { + if (filename) { + HMODULE a_handle = LoadLibrary(filename); + + if (a_handle == 0) + ThrowError(std::string(filename) + ": Can't open : "); + + OpenedHandles.push_back(a_handle); + } else { + // When no file is specified, enumerate all DLLs and EXEs in the + // process. + EnumerateLoadedModules(GetCurrentProcess(), ELM_Callback, 0); + } + + // Because we don't remember the handles, we will never free them; hence, + // it is loaded permanently. +} + +void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) { + for (std::vector::iterator I = OpenedHandles.begin(), + E = OpenedHandles.end(); I != E; ++I) { + FARPROC ptr = GetProcAddress((HMODULE)*I, symbolName); + if (ptr) + return ptr; + } + + return 0; } void *DynamicLibrary::GetAddressOfSymbol(const char *symbolName) { - assert(handle !=0 && "Invalid DynamicLibrary handle"); - return (void*) GetProcAddress((HMODULE*)handle, symbolName); + assert(handle != 0 && "Invalid DynamicLibrary handle"); + return GetProcAddress((HMODULE)handle, symbolName); } } From jeffc at jolt-lang.org Fri Dec 24 01:57:20 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Fri, 24 Dec 2004 01:57:20 -0600 Subject: [llvm-commits] CVS: llvm/win32/System/System.vcproj Message-ID: <200412240757.BAA32273@zion.cs.uiuc.edu> Changes in directory llvm/win32/System: System.vcproj updated: 1.9 -> 1.10 --- Log message: Eliminate use of ltdl.c when doing a VC++ build. Because libtool isn't used, ltdl's LGPL license would infect all of LLVM. --- Diffs of the changes: (+0 -18) Index: llvm/win32/System/System.vcproj diff -u llvm/win32/System/System.vcproj:1.9 llvm/win32/System/System.vcproj:1.10 --- llvm/win32/System/System.vcproj:1.9 Sat Dec 18 20:29:00 2004 +++ llvm/win32/System/System.vcproj Fri Dec 24 01:57:09 2004 @@ -131,21 +131,6 @@ RelativePath="..\..\lib\System\DynamicLibrary.cpp"> - - - - - - - - - - Changes in directory llvm/win32: llvm.sln updated: 1.5 -> 1.6 --- Log message: Eliminate use of ltdl.c when doing a VC++ build. Because libtool isn't used, ltdl's LGPL license would infect all of LLVM. --- Diffs of the changes: (+1 -1) Index: llvm/win32/llvm.sln diff -u llvm/win32/llvm.sln:1.5 llvm/win32/llvm.sln:1.6 --- llvm/win32/llvm.sln:1.5 Thu Dec 23 00:45:32 2004 +++ llvm/win32/llvm.sln Fri Dec 24 01:57:09 2004 @@ -72,6 +72,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lli", "lli\lli.vcproj", "{FB6FFD68-C1E4-4DCF-AB02-36D205D5263E}" ProjectSection(ProjectDependencies) = postProject + {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} @@ -93,7 +94,6 @@ {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} - {144EEBF6-8C9B-4473-B715-2C821666AF6C} = {144EEBF6-8C9B-4473-B715-2C821666AF6C} EndProjectSection EndProject Global From jeffc at jolt-lang.org Fri Dec 24 01:57:21 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Fri, 24 Dec 2004 01:57:21 -0600 Subject: [llvm-commits] CVS: llvm/win32/lli/lli.vcproj Message-ID: <200412240757.BAA32279@zion.cs.uiuc.edu> Changes in directory llvm/win32/lli: lli.vcproj updated: 1.1 -> 1.2 --- Log message: Eliminate use of ltdl.c when doing a VC++ build. Because libtool isn't used, ltdl's LGPL license would infect all of LLVM. --- Diffs of the changes: (+2 -0) Index: llvm/win32/lli/lli.vcproj diff -u llvm/win32/lli/lli.vcproj:1.1 llvm/win32/lli/lli.vcproj:1.2 --- llvm/win32/lli/lli.vcproj:1.1 Sun Dec 19 00:40:39 2004 +++ llvm/win32/lli/lli.vcproj Fri Dec 24 01:57:09 2004 @@ -38,6 +38,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)/lli.exe" LinkIncremental="2" + ForceSymbolReferences="_X86TargetMachineModule" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(OutDir)/lli.pdb" SubSystem="1" @@ -88,6 +89,7 @@ Name="VCLinkerTool" OutputFile="$(OutDir)/lli.exe" LinkIncremental="1" + ForceSymbolReferences="_X86TargetMachineModule" GenerateDebugInformation="TRUE" SubSystem="1" OptimizeReferences="2" From jeffc at jolt-lang.org Fri Dec 24 01:57:21 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Fri, 24 Dec 2004 01:57:21 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/DynamicLibrary.cpp Message-ID: <200412240757.BAA32285@zion.cs.uiuc.edu> Changes in directory llvm/lib/System: DynamicLibrary.cpp updated: 1.6 -> 1.7 --- Log message: Eliminate use of ltdl.c when doing a VC++ build. Because libtool isn't used, ltdl's LGPL license would infect all of LLVM. --- Diffs of the changes: (+14 -0) Index: llvm/lib/System/DynamicLibrary.cpp diff -u llvm/lib/System/DynamicLibrary.cpp:1.6 llvm/lib/System/DynamicLibrary.cpp:1.7 --- llvm/lib/System/DynamicLibrary.cpp:1.6 Fri Dec 3 22:17:20 2004 +++ llvm/lib/System/DynamicLibrary.cpp Fri Dec 24 01:57:09 2004 @@ -12,6 +12,19 @@ //===----------------------------------------------------------------------===// #include "llvm/System/DynamicLibrary.h" + +// It is not possible to use ltdl.c on VC++ builds as the terms of its LGPL +// license and special exception would cause all of LLVM to be placed under +// the LGPL. This is because the exception applies only when libtool is +// used, and obviously libtool is not used with Visual Studio. An entirely +// separate implementation is provided in win32/DynamicLibrary.cpp. + +#ifdef _WIN32 + +#include "win32/DynamicLibrary.cpp" + +#else + #include "ltdl.h" #include using namespace llvm; @@ -135,3 +148,4 @@ return lt_dlsym((lt_dlhandle) handle, symbolName); } +#endif // _WIN32 \ No newline at end of file From reid at x10sys.com Fri Dec 24 08:47:46 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 24 Dec 2004 08:47:46 -0600 Subject: [llvm-commits] CVS: llvm/Makefile.rules Message-ID: <200412241447.IAA30935@zion.cs.uiuc.edu> Changes in directory llvm: Makefile.rules updated: 1.278 -> 1.279 --- Log message: Make sure llvm-g++ gets the right path for the llvm tools. --- Diffs of the changes: (+2 -1) Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.278 llvm/Makefile.rules:1.279 --- llvm/Makefile.rules:1.278 Thu Dec 23 21:36:31 2004 +++ llvm/Makefile.rules Fri Dec 24 08:47:34 2004 @@ -318,7 +318,8 @@ $(C.Flags) -c Compile.CXX = $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c LTCompile.CXX = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.CXX) -BCCompile.CXX = $(LLVMGXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c +BCCompile.CXX = $(LLVMGXXWITHPATH) $(CPP.Flags) $(CompileCommonOpts) \ + $(CXX.Flags) -c Link = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \ $(CompileCommonOpts) $(LD.Flags) $(Strip) Relink = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \ From reid at x10sys.com Fri Dec 24 09:11:34 2004 From: reid at x10sys.com (Reid Spencer) Date: Fri, 24 Dec 2004 09:11:34 -0600 Subject: [llvm-commits] CVS: llvm/.cvsignore Message-ID: <200412241511.JAA31198@zion.cs.uiuc.edu> Changes in directory llvm: .cvsignore updated: 1.2 -> 1.3 --- Log message: Ignore the autom4te.cache directoy. --- Diffs of the changes: (+1 -0) Index: llvm/.cvsignore diff -u llvm/.cvsignore:1.2 llvm/.cvsignore:1.3 --- llvm/.cvsignore:1.2 Sun Aug 3 13:33:24 2003 +++ llvm/.cvsignore Fri Dec 24 09:11:23 2004 @@ -3,3 +3,4 @@ config.log config.status cvs.out +autom4te.cache From jeffc at jolt-lang.org Fri Dec 24 10:26:59 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Fri, 24 Dec 2004 10:26:59 -0600 Subject: [llvm-commits] CVS: llvm/lib/System/DynamicLibrary.cpp Message-ID: <200412241626.KAA32483@zion.cs.uiuc.edu> Changes in directory llvm/lib/System: DynamicLibrary.cpp updated: 1.7 -> 1.8 --- Log message: Get VC++ building again --- Diffs of the changes: (+3 -2) Index: llvm/lib/System/DynamicLibrary.cpp diff -u llvm/lib/System/DynamicLibrary.cpp:1.7 llvm/lib/System/DynamicLibrary.cpp:1.8 --- llvm/lib/System/DynamicLibrary.cpp:1.7 Fri Dec 24 01:57:09 2004 +++ llvm/lib/System/DynamicLibrary.cpp Fri Dec 24 10:26:47 2004 @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/System/DynamicLibrary.h" +#include "llvm/Config/config.h" // It is not possible to use ltdl.c on VC++ builds as the terms of its LGPL // license and special exception would cause all of LLVM to be placed under @@ -19,7 +20,7 @@ // used, and obviously libtool is not used with Visual Studio. An entirely // separate implementation is provided in win32/DynamicLibrary.cpp. -#ifdef _WIN32 +#ifdef LLVM_ON_WIN32 #include "win32/DynamicLibrary.cpp" @@ -148,4 +149,4 @@ return lt_dlsym((lt_dlhandle) handle, symbolName); } -#endif // _WIN32 \ No newline at end of file +#endif // LLVM_ON_WIN32 From jeffc at jolt-lang.org Fri Dec 24 10:26:58 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Fri, 24 Dec 2004 10:26:58 -0600 Subject: [llvm-commits] CVS: llvm/win32/Configure/Configure.vcproj Message-ID: <200412241626.KAA32480@zion.cs.uiuc.edu> Changes in directory llvm/win32/Configure: Configure.vcproj updated: 1.4 -> 1.5 --- Log message: Get VC++ building again --- Diffs of the changes: (+1 -1) Index: llvm/win32/Configure/Configure.vcproj diff -u llvm/win32/Configure/Configure.vcproj:1.4 llvm/win32/Configure/Configure.vcproj:1.5 --- llvm/win32/Configure/Configure.vcproj:1.4 Tue Dec 21 00:49:13 2004 +++ llvm/win32/Configure/Configure.vcproj Fri Dec 24 10:26:47 2004 @@ -73,7 +73,7 @@ Name="Configure|Win32"> From jeffc at jolt-lang.org Fri Dec 24 10:26:59 2004 From: jeffc at jolt-lang.org (Jeff Cohen) Date: Fri, 24 Dec 2004 10:26:59 -0600 Subject: [llvm-commits] CVS: llvm/win32/System/System.vcproj Message-ID: <200412241626.KAA32486@zion.cs.uiuc.edu> Changes in directory llvm/win32/System: System.vcproj updated: 1.10 -> 1.11 --- Log message: Get VC++ building again --- Diffs of the changes: (+2 -6) Index: llvm/win32/System/System.vcproj diff -u llvm/win32/System/System.vcproj:1.10 llvm/win32/System/System.vcproj:1.11 --- llvm/win32/System/System.vcproj:1.10 Fri Dec 24 01:57:09 2004 +++ llvm/win32/System/System.vcproj Fri Dec 24 10:26:47 2004 @@ -44,10 +44,8 @@ Name="VCPostBuildEventTool"/> Changes in directory llvm/lib/System/Win32: DynamicLibrary.cpp updated: 1.7 -> 1.8 --- Log message: mingw doesn't support the official debug API. Old versions of the C runtime somehow get loaded into the process. Make sure they aren't searched for symbols. --- Diffs of the changes: (+28 -9) Index: llvm/lib/System/Win32/DynamicLibrary.cpp diff -u llvm/lib/System/Win32/DynamicLibrary.cpp:1.7 llvm/lib/System/Win32/DynamicLibrary.cpp:1.8 --- llvm/lib/System/Win32/DynamicLibrary.cpp:1.7 Fri Dec 24 01:57:09 2004 +++ llvm/lib/System/Win32/DynamicLibrary.cpp Fri Dec 24 22:50:17 2004 @@ -7,12 +7,17 @@ // //===----------------------------------------------------------------------===// // -// This file provides the Win32 specific implementation of DynamicLibrary. +// This file provides the Win32 specific implementation of DynamicLibrary. // //===----------------------------------------------------------------------===// #include "Win32.h" + +#ifdef __MINGW +#include +#else #include +#endif #pragma comment(lib, "dbghelp.lib") @@ -26,13 +31,27 @@ static std::vector OpenedHandles; -BOOL CALLBACK ELM_Callback(PSTR ModuleName, - ULONG ModuleBase, - ULONG ModuleSize, - PVOID UserContext) -{ - OpenedHandles.push_back((HMODULE)ModuleBase); - return TRUE; +extern "C" { + static BOOL CALLBACK ELM_Callback(PSTR ModuleName, + ULONG ModuleBase, + ULONG ModuleSize, + PVOID UserContext) + { + // Ignore VC++ runtimes prior to 7.1. Somehow some of them get loaded + // into the process. + if (stricmp(ModuleName, "msvci70") != 0 && + stricmp(ModuleName, "msvcirt") != 0 && + stricmp(ModuleName, "msvcp50") != 0 && + stricmp(ModuleName, "msvcp60") != 0 && + stricmp(ModuleName, "msvcp70") != 0 && + stricmp(ModuleName, "msvcr70") != 0 && + stricmp(ModuleName, "msvcrt") != 0 && + stricmp(ModuleName, "msvcrt20") != 0 && + stricmp(ModuleName, "msvcrt40") != 0) { + OpenedHandles.push_back((HMODULE)ModuleBase); + } + return TRUE; + } } DynamicLibrary::DynamicLibrary() : handle(0) { @@ -83,7 +102,7 @@ EnumerateLoadedModules(GetCurrentProcess(), ELM_Callback, 0); } - // Because we don't remember the handles, we will never free them; hence, + // Because we don't remember the handle, we will never free it; hence, // it is loaded permanently. } From reid at x10sys.com Sat Dec 25 01:31:40 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 25 Dec 2004 01:31:40 -0600 Subject: [llvm-commits] CVS: llvm/include/llvm/Config/config.h.in Message-ID: <200412250731.BAA13205@zion.cs.uiuc.edu> Changes in directory llvm/include/llvm/Config: config.h.in updated: 1.42 -> 1.43 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : * Make sure all headers used by lib/System have checks * Use "standard" autoconf checks for certain problematic headers For PR432: http://llvm.cs.uiuc.edu/PR432 : * Resurrect --with-llvmgccdir so a specific llvm-gcc/llvm-g++ installation can be specified. --- Diffs of the changes: (+15 -0) Index: llvm/include/llvm/Config/config.h.in diff -u llvm/include/llvm/Config/config.h.in:1.42 llvm/include/llvm/Config/config.h.in:1.43 --- llvm/include/llvm/Config/config.h.in:1.42 Fri Dec 24 00:29:05 2004 +++ llvm/include/llvm/Config/config.h.in Sat Dec 25 01:31:29 2004 @@ -228,9 +228,15 @@ /* Define to 1 if you have the `rindex' function. */ #undef HAVE_RINDEX +/* Define to 1 if you have the `setrlimit' function. */ +#undef HAVE_SETRLIMIT + /* Define if you have the shl_load function. */ #undef HAVE_SHL_LOAD +/* Define to 1 if you have the header file. */ +#undef HAVE_SIGNAL_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -296,6 +302,9 @@ */ #undef HAVE_SYS_NDIR_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_RESOURCE_H @@ -317,6 +326,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIME_H + /* Define to 1 if the system has the type `u_int64_t'. */ #undef HAVE_U_INT64_T @@ -402,6 +414,9 @@ STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION +/* Define to 1 if the `S_IS*' macros in do not work properly. */ +#undef STAT_MACROS_BROKEN + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS From reid at x10sys.com Sat Dec 25 01:31:40 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 25 Dec 2004 01:31:40 -0600 Subject: [llvm-commits] CVS: llvm/configure Message-ID: <200412250731.BAA13208@zion.cs.uiuc.edu> Changes in directory llvm: configure updated: 1.160 -> 1.161 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : * Make sure all headers used by lib/System have checks * Use "standard" autoconf checks for certain problematic headers For PR432: http://llvm.cs.uiuc.edu/PR432 : * Resurrect --with-llvmgccdir so a specific llvm-gcc/llvm-g++ installation can be specified. --- Diffs of the changes: (+691 -422) Index: llvm/configure diff -u llvm/configure:1.160 llvm/configure:1.161 --- llvm/configure:1.160 Fri Dec 24 00:49:16 2004 +++ llvm/configure Sat Dec 25 01:31:28 2004 @@ -476,7 +476,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_COPYRIGHT subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS ARCH ENDIAN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT ENABLE_OPTIMIZED JIT ENABLE_DOXYGEN CPP CXX CXXFLAGS ac_ct_CXX LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON ifGNUmake LN_S CMP CP DATE FIND GREP LLVMGCC LLVMGXX MKDIR MV PAX RANLIB ac_ct_RANLIB RM SED TAR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA BZIP2 DOT DOXYGEN ETAGS GROFF GZIP POD2HTML POD2MAN RUNTEST TCLSH ZIP EGREP INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL ECHO AR ac_ct_AR STRIP ac_c! t_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ETAGSFLAGS ALLOCA MMAP_FILE LLVMCC1 LLVMCC1PLUS LLVMGCCDIR SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_COPYRIGHT subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS ARCH ENDIAN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT ENABLE_OPTIMIZED JIT ENABLE_DOXYGEN CPP CXX CXXFLAGS ac_ct_CXX LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON ifGNUmake LN_S CMP CP DATE FIND GREP MKDIR MV PAX RANLIB ac_ct_RANLIB RM SED TAR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA BZIP2 DOT DOXYGEN ETAGS GROFF GZIP POD2HTML POD2MAN RUNTEST TCLSH ZIP EGREP INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL ECHO AR ac_ct_AR STRIP ac_ct_STRIP CXXCPP F! 77 FFLAGS ac_ct_F77 LIBTOOL ETAGSFLAGS LLVMGCC LLVMGXX ALLOCA MMAP_FILE LLVMCC1 LLVMCC1PLUS LLVMGCCDIR SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1049,6 +1049,8 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-llvmgccdir Specify location of llvm-gcc install dir (default + searches PATH) --with-tclinclude directory where tcl headers are --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use @@ -3019,6 +3021,22 @@ esac +# Check whether --with-llvmgccdir or --without-llvmgccdir was given. +if test "${with_llvmgccdir+set}" = set; then + withval="$with_llvmgccdir" + +else + withval=default +fi; +case "$withval" in + default) WITH_LLVMGCCDIR=default ;; + /*) WITH_LLVMGCCDIR=$withval ;; + *) { { echo "$as_me:$LINENO: error: Invalid path for --with-llvmgccdir. Provide full path" >&5 +echo "$as_me: error: Invalid path for --with-llvmgccdir. Provide full path" >&2;} + { (exit 1); exit 1; }; } ;; +esac + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4707,86 +4725,6 @@ echo "${ECHO_T}no" >&6 fi -# Extract the first word of "llvm-gcc", so it can be a program name with args. -set dummy llvm-gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_LLVMGCC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $LLVMGCC in - [\\/]* | ?:[\\/]*) - ac_cv_path_LLVMGCC="$LLVMGCC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LLVMGCC="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_LLVMGCC" && ac_cv_path_LLVMGCC="llvm-gcc" - ;; -esac -fi -LLVMGCC=$ac_cv_path_LLVMGCC - -if test -n "$LLVMGCC"; then - echo "$as_me:$LINENO: result: $LLVMGCC" >&5 -echo "${ECHO_T}$LLVMGCC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -# Extract the first word of "llvm-g++", so it can be a program name with args. -set dummy llvm-g++; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_LLVMGXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $LLVMGXX in - [\\/]* | ?:[\\/]*) - ac_cv_path_LLVMGXX="$LLVMGXX" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LLVMGXX="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_LLVMGXX" && ac_cv_path_LLVMGXX="llvm-g++" - ;; -esac -fi -LLVMGXX=$ac_cv_path_LLVMGXX - -if test -n "$LLVMGXX"; then - echo "$as_me:$LINENO: result: $LLVMGXX" >&5 -echo "${ECHO_T}$LLVMGXX" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - # Extract the first word of "mkdir", so it can be a program name with args. set dummy mkdir; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -8282,7 +8220,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext + echo '#line 10214 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10758,7 +10696,7 @@ # Provide some information about the compiler. -echo "$as_me:10761:" \ +echo "$as_me:10699:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -11815,11 +11753,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11818: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11756: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11822: \$? = $ac_status" >&5 + echo "$as_me:11760: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12058,11 +11996,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12061: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11999: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12065: \$? = $ac_status" >&5 + echo "$as_me:12003: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12118,11 +12056,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12121: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12059: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12125: \$? = $ac_status" >&5 + echo "$as_me:12063: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14303,7 +14241,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:16535: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16601: \$? = $ac_status" >&5 + echo "$as_me:16539: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16654,11 +16592,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16657: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16595: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16661: \$? = $ac_status" >&5 + echo "$as_me:16599: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18015,7 +17953,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:18891: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18957: \$? = $ac_status" >&5 + echo "$as_me:18895: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -19010,11 +18948,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19013: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18951: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19017: \$? = $ac_status" >&5 + echo "$as_me:18955: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -21049,11 +20987,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21052: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20990: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21056: \$? = $ac_status" >&5 + echo "$as_me:20994: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -21292,11 +21230,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21295: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21233: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21299: \$? = $ac_status" >&5 + echo "$as_me:21237: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -21352,11 +21290,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21355: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21293: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:21359: \$? = $ac_status" >&5 + echo "$as_me:21297: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -23537,7 +23475,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_LLVMGCC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $LLVMGCC in + [\\/]* | ?:[\\/]*) + ac_cv_path_LLVMGCC="$LLVMGCC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LLVMGCC="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_LLVMGCC" && ac_cv_path_LLVMGCC="llvm-gcc" + ;; +esac +fi +LLVMGCC=$ac_cv_path_LLVMGCC + +if test -n "$LLVMGCC"; then + echo "$as_me:$LINENO: result: $LLVMGCC" >&5 +echo "${ECHO_T}$LLVMGCC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + # Extract the first word of "llvm-g++", so it can be a program name with args. +set dummy llvm-g++; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_LLVMGXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $LLVMGXX in + [\\/]* | ?:[\\/]*) + ac_cv_path_LLVMGXX="$LLVMGXX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LLVMGXX="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_LLVMGXX" && ac_cv_path_LLVMGXX="llvm-g++" + ;; +esac +fi +LLVMGXX=$ac_cv_path_LLVMGXX + +if test -n "$LLVMGXX"; then + echo "$as_me:$LINENO: result: $LLVMGXX" >&5 +echo "${ECHO_T}$LLVMGXX" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +else + LLVMGCC=$WITH_LLVMGCCDIR/bin/llvm-gcc + LLVMGXX=$WITH_LLVMGCCDIR/bin/llvm-g++ + LLVMGCC=$LLVMGCC + + LLVMGXX=$LLVMGXX + +fi + echo "$as_me:$LINENO: checking tool compatibility" >&5 echo $ECHO_N "checking tool compatibility... $ECHO_C" >&6 @@ -25321,9 +25349,17 @@ -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then + + + + + +ac_header_dirent=no +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -25332,15 +25368,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include -#include -#include +#include +#include <$ac_hdr> int main () { - +if ((DIR *) 0) +return 0; ; return 0; } @@ -25367,70 +25402,527 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_header_stdc=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no +eval "$as_ac_Header=no" fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* +ac_header_dirent=$ac_hdr; break fi -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : +done +# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +if test $ac_header_dirent = dirent.h; then + echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 +if test "${ac_cv_search_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_func_search_save_LIBS=$LIBS +ac_cv_search_opendir=no +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#if ((' ' & 0x0FF) == 0x020) + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="none required" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_opendir" = no; then + for ac_lib in dir; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6 +if test "$ac_cv_search_opendir" != no; then + test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" + +fi + +else + echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 +if test "${ac_cv_search_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +ac_cv_search_opendir=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="none required" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_opendir" = no; then + for ac_lib in x; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_opendir="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6 +if test "$ac_cv_search_opendir" != no; then + test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" + +fi + +fi + +echo "$as_me:$LINENO: checking for MAP_ANONYMOUS vs. MAP_ANON" >&5 +echo $ECHO_N "checking for MAP_ANONYMOUS vs. MAP_ANON... $ECHO_C" >&6 +if test "${ac_cv_header_mmap_anon+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +int +main () +{ +mmap (0, 1, PROT_READ, MAP_ANONYMOUS, -1, 0); return (0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_mmap_anon=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_mmap_anon=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +echo "$as_me:$LINENO: result: $ac_cv_header_mmap_anon" >&5 +echo "${ECHO_T}$ac_cv_header_mmap_anon" >&6 +if test "$ac_cv_header_mmap_anon" = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MMAP_ANONYMOUS +_ACEOF + +fi + +echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5 +echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 +if test "${ac_cv_header_stat_broken+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include + +#if defined(S_ISBLK) && defined(S_IFDIR) +# if S_ISBLK (S_IFDIR) +You lose. +# endif +#endif + +#if defined(S_ISBLK) && defined(S_IFCHR) +# if S_ISBLK (S_IFCHR) +You lose. +# endif +#endif + +#if defined(S_ISLNK) && defined(S_IFREG) +# if S_ISLNK (S_IFREG) +You lose. +# endif +#endif + +#if defined(S_ISSOCK) && defined(S_IFREG) +# if S_ISSOCK (S_IFREG) +You lose. +# endif +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "You lose" >/dev/null 2>&1; then + ac_cv_header_stat_broken=yes +else + ac_cv_header_stat_broken=no +fi +rm -f conftest* + +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 +echo "${ECHO_T}$ac_cv_header_stat_broken" >&6 +if test $ac_cv_header_stat_broken = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STAT_MACROS_BROKEN 1 +_ACEOF + +fi + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else @@ -25487,7 +25979,6 @@ fi - echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 if test "${ac_cv_header_sys_wait_h+set}" = set; then @@ -25559,34 +26050,29 @@ fi - - - - - -for ac_header in sys/time.h sys/mman.h sys/resource.h sys/time.h sys/types.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +#include +#include +#include + +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -25610,115 +26096,33 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_time=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------- ## -## Report this to llvmbugs at cs.uiuc.edu ## -## ----------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6 +if test $ac_cv_header_time = yes; then -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +cat >>confdefs.h <<\_ACEOF +#define TIME_WITH_SYS_TIME 1 _ACEOF fi -done -for ac_header in dlfcn.h execinfo.h fcntl.h limits.h link.h + +for ac_header in dlfcn.h execinfo.h fcntl.h inttypes.h limits.h link.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -25870,7 +26274,10 @@ -for ac_header in malloc.h unistd.h windows.h + + + +for ac_header in malloc.h signal.h stdint.h unistd.h utime.h windows.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -26019,151 +26426,12 @@ done -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 -if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_time=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_time=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 -if test $ac_cv_header_time = yes; then - -cat >>confdefs.h <<\_ACEOF -#define TIME_WITH_SYS_TIME 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for MAP_ANONYMOUS vs. MAP_ANON" >&5 -echo $ECHO_N "checking for MAP_ANONYMOUS vs. MAP_ANON... $ECHO_C" >&6 -if test "${ac_cv_header_mmap_anon+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -int -main () -{ -mmap (0, 1, PROT_READ, MAP_ANONYMOUS, -1, 0); return (0); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_mmap_anon=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_mmap_anon=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi -echo "$as_me:$LINENO: result: $ac_cv_header_mmap_anon" >&5 -echo "${ECHO_T}$ac_cv_header_mmap_anon" >&6 -if test "$ac_cv_header_mmap_anon" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_MMAP_ANONYMOUS -_ACEOF -fi -for ac_header in inttypes.h stdint.h +for ac_header in sys/mman.h sys/param.h sys/resource.h sys/time.h sys/types.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -27000,7 +27268,8 @@ -for ac_func in realpath strdup strtoq strtoll sysconf + +for ac_func in realpath setrlimit strdup strtoq strtoll sysconf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -30468,8 +30737,6 @@ s, at DATE@,$DATE,;t t s, at FIND@,$FIND,;t t s, at GREP@,$GREP,;t t -s, at LLVMGCC@,$LLVMGCC,;t t -s, at LLVMGXX@,$LLVMGXX,;t t s, at MKDIR@,$MKDIR,;t t s, at MV@,$MV,;t t s, at PAX@,$PAX,;t t @@ -30509,6 +30776,8 @@ s, at ac_ct_F77@,$ac_ct_F77,;t t s, at LIBTOOL@,$LIBTOOL,;t t s, at ETAGSFLAGS@,$ETAGSFLAGS,;t t +s, at LLVMGCC@,$LLVMGCC,;t t +s, at LLVMGXX@,$LLVMGXX,;t t s, at ALLOCA@,$ALLOCA,;t t s, at MMAP_FILE@,$MMAP_FILE,;t t s, at LLVMCC1@,$LLVMCC1,;t t From reid at x10sys.com Sat Dec 25 01:31:40 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 25 Dec 2004 01:31:40 -0600 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200412250731.BAA13211@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.152 -> 1.153 --- Log message: For PR351: http://llvm.cs.uiuc.edu/PR351 : * Make sure all headers used by lib/System have checks * Use "standard" autoconf checks for certain problematic headers For PR432: http://llvm.cs.uiuc.edu/PR432 : * Resurrect --with-llvmgccdir so a specific llvm-gcc/llvm-g++ installation can be specified. --- Diffs of the changes: (+30 -14) Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.152 llvm/autoconf/configure.ac:1.153 --- llvm/autoconf/configure.ac:1.152 Fri Dec 24 00:49:16 2004 +++ llvm/autoconf/configure.ac Sat Dec 25 01:31:29 2004 @@ -233,6 +233,17 @@ *) AC_MSG_ERROR([Invalid setting for --enable-doxygen. Use "yes" or "no"]) ;; esac +dnl Allow a specific llvm-gcc/llvm-g++ pair to be used with this LLVM config. +AC_ARG_WITH(llvmgccdir, + AS_HELP_STRING([--with-llvmgccdir], + [Specify location of llvm-gcc install dir (default searches PATH)]),, + withval=default) +case "$withval" in + default) WITH_LLVMGCCDIR=default ;; + /*) WITH_LLVMGCCDIR=$withval ;; + *) AC_MSG_ERROR([Invalid path for --with-llvmgccdir. Provide full path]) ;; +esac + dnl===-----------------------------------------------------------------------=== dnl=== dnl=== SECTION 4: Check for programs we need and that they are the right version @@ -254,8 +265,6 @@ AC_PATH_PROG(DATE, [date], [date]) AC_PATH_PROG(FIND, [find], [find]) AC_PATH_PROG(GREP, [grep], [grep]) -AC_PATH_PROG(LLVMGCC, [llvm-gcc], [llvm-gcc]) -AC_PATH_PROG(LLVMGXX, [llvm-g++], [llvm-g++]) AC_PATH_PROG(MKDIR,[mkdir],[mkdir]) AC_PATH_PROG(MV, [mv], [mv]) AC_PATH_PROG(PAX, [pax], [pax]) @@ -302,6 +311,16 @@ esac AC_SUBST(ETAGSFLAGS,$ETAGSFLAGS) +if test "$WITH_LLVMGCCDIR" != "default" ; then + AC_PATH_PROG(LLVMGCC, [llvm-gcc], [llvm-gcc]) + AC_PATH_PROG(LLVMGXX, [llvm-g++], [llvm-g++]) +else + LLVMGCC=$WITH_LLVMGCCDIR/bin/llvm-gcc + LLVMGXX=$WITH_LLVMGCCDIR/bin/llvm-g++ + AC_SUBST(LLVMGCC,$LLVMGCC) + AC_SUBST(LLVMGXX,$LLVMGXX) +fi + AC_MSG_CHECKING([tool compatibility]) dnl Ensure that compilation tools are GCC or a GNU compatible compiler such as @@ -386,23 +405,20 @@ dnl=== dnl===-----------------------------------------------------------------------=== +dnl First, use autoconf provided macros for specific headers that we need dnl We don't check for ancient stuff or things that are guaranteed to be there dnl by the C++ standard. We always use the versions of C headers. +dnl Generally we're looking for POSIX headers. +AC_HEADER_DIRENT +AC_HEADER_MMAP_ANONYMOUS +AC_HEADER_STAT AC_HEADER_STDC - -dnl However, we do need some system specific header files. Generally we're -dnl looking for POSIX headers. AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([sys/time.h sys/mman.h sys/resource.h sys/time.h sys/types.h]) -AC_CHECK_HEADERS([dlfcn.h execinfo.h fcntl.h limits.h link.h]) -AC_CHECK_HEADERS([malloc.h unistd.h windows.h]) AC_HEADER_TIME -AC_HEADER_MMAP_ANONYMOUS -dnl Check for things that need to be included in public headers, and so -dnl for which we may not have access to a HAVE_* preprocessor #define. -dnl (primarily used in DataTypes.h) -AC_CHECK_HEADERS([inttypes.h stdint.h]) +AC_CHECK_HEADERS([dlfcn.h execinfo.h fcntl.h inttypes.h limits.h link.h]) +AC_CHECK_HEADERS([malloc.h signal.h stdint.h unistd.h utime.h windows.h]) +AC_CHECK_HEADERS([sys/mman.h sys/param.h sys/resource.h sys/time.h sys/types.h]) dnl===-----------------------------------------------------------------------=== dnl=== @@ -427,7 +443,7 @@ AC_CHECK_FUNCS([backtrace getcwd getpagesize getrusage gettimeofday isatty ]) AC_CHECK_FUNCS([mkdtemp mkstemp mktemp ]) -AC_CHECK_FUNCS([realpath strdup strtoq strtoll sysconf ]) +AC_CHECK_FUNCS([realpath setrlimit strdup strtoq strtoll sysconf ]) AC_C_PRINTF_A AC_FUNC_ALLOCA AC_FUNC_RAND48 From reid at x10sys.com Sat Dec 25 23:21:24 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 25 Dec 2004 23:21:24 -0600 Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.pl Message-ID: <200412260521.XAA08677@zion.cs.uiuc.edu> Changes in directory llvm/utils: NightlyTest.pl updated: 1.84 -> 1.85 --- Log message: Revert the last patch so that the LLVMGCCDIR environment variable is still viable and will make use of the resurrected --with-llvmgccdir configure option. --- Diffs of the changes: (+5 -0) Index: llvm/utils/NightlyTest.pl diff -u llvm/utils/NightlyTest.pl:1.84 llvm/utils/NightlyTest.pl:1.85 --- llvm/utils/NightlyTest.pl:1.84 Fri Dec 24 00:32:54 2004 +++ llvm/utils/NightlyTest.pl Sat Dec 25 23:21:13 2004 @@ -45,6 +45,8 @@ # WEBDIR is the directory into which the test results web page will be written, # AND in which the "index.html" is assumed to be a symlink to the most recent # copy of the results. This directory will be created if it does not exist. +# LLVMGCCDIR is the directory in which the LLVM GCC Front End is installed +# to. This is the same as you would have for a normal LLVM build. # use POSIX qw(strftime); use File::Copy; @@ -280,6 +282,9 @@ print "Unknown option: $_ : ignoring!\n"; } +if ($ENV{'LLVMGCCDIR'}) { + $CONFIGUREARGS .= " --with-llvmgccdir=" . $ENV{'LLVMGCCDIR'}; +} if ($CONFIGUREARGS !~ /--disable-jit/) { $CONFIGUREARGS .= " --enable-jit"; } From reid at x10sys.com Sat Dec 25 23:47:37 2004 From: reid at x10sys.com (Reid Spencer) Date: Sat, 25 Dec 2004 23:47:37 -0600 Subject: [llvm-commits] CVS: llvm/docs/GettingStarted.html Message-ID: <200412260547.XAA09054@zion.cs.uiuc.edu> Changes in directory llvm/docs: GettingStarted.html updated: 1.100 -> 1.101 --- Log message: Describe the --with-llvmgccdir option to configure. --- Diffs of the changes: (+20 -2) Index: llvm/docs/GettingStarted.html diff -u llvm/docs/GettingStarted.html:1.100 llvm/docs/GettingStarted.html:1.101 --- llvm/docs/GettingStarted.html:1.100 Thu Dec 23 13:39:54 2004 +++ llvm/docs/GettingStarted.html Sat Dec 25 23:47:26 2004 @@ -178,6 +178,10 @@
  • --prefix=directory

    Specify for directory the full pathname of where you want the LLVM tools and libraries to be installed.

  • +
  • --with-llvmgccdir=directory +

    Optionally, specify for directory the full pathname of the + C/C++ FrontEnd installation to use with this LLVM configuration. If + not specified, the PATH will be searched.

  • --enable-spec2000=directory

    Enable the SPEC2000 benchmarks for testing. The SPEC2000 benchmarks should be available in @@ -532,7 +536,7 @@

    LLVMGCCDIR
    - This is the where the LLVM GCC Front End is installed. + This is where the LLVM GCC Front End is installed.

    For the pre-built GCC front end binaries, the LLVMGCCDIR is cfrontend/platform/llvm-gcc. @@ -756,6 +760,20 @@

    The following options can be used to set or enable LLVM specific options:

    +
    --with-llvmgccdir
    +
    Path to the LLVM C/C++ FrontEnd to be used with this LLVM configuration. + The value of this option should specify the full pathname of the C/C++ Front + End to be used. If this option is not provided, the PATH will be searched for + a program named llvm-gcc and the C/C++ FrontEnd install directory will + be inferred from the path found. If the option is not given, and no llvm-gcc + can be found in the path then a warning will be produced by + configure indicating this situation. LLVM may still be built with + the tools-only target but attempting to build the runtime libraries + will fail as these libraries require llvm-gcc and llvm-g++. See + Install the GCC Front End for details on installing + the C/C++ Front End. See + Bootstrapping the LLVM C/C++ Front-End + for details on building the C/C++ Front End.
    --with-tclinclude
    Path to the tcl include directory under which the tclsh can be found. Use this if you have multiple tcl installations on your machine and you @@ -1491,7 +1509,7 @@ Chris Lattner
    Reid Spencer
    The LLVM Compiler Infrastructure
    - Last modified: $Date: 2004/12/23 19:39:54 $ + Last modified: $Date: 2004/12/26 05:47:26 $ From reid at x10sys.com Sun Dec 26 21:14:54 2004 From: reid at x10sys.com (Reid Spencer) Date: Sun, 26 Dec 2004 21:14:54 -0600 Subject: [llvm-commits] CVS: llvm/autoconf/m4/header_mmap_anonymous.m4 Message-ID: <200412270314.VAA31775@zion.cs.uiuc.edu> Changes in directory llvm/autoconf/m4: header_mmap_anonymous.m4 updated: 1.2 -> 1.3 --- Log message: Provide a value for HAVE_MMAP_ANONYMOUS variable, for consistency with other #define's. --- Diffs of the changes: (+1 -1) Index: llvm/autoconf/m4/header_mmap_anonymous.m4 diff -u llvm/autoconf/m4/header_mmap_anonymous.m4:1.2 llvm/autoconf/m4/header_mmap_anonymous.m4:1.3 --- llvm/autoconf/m4/header_mmap_anonymous.m4:1.2 Sun Sep 19 17:31:49 2004 +++ llvm/autoconf/m4/header_mmap_anonymous.m4 Sun Dec 26 21:14:43 2004 @@ -16,6 +16,6 @@ AC_LANG_POP([C]) ]) if test "$ac_cv_header_mmap_anon" = yes; then - AC_DEFINE([HAVE_MMAP_ANONYMOUS],[],[Define if mmap() uses MAP_ANONYMOUS to map anonymous pages, or undefine if it uses MAP_ANON]) + AC_DEFINE([HAVE_MMAP_ANONYMOUS],[1],[Define if mmap() uses MAP_ANONYMOUS to map anonymous pages, or undefine if it uses MAP_ANON]) fi ]) From reid at x10sys.com Sun Dec 26 21:15:39 2004 From: reid at x10sys.com (Reid Spencer) Date: Sun, 26 Dec 2004 21:15:39 -0600 Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac Message-ID: <200412270315.VAA31818@zion.cs.uiuc.edu> Changes in directory llvm/autoconf: configure.ac updated: 1.153 -> 1.154 --- Log message: Oops, reverse the logic on a test for WITH_LLVMGCCDIR to make it define the path names correctly. --- Diffs of the changes: (+1 -1) Index: llvm/autoconf/configure.ac diff -u llvm/autoconf/configure.ac:1.153 llvm/autoconf/configure.ac:1.154 --- llvm/autoconf/configure.ac:1.153 Sat Dec 25 01:31:29 2004 +++ llvm/autoconf/configure.ac Sun Dec 26 21:15:28 2004 @@ -311,7 +311,7 @@ esac AC_SUBST(ETAGSFLAGS,$ETAGSFLAGS) -if test "$WITH_LLVMGCCDIR" != "default" ; then +if test "$WITH_LLVMGCCDIR" = "default" ; then AC_PATH_PROG(LLVMGCC, [llvm-gcc], [llvm-gcc]) AC_PATH_PROG(LLVMGXX, [llvm-g++], [llvm-g++]) else