This is an archive of the discontinued LLVM Phabricator instance.

Differential D9045

Fix TestPluginCommands for gcc.
ClosedPublic

Authored by chaoren on Apr 15 2015, 6:38 PM.

Details

Reviewers
sivachandra
pcc
clayborg
Commits
rG54fff4c9e258: Fix TestPluginCommands for gcc.
rLLDB235137: Fix TestPluginCommands for gcc.
rL235137: Fix TestPluginCommands for gcc.
Summary

gcc requires that LDFLAGS come after DYLIB_OBJECTS.

Diff Detail

Event Timeline

chaoren updated this revision to Diff 23818.Apr 15 2015, 6:38 PM
chaoren retitled this revision from to GCC requires LDFLAGS at the end of the command line..
chaoren updated this object.
chaoren edited the test plan for this revision. (Show Details)
chaoren added reviewers: sivachandra, pcc, clayborg.
chaoren added a subscriber: Unknown Object (MLST).
chaoren added a comment.Apr 15 2015, 6:41 PM

There's a bunch of other places with $(LD) $(LDFLAGS) ..., I'm not sure if it's necessary to change all of them.

chaoren retitled this revision from GCC requires LDFLAGS at the end of the command line. to Fix TestPluginCommands for gcc..Apr 16 2015, 10:48 AM
chaoren updated this object.
chaoren updated this revision to Diff 23867.Apr 16 2015, 10:49 AM

Update for consistency.

clayborg accepted this revision.Apr 16 2015, 3:04 PM
clayborg edited edge metadata.

Looks good.

This revision is now accepted and ready to land.Apr 16 2015, 3:04 PM
Closed by commit rL235137: Fix TestPluginCommands for gcc. (authored by chaoren). · Explain WhyApr 16 2015, 3:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
functionalities/
plugins/
commands/
1 line
make/
4 lines

Diff 23867

test/functionalities/plugins/commands/TestPluginCommands.py

Show All 15 Linesclass PluginCommandTestCase(TestBase):
def setUp(self): def setUp(self):
# Call super's setUp(). # Call super's setUp().
TestBase.setUp(self) TestBase.setUp(self)
self.lib_dir = os.environ["LLDB_LIB_DIR"] self.lib_dir = os.environ["LLDB_LIB_DIR"]
self.implib_dir = os.environ["LLDB_IMPLIB_DIR"] self.implib_dir = os.environ["LLDB_IMPLIB_DIR"]
@expectedFailureFreeBSD('llvm.org/pr17430') @expectedFailureFreeBSD('llvm.org/pr17430')
@skipIfi386 # This test links against liblldb.so. Thus, the test requires a 32-bit liblldb.so. @skipIfi386 # This test links against liblldb.so. Thus, the test requires a 32-bit liblldb.so.
@skipIfGcc # llvm.org/pr23221
@skipIfNoSBHeaders @skipIfNoSBHeaders
def test_load_plugin(self): def test_load_plugin(self):
"""Test that plugins that load commands work correctly.""" """Test that plugins that load commands work correctly."""
plugin_name = "plugin" plugin_name = "plugin"
if sys.platform.startswith("darwin"): if sys.platform.startswith("darwin"):
plugin_lib_name = "lib%s.dylib" % plugin_name plugin_lib_name = "lib%s.dylib" % plugin_name
else: else:
Show All 36 Lines

test/make/Makefile.rules

Show First 20 Lines • Show All 391 Lines • ▼ Show 20 Lines
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Make the dylib # Make the dylib
#---------------------------------------------------------------------- #----------------------------------------------------------------------
$(DYLIB_OBJECTS) : CFLAGS += -DCOMPILING_LLDB_TEST_DLL $(DYLIB_OBJECTS) : CFLAGS += -DCOMPILING_LLDB_TEST_DLL
$(DYLIB_FILENAME) : $(DYLIB_OBJECTS) $(DYLIB_FILENAME) : $(DYLIB_OBJECTS)
ifeq "$(OS)" "Darwin" ifeq "$(OS)" "Darwin"
$(LD) $(LDFLAGS) $(DYLIB_OBJECTS) -install_name "@executable_path/$(DYLIB_FILENAME)" -dynamiclib -o "$(DYLIB_FILENAME)" $(LD) $(DYLIB_OBJECTS) $(LDFLAGS) -install_name "@executable_path/$(DYLIB_FILENAME)" -dynamiclib -o "$(DYLIB_FILENAME)"
ifneq "$(MAKE_DSYM)" "NO" ifneq "$(MAKE_DSYM)" "NO"
ifneq "$(DS)" "" ifneq "$(DS)" ""
"$(DS)" $(DSFLAGS) "$(DYLIB_FILENAME)" "$(DS)" $(DSFLAGS) "$(DYLIB_FILENAME)"
endif endif
endif endif
else else
$(LD) $(LDFLAGS) $(DYLIB_OBJECTS) -shared -o "$(DYLIB_FILENAME)" $(LD) $(DYLIB_OBJECTS) $(LDFLAGS) -shared -o "$(DYLIB_FILENAME)"
ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES" ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"
$(OBJCOPY) --only-keep-debug "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME).debug" $(OBJCOPY) --only-keep-debug "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME).debug"
$(OBJCOPY) --strip-debug --add-gnu-debuglink="$(DYLIB_FILENAME).debug" "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME)" $(OBJCOPY) --strip-debug --add-gnu-debuglink="$(DYLIB_FILENAME).debug" "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME)"
endif endif
endif endif
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Automatic variables based on items already entered. Below we create # Automatic variables based on items already entered. Below we create
▲ Show 20 Lines • Show All 93 Lines • Show Last 20 Lines