From a9f992434d3a75f262d261d6a8a5a111a757d5bd Mon Sep 17 00:00:00 2001
From: Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
Date: Tue, 8 Jun 2021 21:58:42 +0200
Subject: [PATCH] VS: Remove the /MERGE flag from FlagTables
Fixes #22229
---
Templates/MSBuild/FlagTables/v10_Link.json | 9 ---------
Templates/MSBuild/FlagTables/v11_Link.json | 9 ---------
Templates/MSBuild/FlagTables/v12_Link.json | 9 ---------
Templates/MSBuild/FlagTables/v140_Link.json | 9 ---------
Templates/MSBuild/FlagTables/v141_Link.json | 9 ---------
Templates/MSBuild/FlagTables/v142_Link.json | 9 ---------
6 files changed, 54 deletions(-)
diff --git a/Templates/MSBuild/FlagTables/v10_Link.json b/Templates/MSBuild/FlagTables/v10_Link.json
index ac5b8b16cc..494774bc20 100644
--- a/Templates/MSBuild/FlagTables/v10_Link.json
+++ b/Templates/MSBuild/FlagTables/v10_Link.json
@@ -1089,15 +1089,6 @@
"UserValue"
]
},
- {
- "name": "MergeSections",
- "switch": "MERGE:",
- "comment": "Merge Sections",
- "value": "",
- "flags": [
- "UserValue"
- ]
- },
{
"name": "LinkKeyFile",
"switch": "KEYFILE:",
diff --git a/Templates/MSBuild/FlagTables/v11_Link.json b/Templates/MSBuild/FlagTables/v11_Link.json
index 5d5c13f219..0db5d9e059 100644
--- a/Templates/MSBuild/FlagTables/v11_Link.json
+++ b/Templates/MSBuild/FlagTables/v11_Link.json
@@ -1224,15 +1224,6 @@
"UserValue"
]
},
- {
- "name": "MergeSections",
- "switch": "MERGE:",
- "comment": "Merge Sections",
- "value": "",
- "flags": [
- "UserValue"
- ]
- },
{
"name": "LinkKeyFile",
"switch": "KEYFILE:",
diff --git a/Templates/MSBuild/FlagTables/v12_Link.json b/Templates/MSBuild/FlagTables/v12_Link.json
index 5d5c13f219..0db5d9e059 100644
--- a/Templates/MSBuild/FlagTables/v12_Link.json
+++ b/Templates/MSBuild/FlagTables/v12_Link.json
@@ -1224,15 +1224,6 @@
"UserValue"
]
},
- {
- "name": "MergeSections",
- "switch": "MERGE:",
- "comment": "Merge Sections",
- "value": "",
- "flags": [
- "UserValue"
- ]
- },
{
"name": "LinkKeyFile",
"switch": "KEYFILE:",
diff --git a/Templates/MSBuild/FlagTables/v140_Link.json b/Templates/MSBuild/FlagTables/v140_Link.json
index 3fb072c506..7e293b140b 100644
--- a/Templates/MSBuild/FlagTables/v140_Link.json
+++ b/Templates/MSBuild/FlagTables/v140_Link.json
@@ -1268,15 +1268,6 @@
"UserValue"
]
},
- {
- "name": "MergeSections",
- "switch": "MERGE:",
- "comment": "Merge Sections",
- "value": "",
- "flags": [
- "UserValue"
- ]
- },
{
"name": "LinkKeyFile",
"switch": "KEYFILE:",
diff --git a/Templates/MSBuild/FlagTables/v141_Link.json b/Templates/MSBuild/FlagTables/v141_Link.json
index 66ee76fcb4..e311240b63 100644
--- a/Templates/MSBuild/FlagTables/v141_Link.json
+++ b/Templates/MSBuild/FlagTables/v141_Link.json
@@ -1275,15 +1275,6 @@
"UserValue"
]
},
- {
- "name": "MergeSections",
- "switch": "MERGE:",
- "comment": "Merge Sections",
- "value": "",
- "flags": [
- "UserValue"
- ]
- },
{
"name": "LinkKeyFile",
"switch": "KEYFILE:",
diff --git a/Templates/MSBuild/FlagTables/v142_Link.json b/Templates/MSBuild/FlagTables/v142_Link.json
index 110dcc2b14..d5fc2e4d7d 100644
--- a/Templates/MSBuild/FlagTables/v142_Link.json
+++ b/Templates/MSBuild/FlagTables/v142_Link.json
@@ -1282,15 +1282,6 @@
"UserValue"
]
},
- {
- "name": "MergeSections",
- "switch": "MERGE:",
- "comment": "Merge Sections",
- "value": "",
- "flags": [
- "UserValue"
- ]
- },
{
"name": "LinkKeyFile",
"switch": "KEYFILE:",
--
GitLab