From 176695a3b318fb83643408cbc32f4b7b9f37e2b5 Mon Sep 17 00:00:00 2001
From: Dorel Luca <dluca@mozilla.com>
Date: Wed, 19 Dec 2018 10:39:10 +0200
Subject: [PATCH] Backed out changeset 7e548edaf318 (bug 1485016) for build
 bustage

---
 build/moz.configure/toolchain.configure | 14 --------------
 js/src/old-configure.in                 |  1 -
 old-configure.in                        |  1 -
 3 files changed, 16 deletions(-)

diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 75ca005a16dd..8c307ff5fa50 100755
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1599,8 +1599,6 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target
 
     flags = []
     js_flags = []
-    ldflags = []
-    js_ldflags = []
 
     # FORTIFY_SOURCE ------------------------------------
     # If hardening is explicitly enabled, or not explicitly disabled
@@ -1623,14 +1621,6 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target
             if target.os != 'WINNT' or c_compiler == 'gcc':
                 flags.append("-fstack-protector-strong")
 
-        if c_compiler.type == 'clang-cl':
-            flags.append("-guard:cf")
-            js_flags.append("-guard:cf")
-            # nolongjmp is needed because clang doesn't emit the CFG tables of
-            # setjmp return addresses https://bugs.llvm.org/show_bug.cgi?id=40057
-            ldflags.append("-guard:cf,nolongjmp")
-            js_ldflags.append("-guard:cf,nolongjmp")
-
     # If ASAN _is_ on, undefine FOTIFY_SOURCE just to be safe
     if asan:
         flags.append("-U_FORTIFY_SOURCE")
@@ -1646,16 +1636,12 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target
 
     return namespace(
         flags=flags,
-        ldflags=ldflags,
         js_flags=js_flags,
-        js_ldflags=js_ldflags,
     )
 
 
 add_old_configure_assignment('MOZ_HARDENING_CFLAGS', security_hardening_cflags.flags)
-add_old_configure_assignment('MOZ_HARDENING_LDFLAGS', security_hardening_cflags.ldflags)
 add_old_configure_assignment('MOZ_HARDENING_CFLAGS_JS', security_hardening_cflags.js_flags)
-add_old_configure_assignment('MOZ_HARDENING_LDFLAGS_JS', security_hardening_cflags.js_ldflags)
 
 # Code Coverage
 # ==============================================================
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 767793ce3497..6ddff0d843bd 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -519,7 +519,6 @@ dnl ========================================================
 CFLAGS="$CFLAGS $MOZ_HARDENING_CFLAGS_JS"
 CPPFLAGS="$CPPFLAGS $MOZ_HARDENING_CFLAGS_JS"
 CXXFLAGS="$CXXFLAGS $MOZ_HARDENING_CFLAGS_JS"
-LDFLAGS="$CFLAGS $MOZ_HARDENING_LDFLAGS_JS"
 
 dnl ========================================================
 dnl System overrides of the defaults for target
diff --git a/old-configure.in b/old-configure.in
index 39be8f9d408c..1aae4aa73112 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -404,7 +404,6 @@ dnl ========================================================
 CFLAGS="$CFLAGS $MOZ_HARDENING_CFLAGS"
 CPPFLAGS="$CPPFLAGS $MOZ_HARDENING_CFLAGS"
 CXXFLAGS="$CXXFLAGS $MOZ_HARDENING_CFLAGS"
-LDFLAGS="$CFLAGS $MOZ_HARDENING_LDFLAGS"
 
 dnl ========================================================
 dnl GNU specific defaults