re PR driver/47249 (ICE in common_handle_option, at opts.c:1695 with unknown option...

	PR driver/47249
	* common.opt (-pie, -shared, pie, shared): Change from Common to
	Driver.
	* gcc.c (display_help): Display help for -pie and -shared.

From-SVN: r183474

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4f274190481914071d535cb58e3cfc4744df6ef1..05ec2e139b040eba09384b72e9111fe1f6cfbe3b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-24  Jakub Jelinek  <jakub@redhat.com>
+
+       PR driver/47249
+       * common.opt (-pie, -shared, pie, shared): Change from Common to
+       Driver.
+       * gcc.c (display_help): Display help for -pie and -shared.
+
 2012-01-24  Georg-Johann Lay  <avr@gjlay.de>
 
        PR target/49868

diff --git a/gcc/common.opt b/gcc/common.opt
index 0544478f4e06f4834cf4d3108a7add7709dc5a1b..ec1dbd1b25431e59ac6ab06414180d640acc0c10 100644 (file)
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1,6 +1,6 @@
 ; Options for the language- and target-independent parts of the compiler.
 
-; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 ; Free Software Foundation, Inc.
 ;
 ; This file is part of GCC.
@@ -313,7 +313,7 @@ Common Alias(pedantic)
 Common Alias(pedantic-errors)
 
 -pie
-Common Alias(pie)
+Driver Alias(pie)
 
 -pipe
 Driver Alias(pipe)
@@ -367,7 +367,7 @@ Common Alias(p)
 Driver Alias(save-temps)
 
 -shared
-Common Alias(shared)
+Driver Alias(shared)
 
 -specs
 Driver Separate Alias(specs=)
@@ -2380,7 +2380,7 @@ x
 Driver Joined Separate
 
 shared
-Common RejectNegative Negative(pie)
+Driver RejectNegative Negative(pie)
 Create a shared library
 
 shared-libgcc
@@ -2413,7 +2413,7 @@ symbolic
 Driver
 
 pie
-Common RejectNegative Negative(shared)
+Driver RejectNegative Negative(shared)
 Create a position independent executable
 
 z

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 71b369c23e2918610770f36d7ba6a42d5632b2e1..6cdd9592cd5071d72d6e60edcd1a18d44b5b2f64 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -2988,6 +2988,8 @@ display_help (void)
   fputs (_("  -S                       Compile only; do not assemble or link\n"), stdout);
   fputs (_("  -c                       Compile and assemble, but do not link\n"), stdout);
   fputs (_("  -o <file>                Place the output into <file>\n"), stdout);
+  fputs (_("  -pie                     Create a position independent executable\n"), stdout);
+  fputs (_("  -shared                  Create a shared library\n"), stdout);
   fputs (_("\
   -x <language>            Specify the language of the following input files\n\
                            Permissible languages include: c c++ assembler none\n\