@@ -484,49 +484,16 @@ std::string Linux::ComputeEffectiveClangTriple(const llvm::opt::ArgList &Args,
484484// options represent the default signing schema.
485485static void handlePAuthABI (const Driver &D, const ArgList &DriverArgs,
486486 ArgStringList &CC1Args) {
487- if (!DriverArgs.hasArg (options::OPT_fptrauth_intrinsics,
488- options::OPT_fno_ptrauth_intrinsics))
489- CC1Args.push_back (" -fptrauth-intrinsics" );
490-
491- if (!DriverArgs.hasArg (options::OPT_fptrauth_calls,
492- options::OPT_fno_ptrauth_calls))
493- CC1Args.push_back (" -fptrauth-calls" );
494-
495- if (!DriverArgs.hasArg (options::OPT_fptrauth_returns,
496- options::OPT_fno_ptrauth_returns))
497- CC1Args.push_back (" -fptrauth-returns" );
498-
499- if (!DriverArgs.hasArg (options::OPT_fptrauth_auth_traps,
500- options::OPT_fno_ptrauth_auth_traps))
501- CC1Args.push_back (" -fptrauth-auth-traps" );
502-
503- if (!DriverArgs.hasArg (
504- options::OPT_fptrauth_vtable_pointer_address_discrimination,
505- options::OPT_fno_ptrauth_vtable_pointer_address_discrimination))
506- CC1Args.push_back (" -fptrauth-vtable-pointer-address-discrimination" );
507-
508- if (!DriverArgs.hasArg (
509- options::OPT_fptrauth_vtable_pointer_type_discrimination,
510- options::OPT_fno_ptrauth_vtable_pointer_type_discrimination))
511- CC1Args.push_back (" -fptrauth-vtable-pointer-type-discrimination" );
512-
513- if (!DriverArgs.hasArg (
514- options::OPT_fptrauth_type_info_vtable_pointer_discrimination,
515- options::OPT_fno_ptrauth_type_info_vtable_pointer_discrimination))
516- CC1Args.push_back (" -fptrauth-type-info-vtable-pointer-discrimination" );
517-
518- if (!DriverArgs.hasArg (options::OPT_fptrauth_indirect_gotos,
519- options::OPT_fno_ptrauth_indirect_gotos))
520- CC1Args.push_back (" -fptrauth-indirect-gotos" );
521-
522- if (!DriverArgs.hasArg (options::OPT_fptrauth_init_fini,
523- options::OPT_fno_ptrauth_init_fini))
524- CC1Args.push_back (" -fptrauth-init-fini" );
525-
526- if (!DriverArgs.hasArg (
527- options::OPT_fptrauth_init_fini_address_discrimination,
528- options::OPT_fno_ptrauth_init_fini_address_discrimination))
529- CC1Args.push_back (" -fptrauth-init-fini-address-discrimination" );
487+ CC1Args.push_back (" -fptrauth-intrinsics" );
488+ CC1Args.push_back (" -fptrauth-calls" );
489+ CC1Args.push_back (" -fptrauth-returns" );
490+ CC1Args.push_back (" -fptrauth-auth-traps" );
491+ CC1Args.push_back (" -fptrauth-vtable-pointer-address-discrimination" );
492+ CC1Args.push_back (" -fptrauth-vtable-pointer-type-discrimination" );
493+ CC1Args.push_back (" -fptrauth-type-info-vtable-pointer-discrimination" );
494+ CC1Args.push_back (" -fptrauth-indirect-gotos" );
495+ CC1Args.push_back (" -fptrauth-init-fini" );
496+ CC1Args.push_back (" -fptrauth-init-fini-address-discrimination" );
530497
531498 if (!DriverArgs.hasArg (options::OPT_faarch64_jump_table_hardening,
532499 options::OPT_fno_aarch64_jump_table_hardening))
0 commit comments