[PATCH] D77728: [Driver][X86] Add an alias for -mpad-max-prefix-size

[Kan Shengchen via Phabricator via cfe-commits]

skan added a comment.

After careful consideration, I agree with @MaskRay ’s point of view that this 
alias is incorrect since they do different things. If there is no objection, I 
plan to abandon this revision.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D77728/new/

https://reviews.llvm.org/D77728



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D77728: [Driver][X86] Add an alias for -mpad-max-prefix-size

[Kan Shengchen via Phabricator via cfe-commits]

skan updated this revision to Diff 256308.
skan added a comment.

Fix the tests after rebase


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D77728/new/

https://reviews.llvm.org/D77728

Files:
  clang/include/clang/Driver/Options.td
  clang/test/Driver/x86-malign-branch.c
  clang/test/Driver/x86-malign-branch.s


Index: clang/test/Driver/x86-malign-branch.s
===
--- clang/test/Driver/x86-malign-branch.s
+++ clang/test/Driver/x86-malign-branch.s
@@ -9,5 +9,7 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=5 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX
 // PREFIX: "-mllvm" "-x86-pad-max-prefix-size=5"
 
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX
+
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 
| FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/test/Driver/x86-malign-branch.c
===
--- clang/test/Driver/x86-malign-branch.c
+++ clang/test/Driver/x86-malign-branch.c
@@ -24,6 +24,9 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=15 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX-15
 // PREFIX-15: "-mllvm" "-x86-pad-max-prefix-size=15"
 
+/// Test -malign-branch-prefix-size= for GCC compatibilty
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=15 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX-15
+
 /// Test -mbranches-within-32B-boundaries
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 
| FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -2189,6 +2189,8 @@
   HelpText<"Specify the boundary's size to align branches">;
 def mpad_max_prefix_size_EQ : Joined<["-"], "mpad-max-prefix-size=">, 
Group, Flags<[DriverOption]>,
   HelpText<"Specify maximum number of prefixes to use for padding">;
+def malign_branch_prefix_size_EQ : Joined<["-"], 
"malign-branch-prefix-size=">, Group, Flags<[DriverOption]>, 
Alias,
+  HelpText<"Alias for -mpad-max-prefix-size">;// Alias for GCC compatibility
 def mbranches_within_32B_boundaries : Flag<["-"], 
"mbranches-within-32B-boundaries">, Flags<[DriverOption]>, Group,
   HelpText<"Align selected branches (fused, jcc, jmp) within 32-byte 
boundary">;
 def mfancy_math_387 : Flag<["-"], "mfancy-math-387">, 
Group;


Index: clang/test/Driver/x86-malign-branch.s
===
--- clang/test/Driver/x86-malign-branch.s
+++ clang/test/Driver/x86-malign-branch.s
@@ -9,5 +9,7 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=5 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX
 // PREFIX: "-mllvm" "-x86-pad-max-prefix-size=5"
 
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX
+
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 | FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/test/Driver/x86-malign-branch.c
===
--- clang/test/Driver/x86-malign-branch.c
+++ clang/test/Driver/x86-malign-branch.c
@@ -24,6 +24,9 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=15 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX-15
 // PREFIX-15: "-mllvm" "-x86-pad-max-prefix-size=15"
 
+/// Test -malign-branch-prefix-size= for GCC compatibilty
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=15 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX-15
+
 /// Test -mbranches-within-32B-boundaries
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 | FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -2189,6 +2189,8 @@
   HelpText<"Specify the boundary's size to align branches">;
 def mpad_max_prefix_size_EQ : Joined<["-"], "mpad-max-prefix-size=">, Group, Flags<[DriverOption]>,
   HelpText<"Specify maximum number of prefixes to use for padding">;
+def malign_branch_prefix_size_EQ : Joined<["-"], "malign-branch-prefix-size=">, Group, Flags<[DriverOption]>, Alias,
+  HelpText<"Alias for -mpad-max-prefix-size">;// Alias for GCC compatibility
 def mbranches_within_32B_boundaries : Flag<["-"], "mbranches-within-32B-boundaries">, Flags<[DriverOption]>, Group,
   HelpText<"Align selected branches (fused, jcc, jmp) within 32-byte boundary">;
 de

[PATCH] D77728: [Driver][X86] Add an alias for -mpad-max-prefix-size

[Kan Shengchen via Phabricator via cfe-commits]

skan updated this revision to Diff 256268.
skan edited the summary of this revision.
skan added a comment.

Rebase(didn't rebase correctly last time)


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D77728/new/

https://reviews.llvm.org/D77728

Files:
  clang/include/clang/Driver/Options.td
  clang/test/Driver/x86-malign-branch.c
  clang/test/Driver/x86-malign-branch.s


Index: clang/test/Driver/x86-malign-branch.s
===
--- clang/test/Driver/x86-malign-branch.s
+++ clang/test/Driver/x86-malign-branch.s
@@ -9,5 +9,7 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=5 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX
 // PREFIX: "-mllvm" "-x86-pad-max-prefix-size=5"
 
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX
+
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 
| FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/test/Driver/x86-malign-branch.c
===
--- clang/test/Driver/x86-malign-branch.c
+++ clang/test/Driver/x86-malign-branch.c
@@ -24,6 +24,9 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=15 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX-15
 // PREFIX-15: "-mllvm" "-x86-pad-max-prefix-size=15"
 
+/// Test -malign-branch-prefix-size= for GCC compatibilty
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX-5
+
 /// Test -mbranches-within-32B-boundaries
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 
| FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -2189,6 +2189,8 @@
   HelpText<"Specify the boundary's size to align branches">;
 def mpad_max_prefix_size_EQ : Joined<["-"], "mpad-max-prefix-size=">, 
Group, Flags<[DriverOption]>,
   HelpText<"Specify maximum number of prefixes to use for padding">;
+def malign_branch_prefix_size_EQ : Joined<["-"], 
"malign-branch-prefix-size=">, Group, Flags<[DriverOption]>, 
Alias,
+  HelpText<"Alias for -mpad-max-prefix-size">;// Alias for GCC compatibility
 def mbranches_within_32B_boundaries : Flag<["-"], 
"mbranches-within-32B-boundaries">, Flags<[DriverOption]>, Group,
   HelpText<"Align selected branches (fused, jcc, jmp) within 32-byte 
boundary">;
 def mfancy_math_387 : Flag<["-"], "mfancy-math-387">, 
Group;


Index: clang/test/Driver/x86-malign-branch.s
===
--- clang/test/Driver/x86-malign-branch.s
+++ clang/test/Driver/x86-malign-branch.s
@@ -9,5 +9,7 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=5 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX
 // PREFIX: "-mllvm" "-x86-pad-max-prefix-size=5"
 
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX
+
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 | FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/test/Driver/x86-malign-branch.c
===
--- clang/test/Driver/x86-malign-branch.c
+++ clang/test/Driver/x86-malign-branch.c
@@ -24,6 +24,9 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=15 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX-15
 // PREFIX-15: "-mllvm" "-x86-pad-max-prefix-size=15"
 
+/// Test -malign-branch-prefix-size= for GCC compatibilty
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX-5
+
 /// Test -mbranches-within-32B-boundaries
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 | FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -2189,6 +2189,8 @@
   HelpText<"Specify the boundary's size to align branches">;
 def mpad_max_prefix_size_EQ : Joined<["-"], "mpad-max-prefix-size=">, Group, Flags<[DriverOption]>,
   HelpText<"Specify maximum number of prefixes to use for padding">;
+def malign_branch_prefix_size_EQ : Joined<["-"], "malign-branch-prefix-size=">, Group, Flags<[DriverOption]>, Alias,
+  HelpText<"Alias for -mpad-max-prefix-size">;// Alias for GCC compatibility
 def mbranches_within_32B_boundaries : Flag<["-"], "mbranches-within-32B-boundaries">, Flags<[DriverOption]>, Group,
   HelpText<"Align selected bran

[PATCH] D77728: [Driver][X86] Add an alias for -mpad-max-prefix-size

[Kan Shengchen via Phabricator via cfe-commits]

skan updated this revision to Diff 256250.
skan added a comment.

Rebase


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D77728/new/

https://reviews.llvm.org/D77728

Files:
  clang/include/clang/Driver/Options.td
  clang/test/Driver/x86-malign-branch.c
  clang/test/Driver/x86-malign-branch.s


Index: clang/test/Driver/x86-malign-branch.s
===
--- clang/test/Driver/x86-malign-branch.s
+++ clang/test/Driver/x86-malign-branch.s
@@ -9,5 +9,7 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=5 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX
 // PREFIX: "-mllvm" "-x86-pad-max-prefix-size=5"
 
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX
+
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 
| FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/test/Driver/x86-malign-branch.c
===
--- clang/test/Driver/x86-malign-branch.c
+++ clang/test/Driver/x86-malign-branch.c
@@ -27,6 +27,9 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=6 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX-6
 // PREFIX-6: invalid argument
 
+/// Test -malign-branch-prefix-size= for GCC compatibilty
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX-5
+
 /// Test -mbranches-within-32B-boundaries
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 
| FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -2189,6 +2189,8 @@
   HelpText<"Specify the boundary's size to align branches">;
 def mpad_max_prefix_size_EQ : Joined<["-"], "mpad-max-prefix-size=">, 
Group, Flags<[DriverOption]>,
   HelpText<"Specify maximum number of prefixes to use for padding">;
+def malign_branch_prefix_size_EQ : Joined<["-"], 
"malign-branch-prefix-size=">, Group, 
Flags<[DriverOption]>,Alias,
+  HelpText<"Alias for -mpad-max-prefix-size">;// Alias for GCC compatibility
 def mbranches_within_32B_boundaries : Flag<["-"], 
"mbranches-within-32B-boundaries">, Flags<[DriverOption]>, Group,
   HelpText<"Align selected branches (fused, jcc, jmp) within 32-byte 
boundary">;
 def mfancy_math_387 : Flag<["-"], "mfancy-math-387">, 
Group;


Index: clang/test/Driver/x86-malign-branch.s
===
--- clang/test/Driver/x86-malign-branch.s
+++ clang/test/Driver/x86-malign-branch.s
@@ -9,5 +9,7 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=5 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX
 // PREFIX: "-mllvm" "-x86-pad-max-prefix-size=5"
 
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX
+
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 | FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/test/Driver/x86-malign-branch.c
===
--- clang/test/Driver/x86-malign-branch.c
+++ clang/test/Driver/x86-malign-branch.c
@@ -27,6 +27,9 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=6 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX-6
 // PREFIX-6: invalid argument
 
+/// Test -malign-branch-prefix-size= for GCC compatibilty
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX-5
+
 /// Test -mbranches-within-32B-boundaries
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 | FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -2189,6 +2189,8 @@
   HelpText<"Specify the boundary's size to align branches">;
 def mpad_max_prefix_size_EQ : Joined<["-"], "mpad-max-prefix-size=">, Group, Flags<[DriverOption]>,
   HelpText<"Specify maximum number of prefixes to use for padding">;
+def malign_branch_prefix_size_EQ : Joined<["-"], "malign-branch-prefix-size=">, Group, Flags<[DriverOption]>,Alias,
+  HelpText<"Alias for -mpad-max-prefix-size">;// Alias for GCC compatibility
 def mbranches_within_32B_boundaries : Flag<["-"], "mbranches-within-32B-boundaries">, Flags<[DriverOption]>, Group,
   HelpText<"Align selected branches (fused, jcc, jmp) within 32-byte boundary">;
 def mfancy_math_387 : Flag<["-"], "mfancy-math-387">, Group;
_

[PATCH] D77728: [Driver][X86] Add an alias for -mpad-max-prefix-size

[Kan Shengchen via Phabricator via cfe-commits]

skan added a comment.

In D77728#1970922 , @MaskRay wrote:

> In D77728#1970912 , @skan wrote:
>
> > In D77728#1969788 , @MaskRay wrote:
> >
> > > > Make -malign-branch-prefix-size an alias for -mpad-max-prefix-size (For 
> > > > GCC compatibility)
> > >
> > > I cannot find a discussion on -mpad-max-prefix-size. Is it a planned GNU 
> > > as option or GCC driver option?
> >
> >
> > `-mpad-max-prefix-size` has nothing to do with GCC,  it exposes the 
> > `-x86-pad-max-prefix-size` to clang
>
>
> Then it is incorrect to say `HelpText<"Alias for -mpad-max-prefix-size">;// 
> Alias for GCC compatibility`


Fine, we can have more discussion on this revision. D77628 
 really has nothing to do with GCC/GAS 
compatibility, could you remove the "request change"?


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D77728/new/

https://reviews.llvm.org/D77728



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D77728: [Driver][X86] Add an alias for -mpad-max-prefix-size

[Fangrui Song via Phabricator via cfe-commits]

MaskRay added a comment.

In D77728#1970912 , @skan wrote:

> In D77728#1969788 , @MaskRay wrote:
>
> > > Make -malign-branch-prefix-size an alias for -mpad-max-prefix-size (For 
> > > GCC compatibility)
> >
> > I cannot find a discussion on -mpad-max-prefix-size. Is it a planned GNU as 
> > option or GCC driver option?
>
>
> `-mpad-max-prefix-size` has nothing to do with GCC,  it exposes the 
> `-x86-pad-max-prefix-size` to clang


Then it is incorrect to say `HelpText<"Alias for -mpad-max-prefix-size">;// 
Alias for GCC compatibility`


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D77728/new/

https://reviews.llvm.org/D77728



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D77728: [Driver][X86] Add an alias for -mpad-max-prefix-size

[Kan Shengchen via Phabricator via cfe-commits]

skan added a comment.

In D77728#1969788 , @MaskRay wrote:

> > Make -malign-branch-prefix-size an alias for -mpad-max-prefix-size (For GCC 
> > compatibility)
>
> I cannot find a discussion on -mpad-max-prefix-size. Is it a planned GNU as 
> option or GCC driver option?


`-mpad-max-prefix-size` has nothing to do with GCC,  it exposes the 
`-x86-pad-max-prefix-size` to clang


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D77728/new/

https://reviews.llvm.org/D77728



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D77728: [Driver][X86] Add an alias for -mpad-max-prefix-size

[Fangrui Song via Phabricator via cfe-commits]

MaskRay added a comment.

> Make -malign-branch-prefix-size an alias for -mpad-max-prefix-size (For GCC 
> compatibility)

I cannot find a discussion on -mpad-max-prefix-size. Is it a planned GNU as 
option or GCC driver option?


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D77728/new/

https://reviews.llvm.org/D77728



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D77728: [Driver][X86] Add an alias for -mpad-max-prefix-size

[Kan Shengchen via Phabricator via cfe-commits]

skan created this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
skan added a parent revision: D77628: [Driver][X86] Add -mpad-max-prefix-size.

Make -malign-branch-prefix-size an alias for -mpad-max-prefix-size (For
GCC compatibility)


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D77728

Files:
  clang/include/clang/Driver/Options.td
  clang/test/Driver/x86-malign-branch.c
  clang/test/Driver/x86-malign-branch.s


Index: clang/test/Driver/x86-malign-branch.s
===
--- clang/test/Driver/x86-malign-branch.s
+++ clang/test/Driver/x86-malign-branch.s
@@ -9,5 +9,7 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=5 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX
 // PREFIX: "-mllvm" "-x86-pad-max-prefix-size=5"
 
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX
+
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 
| FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/test/Driver/x86-malign-branch.c
===
--- clang/test/Driver/x86-malign-branch.c
+++ clang/test/Driver/x86-malign-branch.c
@@ -27,6 +27,9 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=6 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX-6
 // PREFIX-6: invalid argument
 
+/// Test -malign-branch-prefix-size= for GCC compatibilty
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | 
FileCheck %s --check-prefix=PREFIX-5
+
 /// Test -mbranches-within-32B-boundaries
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 
| FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -2189,6 +2189,8 @@
   HelpText<"Specify the boundary's size to align branches">;
 def mpad_max_prefix_size_EQ : Joined<["-"], "mpad-max-prefix-size=">, 
Group, Flags<[DriverOption]>,
   HelpText<"Specify maximum number of prefixes to use for padding">;
+def malign_branch_prefix_size_EQ : Joined<["-"], 
"malign-branch-prefix-size=">, Group, 
Flags<[DriverOption]>,Alias,
+  HelpText<"Alias for -mpad-max-prefix-size">;// Alias for GCC compatibility
 def mbranches_within_32B_boundaries : Flag<["-"], 
"mbranches-within-32B-boundaries">, Flags<[DriverOption]>, Group,
   HelpText<"Align selected branches (fused, jcc, jmp) within 32-byte 
boundary">;
 def mfancy_math_387 : Flag<["-"], "mfancy-math-387">, 
Group;


Index: clang/test/Driver/x86-malign-branch.s
===
--- clang/test/Driver/x86-malign-branch.s
+++ clang/test/Driver/x86-malign-branch.s
@@ -9,5 +9,7 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=5 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX
 // PREFIX: "-mllvm" "-x86-pad-max-prefix-size=5"
 
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX
+
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 | FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/test/Driver/x86-malign-branch.c
===
--- clang/test/Driver/x86-malign-branch.c
+++ clang/test/Driver/x86-malign-branch.c
@@ -27,6 +27,9 @@
 // RUN: %clang -target x86_64 -mpad-max-prefix-size=6 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX-6
 // PREFIX-6: invalid argument
 
+/// Test -malign-branch-prefix-size= for GCC compatibilty
+// RUN: %clang -target x86_64 -malign-branch-prefix-size=5 %s -c -### 2>&1 | FileCheck %s --check-prefix=PREFIX-5
+
 /// Test -mbranches-within-32B-boundaries
 // RUN: %clang -target x86_64 -mbranches-within-32B-boundaries %s -c -### 2>&1 | FileCheck %s --check-prefix=32B
 // 32B: "-mllvm" "-x86-branches-within-32B-boundaries"
Index: clang/include/clang/Driver/Options.td
===
--- clang/include/clang/Driver/Options.td
+++ clang/include/clang/Driver/Options.td
@@ -2189,6 +2189,8 @@
   HelpText<"Specify the boundary's size to align branches">;
 def mpad_max_prefix_size_EQ : Joined<["-"], "mpad-max-prefix-size=">, Group, Flags<[DriverOption]>,
   HelpText<"Specify maximum number of prefixes to use for padding">;
+def malign_branch_prefix_size_EQ : Joined<["-"], "malign-branch-prefix-size=">, Group, Flags<[DriverOption]>,Alias,
+  HelpText<"Alias for -mpad-max-prefix-size">;// Alias for GCC compatibility
 def mbranches_within_32B_boundaries : Flag<["-"], "mbranches-within-32B-boundaries">, Flags<[DriverOption]>, Group,
   HelpText<"Align selected br