Skip to content

Commit df58a4f

Browse files
committed
Remove 'LLVM with Clang' linker I/O options
The "-native", "-native-cbe" and "-link-as-library" options are now obsolete.
1 parent da2aa20 commit df58a4f

2 files changed

Lines changed: 2 additions & 63 deletions

File tree

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.properties

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,6 @@ Option.Posix.UserBcs=Other bitcode and object files
160160
#Option.Posix.Linker.SOName=Shared object name (-Wl,-soname=)
161161
#Option.Posix.Linker.Implib=Import Library name (-Wl,--out-implib=)
162162
#Option.Posix.Linker.Defname=DEF file name (-Wl,--output-def=)
163-
Option.Posix.Linker.link_as_library=Create a library
164-
Option.Posix.Linker.LlvmOptions=Input/Output Options
165-
Option.Posix.Linker.native=Create native binary (with LLVM native code generator)
166-
Option.Posix.Linker.nativeCBackend=Create native binary (with C backend code generator)
167163
Option.Posix.Static.Compiler.Flags=Static Compiler Flags
168164

169165
Option.Llvm.Clang.EmitLlvm.name=Emit LLVM IR (-emit-llvm)
@@ -188,7 +184,7 @@ Option.Llvm.Lli.enable-correct-eh-support=Make the -lowerinvoke pass insert expe
188184
Option.Llvm.Lli.jit-enable-eh=Exception handling should be enabled in the just-in-time compiler
189185
Option.Llvm.Assembler.Flags=Assembler flags
190186
Option.Llvm.Assembler.warn.suppress=Suppress warnings (-W)
191-
Option.Llvm.Assembler.version=Announce version (-v)
187+
Option.Llvm.Assembler.version=Announce version (--version)
192188

193189
# Platform specific option names
194190
#Option.Windows.Windres.OutputFormat = Output format

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml

Lines changed: 1 addition & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -136,70 +136,13 @@ Contributors:
136136
name="%Option.Posix.Linker.Flags"
137137
valueType="string">
138138
</option>
139-
<option
140-
category="llvm.c.link.category.llvmOptions"
141-
command="-native"
142-
defaultValue="false"
143-
id="llvm.c.link.option.native"
144-
isAbstract="false"
145-
name="%Option.Posix.Linker.native"
146-
resourceFilter="all"
147-
tip="%option.tip.6"
148-
valueType="boolean">
149-
</option>
150-
<option
151-
category="llvm.c.link.category.llvmOptions"
152-
command="-native-cbe"
153-
defaultValue="false"
154-
id="llvm.c.link.option.nativeCBackEnd"
155-
isAbstract="false"
156-
name="%Option.Posix.Linker.nativeCBackend"
157-
resourceFilter="all"
158-
tip="%option.tip.7"
159-
valueType="boolean">
160-
<enablement
161-
attribute="defaultValue"
162-
extensionAdjustment="false"
163-
type="CONTAINER_ATTRIBUTE"
164-
value="false">
165-
<checkBuildProperty
166-
property="org.eclipse.cdt.build.core.buildArtefactType"
167-
value="org.eclipse.cdt.build.core.buildArtefactType.exe">
168-
</checkBuildProperty>
169-
</enablement>
170-
</option>
171139
<option
172140
browseType="file"
173141
category="llvm.c.link.category.other"
174142
id="llvm.c.link.option.userobjs"
175143
name="%Option.Posix.UserBcs"
176144
valueType="userObjs">
177145
</option>
178-
<optionCategory
179-
id="llvm.c.link.category.llvmOptions"
180-
name="%Option.Posix.Linker.LlvmOptions"
181-
owner="cdt.managedbuild.tool.llvm.c.linker">
182-
</optionCategory>
183-
<option
184-
category="llvm.c.link.category.llvmOptions"
185-
command="-link-as-library"
186-
defaultValue="false"
187-
id="llvm.c.link.option.linkaslibrary"
188-
isAbstract="false"
189-
name="%Option.Posix.Linker.link_as_library"
190-
tip="%option.tip.8"
191-
valueType="boolean">
192-
<enablement
193-
attribute="defaultValue"
194-
extensionAdjustment="false"
195-
type="CONTAINER_ATTRIBUTE"
196-
value="true">
197-
<checkBuildProperty
198-
property="org.eclipse.cdt.build.core.buildArtefactType"
199-
value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib">
200-
</checkBuildProperty>
201-
</enablement>
202-
</option>
203146
<optionCategory
204147
id="llvm.c.link.category.other"
205148
name="%OptionCategory.Misc"
@@ -384,7 +327,7 @@ Contributors:
384327
</option>
385328
<option
386329
category="llvm.asm.category.general"
387-
command="-v"
330+
command="--version"
388331
defaultValue="false"
389332
id="llvm.both.asm.option.version"
390333
name="%Option.Llvm.Assembler.version"

0 commit comments

Comments
 (0)