This is an archive of the discontinued LLVM Phabricator instance.

Differential D7856

Fix global makefiles for the tests to support android
ClosedPublic

Authored by tberghammer on Feb 24 2015, 3:24 AM.

Details

Reviewers
vharron
ovyalov
Commits
rG37099e87cb78: Fix global makefiles for the tests to support android
rLLDB230487: Fix global makefiles for the tests to support android
rL230487: Fix global makefiles for the tests to support android
Summary

Fix global makefiles for the tests to support android




Two changes are required to compile the tests for android



    

  • Disable the usage of -lpthread as it is included by default on android
    • 

  • Add -pie to the linker flags because android only support position independent executables
    • 

Diff Detail
Repository 
rL LLVM 
Event Timeline
tberghammer updated this revision to Diff 20588.Feb 24 2015, 3:24 AM
tberghammer retitled this revision from  to Fix global makefiles for the tests to support android.
tberghammer updated this object.
tberghammer edited the test plan for this revision. (Show Details)
tberghammer added reviewers: vharron, ovyalov.
tberghammer added a subscriber: Unknown Object (MLST).
tberghammer updated this revision to Diff 20593.Feb 24 2015, 5:36 AM
Fix broken check for OS
ovyalov accepted this revision.Feb 24 2015, 10:44 AM
ovyalov edited edge metadata.
This revision is now accepted and ready to land.Feb 24 2015, 10:44 AM
Closed by commit rL230487: Fix global makefiles for the tests to support android (authored by tberghammer).  ·  Explain WhyFeb 25 2015, 5:04 AM
This revision was automatically updated to reflect the committed changes.
Revision Contents
PathSize
lldb/
trunk/
test/
make/
11 lines
Diff 20667
lldb/trunk/test/make/Makefile.rules
Show First 20 Lines • Show All 117 Lines • ▼ Show 20 Lines
# Use this one if you want to build one part of the result without debug information:
# Use this one if you want to build one part of the result without debug information:

CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS)
CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS)




CXXFLAGS += -std=c++11
CXXFLAGS += -std=c++11

CXXFLAGS += $(CFLAGS)
CXXFLAGS += $(CFLAGS)

LD = $(CC)
LD = $(CC)

LDFLAGS ?= $(CFLAGS)
LDFLAGS ?= $(CFLAGS)

LDFLAGS += $(LD_EXTRAS)
LDFLAGS += $(LD_EXTRAS)

ifneq "$(OS)" "Windows_NT"
ifeq (,$(filter $(OS), Windows_NT Android))

    ifeq "$(ENABLE_THREADS)" "YES"
    ifeq "$(ENABLE_THREADS)" "YES"

        LDFLAGS += -lpthread
        LDFLAGS += -lpthread

    else 
    else

        ifeq "$(ENABLE_STD_THREADS)" "YES"
        ifeq "$(ENABLE_STD_THREADS)" "YES"

            # with the specific combination of Linux, g++, std=c++11, adding the 
            # with the specific combination of Linux, g++, std=c++11, adding the 

            # linker flag -lpthread, will cause a program to hang when a std::conditional_variable
            # linker flag -lpthread, will cause a program to hang when a std::conditional_variable

            # is used in a program that links lldb (see bugzilla 21553)
            # is used in a program that links lldb (see bugzilla 21553)

            ifeq "$(OS)" "Linux"
            ifeq "$(OS)" "Linux"

                ifeq (,$(findstring gcc,$(CC))) 
                ifeq (,$(findstring gcc,$(CC))) 

                    # Linux, but not gcc
                    # Linux, but not gcc

                    LDFLAGS += -lpthread
                    LDFLAGS += -lpthread

▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines  ifneq (,$(findstring clang,$(CC)))

    CXXFLAGS += -D_HAS_EXCEPTIONS=0
    CXXFLAGS += -D_HAS_EXCEPTIONS=0

    # The MSVC linker doesn't understand long section names
    # The MSVC linker doesn't understand long section names

    # generated by the clang compiler.
    # generated by the clang compiler.

    LDFLAGS += -fuse-ld=lld
    LDFLAGS += -fuse-ld=lld

  endif
  endif

endif
endif




#----------------------------------------------------------------------
#----------------------------------------------------------------------

# Android specific options

#----------------------------------------------------------------------

ifeq "$(OS)" "Android"

  LDFLAGS += -pie

endif



#----------------------------------------------------------------------

# C++ standard library options
# C++ standard library options

#----------------------------------------------------------------------
#----------------------------------------------------------------------

ifeq (1,$(USE_LIBSTDCPP))
ifeq (1,$(USE_LIBSTDCPP))

  # Clang requires an extra flag: -stdlib=libstdc++
  # Clang requires an extra flag: -stdlib=libstdc++

  ifneq (,$(findstring clang,$(CC)))
  ifneq (,$(findstring clang,$(CC)))

    CXXFLAGS += -stdlib=libstdc++
    CXXFLAGS += -stdlib=libstdc++

    LDFLAGS += -stdlib=libstdc++
    LDFLAGS += -stdlib=libstdc++

  endif
  endif

▲ Show 20 Lines • Show All 266 Lines • Show Last 20 Lines