[llvm-commits] [llvm] r43933 - /llvm/trunk/lib/CodeGen/BreakCriticalMachineEdges.cpp
Author: baldrick Date: Fri Nov 9 02:30:21 2007 New Revision: 43933 URL: http://llvm.org/viewvc/llvm-project?rev=43933view=rev Log: Add terminating newline. Modified: llvm/trunk/lib/CodeGen/BreakCriticalMachineEdges.cpp Modified: llvm/trunk/lib/CodeGen/BreakCriticalMachineEdges.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/BreakCriticalMachineEdges.cpp?rev=43933r1=43932r2=43933view=diff == --- llvm/trunk/lib/CodeGen/BreakCriticalMachineEdges.cpp (original) +++ llvm/trunk/lib/CodeGen/BreakCriticalMachineEdges.cpp Fri Nov 9 02:30:21 2007 @@ -128,4 +128,4 @@ splitCriticalEdge(SourceBlocks[u], DestBlocks[u]); return false; -} \ No newline at end of file +} ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] [llvm] r43918 - in /llvm/trunk/lib/Target/X86: X86RegisterInfo.cpp X86RegisterInfo.td
Rewrite Dwarf number handling per review comments. Thanks, Dale! -- With best regards, Anton Korobeynikov. Faculty of Mathematics Mechanics, Saint Petersburg State University. ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm] r43934 - in /llvm/trunk: include/llvm/CodeGen/ValueTypes.h lib/CodeGen/SelectionDAG/DAGCombiner.cpp lib/CodeGen/SelectionDAG/LegalizeDAGTypes.cpp
Author: baldrick
Date: Fri Nov 9 02:57:19 2007
New Revision: 43934
URL: http://llvm.org/viewvc/llvm-project?rev=43934view=rev
Log:
Fix some load/store logic that would be wrong for
apints on big-endian machines if the bitwidth is
not a multiple of 8. Introduce a new helper,
MVT::getStoreSizeInBits, and use it.
Modified:
llvm/trunk/include/llvm/CodeGen/ValueTypes.h
llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAGTypes.cpp
Modified: llvm/trunk/include/llvm/CodeGen/ValueTypes.h
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ValueTypes.h?rev=43934r1=43933r2=43934view=diff
==
--- llvm/trunk/include/llvm/CodeGen/ValueTypes.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ValueTypes.h Fri Nov 9 02:57:19 2007
@@ -243,6 +243,13 @@
}
}
+ /// MVT::getStoreSizeInBits - Return the number of bits overwritten by a
+ /// store of the specified value type.
+ ///
+ static inline unsigned getStoreSizeInBits(ValueType VT) {
+return (getSizeInBits(VT) + 7)/8*8;
+ }
+
/// MVT::getIntegerType - Returns the ValueType that represents an integer
/// with the given number of bits.
///
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=43934r1=43933r2=43934view=diff
==
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Fri Nov 9 02:57:19 2007
@@ -1713,8 +1713,9 @@
// For big endian targets, we need to add an offset to the pointer to
// load the correct bytes. For little endian systems, we merely need
to
// read fewer bytes from the same pointer.
-unsigned PtrOff =
- (MVT::getSizeInBits(LoadedVT) - MVT::getSizeInBits(EVT)) / 8;
+unsigned LVTStoreBytes = MVT::getStoreSizeInBits(LoadedVT)/8;
+unsigned EVTStoreBytes = MVT::getStoreSizeInBits(EVT)/8;
+unsigned PtrOff = LVTStoreBytes - EVTStoreBytes;
unsigned Alignment = LN0-getAlignment();
SDOperand NewPtr = LN0-getBasePtr();
if (!TLI.isLittleEndian()) {
@@ -2991,8 +2992,11 @@
MVT::ValueType PtrType = N0.getOperand(1).getValueType();
// For big endian targets, we need to adjust the offset to the pointer to
// load the correct bytes.
-if (!TLI.isLittleEndian())
- ShAmt = MVT::getSizeInBits(N0.getValueType()) - ShAmt - EVTBits;
+if (!TLI.isLittleEndian()) {
+ unsigned LVTStoreBits = MVT::getStoreSizeInBits(N0.getValueType());
+ unsigned EVTStoreBits = MVT::getStoreSizeInBits(EVT);
+ ShAmt = LVTStoreBits - EVTStoreBits - ShAmt;
+}
uint64_t PtrOff = ShAmt / 8;
unsigned NewAlign = MinAlign(LN0-getAlignment(), PtrOff);
SDOperand NewPtr = DAG.getNode(ISD::ADD, PtrType, LN0-getBasePtr(),
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAGTypes.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAGTypes.cpp?rev=43934r1=43933r2=43934view=diff
==
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAGTypes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAGTypes.cpp Fri Nov 9
02:57:19 2007
@@ -1036,7 +1036,7 @@
// Big-endian - high bits are at low addresses. Favor aligned loads at
// the cost of some bit-fiddling.
MVT::ValueType EVT = N-getLoadedVT();
-unsigned EBytes = (MVT::getSizeInBits(EVT) + 7)/8;
+unsigned EBytes = MVT::getStoreSizeInBits(EVT)/8;
unsigned IncrementSize = MVT::getSizeInBits(NVT)/8;
unsigned ExcessBits = (EBytes - IncrementSize)*8;
@@ -2069,7 +2069,7 @@
GetExpandedOp(N-getValue(), Lo, Hi);
MVT::ValueType EVT = N-getStoredVT();
-unsigned EBytes = (MVT::getSizeInBits(EVT) + 7)/8;
+unsigned EBytes = MVT::getStoreSizeInBits(EVT)/8;
unsigned IncrementSize = MVT::getSizeInBits(NVT)/8;
unsigned ExcessBits = (EBytes - IncrementSize)*8;
MVT::ValueType HiVT =
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] Error During Compilation
Hi all,
I'm getting an error during compilation of LLVM-GCC 4.0. Here's the
error:
/var/tmp//ccKGJOpy.s:unknown:Undefined local symbol L6$pb
and here's the reduced testcase:
$ cat testcase.i
void bork(int qux) {
switch (qux) {
case 0: case 2: case 4: case 1:
break;
}
}
$ /Volumes/Gir/devel/llvm/llvm-gcc-4.0.obj/gcc/xgcc -B/Volumes/Gir/
devel/llvm/llvm-gcc-4.0.obj/gcc/ -B/Volumes/Gir/devel/llvm/llvm-
gcc-4.0.install/i686-apple-darwin9.1.0/bin/ -B/Volumes/Gir/devel/llvm/
llvm-gcc-4.0.install/i686-apple-darwin9.1.0/lib/ -m64 -c testcase.i
/var/tmp//ccqurtth.s:unknown:Undefined local symbol L1$pb
Evan, you were working in the switch area. Do you think this could be
related?
-bw
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm-gcc-4.2] r43935 - /llvm-gcc-4.2/trunk/gcc/c-common.c
Author: asl Date: Fri Nov 9 04:15:11 2007 New Revision: 43935 URL: http://llvm.org/viewvc/llvm-project?rev=43935view=rev Log: Make the check general. This also fixes PR1785 Modified: llvm-gcc-4.2/trunk/gcc/c-common.c Modified: llvm-gcc-4.2/trunk/gcc/c-common.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-common.c?rev=43935r1=43934r2=43935view=diff == --- llvm-gcc-4.2/trunk/gcc/c-common.c (original) +++ llvm-gcc-4.2/trunk/gcc/c-common.c Fri Nov 9 04:15:11 2007 @@ -7574,7 +7574,7 @@ clobbers = tree_cons (NULL_TREE, build_string (3, eax), clobbers); - if (MACHO_DYNAMIC_NO_PIC_P) + if (!flag_pic) clobbers = tree_cons (NULL_TREE, build_string (3, ebx), clobbers); ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm-gcc-4.2] r43936 - /llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
Author: asl Date: Fri Nov 9 05:23:12 2007 New Revision: 43936 URL: http://llvm.org/viewvc/llvm-project?rev=43936view=rev Log: Remove extra words after #endif Modified: llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Modified: llvm-gcc-4.2/trunk/gcc/objc/objc-act.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/objc/objc-act.c?rev=43936r1=43935r2=43936view=diff == --- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original) +++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Fri Nov 9 05:23:12 2007 @@ -18406,7 +18406,7 @@ /* Let optimizer know that this decl is not removable. */ set_user_assembler_name(decl, IDENTIFIER_POINTER (DECL_NAME(decl))); DECL_PRESERVE_P (decl) = 1; -#endif ENABLE_LLVM +#endif /* APPLE LOCAL end LLVM */ assemble_variable (decl, 1, 0, 0); } ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm] r43940 - in /llvm/trunk/lib/Transforms/Utils: CloneFunction.cpp CloneModule.cpp CloneTrace.cpp ValueMapper.cpp
Author: asl Date: Fri Nov 9 06:27:04 2007 New Revision: 43940 URL: http://llvm.org/viewvc/llvm-project?rev=43940view=rev Log: Forget to commit users part of value mapper interface Modified: llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp llvm/trunk/lib/Transforms/Utils/CloneModule.cpp llvm/trunk/lib/Transforms/Utils/CloneTrace.cpp llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp Modified: llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp?rev=43940r1=43939r2=43940view=diff == --- llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp Fri Nov 9 06:27:04 2007 @@ -20,7 +20,7 @@ #include llvm/Function.h #include llvm/Support/CFG.h #include llvm/Support/Compiler.h -#include ValueMapper.h +#include llvm/Transforms/Utils/ValueMapper.h #include llvm/Analysis/ConstantFolding.h #include llvm/ADT/SmallVector.h #include map Modified: llvm/trunk/lib/Transforms/Utils/CloneModule.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CloneModule.cpp?rev=43940r1=43939r2=43940view=diff == --- llvm/trunk/lib/Transforms/Utils/CloneModule.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/CloneModule.cpp Fri Nov 9 06:27:04 2007 @@ -17,7 +17,7 @@ #include llvm/DerivedTypes.h #include llvm/TypeSymbolTable.h #include llvm/Constant.h -#include ValueMapper.h +#include llvm/Transforms/Utils/ValueMapper.h using namespace llvm; /// CloneModule - Return an exact copy of the specified module. This is not as Modified: llvm/trunk/lib/Transforms/Utils/CloneTrace.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CloneTrace.cpp?rev=43940r1=43939r2=43940view=diff == --- llvm/trunk/lib/Transforms/Utils/CloneTrace.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/CloneTrace.cpp Fri Nov 9 06:27:04 2007 @@ -19,7 +19,7 @@ #include llvm/Transforms/Utils/Cloning.h #include llvm/Instructions.h #include llvm/Function.h -#include ValueMapper.h +#include llvm/Transforms/Utils/ValueMapper.h using namespace llvm; //Clones the trace (a vector of basic blocks) Modified: llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp?rev=43940r1=43939r2=43940view=diff == --- llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp (original) +++ llvm/trunk/lib/Transforms/Utils/ValueMapper.cpp Fri Nov 9 06:27:04 2007 @@ -12,7 +12,7 @@ // //===--===// -#include ValueMapper.h +#include llvm/Transforms/Utils/ValueMapper.h #include llvm/Constants.h #include llvm/GlobalValue.h #include llvm/Instruction.h ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm] r43941 - /llvm/trunk/lib/Transforms/Utils/CloneTrace.cpp
Author: asl
Date: Fri Nov 9 06:34:20 2007
New Revision: 43941
URL: http://llvm.org/viewvc/llvm-project?rev=43941view=rev
Log:
Fix indent
Modified:
llvm/trunk/lib/Transforms/Utils/CloneTrace.cpp
Modified: llvm/trunk/lib/Transforms/Utils/CloneTrace.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CloneTrace.cpp?rev=43941r1=43940r2=43941view=diff
==
--- llvm/trunk/lib/Transforms/Utils/CloneTrace.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/CloneTrace.cpp Fri Nov 9 06:34:20 2007
@@ -32,7 +32,7 @@
//them using CloneBasicBlock. Also fix the phi nodes during
//this loop. To fix the phi nodes, we delete incoming branches
//that are not in the trace.
- for(std::vectorBasicBlock *::const_iterator T = origTrace.begin(),
+ for (std::vectorBasicBlock *::const_iterator T = origTrace.begin(),
End = origTrace.end(); T != End; ++T) {
//Clone Basic Block
@@ -48,7 +48,7 @@
//Loop over the phi instructions and delete operands
//that are from blocks not in the trace
//only do this if we are NOT the first block
-if(T != origTrace.begin()) {
+if (T != origTrace.begin()) {
for (BasicBlock::iterator I = clonedBlock-begin();
isaPHINode(I); ++I) {
PHINode *PN = castPHINode(I);
@@ -66,20 +66,19 @@
}
//Second loop to do the remapping
- for(std::vectorBasicBlock *::const_iterator BB = clonedTrace.begin(),
+ for (std::vectorBasicBlock *::const_iterator BB = clonedTrace.begin(),
BE = clonedTrace.end(); BB != BE; ++BB) {
-for(BasicBlock::iterator I = (*BB)-begin(); I != (*BB)-end(); ++I) {
-
+for (BasicBlock::iterator I = (*BB)-begin(); I != (*BB)-end(); ++I) {
//Loop over all the operands of the instruction
- for(unsigned op=0, E = I-getNumOperands(); op != E; ++op) {
-const Value *Op = I-getOperand(op);
+ for (unsigned op=0, E = I-getNumOperands(); op != E; ++op) {
+const Value *Op = I-getOperand(op);
-//Get it out of the value map
-Value *V = ValueMap[Op];
+//Get it out of the value map
+Value *V = ValueMap[Op];
-//If not in the value map, then its outside our trace so ignore
-if(V != 0)
- I-setOperand(op,V);
+//If not in the value map, then its outside our trace so ignore
+if (V != 0)
+ I-setOperand(op,V);
}
}
}
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm-gcc-4.2] r43937 - in /llvm-gcc-4.2/trunk/gcc/config/i386: cygming.h linux.h t-mingw32
Author: asl
Date: Fri Nov 9 06:04:39 2007
New Revision: 43937
URL: http://llvm.org/viewvc/llvm-project?rev=43937view=rev
Log:
Fix fallout from recent commits. This fixes PR1785
Folks, when syncing to Apple gcc, please, do remember, that some files
are nullified in the gcc/config directory (mostly for targets Apple doesn't
care),
don't propagate this to llvm-gcc. This stuff is hard to catch, because it
doesn't
lead to any errors during gcc compilation, only resulting binaries are broken.
Modified:
llvm-gcc-4.2/trunk/gcc/config/i386/cygming.h
llvm-gcc-4.2/trunk/gcc/config/i386/linux.h
llvm-gcc-4.2/trunk/gcc/config/i386/t-mingw32
Modified: llvm-gcc-4.2/trunk/gcc/config/i386/cygming.h
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/cygming.h?rev=43937r1=43936r2=43937view=diff
==
--- llvm-gcc-4.2/trunk/gcc/config/i386/cygming.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/cygming.h Fri Nov 9 06:04:39 2007
@@ -1,3 +1,394 @@
+/* Operating system specific defines to be used when targeting GCC for
+ hosting on Windows32, using a Unix style C library and tools.
+ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+ 2004, 2005
+ Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING. If not, write to
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
+
+#define DBX_DEBUGGING_INFO 1
+#define SDB_DEBUGGING_INFO 1
+#undef PREFERRED_DEBUGGING_TYPE
+#define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
+
+#ifdef HAVE_GAS_PE_SECREL32_RELOC
+#define DWARF2_DEBUGGING_INFO 1
+
+#undef DBX_REGISTER_NUMBER
+#define DBX_REGISTER_NUMBER(n) (write_symbols == DWARF2_DEBUG \
+? svr4_dbx_register_map[n] \
+: dbx_register_map[n])
+
+/* Use section relative relocations for debugging offsets. Unlike
+ other targets that fake this by putting the section VMA at 0, PE
+ won't allow it. */
+#define ASM_OUTPUT_DWARF_OFFSET(FILE, SIZE, LABEL, SECTION)\
+ do { \
+if (SIZE != 4) \
+ abort ();\
+ \
+fputs (\t.secrel32\t, FILE); \
+assemble_name (FILE, LABEL); \
+ } while (0)
+#endif
+
+#define TARGET_EXECUTABLE_SUFFIX .exe
+
+#include stdio.h
+
+#define MAYBE_UWIN_CPP_BUILTINS() /* Nothing. */
+
+#define TARGET_OS_CPP_BUILTINS() \
+ do \
+{ \
+ builtin_define (_X86_=1); \
+ builtin_assert (system=winnt);\
+ builtin_define (__stdcall=__attribute__((__stdcall__))); \
+ builtin_define (__fastcall=__attribute__((__fastcall__)));\
+ builtin_define (__cdecl=__attribute__((__cdecl__))); \
+ if (!flag_iso) \
+ { \
+ builtin_define (_stdcall=__attribute__((__stdcall__))); \
+ builtin_define (_fastcall=__attribute__((__fastcall__))); \
+ builtin_define (_cdecl=__attribute__((__cdecl__))); \
+ } \
+ /* Even though linkonce works with static libs, this is needed \
+ to compare typeinfo symbols across dll boundaries. */ \
+ builtin_define (__GXX_MERGED_TYPEINFO_NAMES=0); \
+ MAYBE_UWIN_CPP_BUILTINS (); \
+ EXTRA_OS_CPP_BUILTINS (); \
+ }\
+ while (0)
+
+/* Get tree.c to declare a target-specific specialization of
+ merge_decl_attributes. */
+#define TARGET_DLLIMPORT_DECL_ATTRIBUTES 1
+
+/* This macro defines names of additional specifications to put in the specs
+ that can be used in various specifications like CC1_SPEC. Its
[llvm-commits] [llvm] r43945 - /llvm/trunk/test/FrontendObjC/2007-09-25-EH.m
Author: baldrick
Date: Fri Nov 9 07:50:25 2007
New Revision: 43945
URL: http://llvm.org/viewvc/llvm-project?rev=43945view=rev
Log:
Thanks to the XTARGET line, this test should still
be run on darwin, but I have no way of checking...
Modified:
llvm/trunk/test/FrontendObjC/2007-09-25-EH.m
Modified: llvm/trunk/test/FrontendObjC/2007-09-25-EH.m
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendObjC/2007-09-25-EH.m?rev=43945r1=43944r2=43945view=diff
==
--- llvm/trunk/test/FrontendObjC/2007-09-25-EH.m (original)
+++ llvm/trunk/test/FrontendObjC/2007-09-25-EH.m Fri Nov 9 07:50:25 2007
@@ -1,4 +1,5 @@
// RUN: %llvmgcc -c -w -m64 -mmacosx-version-min=10.5 %s -o /dev/null
+// XFAIL: *
// XTARGET: darwin
@class NSDictionary, DSoBuffer, DSoDirectory, NSMutableArray;
@interface NSException {}
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm] r43944 - in /llvm/trunk: include/llvm/Support/Alignment.h include/llvm/Support/MathExtras.h lib/CodeGen/SelectionDAG/DAGCombiner.cpp lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/
Author: baldrick
Date: Fri Nov 9 07:41:39 2007
New Revision: 43944
URL: http://llvm.org/viewvc/llvm-project?rev=43944view=rev
Log:
Move MinAlign to MathExtras.h.
Removed:
llvm/trunk/include/llvm/Support/Alignment.h
Modified:
llvm/trunk/include/llvm/Support/MathExtras.h
llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAGTypes.cpp
Removed: llvm/trunk/include/llvm/Support/Alignment.h
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Alignment.h?rev=43943view=auto
==
--- llvm/trunk/include/llvm/Support/Alignment.h (original)
+++ llvm/trunk/include/llvm/Support/Alignment.h (removed)
@@ -1,28 +0,0 @@
-//===--- Alignment.h - Alignment computation *- C++
-*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file was developed by Duncan Sands and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
-//
-//===--===//
-//
-// This file defines utilities for computing alignments.
-//
-//===--===//
-
-#ifndef LLVM_SUPPORT_ALIGNMENT_H
-#define LLVM_SUPPORT_ALIGNMENT_H
-
-namespace llvm {
-
-/// MinAlign - A and B are either alignments or offsets. Return the minimum
-/// alignment that may be assumed after adding the two together.
-
-static inline unsigned MinAlign(unsigned A, unsigned B) {
- // The largest power of 2 that divides both A and B.
- return (A | B) -(A | B);
-}
-
-} // end namespace llvm
-#endif
Modified: llvm/trunk/include/llvm/Support/MathExtras.h
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/MathExtras.h?rev=43944r1=43943r2=43944view=diff
==
--- llvm/trunk/include/llvm/Support/MathExtras.h (original)
+++ llvm/trunk/include/llvm/Support/MathExtras.h Fri Nov 9 07:41:39 2007
@@ -358,6 +358,13 @@
int IsInf(float f);
int IsInf(double d);
+/// MinAlign - A and B are either alignments or offsets. Return the minimum
+/// alignment that may be assumed after adding the two together.
+static inline unsigned MinAlign(unsigned A, unsigned B) {
+ // The largest power of 2 that divides both A and B.
+ return (A | B) -(A | B);
+}
+
} // End llvm namespace
#endif
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=43944r1=43943r2=43944view=diff
==
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Fri Nov 9 07:41:39 2007
@@ -37,7 +37,6 @@
#include llvm/Target/TargetOptions.h
#include llvm/ADT/SmallPtrSet.h
#include llvm/ADT/Statistic.h
-#include llvm/Support/Alignment.h
#include llvm/Support/Compiler.h
#include llvm/Support/CommandLine.h
#include llvm/Support/Debug.h
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=43944r1=43943r2=43944view=diff
==
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Fri Nov 9 07:41:39 2007
@@ -23,7 +23,6 @@
#include llvm/CallingConv.h
#include llvm/Constants.h
#include llvm/DerivedTypes.h
-#include llvm/Support/Alignment.h
#include llvm/Support/CommandLine.h
#include llvm/Support/Compiler.h
#include llvm/Support/MathExtras.h
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAGTypes.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAGTypes.cpp?rev=43944r1=43943r2=43944view=diff
==
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAGTypes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAGTypes.cpp Fri Nov 9
07:41:39 2007
@@ -18,9 +18,9 @@
#include llvm/DerivedTypes.h
#include llvm/Target/TargetLowering.h
#include llvm/ADT/DenseMap.h
-#include llvm/Support/Alignment.h
#include llvm/Support/Compiler.h
#include llvm/Support/Debug.h
+#include llvm/Support/MathExtras.h
using namespace llvm;
//===--===//
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] [llvm] r43918 - in /llvm/trunk/lib/Target/X86: X86RegisterInfo.cpp X86RegisterInfo.td
On Nov 8, 2007, at 10:05 PM, Chris Lattner wrote:
URL: http://llvm.org/viewvc/llvm-project?rev=43918view=rev
Log:
Rewrite Dwarf number handling per review comments.
Hi Dale,
I'm pretty uncomfortable with this, because it means that we're tying
down the register order.
I tend to agree, but both comments I got on this patch suggested the
table approach.
Actually the more I look at other people's suggestions the more I
like my original patch (43844).
Compared to your suggestion below, that has 2 switches instead of 3
and the switches
are smaller, and it's also proof against reordering of registers.
What do you think of that one?
How about something like:
if (Darwin32) {
switch (RegNo) {
case X86::AL: case X86::AH: case X86::AX: return 0;
case X86::EDI: ...
} else if (darwin64) {
switch (RegNo) {
...
} else {
}
That way we don't break EH/debug info if registers are reordered or
added in the future.
-Chris
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] [llvm] r43918 - in /llvm/trunk/lib/Target/X86: X86RegisterInfo.cpp X86RegisterInfo.td
Since I gave bad advice last time, how about one more advice? :-)
Create a DenseMap mapping from target registers to dwarf numbers at
X86RegisterInfo ctor (or on demand the first time getDwarfRegNum is
called). So subsequent queries should be nice and fast.
Frankly I don't think the issue is worth spending this much time on.
Whatever works and maintainable is good.
Evan
On Nov 9, 2007, at 8:13 AM, Dale Johannesen wrote:
On Nov 8, 2007, at 10:05 PM, Chris Lattner wrote:
URL: http://llvm.org/viewvc/llvm-project?rev=43918view=rev
Log:
Rewrite Dwarf number handling per review comments.
Hi Dale,
I'm pretty uncomfortable with this, because it means that we're tying
down the register order.
I tend to agree, but both comments I got on this patch suggested the
table approach.
Actually the more I look at other people's suggestions the more I
like my original patch (43844).
Compared to your suggestion below, that has 2 switches instead of 3
and the switches
are smaller, and it's also proof against reordering of registers.
What do you think of that one?
How about something like:
if (Darwin32) {
switch (RegNo) {
case X86::AL: case X86::AH: case X86::AX: return 0;
case X86::EDI: ...
} else if (darwin64) {
switch (RegNo) {
...
} else {
}
That way we don't break EH/debug info if registers are reordered or
added in the future.
-Chris
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] [llvm-gcc-4.2] r43937 - in /llvm-gcc-4.2/trunk/gcc/config/i386: cygming.h linux.h t-mingw32
On Nov 9, 2007, at 4:04 AM, Anton Korobeynikov wrote: Author: asl Date: Fri Nov 9 06:04:39 2007 New Revision: 43937 URL: http://llvm.org/viewvc/llvm-project?rev=43937view=rev Log: Fix fallout from recent commits. This fixes PR1785 Folks, when syncing to Apple gcc, please, do remember, that some files are nullified in the gcc/config directory (mostly for targets Apple doesn't care), don't propagate this to llvm-gcc. This stuff is hard to catch, because it doesn't lead to any errors during gcc compilation, only resulting binaries are broken. Doh. :( Thanks for finding and fixing this Anton! -Chris ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] [llvm] r43918 - in /llvm/trunk/lib/Target/X86: X86RegisterInfo.cpp X86RegisterInfo.td
On Nov 9, 2007, at 8:55 AM, Evan Cheng wrote: Since I gave bad advice last time, how about one more advice? :-) Create a DenseMap mapping from target registers to dwarf numbers at X86RegisterInfo ctor (or on demand the first time getDwarfRegNum is called). So subsequent queries should be nice and fast. Ick :) Frankly I don't think the issue is worth spending this much time on. Whatever works and maintainable is good. I'd prefer to use one switch statement form or the other. The compiler should be able to turn trivial switches like that into an array lookup. Note that it doesn't currently, but adding this shouldn't be hard. -Chris ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm] r43949 - in /llvm/trunk: lib/Transforms/IPO/GlobalOpt.cpp test/Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll
Author: lattner
Date: Fri Nov 9 11:33:02 2007
New Revision: 43949
URL: http://llvm.org/viewvc/llvm-project?rev=43949view=rev
Log:
Tighten up a check for folding away loads from (newly constant) globals. This
fixes a crash on Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll and
rdar://5585488.
Added:
llvm/trunk/test/Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll
Modified:
llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=43949r1=43948r2=43949view=diff
==
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Fri Nov 9 11:33:02 2007
@@ -342,12 +342,17 @@
Changed = true;
}
} else if (GetElementPtrInst *GEP = dyn_castGetElementPtrInst(U)) {
- Constant *SubInit = 0;
- ConstantExpr *CE =
-dyn_cast_or_nullConstantExpr(ConstantFoldInstruction(GEP));
- if (Init CE CE-getOpcode() == Instruction::GetElementPtr)
-SubInit = ConstantFoldLoadThroughGEPConstantExpr(Init, CE);
- Changed |= CleanupConstantGlobalUsers(GEP, SubInit);
+ // Do not transform gepinst (gep constexpr (GV)) here, because forming
+ // gepconstexpr (gep constexpr (GV)) will cause the two gep's to fold
+ // and will invalidate our notion of what Init is.
+ if (!isaConstantExpr(GEP-getOperand(0))) {
+ConstantExpr *CE =
+ dyn_cast_or_nullConstantExpr(ConstantFoldInstruction(GEP));
+if (Init CE CE-getOpcode() == Instruction::GetElementPtr)
+ if (Constant *SubInit =
+ ConstantFoldLoadThroughGEPConstantExpr(Init, CE))
+Changed |= CleanupConstantGlobalUsers(GEP, SubInit);
+ }
if (GEP-use_empty()) {
GEP-eraseFromParent();
Added: llvm/trunk/test/Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll?rev=43949view=auto
==
--- llvm/trunk/test/Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll (added)
+++ llvm/trunk/test/Transforms/GlobalOpt/2007-11-09-GEP-GEP-Crash.ll Fri Nov 9
11:33:02 2007
@@ -0,0 +1,19 @@
+; RUN: llvm-as %s | opt -globalopt -disable-output
+target datalayout =
E-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f128:64:128
+target triple = powerpc-apple-darwin8
+%struct.empty0 = type { }
+%struct.es = type { %struct.empty0 }
+%struct.es1 = type { %struct.empty0 }
[EMAIL PROTECTED] = internal global [6 x [2 x i32]] [ [2 x i32] [ i32 1, i32 1
], [2 x i32] [ i32 1, i32 1 ], [2 x i32] [ i32 1, i32 1 ], [2 x i32] [ i32 1,
i32 1 ], [2 x i32] [ i32 1, i32 1 ], [2 x i32] [ i32 1, i32 1 ] ]
; [6 x [2 x i32]]* [#uses=1]
[EMAIL PROTECTED] = internal global [0 x [2 x i32]] zeroinitializer
; [0 x [2 x i32]]* [#uses=1]
+
+define i8 @func() {
+entry:
+%tmp10 = getelementptr [2 x i32]* getelementptr ([6 x [2 x i32]]*
@aaui1, i32 0, i32 0), i32 5, i32 1 ; i32* [#uses=1]
+%tmp11 = load i32* %tmp10, align 4 ; i32 [#uses=1]
+%tmp12 = call i32 (...)* @func3( i32* null, i32 0, i32 %tmp11 )
; i32 [#uses=0]
+ret i8 undef
+}
+
+declare i32 @func3(...)
+
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm] r43950 - in /llvm/trunk/lib/Target/X86: X86RegisterInfo.cpp X86RegisterInfo.td
Author: johannes
Date: Fri Nov 9 12:07:11 2007
New Revision: 43950
URL: http://llvm.org/viewvc/llvm-project?rev=43950view=rev
Log:
Revert previous rewrite per chris's comments.
Modified:
llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
llvm/trunk/lib/Target/X86/X86RegisterInfo.td
Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp?rev=43950r1=43949r2=43950view=diff
==
--- llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp Fri Nov 9 12:07:11 2007
@@ -665,100 +665,47 @@
// for exception handling.
int X86RegisterInfo::getDwarfRegNum(unsigned RegNo) const {
- static const int dwarf_64bit[] = {
- // none, ah, al, ax, bh, bl, bp, bpl, bx, ch,
- -1,0,0,0,3,3,6,6,3,2,
- // cl, cx, dh, di, dil, dl, dx, eax, ebp, ebx,
-2,2,1,5,5,1,1,0,6,3,
- // ecx, edi, edx, efl, eip, esi, esp, fp0, fp1, fp2,
-2,5,1, -1, 16,4,7, -1, -1, -1,
- // fp3, fp4, fp5, fp6, ip, mm0, mm1, mm2, mm3, mm4,
- -1, -1, -1, -1, 16, 41, 42, 43, 44, 45,
- // mm5, mm6, mm7, r10, r10b, r10d, r10w, r11, r11b, r11d,
- 46, 47, 48, 10, 10, 10, 10, 11, 11, 11,
- // r11w, r12, r12b, r12d, r12w, r13, r13b, r13d, r13w, r14,
- 11, 12, 12, 12, 12, 13, 13, 13, 13, 14,
- // r14b, r14d, r14w, r15, r15b, r15d, r15w, r8, r8b, r8d,
- 14, 14, 14, 15, 15, 15, 15,8,8,8,
- // r8w, r9, r9b, r9d, r9w, rax, rbp, rbx, rcx, rdi,
-8,9,9,9,9,0,6,3,2,5,
- // rdx, rip, rsi, rsp, si, sil, sp, spl, st0, st1,
-1, 16,4,7,4,4,7,7, 33, 34,
- // st2, st3, st4, st5, st6, st7, xmm0, xmm1,xmm10,xmm11,
- 35, 36, 37, 38, 39, 40, 17, 18, 27, 28,
- //xmm12,xmm13,xmm14,xmm15, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7,
- 29, 30, 31, 32, 19, 20, 21, 22, 23, 24,
- // xmm8, xmm9
- 25, 26 };
-
- static const int dwarf_32bit_darwin[] = {
- // none, ah, al, ax, bh, bl, bp, bpl, bx, ch,
- -1,0,0,0,3,3,4,4,3,1,
- // cl, cx, dh, di, dil, dl, dx, eax, ebp, ebx,
-1,1,2,7,7,2,2,0,4,3,
- // ecx, edi, edx, efl, eip, esi, esp, fp0, fp1, fp2,
-1,7,2, -1,8,6,5, -1, -1, -1,
- // fp3, fp4, fp5, fp6, ip, mm0, mm1, mm2, mm3, mm4,
- -1, -1, -1, -1,8, 29, 30, 31, 32, 33,
- // mm5, mm6, mm7, r10, r10b, r10d, r10w, r11, r11b, r11d,
- 34, 35, 36, -1, -1, -1, -1, -1, -1, -1,
- // r11w, r12, r12b, r12d, r12w, r13, r13b, r13d, r13w, r14,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- // r14b, r14d, r14w, r15, r15b, r15d, r15w, r8, r8b, r8d,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- // r8w, r9, r9b, r9d, r9w, rax, rbp, rbx, rcx, rdi,
- -1, -1, -1, -1, -1,0,4,3,1,7,
- // rdx, rip, rsi, rsp, si, sil, sp, spl, st0, st1,
-2,8,6,5,6,6,5,5, 12, 13,
- // st2, st3, st4, st5, st6, st7, xmm0, xmm1,xmm10,xmm11,
- 14, 15, 16, 17, 18, 19, 21, 22, -1, -1,
- //xmm12,xmm13,xmm14,xmm15, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7,
- -1, -1, -1, -1, 23, 24, 25, 26, 27, 28,
- // xmm8, xmm9
- -1, -1 };
-
- static const int dwarf_32bit_linux[] = {
- // none, ah, al, ax, bh, bl, bp, bpl, bx, ch,
- -1,0,0,0,3,3,5,5,3,1,
- // cl, cx, dh, di, dil, dl, dx, eax, ebp, ebx,
-1,1,2,7,7,2,2,0,5,3,
- // ecx, edi, edx, efl, eip, esi, esp, fp0, fp1, fp2,
-1,7,2, -1,8,6,4, -1, -1, -1,
- // fp3, fp4, fp5, fp6, ip, mm0, mm1, mm2, mm3, mm4,
- -1, -1, -1, -1,8, 29, 30, 31, 32, 33,
- // mm5, mm6, mm7, r10, r10b, r10d, r10w, r11, r11b, r11d,
- 34, 35, 36, -1, -1, -1, -1, -1, -1, -1,
- // r11w, r12, r12b, r12d, r12w, r13, r13b, r13d, r13w, r14,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- // r14b, r14d, r14w, r15, r15b, r15d, r15w, r8, r8b, r8d,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- // r8w, r9, r9b, r9d, r9w, rax, rbp, rbx, rcx, rdi,
- -1, -1, -1, -1, -1,0,5,3,1,7,
Re: [llvm-commits] [llvm] r43918 - in /llvm/trunk/lib/Target/X86: X86RegisterInfo.cpp X86RegisterInfo.td
On Nov 9, 2007, at 9:03 AM, Chris Lattner wrote: On Nov 9, 2007, at 8:55 AM, Evan Cheng wrote: Frankly I don't think the issue is worth spending this much time on. Whatever works and maintainable is good. I'd prefer to use one switch statement form or the other. The compiler should be able to turn trivial switches like that into an array lookup. Note that it doesn't currently, but adding this shouldn't be hard. -Chris OK, I don't see a consensus in our future, so I've checked in what I think is the best thing. If anyone dislikes this enough to rewrite it, I will not object. ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm-gcc-4.2] r43951 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
Author: dpatel Date: Fri Nov 9 12:24:53 2007 New Revision: 43951 URL: http://llvm.org/viewvc/llvm-project?rev=43951view=rev Log: Include missing header. Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=43951r1=43950r2=43951view=diff == --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Nov 9 12:24:53 2007 @@ -36,6 +36,7 @@ #include llvm/Module.h #include llvm/Analysis/ConstantFolding.h #include llvm/Support/MathExtras.h +#include llvm/Support/Alignment.h #include llvm/Target/TargetAsmInfo.h #include llvm/Target/TargetData.h #include llvm/Target/TargetMachine.h ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] [llvm-gcc-4.2] r43951 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project?rev=43951view=rev Log: Include missing header. Alignment.h went away, merged into MathExtras.h. -Chris Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ llvm-convert.cpp?rev=43951r1=43950r2=43951view=diff == --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Nov 9 12:24:53 2007 @@ -36,6 +36,7 @@ #include llvm/Module.h #include llvm/Analysis/ConstantFolding.h #include llvm/Support/MathExtras.h +#include llvm/Support/Alignment.h #include llvm/Target/TargetAsmInfo.h #include llvm/Target/TargetData.h #include llvm/Target/TargetMachine.h ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] [llvm-gcc-4.2] r43930 - in /llvm-gcc-4.2/trunk/gcc/config/arm: darwin-libgcc.10.4.ver darwin-libgcc.10.5.ver darwin.h darwin.opt t-darwin
Following the Big Merge there are literally thousands of new gcc testsuite failures. The most obvious ones (~1500) give this error: /Volumes/MacOS9/gcc/llvm-gcc-4.2/gcc/testsuite/gcc.apple/4516827.c: 34: internal compiler error: tree check: expected class 'expression', have 'constant' (integer_cst) in simple_cst_equal, at tree.c:4825 I will investigate. On Nov 8, 2007, at 11:19 PM, Bill Wendling wrote: Author: void Date: Fri Nov 9 01:19:47 2007 New Revision: 43930 URL: http://llvm.org/viewvc/llvm-project?rev=43930view=rev Log: Last (penultimate?) Apple GCC 4.2 updates. Added: llvm-gcc-4.2/trunk/gcc/config/arm/darwin-libgcc.10.4.ver llvm-gcc-4.2/trunk/gcc/config/arm/darwin-libgcc.10.5.ver llvm-gcc-4.2/trunk/gcc/config/arm/darwin.h llvm-gcc-4.2/trunk/gcc/config/arm/darwin.opt llvm-gcc-4.2/trunk/gcc/config/arm/t-darwin Added: llvm-gcc-4.2/trunk/gcc/config/arm/darwin-libgcc.10.4.ver URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ config/arm/darwin-libgcc.10.4.ver?rev=43930view=auto ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm-gcc-4.2] r43952 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
Author: dpatel Date: Fri Nov 9 12:38:41 2007 New Revision: 43952 URL: http://llvm.org/viewvc/llvm-project?rev=43952view=rev Log: Remove header include. Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=43952r1=43951r2=43952view=diff == --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Nov 9 12:38:41 2007 @@ -36,7 +36,6 @@ #include llvm/Module.h #include llvm/Analysis/ConstantFolding.h #include llvm/Support/MathExtras.h -#include llvm/Support/Alignment.h #include llvm/Target/TargetAsmInfo.h #include llvm/Target/TargetData.h #include llvm/Target/TargetMachine.h ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] Error During Compilation
I'll look into this.
Evan
On Nov 9, 2007, at 1:00 AM, Bill Wendling wrote:
Hi all,
I'm getting an error during compilation of LLVM-GCC 4.0. Here's the
error:
/var/tmp//ccKGJOpy.s:unknown:Undefined local symbol L6$pb
and here's the reduced testcase:
$ cat testcase.i
void bork(int qux) {
switch (qux) {
case 0: case 2: case 4: case 1:
break;
}
}
$ /Volumes/Gir/devel/llvm/llvm-gcc-4.0.obj/gcc/xgcc -B/Volumes/Gir/
devel/llvm/llvm-gcc-4.0.obj/gcc/ -B/Volumes/Gir/devel/llvm/llvm-
gcc-4.0.install/i686-apple-darwin9.1.0/bin/ -B/Volumes/Gir/devel/llvm/
llvm-gcc-4.0.install/i686-apple-darwin9.1.0/lib/ -m64 -c testcase.i
/var/tmp//ccqurtth.s:unknown:Undefined local symbol L1$pb
Evan, you were working in the switch area. Do you think this could be
related?
-bw
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm] r43953 - /llvm/tags/Apple/llvmCore-2000/
Author: void Date: Fri Nov 9 13:00:21 2007 New Revision: 43953 URL: http://llvm.org/viewvc/llvm-project?rev=43953view=rev Log: Creation of llvmCore-2000 Added: llvm/tags/Apple/llvmCore-2000/ - copied from r43952, llvm/trunk/ ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] [llvm-gcc-4.2] r43937 - in /llvm-gcc-4.2/trunk/gcc/config/i386: cygming.h linux.h t-mingw32
On Nov 9, 2007 4:04 AM, Anton Korobeynikov [EMAIL PROTECTED] wrote: Author: asl Date: Fri Nov 9 06:04:39 2007 New Revision: 43937 URL: http://llvm.org/viewvc/llvm-project?rev=43937view=rev Log: Fix fallout from recent commits. This fixes PR1785 Folks, when syncing to Apple gcc, please, do remember, that some files are nullified in the gcc/config directory (mostly for targets Apple doesn't care), don't propagate this to llvm-gcc. This stuff is hard to catch, because it doesn't lead to any errors during gcc compilation, only resulting binaries are broken. Sorry about that. I tried to revert all of the erasures in the gcc/config directory. I obviously missed a few. -bw ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm] r43954 - /llvm/trunk/lib/Target/TargetData.cpp
Author: asl
Date: Fri Nov 9 13:06:14 2007
New Revision: 43954
URL: http://llvm.org/viewvc/llvm-project?rev=43954view=rev
Log:
Silence a warning
Modified:
llvm/trunk/lib/Target/TargetData.cpp
Modified: llvm/trunk/lib/Target/TargetData.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetData.cpp?rev=43954r1=43953r2=43954view=diff
==
--- llvm/trunk/lib/Target/TargetData.cpp (original)
+++ llvm/trunk/lib/Target/TargetData.cpp Fri Nov 9 13:06:14 2007
@@ -211,7 +211,7 @@
case 'f':
case 'a':
case 's': {
- AlignTypeEnum align_type;
+ AlignTypeEnum align_type = STACK_ALIGN; // Dummy init, silence warning
switch(*p) {
case 'i': align_type = INTEGER_ALIGN; break;
case 'v': align_type = VECTOR_ALIGN; break;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm] r43955 - /llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp
Author: evancheng
Date: Fri Nov 9 13:11:23 2007
New Revision: 43955
URL: http://llvm.org/viewvc/llvm-project?rev=43955view=rev
Log:
Unbreak x86-64 jumptable.
Modified:
llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp
Modified: llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp?rev=43955r1=43954r2=43955view=diff
==
--- llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Fri Nov 9 13:11:23 2007
@@ -506,7 +506,11 @@
O TAI-getSetDirective() ' ' TAI-getPrivateGlobalPrefix()
getFunctionNumber() '_' uid _set_ MBB-getNumber() ',';
printBasicBlockLabel(MBB, false, false);
- O '-' computePICLabel(getFunctionNumber(), TAI, Subtarget) '\n';
+ if (Subtarget-isPICStyleRIPRel())
+O '-' TAI-getPrivateGlobalPrefix() JTI getFunctionNumber()
+ '_' uid '\n';
+ else
+O '-' computePICLabel(getFunctionNumber(), TAI, Subtarget) '\n';
}
void X86ATTAsmPrinter::printPICLabel(const MachineInstr *MI, unsigned Op) {
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] [llvm-gcc-4.2] r43937 - in /llvm-gcc-4.2/trunk/gcc/config/i386: cygming.h linux.h t-mingw32
Bill, Sorry about that. I tried to revert all of the erasures in the gcc/config directory. I obviously missed a few. No problem. diffstat is your friend here. -- With best regards, Anton Korobeynikov. Faculty of Mathematics Mechanics, Saint Petersburg State University. ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm] r43961 - in /llvm/trunk/test/CodeGen/X86: pic_jumptable.ll test-pic-jtbl.ll
Author: evancheng
Date: Fri Nov 9 14:46:00 2007
New Revision: 43961
URL: http://llvm.org/viewvc/llvm-project?rev=43961view=rev
Log:
Fix tests.
Modified:
llvm/trunk/test/CodeGen/X86/pic_jumptable.ll
llvm/trunk/test/CodeGen/X86/test-pic-jtbl.ll
Modified: llvm/trunk/test/CodeGen/X86/pic_jumptable.ll
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pic_jumptable.ll?rev=43961r1=43960r2=43961view=diff
==
--- llvm/trunk/test/CodeGen/X86/pic_jumptable.ll (original)
+++ llvm/trunk/test/CodeGen/X86/pic_jumptable.ll Fri Nov 9 14:46:00 2007
@@ -1,7 +1,5 @@
-; RUN: llvm-upgrade %s | llvm-as | llc -relocation-model=pic -march=x86 |
not grep -F .text
-target endian = little
-target pointersize = 32
-target triple = i386-linux-gnu
+; RUN: llvm-upgrade %s | llvm-as | llc -relocation-model=pic
-mtriple=i386-linux-gnu | not grep -F .text
+; RUN: llvm-upgrade %s | llvm-as | llc -relocation-model=pic
-mtriple=i686-apple-darwin | not grep lea
implementation ; Functions:
Modified: llvm/trunk/test/CodeGen/X86/test-pic-jtbl.ll
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/test-pic-jtbl.ll?rev=43961r1=43960r2=43961view=diff
==
--- llvm/trunk/test/CodeGen/X86/test-pic-jtbl.ll (original)
+++ llvm/trunk/test/CodeGen/X86/test-pic-jtbl.ll Fri Nov 9 14:46:00 2007
@@ -1,10 +1,10 @@
; RUN: llvm-as %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \
; RUN: -o %t -f
; RUN: grep _GLOBAL_OFFSET_TABLE_ %t
-; RUN: grep piclabel %t | count 3
+; RUN: grep piclabel %t | count 9
; RUN: grep PLT %t | count 6
-; RUN: grep GOTOFF %t | count 2
-; RUN: grep JTI %t | count 9
+; RUN: grep GOTOFF %t | count 1
+; RUN: grep JTI %t | count 2
define void @bar(i32 %n.u) {
entry:
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm-gcc-4.0] r43962 - /llvm-gcc-4.0/trunk/build_gcc
Author: dpatel
Date: Fri Nov 9 14:48:26 2007
New Revision: 43962
URL: http://llvm.org/viewvc/llvm-project?rev=43962view=rev
Log:
Change default install location.
Modified:
llvm-gcc-4.0/trunk/build_gcc
Modified: llvm-gcc-4.0/trunk/build_gcc
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/build_gcc?rev=43962r1=43961r2=43962view=diff
==
--- llvm-gcc-4.0/trunk/build_gcc (original)
+++ llvm-gcc-4.0/trunk/build_gcc Fri Nov 9 14:48:26 2007
@@ -1,6 +1,7 @@
#!/bin/sh
# APPLE LOCAL file BI
-
+# LLVM LOCAL file
+# LLVM install location changes touches many lines in this file.
set -x
# -arch arguments are different than configure arguments. We need to
@@ -91,9 +92,8 @@
# enabled in the LLVM libs/tools.
LLVM_ASSERTIONS=${10}
-# LLVM_INSTALL_PREFIX - This is the prefix where LLVM tools/headers/libraries
-# and the llvm-gcc/llvm-g++ symlinks get installed.
-LLVM_INSTALL_PREFIX=/usr/local
+# LLVM_BIN_DIR - This is the place where llvm-gcc/llvm-g++ symlinks get
installed.
+LLVM_BIN_DIR=/Developer/usr/bin
# LLVM_ARCHS - This tells us which architectures we'd like the libraries to be
# build for. The default is 4-way.
@@ -118,13 +118,6 @@
# to be built. It's VERS but only up to the second '.' (if there is one).
MAJ_VERS=`echo $VERS | sed 's/\([0-9]*\.[0-9]*\)[.-].*/\1/'`
-# APPLE LOCAL begin LLVM
-if [ $ENABLE_LLVM == true ]; then
- # Add suffix.
- MAJ_VERS=${MAJ_VERS}-llvm
-fi
-# APPLE LOCAL end LLVM
-
# This is the default architecture for i386 configurations.
I386_CPU=--with-arch=apple --with-tune=generic
@@ -178,9 +171,10 @@
CONFIGFLAGS=$CHECKING_FLAGS \
--prefix=$DEST_ROOT \
- --mandir=$LLVM_INSTALL_PREFIX/share/man \
+ --mandir=$DEST_ROOT/share/man \
--enable-languages=c,objc,c++,obj-c++ \
- --program-transform-name=/^[cg][^.-]*$/s/$/-$MAJ_VERS/ \
+ --program-prefix=llvm- \
+ --program-suffix=-$MAJ_VERS \
$LIBSTDCXX_CONFIG_OPTION \
--with-slibdir=/usr/lib \
--build=$BUILD-apple-darwin$DARWIN_VERS
@@ -191,7 +185,7 @@
CONFIGFLAGS=$CONFIGFLAGS --enable-llvm=$DIR/obj-llvm
# Build the LLVM tree universal.
- LLVMCONFIGFLAGS=--prefix=$DEST_DIR$LLVM_INSTALL_PREFIX \
+ LLVMCONFIGFLAGS=--prefix=$DEST_DIR$DEST_ROOT \
--enable-targets=$LLVM_TARGETS \
--enable-assertions=$LLVM_ASSERTIONS
mkdir -p $DIR/obj-llvm || exit 1
@@ -269,11 +263,6 @@
make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-$BUILD install-gcc install-target \
CFLAGS=$CFLAGS CXXFLAGS=$CFLAGS || exit 1
-# Add the compiler we just built to the path, giving it appropriate names.
-# APPLE LOCAL LLVM Support for non /usr $DEST_ROOT
-D=$DIR/dst-$BUILD-$BUILD$DEST_ROOT/bin
-ln -f $D/gcc-$MAJ_VERS $D/gcc || exit 1
-ln -f $D/gcc $D/$BUILD-apple-darwin$DARWIN_VERS-gcc || exit 1
# APPLE LOCAL LLVM Support for non /usr $DEST_ROOT
PATH=$DIR/dst-$BUILD-$BUILD$DEST_ROOT/bin:$PATH
@@ -381,9 +370,9 @@
fi
# Manual pages
-mkdir -p .$LLVM_INSTALL_PREFIX/share || exit 1
+mkdir -p .$DEST_ROOT/share || exit 1
# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
-cp -Rp $DIR/dst-$BUILD-$BUILD$LLVM_INSTALL_PREFIX/share/man
.$LLVM_INSTALL_PREFIX/share/ \
+cp -Rp $DIR/dst-$BUILD-$BUILD$DEST_ROOT/share/man .$DEST_ROOT/share/ \
|| exit 1
# libexec
@@ -432,11 +421,11 @@
# The fully-named drivers, which have the same target on every host.
for t in $TARGETS ; do
# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
- lipo -output .$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-gcc-$VERS -create \
-$DIR/dst-*-$t/$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-gcc-$VERS || exit
1
+ lipo -output .$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-llvm-gcc-$MAJ_VERS
-create \
+
$DIR/dst-*-$t/$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-llvm-gcc-$MAJ_VERS ||
exit 1
# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
- lipo -output .$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-g++-$VERS -create \
-$DIR/dst-*-$t/$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-g++* || exit 1
+ lipo -output .$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-llvm-g++-$MAJ_VERS
-create \
+
$DIR/dst-*-$t/$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-llvm-g++-$MAJ_VERS ||
exit 1
done
# lib
@@ -480,48 +469,48 @@
done
# Add extra man page symlinks for 'c++' and for arch-specific names.
-MDIR=$DEST_DIR$LLVM_INSTALL_PREFIX/share/man/man1
-ln -f $MDIR/g++-$MAJ_VERS.1 $MDIR/c++-$MAJ_VERS.1 || exit 1
+MDIR=$DEST_DIR$DEST_ROOT/share/man/man1
+ln -f $MDIR/llvm-g++-$MAJ_VERS.1 $MDIR/llvm-c++-$MAJ_VERS.1 || exit 1
for t in $TARGETS ; do
- ln -f $MDIR/gcc-$MAJ_VERS.1 $MDIR/$t-apple-darwin$DARWIN_VERS-gcc-$VERS.1 \
+ ln -f $MDIR/llvm-gcc-$MAJ_VERS.1
$MDIR/$t-apple-darwin$DARWIN_VERS-llvm-gcc-$MAJ_VERS.1 \
|| exit 1
- ln -f $MDIR/g++-$MAJ_VERS.1 $MDIR/$t-apple-darwin$DARWIN_VERS-g++-$VERS.1 \
+ ln -f $MDIR/llvm-g++-$MAJ_VERS.1
$MDIR/$t-apple-darwin$DARWIN_VERS-llvm-g++-$MAJ_VERS.1 \
|| exit 1
[llvm-commits] [llvm-gcc-4.0] r43963 - /llvm-gcc-4.0/trunk/GNUmakefile
Author: dpatel Date: Fri Nov 9 14:51:33 2007 New Revision: 43963 URL: http://llvm.org/viewvc/llvm-project?rev=43963view=rev Log: Change default install location. Modified: llvm-gcc-4.0/trunk/GNUmakefile Modified: llvm-gcc-4.0/trunk/GNUmakefile URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/GNUmakefile?rev=43963r1=43962r2=43963view=diff == --- llvm-gcc-4.0/trunk/GNUmakefile (original) +++ llvm-gcc-4.0/trunk/GNUmakefile Fri Nov 9 14:51:33 2007 @@ -39,7 +39,7 @@ ifndef DISABLE_LLVM ENABLE_LLVM = true # LLVM gets installed into /usr/local, not /usr. -PREFIX = /usr/local/llvm-gcc-install +PREFIX = /Developer/usr/llvm-gcc-4.0 else ENABLE_LLVM = false endif ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] [llvm-gcc-4.2] r43930 - in /llvm-gcc-4.2/trunk/gcc/config/arm: darwin-libgcc.10.4.ver darwin-libgcc.10.5.ver darwin.h darwin.opt t-darwin
On Nov 9, 2007, at 10:36 AM, Dale Johannesen wrote: Following the Big Merge there are literally thousands of new gcc testsuite failures. The most obvious ones (~1500) give this error: /Volumes/MacOS9/gcc/llvm-gcc-4.2/gcc/testsuite/gcc.apple/4516827.c: 34: internal compiler error: tree check: expected class 'expression', have 'constant' (integer_cst) in simple_cst_equal, at tree.c:4825 I will investigate. This is some kind of self-compile problem, probably because I didn't clean my build directory. Unfortunately a clean build runs into the problem Bill reported: /var/tmp//ccKGJOpy.s:unknown:Undefined local symbol L6$pb ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm-gcc-4.0] r43965 - in /llvm-gcc-4.0/trunk: gcc/Makefile.in gcc/configure gcc/configure.ac libcpp/configure libcpp/configure.ac
Author: dpatel
Date: Fri Nov 9 16:03:13 2007
New Revision: 43965
URL: http://llvm.org/viewvc/llvm-project?rev=43965view=rev
Log:
Support installed llvm location as --enable-llvm configure time parameter.
Similar patch was applied to llvm-gcc-4.2 couple of weeks ago.
Modified:
llvm-gcc-4.0/trunk/gcc/Makefile.in
llvm-gcc-4.0/trunk/gcc/configure
llvm-gcc-4.0/trunk/gcc/configure.ac
llvm-gcc-4.0/trunk/libcpp/configure
llvm-gcc-4.0/trunk/libcpp/configure.ac
Modified: llvm-gcc-4.0/trunk/gcc/Makefile.in
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/Makefile.in?rev=43965r1=43964r2=43965view=diff
==
--- llvm-gcc-4.0/trunk/gcc/Makefile.in (original)
+++ llvm-gcc-4.0/trunk/gcc/Makefile.in Fri Nov 9 16:03:13 2007
@@ -221,7 +221,11 @@
# Determine BUILDMODE from configure run (--enable-llvm)
BUILDMODE := @LLVMBUILDMODE@
+ifneq ($(BUILDMODE),)
LLVMBINPATH = $(LLVMOBJDIR)/$(BUILDMODE)/bin
+else
+LLVMBINPATH = $(LLVMOBJDIR)/bin
+endif
ifeq ($(LLVMOBJDIR),)
CPPFLAGS = @CPPFLAGS@
Modified: llvm-gcc-4.0/trunk/gcc/configure
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/configure?rev=43965r1=43964r2=43965view=diff
==
--- llvm-gcc-4.0/trunk/gcc/configure (original)
+++ llvm-gcc-4.0/trunk/gcc/configure Fri Nov 9 16:03:13 2007
@@ -7111,6 +7111,8 @@
elif test -x $LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT; then
echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
LLVMBUILDMODE=Debug-Asserts+Checks
+ elif test -x $LLVMBASEPATH/bin/llc$EXEEXT; then
+ echo Found Installed LLVM Tree in $LLVMBASEPATH
else
{ { echo $as_me:$LINENO: error: You must specify valid path to your LLVM
tree with --enable-llvm=DIR 5
echo $as_me: error: You must specify valid path to your LLVM tree with
--enable-llvm=DIR 2;}
@@ -7754,7 +7756,7 @@
else
ac_prog_version=`$MAKEINFO --version 21 |
sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
- echo configure:7757: version of makeinfo is $ac_prog_version 5
+ echo configure:7759: version of makeinfo is $ac_prog_version 5
case $ac_prog_version in
'') gcc_cv_prog_makeinfo_modern=no;;
4.[2-9]*)
Modified: llvm-gcc-4.0/trunk/gcc/configure.ac
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/configure.ac?rev=43965r1=43964r2=43965view=diff
==
--- llvm-gcc-4.0/trunk/gcc/configure.ac (original)
+++ llvm-gcc-4.0/trunk/gcc/configure.ac Fri Nov 9 16:03:13 2007
@@ -767,6 +767,8 @@
elif test -x $LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT; then
echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
LLVMBUILDMODE=Debug-Asserts+Checks
+ elif test -x $LLVMBASEPATH/bin/llc$EXEEXT; then
+ echo Found Installed LLVM Tree in $LLVMBASEPATH
else
AC_MSG_ERROR([You must specify valid path to your LLVM tree with
--enable-llvm=DIR])
fi
Modified: llvm-gcc-4.0/trunk/libcpp/configure
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/libcpp/configure?rev=43965r1=43964r2=43965view=diff
==
--- llvm-gcc-4.0/trunk/libcpp/configure (original)
+++ llvm-gcc-4.0/trunk/libcpp/configure Fri Nov 9 16:03:13 2007
@@ -8045,6 +8045,8 @@
elif test -x $LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT; then
echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
LLVMBUILDMODE=Debug-Asserts+Checks
+ elif test -x $LLVMBASEPATH/bin/llc$EXEEXT; then
+ echo Found Installed LLVM Tree in $LLVMBASEPATH
else
{ { echo $as_me:$LINENO: error: You must specify valid path to your LLVM
tree with --enable-llvm=DIR 5
echo $as_me: error: You must specify valid path to your LLVM tree with
--enable-llvm=DIR 2;}
Modified: llvm-gcc-4.0/trunk/libcpp/configure.ac
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/libcpp/configure.ac?rev=43965r1=43964r2=43965view=diff
==
--- llvm-gcc-4.0/trunk/libcpp/configure.ac (original)
+++ llvm-gcc-4.0/trunk/libcpp/configure.ac Fri Nov 9 16:03:13 2007
@@ -181,6 +181,8 @@
elif test -x $LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT; then
echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
LLVMBUILDMODE=Debug-Asserts+Checks
+ elif test -x $LLVMBASEPATH/bin/llc$EXEEXT; then
+ echo Found Installed LLVM Tree in $LLVMBASEPATH
else
AC_MSG_ERROR([You must specify valid path to your LLVM tree with
--enable-llvm=DIR])
fi
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] [llvm-gcc-4.0] r43966 - /llvm-gcc-4.0/trunk/build_gcc
Author: dpatel
Date: Fri Nov 9 16:04:22 2007
New Revision: 43966
URL: http://llvm.org/viewvc/llvm-project?rev=43966view=rev
Log:
Do not build llvm. Use the one installed on the system by default.
Modified:
llvm-gcc-4.0/trunk/build_gcc
Modified: llvm-gcc-4.0/trunk/build_gcc
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/build_gcc?rev=43966r1=43965r2=43966view=diff
==
--- llvm-gcc-4.0/trunk/build_gcc (original)
+++ llvm-gcc-4.0/trunk/build_gcc Fri Nov 9 16:04:22 2007
@@ -25,22 +25,8 @@
# installed.
TARGETS=`echo $2 | $TRANSLATE_TARGETS`
-#APPLE LOCAL begin LLVM
-# LLVM does not require host name translation.
-LLVM_HOSTS=$1
-# LLVM target list is comma separated list.
-#LLVM_TARGETS=`echo $2 | sed -e s/\ /\,/ -e s/ppc/powerpc/ -e s/i386/x86/ \
-#-e s/x86_64// -e s/powerpc64// -e s/ppc64//`
-#FIXME : Hard code targets. See LLVMTARGETOBJ comment in gcc/Makefile.in
-LLVM_TARGETS=x86,powerpc
-#APPLE LOCAL end LLVM
-
# The GNU makefile target ('bootstrap' by default).
-if [ x$LLVM_DEBUG == x ]; then
-BOOTSTRAP=${BOOTSTRAP-bootstrap}
-else
-BOOTSTRAP=
-fi
+BOOTSTRAP=${BOOTSTRAP-bootstrap}
# The BI build srcript (~rc/bin/buildit) accepts an '-othercflags'
# command-line flag, and captures the argument to that flag in
@@ -148,8 +134,6 @@
ln -s $ORIG_SRC_DIR/* $SRC_DIR/ || exit 1
rm -rf $SRC_DIR/tcl $SRC_DIR/expect $SRC_DIR/dejagnu || exit 1
-# APPLE LOCAL begin LLVM Must build libstdc++ to install in /usr/local.
-LIBSTDCXX_CONFIG_OPTION=
# Also remove libstdc++ since it is built from a separate project.
rm -rf $SRC_DIR/libstdc++-v3 || exit 1
LIBSTDCXX_CONFIG_OPTION=--with-gxx-include-dir=/usr/include/c++/$LIBSTDCXX_VERSION
@@ -161,7 +145,6 @@
# APPLE LOCAL end LLVM
# These are the configure and build flags that are used.
-# APPLE LOCAL begin LLVM Support for non /usr $DEST_ROOT, use libstdc++
if [ x$LLVM_DEBUG == x ]; then
CHECKING_FLAGS=--disable-checking --enable-werror
@@ -177,43 +160,8 @@
--program-suffix=-$MAJ_VERS \
$LIBSTDCXX_CONFIG_OPTION \
--with-slibdir=/usr/lib \
+ --enable-llvm=/usr/local/ \
--build=$BUILD-apple-darwin$DARWIN_VERS
-# APPLE LOCAL end LLVM
-
-# APPLE LOCAL begin LLVM
-if [ $ENABLE_LLVM == true ]; then
- CONFIGFLAGS=$CONFIGFLAGS --enable-llvm=$DIR/obj-llvm
-
- # Build the LLVM tree universal.
- LLVMCONFIGFLAGS=--prefix=$DEST_DIR$DEST_ROOT \
- --enable-targets=$LLVM_TARGETS \
- --enable-assertions=$LLVM_ASSERTIONS
- mkdir -p $DIR/obj-llvm || exit 1
- cd $DIR/obj-llvm || exit 1
- if [ \! -f Makefile.config ]; then
- $SRC_DIR/llvm/configure $LLVMCONFIGFLAGS || exit 1
- fi
-
- if [ x$LLVM_SUBMIT_SUBVERSION = x00 -o x$LLVM_SUBMIT_SUBVERSION = x0
]; then
- LLVM_VERSION=$LLVM_SUBMIT_VERSION
- else
- LLVM_VERSION=$LLVM_SUBMIT_VERSION-$LLVM_SUBMIT_SUBVERSION
- fi
-
- # Note: Don't pass -jN here. Building universal already has parallelism and
- # we don't want to make the builders hit swap by firing off too many gcc's at
- # the same time.
- ## FIXME: Remove -O2 when rdar://4560645 is fixed.
- make $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH=$LLVM_ARCHS \
- OPTIMIZE_OPTION='-O2' \
- CXXFLAGS=-DLLVM_VERSION_INFO='\ Apple Build #$LLVM_VERSION\'
-
- if ! test $? == 0 ; then
- echo error: LLVM 'make' failed!
- exit 1
- fi
-fi
-# APPLE LOCAL LLVM end
# Figure out how many make processes to run.
SYSCTL=`sysctl -n hw.activecpu`
@@ -236,12 +184,12 @@
# APPLE LOCAL begin LLVM
if [ $ENABLE_LLVM == true ]; then
# Build llvm-gcc in 'dylib mode'.
- MAKEFLAGS=$MAKEFLAGS BUILD_LLVM_INTO_A_DYLIB=1
- MAKEFLAGS=$MAKEFLAGS LLVM_VERSION_INFO=$LLVM_SUBMIT_VERSION
-
- if [ $LLVM_ASSERTIONS == no ]; then
-MAKEFLAGS=$MAKEFLAGS DISABLE_LLVMASSERTIONS=1
- fi
+MAKEFLAGS=$MAKEFLAGS BUILD_LLVM_INTO_A_DYLIB=1
+MAKEFLAGS=$MAKEFLAGS LLVM_VERSION_INFO=$LLVM_SUBMIT_VERSION
+
+if [ $LLVM_ASSERTIONS == no ]; then
+MAKEFLAGS=$MAKEFLAGS DISABLE_LLVMASSERTIONS=1
+fi
fi
# APPLE LOCAL LLVM end
@@ -258,7 +206,7 @@
# Also keep unset for cross compilers so that the cross built libraries are
# comparable to the native built libraries.
unset RC_DEBUG_OPTIONS
-make $MAKEFLAGS CFLAGS=$CFLAGS CXXFLAGS=$CFLAGS || exit 1
+make $MAKEFLAGS $BOOTSTRAP CFLAGS=$CFLAGS CXXFLAGS=$CFLAGS || exit 1
make $MAKEFLAGS html CFLAGS=$CFLAGS CXXFLAGS=$CFLAGS || exit 1
make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-$BUILD install-gcc install-target \
CFLAGS=$CFLAGS CXXFLAGS=$CFLAGS || exit 1
@@ -548,74 +496,22 @@
| xargs ranlib || exit 1
# APPLE LOCAL begin LLVM
-# Install LLVM libraries/headers/tools.
-if [ $ENABLE_LLVM == true ]; then
- cd $DIR/obj-llvm || exit 1
-
- ## Install the tree into the destination directory.
- make $MAKEFLAGS $OPTIMIZE_OPTS UNIVERSAL=1 OPTIMIZE_OPTION='-O2' install
-
- if ! test $? == 0 ; then
- echo error: LLVM 'make install' failed!
-
[llvm-commits] [llvm] r43964 - /llvm/trunk/docs/CodingStandards.html
Author: lattner Date: Fri Nov 9 15:49:08 2007 New Revision: 43964 URL: http://llvm.org/viewvc/llvm-project?rev=43964view=rev Log: Update links. Modified: llvm/trunk/docs/CodingStandards.html Modified: llvm/trunk/docs/CodingStandards.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CodingStandards.html?rev=43964r1=43963r2=43964view=diff == --- llvm/trunk/docs/CodingStandards.html (original) +++ llvm/trunk/docs/CodingStandards.html Fri Nov 9 15:49:08 2007 @@ -737,15 +737,12 @@ ol -lia href=http://www.aw-bc.com/catalog/academic/product/0,1144,0201310155,00.html;Effective -C++/a by Scott Meyers. There is an online version of the book (only some -chapters though) a -href=http://www.awlonline.com/cseng/meyerscddemo/;available as well/a. Also +lia href=http://www.amazon.com/Effective-Specific-Addison-Wesley-Professional-Computing/dp/0321334876;Effective +C++/a by Scott Meyers. Also interesting and useful are More Effective C++ and Effective STL by the same author./li -lia href=http://cseng.aw.com/book/0,3828,0201633620,00.html;Large-Scale C++ -Software Design/a by John Lakos/li +liLarge-Scale C++ Software Design by John Lakos/li /ol ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
