--- a/lib/freebl/freebl.gyp
+++ b/lib/freebl/freebl.gyp
@@ -159,16 +159,20 @@
           # But I hope that doesn't matter. We also assume this is x86/x64.
           'OTHER_CFLAGS': [
             '-mpclmul',
             '-maes',
           ],
         },
       }],
       [ 'OS=="win" and target_arch=="ia32"', {
+        'cflags_mozilla': [
+          '-mpclmul',
+          '-maes',
+        ],
         'msvs_settings': {
           'VCCLCompilerTool': {
             #TODO: -Ox optimize flags
             'PreprocessorDefinitions': [
               'MP_ASSEMBLY_MULTIPLY',
               'MP_ASSEMBLY_SQUARE',
               'MP_ASSEMBLY_DIV_2DX1D',
               'MP_USE_UINT_DIGIT',
@@ -192,16 +196,20 @@
               'NSS_USE_COMBA',
               'USE_HW_AES',
               'INTEL_GCM',
             ],
           },
         },
       }],
       [ 'cc_use_gnu_ld==1 and OS=="win" and target_arch=="x64"', {
+        'cflags_mozilla': [
+          '-mpclmul',
+          '-maes',
+        ],
         'defines': [
           'MP_IS_LITTLE_ENDIAN',
           'NSS_BEVAND_ARCFOUR',
           'MPI_AMD64',
           'MP_ASSEMBLY_MULTIPLY',
           'NSS_USE_COMBA',
           'USE_HW_AES',
           'INTEL_GCM',
@@ -255,16 +263,20 @@
           }],
           [ 'target_arch=="ia32" or target_arch=="x64"', {
             'cflags': [
               # enable isa option for pclmul am aes-ni; supported since gcc 4.4
               # This is only support by x84/x64. It's not needed for Windows.
               '-mpclmul',
               '-maes',
             ],
+            'cflags_mozilla': [
+              '-mpclmul',
+              '-maes',
+            ],
           }],
           [ 'target_arch=="arm"', {
             'defines': [
               'MP_ASSEMBLY_MULTIPLY',
               'MP_ASSEMBLY_SQUARE',
               'MP_USE_UINT_DIGIT',
               'SHA_NO_LONG_LONG',
               'ARMHF',