Commit 28e92f36 authored by Ian Lynagh's avatar Ian Lynagh

Move the machdepCCOpts flags into cCcOpts

This will ultimately mean they end up in the settings file, rather
than being hardcoded.

We now unconditionally give -D_REENTRANT on alpha, but I think that's
probably the right thing to do nowadays anyway.
parent 3451da4b
......@@ -105,6 +105,21 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
$4="$$4 -arch x86_64"
$5="$$5 -m64"
;;
alpha-*)
# For now, to suppress the gcc warning "call-clobbered
# register used for global register variable", we simply
# disable all warnings altogether using the -w flag. Oh well.
$2="$$2 -w -mieee -D_REENTRANT"
$3="$$3 -w -mieee -D_REENTRANT"
$5="$$5 -w -mieee -D_REENTRANT"
;;
hppa*)
# ___HPUX_SOURCE, not _HPUX_SOURCE, is #defined if -ansi!
# (very nice, but too bad the HP /usr/include files don't agree.)
$2="$$2 -D_HPUX_SOURCE"
$3="$$3 -D_HPUX_SOURCE"
$5="$$5 -D_HPUX_SOURCE"
;;
esac
# If gcc knows about the stack protector, turn it off.
......
......@@ -2201,28 +2201,7 @@ setOptHpcDir arg = upd $ \ d -> d{hpcDir = arg}
-- platform.
machdepCCOpts :: DynFlags -> [String] -- flags for all C compilations
machdepCCOpts _ = cCcOpts ++ machdepCCOpts'
machdepCCOpts' :: [String] -- flags for all C compilations
machdepCCOpts'
#if alpha_TARGET_ARCH
= ["-w", "-mieee"
#ifdef HAVE_THREADED_RTS_SUPPORT
, "-D_REENTRANT"
#endif
]
-- For now, to suppress the gcc warning "call-clobbered
-- register used for global register variable", we simply
-- disable all warnings altogether using the -w flag. Oh well.
#elif hppa_TARGET_ARCH
-- ___HPUX_SOURCE, not _HPUX_SOURCE, is #defined if -ansi!
-- (very nice, but too bad the HP /usr/include files don't agree.)
= ["-D_HPUX_SOURCE"]
#else
= []
#endif
machdepCCOpts _ = cCcOpts
picCCOpts :: DynFlags -> [String]
picCCOpts _dflags
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment