Author: kihwal
Date: Mon Jul 15 18:17:35 2013
New Revision: 1503394
URL: http://svn.apache.org/r1503394
Log:
svn merge -c 1503390 merging from trunk to fix HADOOP-9707.
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/util/bulk_crc32.c
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1503394&r1=1503393&r2=1503394&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Mon Jul 15 18:17:35 2013
@@ -336,6 +336,9 @@ Release 2.1.0-beta - 2013-07-02
HADOOP-9656. Gridmix unit tests fail on Windows and Linux. (Chuan Liu via
cnauroth)
+ HADOOP-9707. Fix register lists for crc32c inline assembly. (todd via
+ kihwal)
+
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/util/bulk_crc32.c
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/util/bulk_crc32.c?rev=1503394&r1=1503393&r2=1503394&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/util/bulk_crc32.c
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/util/bulk_crc32.c
Mon Jul 15 18:17:35 2013
@@ -427,7 +427,7 @@ static void pipelined_crc32c(uint32_t *c
"crc32q (%7,%6,1), %1;\n\t"
"crc32q (%7,%6,2), %2;\n\t"
: "=r"(c1), "=r"(c2), "=r"(c3)
- : "r"(c1), "r"(c2), "r"(c3), "r"(block_size), "r"(data)
+ : "0"(c1), "1"(c2), "2"(c3), "r"(block_size), "r"(data)
);
data++;
counter--;
@@ -443,7 +443,7 @@ static void pipelined_crc32c(uint32_t *c
"crc32b (%7,%6,1), %1;\n\t"
"crc32b (%7,%6,2), %2;\n\t"
: "=r"(c1), "=r"(c2), "=r"(c3)
- : "r"(c1), "r"(c2), "r"(c3), "r"(block_size), "r"(bdata)
+ : "0"(c1), "1"(c2), "2"(c3), "r"(block_size), "r"(bdata)
);
bdata++;
remainder--;
@@ -456,7 +456,7 @@ static void pipelined_crc32c(uint32_t *c
"crc32q (%5), %0;\n\t"
"crc32q (%5,%4,1), %1;\n\t"
: "=r"(c1), "=r"(c2)
- : "r"(c1), "r"(c2), "r"(block_size), "r"(data)
+ : "0"(c1), "1"(c2), "r"(block_size), "r"(data)
);
data++;
counter--;
@@ -468,7 +468,7 @@ static void pipelined_crc32c(uint32_t *c
"crc32b (%5), %0;\n\t"
"crc32b (%5,%4,1), %1;\n\t"
: "=r"(c1), "=r"(c2)
- : "r"(c1), "r"(c2), "r"(block_size), "r"(bdata)
+ : "0"(c1), "1"(c2), "r"(block_size), "r"(bdata)
);
bdata++;
remainder--;
@@ -480,7 +480,7 @@ static void pipelined_crc32c(uint32_t *c
__asm__ __volatile__(
"crc32q (%2), %0;\n\t"
: "=r"(c1)
- : "r"(c1), "r"(data)
+ : "0"(c1), "r"(data)
);
data++;
counter--;
@@ -490,7 +490,7 @@ static void pipelined_crc32c(uint32_t *c
__asm__ __volatile__(
"crc32b (%2), %0;\n\t"
: "=r"(c1)
- : "r"(c1), "r"(bdata)
+ : "0"(c1), "r"(bdata)
);
bdata++;
remainder--;
