Changeset 55b69ed in rtems


Ignore:
Timestamp:
Oct 15, 2018, 6:33:45 AM (6 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
e97806a
Parents:
7038271
git-author:
Sebastian Huber <sebastian.huber@…> (10/15/18 06:33:45)
git-committer:
Sebastian Huber <sebastian.huber@…> (10/29/18 09:33:37)
Message:

Move default config to librtemsdefaultconfig.a

An RTEMS application default configuration is contained in
cpukit/libmisc/dummy/default-configuration.c. This default
configuration was contained in librtemscpu.a. This had at least two
problems:

  1. Application configuration errors may have pulled in the default configuration which in turn lead to multiply define symbols error. This was quite confusing. You had to consult the linker map file to figure out what cased the pull in of the default configuration. You needed to know what a linker map file is and how you generate it with your build system. This was not very user friendly.
  1. It prevented the use of default configuration items for each subsystem in librtemscpu.a. This may be used to reduce the size of the configuration itself.

Move the default configuration to the separate library
librtemsdefaultconfig.a.

Close #3551.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/Makefile.am

    r7038271 r55b69ed  
    282282librtemscpu_a_SOURCES += libmisc/devnull/devnull.c
    283283librtemscpu_a_SOURCES += libmisc/devnull/devzero.c
    284 librtemscpu_a_SOURCES += libmisc/dummy/default-configuration.c
    285284librtemscpu_a_SOURCES += libmisc/dummy/dummy-networking.c
    286285librtemscpu_a_SOURCES += libmisc/dumpbuf/dumpbuf.c
     
    18321831all-local: generate-vc-key
    18331832
     1833project_lib_LIBRARIES += librtemsdefaultconfig.a
     1834
     1835librtemsdefaultconfig_a_SOURCES =
     1836librtemsdefaultconfig_a_SOURCES += libmisc/dummy/default-configuration.c
     1837
    18341838project_lib_LIBRARIES += libftpd.a
    18351839
  • testsuites/libtests/Makefile.am

    r7038271 r55b69ed  
    189189lib_tests += calloc.norun
    190190calloc_norun_SOURCES = POSIX/calloc.c
     191calloc_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    191192endif
    192193
     
    204205lib_tests += clock_gettime.norun
    205206clock_gettime_norun_SOURCES = POSIX/clock_gettime.c
     207clock_gettime_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    206208endif
    207209
     
    209211lib_tests += close.norun
    210212close_norun_SOURCES = POSIX/close.c
     213close_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    211214endif
    212215
     
    258261defaultconfig01_CPPFLAGS = $(AM_CPPFLAGS) \
    259262        $(TEST_FLAGS_defaultconfig01) $(support_includes)
     263defaultconfig01_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    260264endif
    261265
     
    521525lib_tests += dup2.norun
    522526dup2_norun_SOURCES = POSIX/dup2.c
     527dup2_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    523528endif
    524529
     
    544549lib_tests += fcntl.norun
    545550fcntl_norun_SOURCES = POSIX/fcntl.c
     551fcntl_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    546552endif
    547553
     
    559565lib_tests += flockfile.norun
    560566flockfile_norun_SOURCES = POSIX/flockfile.c
     567flockfile_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    561568endif
    562569
     
    564571lib_tests += fork.norun
    565572fork_norun_SOURCES = POSIX/fork.c
     573fork_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    566574endif
    567575
     
    569577lib_tests += free.norun
    570578free_norun_SOURCES = POSIX/free.c
     579free_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    571580endif
    572581
     
    574583lib_tests += fstat.norun
    575584fstat_norun_SOURCES = POSIX/fstat.c
     585fstat_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    576586endif
    577587
     
    591601lib_tests += ftrylockfile.norun
    592602ftrylockfile_norun_SOURCES = POSIX/ftrylockfile.c
     603ftrylockfile_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    593604endif
    594605
     
    596607lib_tests += funlockfile.norun
    597608funlockfile_norun_SOURCES = POSIX/funlockfile.c
     609funlockfile_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    598610endif
    599611
     
    610622lib_tests += getlogin.norun
    611623getlogin_norun_SOURCES = POSIX/getlogin.c
     624getlogin_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    612625endif
    613626
     
    615628lib_tests += getpwnam.norun
    616629getpwnam_norun_SOURCES = POSIX/getpwnam.c
     630getpwnam_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    617631endif
    618632
     
    620634lib_tests += getpwuid.norun
    621635getpwuid_norun_SOURCES = POSIX/getpwuid.c
     636getpwuid_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    622637endif
    623638
     
    625640lib_tests += gettimeofday.norun
    626641gettimeofday_norun_SOURCES = POSIX/gettimeofday.c
     642gettimeofday_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    627643endif
    628644
     
    630646lib_tests += getuid.norun
    631647getuid_norun_SOURCES = POSIX/getuid.c
     648getuid_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    632649endif
    633650
     
    652669lib_tests += htonl.norun
    653670htonl_norun_SOURCES = POSIX/htonl.c
     671htonl_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    654672endif
    655673
     
    666684lib_tests += iconv.norun
    667685iconv_norun_SOURCES = POSIX/iconv.c
     686iconv_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    668687endif
    669688
     
    671690lib_tests += iconv_close.norun
    672691iconv_close_norun_SOURCES = POSIX/iconv_close.c
     692iconv_close_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    673693endif
    674694
     
    676696lib_tests += iconv_open.norun
    677697iconv_open_norun_SOURCES = POSIX/iconv_open.c
     698iconv_open_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    678699endif
    679700
     
    681702lib_tests += kill.norun
    682703kill_norun_SOURCES = POSIX/kill.c
     704kill_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    683705endif
    684706
     
    695717lib_tests += longjmp.norun
    696718longjmp_norun_SOURCES = POSIX/longjmp.c
     719longjmp_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    697720endif
    698721
     
    700723lib_tests += lseek.norun
    701724lseek_norun_SOURCES = POSIX/lseek.c
     725lseek_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    702726endif
    703727
     
    705729lib_tests += lstat.norun
    706730lstat_norun_SOURCES = POSIX/lstat.c
     731lstat_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    707732endif
    708733
     
    710735lib_tests += malloc.norun
    711736malloc_norun_SOURCES = POSIX/malloc.c
     737malloc_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    712738endif
    713739
     
    836862lib_tests += nanosleep.norun
    837863nanosleep_norun_SOURCES = POSIX/nanosleep.c
     864nanosleep_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    838865endif
    839866
     
    861888lib_tests += open.norun
    862889open_norun_SOURCES = POSIX/open.c
     890open_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    863891endif
    864892
     
    866894lib_tests += pipe.norun
    867895pipe_norun_SOURCES = POSIX/pipe.c
     896pipe_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    868897endif
    869898
     
    871900lib_tests += posix_memalign.norun
    872901posix_memalign_norun_SOURCES = POSIX/posix_memalign.c
     902posix_memalign_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    873903endif
    874904
     
    911941lib_tests += read.norun
    912942read_norun_SOURCES = POSIX/read.c
     943read_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    913944endif
    914945
     
    916947lib_tests += readv.norun
    917948readv_norun_SOURCES = POSIX/readv.c
     949readv_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    918950endif
    919951
     
    921953lib_tests += realloc.norun
    922954realloc_norun_SOURCES = POSIX/realloc.c
     955realloc_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    923956endif
    924957
     
    935968lib_tests += setjmp.norun
    936969setjmp_norun_SOURCES = POSIX/setjmp.c
     970setjmp_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    937971endif
    938972
     
    957991lib_tests += sigaddset.norun
    958992sigaddset_norun_SOURCES = POSIX/sigaddset.c
     993sigaddset_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    959994endif
    960995
     
    962997lib_tests += sigdelset.norun
    963998sigdelset_norun_SOURCES = POSIX/sigdelset.c
     999sigdelset_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    9641000endif
    9651001
     
    9671003lib_tests += sigemptyset.norun
    9681004sigemptyset_norun_SOURCES = POSIX/sigemptyset.c
     1005sigemptyset_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    9691006endif
    9701007
     
    9721009lib_tests += sigfillset.norun
    9731010sigfillset_norun_SOURCES = POSIX/sigfillset.c
     1011sigfillset_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    9741012endif
    9751013
     
    9771015lib_tests += sigismember.norun
    9781016sigismember_norun_SOURCES = POSIX/sigismember.c
     1017sigismember_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    9791018endif
    9801019
     
    9821021lib_tests += sigprocmask.norun
    9831022sigprocmask_norun_SOURCES = POSIX/sigprocmask.c
     1023sigprocmask_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    9841024endif
    9851025
     
    10231063lib_tests += stat.norun
    10241064stat_norun_SOURCES = POSIX/stat.c
     1065stat_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    10251066endif
    10261067
     
    12741315lib_tests += unlink.norun
    12751316unlink_norun_SOURCES = POSIX/unlink.c
     1317unlink_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    12761318endif
    12771319
     
    12881330lib_tests += vfork.norun
    12891331vfork_norun_SOURCES = POSIX/vfork.c
     1332vfork_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    12901333endif
    12911334
     
    12931336lib_tests += wait.norun
    12941337wait_norun_SOURCES = POSIX/wait.c
     1338wait_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    12951339endif
    12961340
     
    12981342lib_tests += waitpid.norun
    12991343waitpid_norun_SOURCES = POSIX/waitpid.c
     1344waitpid_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    13001345endif
    13011346
     
    13031348lib_tests += write.norun
    13041349write_norun_SOURCES = POSIX/write.c
     1350write_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    13051351endif
    13061352
     
    13081354lib_tests += writev.norun
    13091355writev_norun_SOURCES = POSIX/writev.c
     1356writev_norun_LDADD = $(LDADD) $(RTEMS_ROOT)cpukit/librtemsdefaultconfig.a
    13101357endif
    13111358
Note: See TracChangeset for help on using the changeset viewer.