diff --git a/build/common.gypi b/build/common.gypi
index ad2908aa38c04230df98a5fe11a9232717c18692..e90321b61784fa170e51fe71fd97b2d0c84b5050 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -684,6 +684,12 @@
             # When building with shared libraries, remove the visiblity-hiding
             # flag.
             'cflags!': [ '-fvisibility=hidden' ],
+            'conditions': [
+              ['target_arch=="x64"', {
+                # Shared libraries need -fPIC on x86-64
+                'cflags': ['-fPIC']
+              }]
+            ],
           }],
         ],
       },
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 86423535fac12bb75476797f608b71ed8ed30a5b..130455d907590dbf6973533aa773b8e2fa96885c 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -5240,6 +5240,9 @@
             'POSIX',
             'OS_LINUX',
           ],
+          'sources!': [
+            'browser/sync/notifier/base/network_status_detector_task_mt.cc',
+          ],
           'dependencies': [
             '../build/linux/system.gyp:gtk'
           ],
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index b3605683e4fba2ac1ac36b0b3dbbf053566f7e5a..b600e75d3d77a637d964b1ceadb1743f55243177 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -67,6 +67,7 @@
         'files/talk/base/asyncpacketsocket.cc',
         'files/talk/base/asyncpacketsocket.h',
         'files/talk/base/asynctcpsocket.h',
+        'files/talk/base/asynctcpsocket.cc',
         'files/talk/base/asyncudpsocket.cc',
         'files/talk/base/asyncudpsocket.h',
         'files/talk/base/autodetectproxy.cc',
diff --git a/third_party/protobuf2/protobuf.gyp b/third_party/protobuf2/protobuf.gyp
index 7b6d0db55476cea06dee8619f882f239e192244c..d96d131d2253e3c49d7c95f8f6273353430cd55f 100644
--- a/third_party/protobuf2/protobuf.gyp
+++ b/third_party/protobuf2/protobuf.gyp
@@ -133,11 +133,12 @@
         'src/src/google/protobuf/text_format.cc',
         'src/src/google/protobuf/unknown_field_set.cc',
         'src/src/google/protobuf/wire_format.cc',
-        'src/src/google/protobuf/io/gzip_stream.cc',
+        # This file pulls in zlib, but it's not actually used by protoc, so
+        # instead of compiling zlib for the host, let's just exclude this.
+        # 'src/src/google/protobuf/io/gzip_stream.cc',
         'src/src/google/protobuf/io/printer.cc',
         'src/src/google/protobuf/io/tokenizer.cc',
         'src/src/google/protobuf/io/zero_copy_stream_impl.cc',
-        'src/src/google/protobuf/io/zero_copy_stream_impl_lite.cc',
         'src/src/google/protobuf/compiler/importer.cc',
         'src/src/google/protobuf/compiler/parser.cc',
       ],