Commit log now prints while interrupts are enabled.

[riscv-isa-sim.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 53dfb60c37c83f16f4be15632db32185cb82a36a..1f3074d6bbc7d4691ffa7f2f264a4153fd487d73 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,7 +61,7 @@ else
 endif
 
 install_hdrs_dir := $(DESTDIR)/include/$(project_name)
-install_libs_dir := $(DESTDIR)/lib/$(project_name)
+install_libs_dir := $(DESTDIR)/lib
 install_exes_dir := $(DESTDIR)/bin
 
 #-------------------------------------------------------------------------
@@ -84,20 +84,22 @@ VPATH := $(addprefix $(src_dir)/, $(sprojs_enabled))
 
 CC            := @CC@
 CXX           := @CXX@
-CPPFLAGS      := @CPPFLAGS@
-CXXFLAGS      := @CXXFLAGS@
-COMPILE       := $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) \
+CFLAGS        += @CFLAGS@ -DPREFIX=\"$(prefix)\"
+CPPFLAGS      += @CPPFLAGS@
+CXXFLAGS      += @CXXFLAGS@ -DPREFIX=\"$(prefix)\"
+COMPILE       := $(CXX) -fPIC -MMD -MP $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) \
                  $(sprojs_include)
-COMPILE_C     := $(CC)  -MMD -MP $(CPPFLAGS) $(CXXFLAGS) \
+COMPILE_C     := $(CC) -fPIC -MMD -MP $(CPPFLAGS) $(CFLAGS) \
                  $(sprojs_include)
 # Linker
 #  - LDFLAGS : Flags for the linker (eg. -L)
 #  - LIBS    : Library flags (eg. -l)
 
+comma := ,
 LD            := $(CXX)
 LDFLAGS       := @LDFLAGS@
 LIBS          := @LIBS@
-LINK          := $(LD) $(LDFLAGS) 
+LINK          := $(LD) -L. $(LDFLAGS) -Wl,-rpath,$(install_libs_dir) $(patsubst -L%,-Wl$(comma)-rpath$(comma)%,$(filter -L%,$(LDFLAGS)))
 
 # Library creation
 
@@ -186,20 +188,12 @@ $(2)_objs := $$(patsubst %.cc, %.o, $$($(2)_srcs))
 $(2)_c_objs := $$(patsubst %.c, %.o, $$($(2)_c_srcs))
 $(2)_deps := $$(patsubst %.o, %.d, $$($(2)_objs))
 $(2)_c_deps := $$(patsubst %.o, %.d, $$($(2)_c_objs))
-$$($(2)_objs) : %.o : %.cc
+$$($(2)_objs) : %.o : %.cc $$($(2)_gen_hdrs)
        $(COMPILE) -c $$<
-$$($(2)_c_objs) : %.o : %.c
+$$($(2)_c_objs) : %.o : %.c $$($(2)_gen_hdrs)
        $(COMPILE_C) -c $$<
 
-$(2)_junk += $$($(2)_objs) $$($(2)_c_objs) $$($(2)_deps) $$($(2)_c_deps)
-
-# Build a library for this subproject
-
-lib$(1).a : $$($(2)_objs) $$($(2)_c_objs)
-       $(AR) rcv $$@ $$^
-       $(RANLIB) $$@
-
-$(2)_junk += lib$(1).a
+$(2)_junk += $$($(2)_objs) $$($(2)_c_objs) $$($(2)_deps) $$($(2)_c_deps) $$($(2)_gen_hdrs)
 
 # Reverse the dependency list so that a given subproject only depends on
 # subprojects listed to its right. This is the correct order for linking
@@ -207,6 +201,17 @@ $(2)_junk += lib$(1).a
 
 $(2)_reverse_deps   := $$(call reverse_list,$$($(2)_subproject_deps))
 
+# Build a library for this subproject
+
+$(2)_lib_libs       := $$($(2)_reverse_deps)
+$(2)_lib_libnames   := $$(patsubst %, lib%.so, $$($(2)_lib_libs))
+$(2)_lib_libarg     := $$(patsubst %, -l%, $$($(2)_lib_libs))
+
+lib$(1).so : $$($(2)_objs) $$($(2)_c_objs) $$($(2)_lib_libnames)
+       $(LINK) -shared -o $$@ $(if $(filter Darwin,$(shell uname -s)),-install_name $(install_libs_dir)/$$@) $$^ $$($(2)_lib_libarg) $(LIBS)
+
+$(2)_junk += lib$(1).so
+
 # Build unit tests
 
 $(2)_test_objs      := $$(patsubst %.cc, %.o, $$($(2)_test_srcs))
@@ -214,8 +219,8 @@ $(2)_test_deps      := $$(patsubst %.o, %.d, $$($(2)_test_objs))
 $(2)_test_exes      := $$(patsubst %.t.cc, %-utst, $$($(2)_test_srcs))
 $(2)_test_outs      := $$(patsubst %, %.out, $$($(2)_test_exes))
 $(2)_test_libs      := $(1) $$($(2)_reverse_deps) utst
-$(2)_test_libnames  := $$(patsubst %, lib%.a, $$($(2)_test_libs))
-$(2)_test_libarg    := -L. $$(patsubst %, -l%, $$($(2)_test_libs))
+$(2)_test_libnames  := $$(patsubst %, lib%.so, $$($(2)_test_libs))
+$(2)_test_libarg    := $$(patsubst %, -l%, $$($(2)_test_libs))
 
 $$($(2)_test_objs) : %.o : %.cc
        $(COMPILE) -c $$<
@@ -241,8 +246,8 @@ $(2)_prog_objs      := $$(patsubst %.cc, %.o, $$($(2)_prog_srcs))
 $(2)_prog_deps      := $$(patsubst %.o, %.d, $$($(2)_prog_objs))
 $(2)_prog_exes      := $$(patsubst %.cc, %, $$($(2)_prog_srcs))
 $(2)_prog_libs      := $(1) $$($(2)_reverse_deps)
-$(2)_prog_libnames  := $$(patsubst %, lib%.a, $$($(2)_prog_libs))
-$(2)_prog_libarg    := -L. $$(patsubst %, -l%, $$($(2)_prog_libs))
+$(2)_prog_libnames  := $$(patsubst %, lib%.so, $$($(2)_prog_libs))
+$(2)_prog_libarg    := $$(patsubst %, -l%, $$($(2)_prog_libs))
 
 $$($(2)_prog_objs) : %.o : %.cc
        $(COMPILE) -c $$<
@@ -259,7 +264,7 @@ $(2)_install_prog_objs := $$(patsubst %.cc, %.o, $$($(2)_install_prog_srcs))
 $(2)_install_prog_deps := $$(patsubst %.o, %.d, $$($(2)_install_prog_objs))
 $(2)_install_prog_exes := $$(patsubst %.cc, %, $$($(2)_install_prog_srcs))
 
-$$($(2)_install_prog_objs) : %.o : %.cc
+$$($(2)_install_prog_objs) : %.o : %.cc $$($(2)_gen_hdrs)
        $(COMPILE) -c $$<
 
 $$($(2)_install_prog_exes) : % : %.o $$($(2)_prog_libnames)
@@ -272,7 +277,7 @@ $(2)_junk += \
 
 # Subproject specific targets
 
-all-$(1) : lib$(1).a $$($(2)_install_prog_exes)
+all-$(1) : lib$(1).so $$($(2)_install_prog_exes)
 
 check-$(1) : $$($(2)_test_outs)
        echo; grep -h -e'Unit Tests' -e'FAILED' -e'Segementation' $$^; echo
@@ -284,17 +289,17 @@ clean-$(1) :
 
 # Update running variables
 
-libs += lib$(1).a
+libs += lib$(1).so
 objs += $$($(2)_objs)
 srcs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_srcs)) 
-hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs))
+hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs)) $$($(2)_gen_hdrs)
 junk += $$($(2)_junk)
 deps += $$($(2)_deps)
 
 test_outs += $$($(2)_test_outs)
 
-install_hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs))
-install_libs += lib$(1).a
+install_hdrs += $$(addprefix $(src_dir)/$(1)/, $$($(2)_hdrs)) $$($(2)_gen_hdrs)
+install_libs += lib$(1).so
 install_exes += $$($(2)_install_prog_exes)
 
 endef
@@ -328,21 +333,21 @@ check : $(test_outs)
 
 install-hdrs : $(install_hdrs)
        $(MKINSTALLDIRS) $(install_hdrs_dir)
-       for file in $(install_hdrs); \
+       for file in $^; \
   do \
     $(INSTALL_HDR) $$file $(install_hdrs_dir); \
   done
 
 install-libs : $(install_libs)
        $(MKINSTALLDIRS) $(install_libs_dir)
-       for file in $(install_libs); \
+       for file in $^; \
   do \
     $(INSTALL_LIB) $$file $(install_libs_dir); \
   done
 
 install-exes : $(install_exes)
        $(MKINSTALLDIRS) $(install_exes_dir)
-       for file in $(install_exes); \
+       for file in $^; \
   do \
     $(INSTALL_EXE) $$file $(install_exes_dir); \
   done