Skip to content
Browse files

Upgrade clang to 141703. Drop old hack for bug 671711. r=rail.

  • Loading branch information...
1 parent 03b8bd7 commit 4be00203d27def904cdbe662a5756a4752e923c8 Rafael Ávila de Espíndola committed
Showing with 1 addition and 35 deletions.
  1. +1 −5 clang/centos5-i686/clang.spec
  2. +0 −30 clang/centos5-i686/pr671711-hack.diff
View
6 clang/centos5-i686/clang.spec
@@ -1,11 +1,10 @@
-%define REPO_REV 135723
+%define REPO_REV 141703
Name: clang
Summary: clang
Version: 3.0
Release: r%{REPO_REV}.moz0
License: BSD
Group: Development/Libraries
-Patch0: pr671711-hack.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%define toplevel_dir clang-%{version}-%{release}
@@ -18,9 +17,6 @@ clang snapshot packaged for mozilla build machines
rm -rf $RPM_BUILD_DIR/%{toplevel_dir}
svn co -r %{REPO_REV} http://llvm.org/svn/llvm-project/llvm/trunk $RPM_SOURCE_DIR/llvm
svn co -r %{REPO_REV} http://llvm.org/svn/llvm-project/cfe/trunk $RPM_SOURCE_DIR/clang
-cd $RPM_SOURCE_DIR/clang
-%patch0 -p1
-cd -
ln -sf ../../clang $RPM_SOURCE_DIR/llvm/tools
mkdir -p %{toplevel_dir}
View
30 clang/centos5-i686/pr671711-hack.diff
@@ -1,30 +0,0 @@
-diff --git a/lib/Basic/TargetInfo.cpp b/lib/Basic/TargetInfo.cpp
-index 30a9bdb..ec6f1c9 100644
---- a/lib/Basic/TargetInfo.cpp
-+++ b/lib/Basic/TargetInfo.cpp
-@@ -186,7 +186,7 @@ static llvm::StringRef removeGCCRegisterPrefix(llvm::StringRef Name) {
- /// Sema.
- bool TargetInfo::isValidClobber(llvm::StringRef Name) const {
- return (isValidGCCRegisterName(Name) ||
-- Name == "memory" || Name == "cc");
-+ Name == "memory" || Name == "cc" || Name == "%cc");
- }
-
- /// isValidGCCRegisterName - Returns whether the passed in string
-diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp
-index 443d877..f0c647e 100644
---- a/lib/CodeGen/CGStmt.cpp
-+++ b/lib/CodeGen/CGStmt.cpp
-@@ -1558,8 +1558,11 @@ void CodeGenFunction::EmitAsmStmt(const AsmStmt &S) {
- for (unsigned i = 0, e = S.getNumClobbers(); i != e; i++) {
- llvm::StringRef Clobber = S.getClobber(i)->getString();
-
-+ if (Clobber == "%cc")
-+ Clobber = "cc";
-+
- if (Clobber != "memory" && Clobber != "cc")
-- Clobber = Target.getNormalizedGCCRegisterName(Clobber);
-+ Clobber = Target.getNormalizedGCCRegisterName(Clobber);
-
- if (i != 0 || NumConstraints != 0)
- Constraints += ',';

0 comments on commit 4be0020

Please sign in to comment.
Something went wrong with that request. Please try again.