summaryrefslogtreecommitdiffstats
path: root/support/kconfig/patches/02-cpp-comments-to-c-comments.patch
diff options
context:
space:
mode:
Diffstat (limited to 'support/kconfig/patches/02-cpp-comments-to-c-comments.patch')
-rw-r--r--support/kconfig/patches/02-cpp-comments-to-c-comments.patch30
1 files changed, 15 insertions, 15 deletions
diff --git a/support/kconfig/patches/02-cpp-comments-to-c-comments.patch b/support/kconfig/patches/02-cpp-comments-to-c-comments.patch
index cb27056ad..72afa84ff 100644
--- a/support/kconfig/patches/02-cpp-comments-to-c-comments.patch
+++ b/support/kconfig/patches/02-cpp-comments-to-c-comments.patch
@@ -2,11 +2,11 @@
expr.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
-Index: config/expr.c
+Index: b/expr.c
===================================================================
---- config.orig/expr.c
-+++ config/expr.c
-@@ -331,7 +331,7 @@
+--- a/expr.c
++++ b/expr.c
+@@ -326,7 +326,7 @@
e->right.expr = expr_trans_bool(e->right.expr);
break;
case E_UNEQUAL:
@@ -15,7 +15,7 @@ Index: config/expr.c
if (e->left.sym->type == S_TRISTATE) {
if (e->right.sym == &symbol_no) {
e->type = E_SYMBOL;
-@@ -380,19 +380,19 @@
+@@ -375,19 +375,19 @@
if (e1->type == E_EQUAL && e2->type == E_EQUAL &&
((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_mod) ||
(e1->right.sym == &symbol_mod && e2->right.sym == &symbol_yes))) {
@@ -38,7 +38,7 @@ Index: config/expr.c
return expr_alloc_comp(E_UNEQUAL, sym1, &symbol_yes);
}
}
-@@ -443,29 +443,29 @@
+@@ -438,29 +438,29 @@
if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_yes) ||
(e2->type == E_SYMBOL && e1->type == E_EQUAL && e1->right.sym == &symbol_yes))
@@ -73,7 +73,7 @@ Index: config/expr.c
sym2 = e2->right.sym;
if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
-@@ -474,19 +474,19 @@
+@@ -469,19 +469,19 @@
if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
((e1->right.sym == &symbol_yes && e2->right.sym == &symbol_no) ||
(e1->right.sym == &symbol_no && e2->right.sym == &symbol_yes)))
@@ -96,7 +96,7 @@ Index: config/expr.c
return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||
-@@ -579,7 +579,7 @@
+@@ -574,7 +574,7 @@
switch (e1->type) {
case E_OR:
expr_eliminate_dups2(e1->type, &e1, &e1);
@@ -105,7 +105,7 @@ Index: config/expr.c
tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
tmp2 = expr_copy(e2);
tmp = expr_extract_eq_and(&tmp1, &tmp2);
-@@ -594,7 +594,7 @@
+@@ -589,7 +589,7 @@
break;
case E_AND:
expr_eliminate_dups2(e1->type, &e1, &e1);
@@ -114,7 +114,7 @@ Index: config/expr.c
tmp1 = expr_transform(expr_alloc_one(E_NOT, expr_copy(e1)));
tmp2 = expr_copy(e2);
tmp = expr_extract_eq_or(&tmp1, &tmp2);
-@@ -703,7 +703,7 @@
+@@ -698,7 +698,7 @@
case E_NOT:
switch (e->left.expr->type) {
case E_NOT:
@@ -123,7 +123,7 @@ Index: config/expr.c
tmp = e->left.expr->left.expr;
free(e->left.expr);
free(e);
-@@ -712,14 +712,14 @@
+@@ -707,14 +707,14 @@
break;
case E_EQUAL:
case E_UNEQUAL:
@@ -140,7 +140,7 @@ Index: config/expr.c
tmp = e->left.expr;
e->type = E_AND;
e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
-@@ -728,7 +728,7 @@
+@@ -723,7 +723,7 @@
e = expr_transform(e);
break;
case E_AND:
@@ -149,7 +149,7 @@ Index: config/expr.c
tmp = e->left.expr;
e->type = E_OR;
e->right.expr = expr_alloc_one(E_NOT, tmp->right.expr);
-@@ -738,7 +738,7 @@
+@@ -733,7 +733,7 @@
break;
case E_SYMBOL:
if (e->left.expr->left.sym == &symbol_yes) {
@@ -158,7 +158,7 @@ Index: config/expr.c
tmp = e->left.expr;
free(e);
e = tmp;
-@@ -747,7 +747,7 @@
+@@ -742,7 +742,7 @@
break;
}
if (e->left.expr->left.sym == &symbol_mod) {
@@ -167,7 +167,7 @@ Index: config/expr.c
tmp = e->left.expr;
free(e);
e = tmp;
-@@ -756,7 +756,7 @@
+@@ -751,7 +751,7 @@
break;
}
if (e->left.expr->left.sym == &symbol_no) {