aboutsummaryrefslogtreecommitdiff
path: root/gcc/gcc.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-12-29 08:32:21 +0000
committerJakub Jelinek <jakub@redhat.com>2008-12-29 08:32:21 +0000
commit6b219a117a7309cf0954b421090739482ded00b6 (patch)
tree95371f82b78423655768e43a1e0c334615bfd483 /gcc/gcc.c
parentf195ef913fb47785506eb8c64d476727ee942ffe (diff)
PR driver/38381
* gcc.c (process_command): Accept also -b with configuration name in the next argument. * doc/invoke.texi (-b): Document that no hyphen is required if configuration name is in the next argument after -b. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@142947 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/gcc.c')
-rw-r--r--gcc/gcc.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 5481d0d4f44..8e1938bd58a 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -3371,8 +3371,10 @@ process_command (int argc, const char **argv)
Use heuristic that all configuration names must have at least
one dash '-'. This allows us to pass options starting with -b. */
if (argc > 1 && argv[1][0] == '-'
- && (argv[1][1] == 'V' ||
- ((argv[1][1] == 'b') && (NULL != strchr(argv[1] + 2,'-')))))
+ && (argv[1][1] == 'V'
+ || (argv[1][1] == 'b'
+ && (argv[1][2] == '\0'
+ || NULL != strchr (argv[1] + 2, '-')))))
{
const char *new_version = DEFAULT_TARGET_VERSION;
const char *new_machine = DEFAULT_TARGET_MACHINE;
@@ -3382,8 +3384,10 @@ process_command (int argc, const char **argv)
int baselen;
while (argc > 1 && argv[1][0] == '-'
- && (argv[1][1] == 'V' ||
- ((argv[1][1] == 'b') && ( NULL != strchr(argv[1] + 2,'-')))))
+ && (argv[1][1] == 'V'
+ || (argv[1][1] == 'b'
+ && (argv[1][2] == '\0'
+ || NULL != strchr (argv[1] + 2, '-')))))
{
char opt = argv[1][1];
const char *arg;
@@ -3842,7 +3846,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"
switch (c)
{
case 'b':
- if (NULL == strchr(argv[i] + 2, '-'))
+ if (p[1] && NULL == strchr (argv[i] + 2, '-'))
goto normal_switch;
/* Fall through. */