diff options
| author | Matt Beaumont-Gay <matthewbg@google.com> | 2010-12-21 23:43:23 +0000 |
|---|---|---|
| committer | Matt Beaumont-Gay <matthewbg@google.com> | 2010-12-21 23:43:23 +0000 |
| commit | e733cf8c2743acf0e4bee4952dfb013de6257478 (patch) | |
| tree | 3134444df00ad4d1d7bd4cc2eae38dbb2e9cf954 /lib/MC/MachObjectWriter.cpp | |
| parent | 491e0307a8bca870d9de03962204b03286b106f7 (diff) | |
| download | llvm-e733cf8c2743acf0e4bee4952dfb013de6257478.tar.gz llvm-e733cf8c2743acf0e4bee4952dfb013de6257478.tar.bz2 llvm-e733cf8c2743acf0e4bee4952dfb013de6257478.tar.xz | |
GCC objects to the two sides of a conditional expression having different enum
types, but they're just getting converted to unsigned anyway, so cast first
(and ask questions later).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122377 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MachObjectWriter.cpp')
| -rw-r--r-- | lib/MC/MachObjectWriter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/MC/MachObjectWriter.cpp b/lib/MC/MachObjectWriter.cpp index 3a15d242d0..386f4517b6 100644 --- a/lib/MC/MachObjectWriter.cpp +++ b/lib/MC/MachObjectWriter.cpp @@ -765,8 +765,8 @@ public: // Note that there is no longer any semantic difference between these two // relocation types from the linkers point of view, this is done solely // for pedantic compatibility with 'as'. - Type = A_SD->isExternal() ? macho::RIT_Difference : - macho::RIT_Generic_LocalDifference; + Type = A_SD->isExternal() ? (unsigned)macho::RIT_Difference : + (unsigned)macho::RIT_Generic_LocalDifference; Value2 = getSymbolAddress(B_SD, Layout); FixedValue -= getSectionAddress(B_SD->getFragment()->getParent()); } |