rollup merge of #21753: dzamlo/master

Before, unknown -Z option would result in a "error: unknown codegen option"
message instead of "error: unknown debugging option".

Author: alexcrichton

src/librustc/session/config.rs

@@ -333,8 +333,8 @@ macro_rules! options {
                 break;
             }
             if !found {
-                early_error(&format!("unknown codegen option: `{}`",
-                                    key)[]);
+                early_error(&format!("unknown {} option: `{}`",
+                                    $outputname, key)[]);
             }
         }
         return op;