Imagelibrary/rtems-patmos
1
0
Fork 0
mirror of https://github.com/t-crest/rtems.git synced 2025-12-09 17:13:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

2001-10-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* Adopt more automake rules:
	* automake/compile.am: Add LINK, CXXLINK, AS, ASCOMPILE;
	Remove ARFLAGS, LINK.c, COMPILE.S, LINK.cc;
	Add CPU_CFLAGS to CXXFLAGS, CFLAGS, ASFLAGS;
	* automake/leaf.am: Add CXXLINK_APP, LINK_APP, make-exe, apply
	CXXLINK_APP in make-cxx-exe.
	* automake/lib.am: Add ARFLAGS.
This commit is contained in:
Joel Sherrill
2001-10-29 14:39:50 +00:00
parent c1368b9ecf
commit a34b2458a4
4 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2001-10-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Adopt more automake rules:
* automake/compile.am: Add LINK, CXXLINK, AS, ASCOMPILE;
Remove ARFLAGS, LINK.c, COMPILE.S, LINK.cc;
Add CPU_CFLAGS to CXXFLAGS, CFLAGS, ASFLAGS;
* automake/leaf.am: Add CXXLINK_APP, LINK_APP, make-exe, apply
CXXLINK_APP in make-cxx-exe.
* automake/lib.am: Add ARFLAGS.
2001-10-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2001-10-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/check-rdbg.m4: Fix latent bug exposed by removal of * aclocal/check-rdbg.m4: Fix latent bug exposed by removal of

29
automake/compile.am
View File

@@ -75,11 +75,11 @@ endif # RTEMS_USE_GCC
DEFS = @DEFS@ DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(CPU_CFLAGS) \ CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) \
$(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC) $(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC)
CFLAGS = $(CFLAGS_DEFAULT) $(XCFLAGS) CFLAGS = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCFLAGS)
CXXFLAGS = $(CFLAGS_DEFAULT) $(XCXXFLAGS) CXXFLAGS = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCXXFLAGS)
ASFLAGS = $(CPU_ASFLAGS) $(XASFLAGS) ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
LINK_LIBS = $(LINK_LIBS_GCC272) $(LD_LIBS) LINK_LIBS = $(LINK_LIBS_GCC272) $(LD_LIBS)
@@ -108,17 +108,24 @@ LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %)
# Client compiler and support tools # Client compiler and support tools
# #
ARFLAGS=ruv
# #
# How to compile stuff into ${ARCH} subdirectory # How to compile stuff into ${ARCH} subdirectory
# #
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXLD = $(CXX)
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AS = $(CC)
ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS) -o $@
${ARCH}/%.o: %.c ${ARCH}/%.o: %.c
${COMPILE} -o $@ -c $< ${COMPILE} -o $@ -c $<
@@ -136,7 +143,7 @@ ${ARCH}/%.o: %.C
${CXXCOMPILE} -o $@ -c $< ${CXXCOMPILE} -o $@ -c $<
${ARCH}/%.o: %.S ${ARCH}/%.o: %.S
${COMPILE.S} $(AM_CPPFLAGS) -DASM -o $@ $< ${ASCOMPILE} -DASM -c $<
# Make foo.rel from foo.o # Make foo.rel from foo.o
${ARCH}/%.rel: ${ARCH}/%.o ${ARCH}/%.rel: ${ARCH}/%.o
@@ -197,20 +204,18 @@ LINK_FILES =\
if RTEMS_USE_GCC if RTEMS_USE_GCC
if RTEMS_USE_GCC272 if RTEMS_USE_GCC272
define make-rel define make-rel
$(LD) $(LDFLAGS_INCOMPLETE) $(XLDFLAGS) -o $@ $^ $(LINK) -nostdlib -Wl,-r $(XLDFLAGS) -o $@ $^
endef endef
else else
## gcc >= 2.8 ## gcc >= 2.8
define make-rel define make-rel
$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \ $(LINK) -qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) $^
-qnolinkcmds -nostdlib -Wl,-r $(XLDFLAGS) -o $@ $^
endef endef
endif endif
else else
## non-gcc ## non-gcc
define make-rel define make-rel
$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \ $(LINK) $(XLDFLAGS) $^
$(XLDFLAGS) -o $@ $^
endef endef
endif endif

13
automake/leaf.am
View File

@@ -1,9 +1,16 @@
include $(RTEMS_ROOT)/make/leaf.cfg include $(RTEMS_ROOT)/make/leaf.cfg
CXXLINK_APP = $(CXXLINK) $(LDLIBS) $(LINK_OBJS) $(LINK_LIBS)
ifndef make-cxx-exe ifndef make-cxx-exe
define make-cxx-exe define make-cxx-exe
$(LINK.cc) $(AM_CFLAGS) $(AM_LDFLAGS) \ $(CXXLINK_APP)
$(LDLIBS) -o $@ \
$(LINK_OBJS) $(LINK_LIBS)
endef endef
@ENDIF@ @ENDIF@
LINK_APP = $(LINK) $(LDLIBS) $(LINK_OBJS) $(LINK_LIBS)
ifndef make-exe
define make-exe
$(LINK_APP)
endef
@ENDIF@

2
automake/lib.am
View File

@@ -6,6 +6,8 @@
AR = @AR@ AR = @AR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
ARFLAGS = ruv
define make-library define make-library
$(RM) $@ $(RM) $@
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $^