Changeset fd244cd in mainline


Ignore:
Timestamp:
2019-06-22T17:22:08Z (5 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ecf0a04b
Parents:
ac49d23c
Message:

Enable building libcpp as shared library

Location:
uspace
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    rac49d23c rfd244cd  
    296296
    297297LIB_CFLAGS = $(CFLAGS) -fPIC
     298LIB_CXXFLAGS = $(CXXFLAGS) -fPIC
    298299LIB_LDFLAGS = $(LDFLAGS) -shared -Wl,-soname,$(LSONAME) -Wl,--no-undefined,--no-allow-shlib-undefined
    299300
    … …  
    415416
    416417%.lo: %.cpp | depend
    417         $(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
     418        $(CXX_JOB) -c -MD -MP $(DEFS) $(LIB_CXXFLAGS) $(EXTRA_CXXFLAGS)
    418419
    419420%.lo: %.cxx | depend
    420         $(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
     421        $(CXX_JOB) -c -MD -MP $(DEFS) $(LIB_CXXFLAGS) $(EXTRA_CXXFLAGS)
    421422
    422423%.lo: %.cc | depend
    423         $(CXX_JOB) -c -MD -MP $(DEFS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
     424        $(CXX_JOB) -c -MD -MP $(DEFS) $(LIB_CXXFLAGS) $(EXTRA_CXXFLAGS)
    424425
    425426-include $(DEPENDS)

  • uspace/lib/cpp/Makefile

    rac49d23c rfd244cd  
    3333
    3434LIBRARY = libcpp
     35SOVERSION = 0.0
    3536
    3637-include $(CONFIG_MAKEFILE)

  • uspace/lib/cpp/src/__bits/runtime.cpp

    rac49d23c rfd244cd  
    7070    }
    7171
     72#ifdef PLATFORM_arm32
     73    extern "C" int __aeabi_atexit(void* p, void (*f)(void*), void* d)
     74    {
     75        return __cxa_atexit(f, p, d);
     76    }
     77#endif
     78
    7279    extern "C" int __cxa_atexit(void (*f)(void*), void* p, void* d)
    7380    {
Note: See TracChangeset for help on using the changeset viewer.