diff options
author | Yuriy Syrovetskiy <cblp@cblp.su> | 2019-04-02 12:59:49 +0300 |
---|---|---|
committer | Ray Shih <rayshih@fb.com> | 2020-07-27 08:06:35 -0700 |
commit | 9c93a63fe700f6c98c6dbaa6977946571abfef2e (patch) | |
tree | c622d1fe00a601eaa01cb0e911f9cc3cf42bbaf6 | |
parent | b98be8ce566917fcfa310db3f68c5d0d92248422 (diff) | |
download | haskell-9c93a63fe700f6c98c6dbaa6977946571abfef2e.tar.gz |
Add `-optcxx` option (#16477)
(cherry picked from commit 97502be8bda9199ac058b9677b4b6ba028022936)
(cherry picked from commit a3b0b8fe92c7364e11779f90c9ff97e6dcd35206)
-rw-r--r-- | compiler/main/DriverPhases.hs | 1 | ||||
-rw-r--r-- | compiler/main/DriverPipeline.hs | 15 | ||||
-rw-r--r-- | compiler/main/DynFlags.hs | 11 | ||||
-rw-r--r-- | compiler/main/HscTypes.hs | 12 | ||||
-rw-r--r-- | compiler/main/SysTools.hs | 1 | ||||
-rw-r--r-- | compiler/main/SysTools/ExtraObj.hs | 2 | ||||
-rw-r--r-- | compiler/main/SysTools/Tasks.hs | 32 | ||||
-rw-r--r-- | docs/users_guide/phases.rst | 7 | ||||
-rw-r--r-- | testsuite/tests/driver/T16737.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/ffi/should_compile/all.T | 9 | ||||
-rw-r--r-- | testsuite/tests/ffi/should_compile/cc017.hs | 19 | ||||
-rw-r--r-- | testsuite/tests/ffi/should_run/all.T | 2 | ||||
-rw-r--r-- | testsuite/tests/th/T13366.hs | 2 |
13 files changed, 91 insertions, 24 deletions
diff --git a/compiler/main/DriverPhases.hs b/compiler/main/DriverPhases.hs index d923262987..01224e19b1 100644 --- a/compiler/main/DriverPhases.hs +++ b/compiler/main/DriverPhases.hs @@ -378,4 +378,3 @@ isHaskellSigFilename f = isHaskellSigSuffix (drop 1 $ takeExtension f) isObjectFilename, isDynLibFilename :: Platform -> FilePath -> Bool isObjectFilename platform f = isObjectSuffix platform (drop 1 $ takeExtension f) isDynLibFilename platform f = isDynLibSuffix platform (drop 1 $ takeExtension f) - diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index bf79ea5d02..08b7c5b7e9 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1272,17 +1272,8 @@ runPhase (RealPhase cc_phase) input_fn dflags ghcVersionH <- liftIO $ getGhcVersionPathName dflags - let gcc_lang_opt | cc_phase `eqPhase` Ccxx = "c++" - | cc_phase `eqPhase` Cobjc = "objective-c" - | cc_phase `eqPhase` Cobjcxx = "objective-c++" - | otherwise = "c" - liftIO $ SysTools.runCc dflags ( - -- force the C compiler to interpret this file as C when - -- compiling .hc files, by adding the -x c option. - -- Also useful for plain .c files, just in case GHC saw a - -- -x c option. - [ SysTools.Option "-x", SysTools.Option gcc_lang_opt - , SysTools.FileOption "" input_fn + liftIO $ SysTools.runCc (phaseForeignLanguage cc_phase) dflags ( + [ SysTools.FileOption "" input_fn , SysTools.Option "-o" , SysTools.FileOption "" output_fn ] @@ -2093,7 +2084,7 @@ doCpp dflags raw input_fn output_fn = do let verbFlags = getVerbFlags dflags let cpp_prog args | raw = SysTools.runCpp dflags args - | otherwise = SysTools.runCc dflags (SysTools.Option "-E" : args) + | otherwise = SysTools.runCc Nothing dflags (SysTools.Option "-E" : args) let target_defs = [ "-D" ++ HOST_OS ++ "_BUILD_OS", diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index b67d657e69..20f1ba0293 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -94,7 +94,8 @@ module DynFlags ( extraGccViaCFlags, systemPackageConfig, pgm_L, pgm_P, pgm_F, pgm_c, pgm_s, pgm_a, pgm_l, pgm_dll, pgm_T, pgm_windres, pgm_libtool, pgm_ar, pgm_ranlib, pgm_lo, pgm_lc, - pgm_lcc, pgm_i, opt_L, opt_P, opt_F, opt_c, opt_a, opt_l, opt_i, + pgm_lcc, pgm_i, + opt_L, opt_P, opt_F, opt_c, opt_cxx, opt_a, opt_l, opt_i, opt_P_signature, opt_windres, opt_lo, opt_lc, opt_lcc, @@ -1348,6 +1349,7 @@ data Settings = Settings { -- See Note [Repeated -optP hashing] sOpt_F :: [String], sOpt_c :: [String], + sOpt_cxx :: [String], sOpt_a :: [String], sOpt_l :: [String], sOpt_windres :: [String], @@ -1433,6 +1435,8 @@ opt_F dflags = sOpt_F (settings dflags) opt_c :: DynFlags -> [String] opt_c dflags = concatMap (wayOptc (targetPlatform dflags)) (ways dflags) ++ sOpt_c (settings dflags) +opt_cxx :: DynFlags -> [String] +opt_cxx dflags = sOpt_cxx (settings dflags) opt_a :: DynFlags -> [String] opt_a dflags = sOpt_a (settings dflags) opt_l :: DynFlags -> [String] @@ -2541,7 +2545,7 @@ setObjectDir, setHiDir, setHieDir, setStubDir, setDumpDir, setOutputDir, setDynObjectSuf, setDynHiSuf, setDylibInstallName, setObjectSuf, setHiSuf, setHieSuf, setHcSuf, parseDynLibLoaderMode, - setPgmP, addOptl, addOptc, addOptP, + setPgmP, addOptl, addOptc, addOptcxx, addOptP, addCmdlineFramework, addHaddockOpts, addGhciScript, setInteractivePrint :: String -> DynFlags -> DynFlags @@ -2657,6 +2661,7 @@ setDumpPrefixForce f d = d { dumpPrefixForce = f} setPgmP f = let (pgm:args) = words f in alterSettings (\s -> s { sPgm_P = (pgm, map Option args)}) addOptl f = alterSettings (\s -> s { sOpt_l = f : sOpt_l s}) addOptc f = alterSettings (\s -> s { sOpt_c = f : sOpt_c s}) +addOptcxx f = alterSettings (\s -> s { sOpt_cxx = f : sOpt_cxx s}) addOptP f = alterSettings (\s -> s { sOpt_P = f : sOpt_P s , sOpt_P_fingerprint = fingerprintStrings (f : sOpt_P s) }) @@ -3061,6 +3066,8 @@ dynamic_flags_deps = [ (hasArg (\f -> alterSettings (\s -> s { sOpt_F = f : sOpt_F s}))) , make_ord_flag defFlag "optc" (hasArg addOptc) + , make_ord_flag defFlag "optcxx" + (hasArg addOptcxx) , make_ord_flag defFlag "opta" (hasArg (\f -> alterSettings (\s -> s { sOpt_a = f : sOpt_a s}))) , make_ord_flag defFlag "optl" diff --git a/compiler/main/HscTypes.hs b/compiler/main/HscTypes.hs index 97f7bb86ff..3a4581fdc5 100644 --- a/compiler/main/HscTypes.hs +++ b/compiler/main/HscTypes.hs @@ -30,6 +30,7 @@ module HscTypes ( ModGuts(..), CgGuts(..), ForeignStubs(..), appendStubC, ImportedMods, ImportedBy(..), importedByUser, ImportedModsVal(..), SptEntry(..), ForeignSrcLang(..), + phaseForeignLanguage, ModSummary(..), ms_imps, ms_installed_mod, ms_mod_name, showModMsg, isBootSummary, msHsFilePath, msHiFilePath, msObjFilePath, @@ -183,6 +184,7 @@ import CmdLineParser import DynFlags import DriverPhases ( Phase, HscSource(..), hscSourceString , isHsBootOrSig, isHsigFile ) +import qualified DriverPhases as Phase import BasicTypes import IfaceSyn import Maybes @@ -3177,3 +3179,13 @@ moduleRetainsAllBindings hsc_env mod case thisModSummary of Just summary -> Just fp == (ml_hs_file . ms_location) summary Nothing -> False + +-- | Foreign language of the phase if the phase deals with a foreign code +phaseForeignLanguage :: Phase -> Maybe ForeignSrcLang +phaseForeignLanguage phase = case phase of + Phase.Cc -> Just LangC + Phase.Ccxx -> Just LangCxx + Phase.Cobjc -> Just LangObjc + Phase.Cobjcxx -> Just LangObjcxx + Phase.HCc -> Just LangC + _ -> Nothing diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs index 9bbce19602..6d14fd1229 100644 --- a/compiler/main/SysTools.hs +++ b/compiler/main/SysTools.hs @@ -315,6 +315,7 @@ initSysTools top_dir sOpt_P_fingerprint = fingerprint0, sOpt_F = [], sOpt_c = [], + sOpt_cxx = [], sOpt_a = [], sOpt_l = [], sOpt_windres = [], diff --git a/compiler/main/SysTools/ExtraObj.hs b/compiler/main/SysTools/ExtraObj.hs index 774884a0d7..149d3a678a 100644 --- a/compiler/main/SysTools/ExtraObj.hs +++ b/compiler/main/SysTools/ExtraObj.hs @@ -40,7 +40,7 @@ mkExtraObj dflags extn xs oFile <- newTempName dflags TFL_GhcSession "o" writeFile cFile xs ccInfo <- liftIO $ getCompilerInfo dflags - runCc dflags + runCc Nothing dflags ([Option "-c", FileOption "" cFile, Option "-o", diff --git a/compiler/main/SysTools/Tasks.hs b/compiler/main/SysTools/Tasks.hs index 45ca73bcf9..72f01f63bc 100644 --- a/compiler/main/SysTools/Tasks.hs +++ b/compiler/main/SysTools/Tasks.hs @@ -10,6 +10,7 @@ module SysTools.Tasks where import Exception import ErrUtils +import HscTypes import DynFlags import Outputable import Platform @@ -57,11 +58,17 @@ runPp dflags args = do opts = map Option (getOpts dflags opt_F) runSomething dflags "Haskell pre-processor" prog (args ++ opts) -runCc :: DynFlags -> [Option] -> IO () -runCc dflags args = do - let (p,args0) = pgm_c dflags - args1 = map Option (getOpts dflags opt_c) - args2 = args0 ++ args ++ args1 +-- | Run compiler of C-like languages and raw objects (such as gcc or clang). +runCc :: Maybe ForeignSrcLang -> DynFlags -> [Option] -> IO () +runCc mLanguage dflags args = do + let (p, args0) = pgm_c dflags + filteredArgs0 = + if mLanguage == Just LangCxx + then filter (/= Option "-std=gnu99") args0 -- it's default for C++ + else args0 + args1 = map Option userOpts + args2 = filteredArgs0 ++ languageOptions ++ args ++ args1 + -- We take care to pass -optc flags in args1 last to ensure that the -- user can override flags passed by GHC. See #14452. mb_env <- getGccEnv args2 @@ -117,6 +124,21 @@ runCc dflags args = do | "warning: call-clobbered register used" `isContainedIn` w = False | otherwise = True + -- force the C compiler to interpret this file as C when + -- compiling .hc files, by adding the -x c option. + -- Also useful for plain .c files, just in case GHC saw a + -- -x c option. + (languageOptions, userOpts) = case mLanguage of + Nothing -> ([], userOpts_c) + Just language -> ([Option "-x", Option languageName], opts) where + (languageName, opts) = case language of + LangCxx -> ("c++", userOpts_cxx) + LangObjc -> ("objective-c", userOpts_c) + LangObjcxx -> ("objective-c++", userOpts_cxx) + _ -> ("c", userOpts_c) + userOpts_c = getOpts dflags opt_c + userOpts_cxx = getOpts dflags opt_cxx + isContainedIn :: String -> String -> Bool xs `isContainedIn` ys = any (xs `isPrefixOf`) (tails ys) diff --git a/docs/users_guide/phases.rst b/docs/users_guide/phases.rst index f5f735b81b..2a17edbba7 100644 --- a/docs/users_guide/phases.rst +++ b/docs/users_guide/phases.rst @@ -154,6 +154,13 @@ the following flags: Pass ⟨option⟩ to the C compiler. +.. ghc-flag:: -optcxx ⟨option⟩ + :shortdesc: pass ⟨option⟩ to the C++ compiler + :type: dynamic + :category: phase-options + + Pass ⟨option⟩ to the C++ compiler. + .. ghc-flag:: -optlo ⟨option⟩ :shortdesc: pass ⟨option⟩ to the LLVM optimiser :type: dynamic diff --git a/testsuite/tests/driver/T16737.hs b/testsuite/tests/driver/T16737.hs index 0abe5457b0..facc15cb43 100644 --- a/testsuite/tests/driver/T16737.hs +++ b/testsuite/tests/driver/T16737.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -DFOO=2 -optP=-DBAR=3 -optc=-DBAZ=5 #-} +{-# OPTIONS_GHC -DFOO=2 -optP=-DBAR=3 -optc=-DBAZ=5 -optcxx=-DBAZ=5 #-} import Language.Haskell.TH.Syntax diff --git a/testsuite/tests/ffi/should_compile/all.T b/testsuite/tests/ffi/should_compile/all.T index 0f2f3901c4..1aa32c87d5 100644 --- a/testsuite/tests/ffi/should_compile/all.T +++ b/testsuite/tests/ffi/should_compile/all.T @@ -32,3 +32,12 @@ test('cc016', normal, compile, ['']) test('T10460', normal, compile, ['']) test('T11983', [omit_ways(['ghci'])], compile, ['T11983.c']) test('T14125', normal, compile, ['']) +test( + 'cc017', + normal, + compile, + [ + '-optc=-DC -optcxx=-DCXX -optcxx=-std=c++11' + + (' -optcxx=-stdlib=libc++' if opsys('darwin') else '') + ], +) diff --git a/testsuite/tests/ffi/should_compile/cc017.hs b/testsuite/tests/ffi/should_compile/cc017.hs new file mode 100644 index 0000000000..a0ff8163db --- /dev/null +++ b/testsuite/tests/ffi/should_compile/cc017.hs @@ -0,0 +1,19 @@ +{-# LANGUAGE TemplateHaskell #-} + +import Language.Haskell.TH.Syntax + +-- Check -optc and -optcxx options passing. +-- This file must be compiled with -optc=-DC -optcxx=-DCXX + +do addForeignSource LangC + "int CXX = 0; // -DCXX must not be passed to C \n\ + \_Static_assert(C, \"name C must come from -DC\"); " + + addForeignSource LangCxx + "int C = 0; // -DC must not be passed to C++ \n\ + \static_assert(CXX, \"name CXX must come from -DCXX\"); " + + pure [] + +main :: IO () +main = pure () diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T index 3a3dfd7456..7135cc1291 100644 --- a/testsuite/tests/ffi/should_run/all.T +++ b/testsuite/tests/ffi/should_run/all.T @@ -28,7 +28,7 @@ test('ffi004', skip, compile_and_run, ['']) # On x86, the test suffers from floating-point differences due to the # use of 80-bit internal precision when using the native code generator. # -test('ffi005', [ omit_ways(prof_ways), +test('ffi005', [ omit_ways(prof_ways), when(arch('i386'), skip), when(platform('i386-apple-darwin'), expect_broken(4105)), exit_code(3) ], diff --git a/testsuite/tests/th/T13366.hs b/testsuite/tests/th/T13366.hs index 6a3bda3d09..7d998f2ae8 100644 --- a/testsuite/tests/th/T13366.hs +++ b/testsuite/tests/th/T13366.hs @@ -1,6 +1,6 @@ {-# LANGUAGE ForeignFunctionInterface #-} {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -optc-DA_MACRO=1 #-} +{-# OPTIONS_GHC -optc-DA_MACRO=1 -optcxx-DA_MACRO=1 #-} import Language.Haskell.TH.Syntax import System.IO (hFlush, stdout) |