[llvm-branch-commits] [compiler-rt-branch] r270406 - Merging r263001:

[Mohit K. Bhakkad via llvm-branch-commits]

Author: mohit.bhakkad
Date: Mon May 23 03:24:51 2016
New Revision: 270406

URL: http://llvm.org/viewvc/llvm-project?rev=270406&view=rev
Log:
Merging r263001:
------------------------------------------------------------------------
r263001 | mohit.bhakkad | 2016-03-09 13:30:37 +0530 (Wed, 09 Mar 2016) | 7 lines

[DFSan] Fix test_inet_pton for big endian archs

Reviewers: samsonov

Subscribers: ed, jaydeep, sagar, llvm-commits

Differential Revision: http://reviews.llvm.org/D17751
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_38/   (props changed)
    compiler-rt/branches/release_38/test/dfsan/custom.cc

Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 03:24:51 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513,261721,261723,261837,261982,262209,262302-262303,262690
+/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513,261721,261723,261837,261982,262209,262302-262303,262690,263001

Modified: compiler-rt/branches/release_38/test/dfsan/custom.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/test/dfsan/custom.cc?rev=270406&r1=270405&r2=270406&view=diff
==============================================================================
--- compiler-rt/branches/release_38/test/dfsan/custom.cc (original)
+++ compiler-rt/branches/release_38/test/dfsan/custom.cc Mon May 23 03:24:51 2016
@@ -536,7 +536,7 @@ void test_inet_pton() {
   int ret4 = inet_pton(AF_INET, addr4, &in4);
   assert(ret4 == 1);
   ASSERT_READ_LABEL(&in4, sizeof(in4), i_label);
-  assert(in4.s_addr == 0x0100007f);
+  assert(in4.s_addr == htonl(0x7f000001));
 
   char addr6[] = "::1";
   dfsan_set_label(j_label, addr6 + 3, 1);