Add new parameters to OPTION macro

[bnbarham]

As in most LLVM updates, OPTION has been modified. Update makeOptions.cpp to take this into account.

[bnbarham]

@swift-ci please test

[compnerd]

@swift-ci please test Linux platform

[compnerd]

The Windows failure is acceptable - it is failing at testing Swift:

Failed Tests (7):
  Swift(windows-x86_64) :: Frontend/output_determinism_check.swift
  Swift(windows-x86_64) :: IRGen/async/class_resilience.swift
  Swift(windows-x86_64) :: IRGen/async/protocol_resilience.swift
  Swift(windows-x86_64) :: Interop/Cxx/class/method/methods-this-and-indirect-return-irgen-msvc.swift
  Swift(windows-x86_64) :: Interop/Cxx/operators/member-out-of-line-irgen.swift
  Swift-Unit :: Basic/./SwiftBasicTests.exe/FileSystem/MoveFileIfDifferentEmpty
  Swift-Unit :: Basic/./SwiftBasicTests.exe/FileSystem/MoveFileIfDifferentNonEmpty

[bnbarham]

I'm just going to merge, the linux failure is infrastructure related and I don't plan on making any other changes to swift-driver in rebranch. I'll just keep an eye on the jobs.