ccc: (Darwin) Pass -ObjC to linker if -ObjC, -ObjC++ or -fobjc is
present.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62070 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/ccc/ccclib/Arguments.py b/tools/ccc/ccclib/Arguments.py
index 5c5320f..564114f 100644
--- a/tools/ccc/ccclib/Arguments.py
+++ b/tools/ccc/ccclib/Arguments.py
@@ -370,10 +370,8 @@
self.oOption = self.addOption(JoinedOrSeparateOption('-o'))
self.xOption = self.addOption(JoinedOrSeparateOption('-x'))
- # FIXME: What do these actually do? The documentation is less than
- # clear.
- self.addOption(FlagOption('-ObjC'))
- self.addOption(FlagOption('-ObjC++'))
+ self.ObjCOption = self.addOption(FlagOption('-ObjC'))
+ self.ObjCXXOption = self.addOption(FlagOption('-ObjC++'))
# FIXME: Weird, gcc claims this here in help but I'm not sure why;
# perhaps interaction with preprocessor? Investigate.
@@ -559,6 +557,7 @@
self.addOption(JoinedOption('-g'))
self.f_exceptionsOption = self.addOption(FlagOption('-fexceptions'))
+ self.f_objcOption = self.addOption(FlagOption('-fobjc'))
self.f_openmpOption = self.addOption(FlagOption('-fopenmp'))
self.f_gnuRuntimeOption = self.addOption(FlagOption('-fgnu-runtime'))
self.f_nestedFunctionsOption = self.addOption(FlagOption('-fnested-functions'))
diff --git a/tools/ccc/ccclib/Tools.py b/tools/ccc/ccclib/Tools.py
index 5ac948c..17a9ce8 100644
--- a/tools/ccc/ccclib/Tools.py
+++ b/tools/ccc/ccclib/Tools.py
@@ -359,7 +359,8 @@
assert outputType is Types.ImageType
# The logic here is derived from gcc's behavior; most of which
- # comes from specs (link_command). Consult gcc for more information.
+ # comes from specs (starting with link_command). Consult gcc
+ # for more information.
# FIXME: gcc's spec controls when this is done; certain things
# like -filelist or -Wl, still trigger a link stage. I don't
@@ -371,9 +372,13 @@
# Not sure why this particular decomposition exists in gcc.
self.addLinkArgs(cmd_args, arch, arglist)
- # FIXME: Need to insert "additional linker options accumulated
- # from compilation". What does this mean precisely? And where
- # do -Wl, options and -Xlinker options come in?
+ # This toolchain never accumlates options in specs, the only
+ # place this gets used is to add -ObjC.
+ if (arglist.getLastArg(arglist.parser.ObjCOption) or
+ arglist.getLastArg(arglist.parser.f_objcOption)):
+ cmd_args.append('-ObjC')
+ if arglist.getLastArg(arglist.parser.ObjCXXOption):
+ cmd_args.append('-ObjC')
# FIXME: gcc has %{x} in here. How could this ever happen?
# Cruft?