aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorGary Funck <gary@intrepid.com>2011-09-02 21:19:17 +0000
committerGary Funck <gfunck@gcc.gnu.org>2011-09-02 21:19:17 +0000
commit58265ea647cc3d461d5ecb0b6f7ee7a20adf8be1 (patch)
treef7d31cb76ec49cf7d2ed94711ee6111092b65896 /gcc
parentdde460d482fcf150d17b0baa2bc0b97714ec6365 (diff)
downloadgcc-58265ea647cc3d461d5ecb0b6f7ee7a20adf8be1.zip
gcc-58265ea647cc3d461d5ecb0b6f7ee7a20adf8be1.tar.gz
gcc-58265ea647cc3d461d5ecb0b6f7ee7a20adf8be1.tar.bz2
opts.c (print_specific_help): Fix off-by-one compare in assertion check.
2011-09-02 Gary Funck <gary@intrepid.com> * opts.c (print_specific_help): Fix off-by-one compare in assertion check. * opts.h (CL_PARAMS, CL_WARNING, CL_OPTIMIZATION, CL_DRIVER, CL_TARGET, CL_COMMON, CL_JOINED, CL_SEPARATE, CL_UNDOCUMENTED): Increase by +5 to allow for more languages. * optc-gen.awk: Generate #if that ensures that the number of languages is within the implementation-defined limit. From-SVN: r178491
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog10
-rw-r--r--gcc/optc-gen.awk3
-rw-r--r--gcc/opts.c2
-rw-r--r--gcc/opts.h18
4 files changed, 23 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b6aeebb..48bdefa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2011-09-02 Gary Funck <gary@intrepid.com>
+
+ * opts.c (print_specific_help): Fix off-by-one compare in
+ assertion check.
+ * opts.h (CL_PARAMS, CL_WARNING, CL_OPTIMIZATION, CL_DRIVER,
+ CL_TARGET, CL_COMMON, CL_JOINED, CL_SEPARATE, CL_UNDOCUMENTED):
+ Increase by +5 to allow for more languages.
+ * optc-gen.awk: Generate #if that ensures that the number of
+ languages is within the implementation-defined limit.
+
2011-09-02 Michael Matz <matz@suse.de>
PR middle-end/50260
diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index 71a03fb..e28c397 100644
--- a/gcc/optc-gen.awk
+++ b/gcc/optc-gen.awk
@@ -169,6 +169,9 @@ for (i = 0; i < n_langs; i++) {
print " 0\n};\n"
print "const unsigned int cl_options_count = N_OPTS;\n"
+print "#if (1U << " n_langs ") > CL_MIN_OPTION_CLASS"
+print " #error the number of languages exceeds the implementation limit"
+print "#endif"
print "const unsigned int cl_lang_count = " n_langs ";\n"
print "const struct cl_option cl_options[] =\n{"
diff --git a/gcc/opts.c b/gcc/opts.c
index 59e8910..5d5bcb9 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1125,7 +1125,7 @@ print_specific_help (unsigned int include_flags,
/* Sanity check: Make sure that we do not have more
languages than we have bits available to enumerate them. */
- gcc_assert ((1U << cl_lang_count) < CL_MIN_OPTION_CLASS);
+ gcc_assert ((1U << cl_lang_count) <= CL_MIN_OPTION_CLASS);
/* If we have not done so already, obtain
the desired maximum width of the output. */
diff --git a/gcc/opts.h b/gcc/opts.h
index 3c0fe3f8..621cdea 100644
--- a/gcc/opts.h
+++ b/gcc/opts.h
@@ -127,12 +127,12 @@ extern const unsigned int cl_options_count;
extern const char *const lang_names[];
extern const unsigned int cl_lang_count;
-#define CL_PARAMS (1U << 11) /* Fake entry. Used to display --param info with --help. */
-#define CL_WARNING (1U << 12) /* Enables an (optional) warning message. */
-#define CL_OPTIMIZATION (1U << 13) /* Enables an (optional) optimization. */
-#define CL_DRIVER (1U << 14) /* Driver option. */
-#define CL_TARGET (1U << 15) /* Target-specific option. */
-#define CL_COMMON (1U << 16) /* Language-independent. */
+#define CL_PARAMS (1U << 16) /* Fake entry. Used to display --param info with --help. */
+#define CL_WARNING (1U << 17) /* Enables an (optional) warning message. */
+#define CL_OPTIMIZATION (1U << 18) /* Enables an (optional) optimization. */
+#define CL_DRIVER (1U << 19) /* Driver option. */
+#define CL_TARGET (1U << 20) /* Target-specific option. */
+#define CL_COMMON (1U << 21) /* Language-independent. */
#define CL_MIN_OPTION_CLASS CL_PARAMS
#define CL_MAX_OPTION_CLASS CL_COMMON
@@ -142,9 +142,9 @@ extern const unsigned int cl_lang_count;
This distinction is important because --help will not list options
which only have these higher bits set. */
-#define CL_JOINED (1U << 17) /* If takes joined argument. */
-#define CL_SEPARATE (1U << 18) /* If takes a separate argument. */
-#define CL_UNDOCUMENTED (1U << 19) /* Do not output with --help. */
+#define CL_JOINED (1U << 22) /* If takes joined argument. */
+#define CL_SEPARATE (1U << 23) /* If takes a separate argument. */
+#define CL_UNDOCUMENTED (1U << 24) /* Do not output with --help. */
/* Flags for an enumerated option argument. */
#define CL_ENUM_CANONICAL (1 << 0) /* Canonical for this value. */