Skip to content

Preview of changes, for discussion #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ledvinap wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Preview of changes, for discussion #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
15398d5
Commit all working changes to get them on github
ledvinap Apr 25, 2019
478a545
sync
ledvinap Apr 26, 2019
a6387fd
make - allow simple switch between error output
ledvinap May 10, 2019
f9658d9
Merge PRINTF_FTOA_BUFFER_SIZE and PRINTF_NTOA_BUFFER_SIZE
ledvinap Jul 25, 2019
996cdf0
Make EXACT_ROUNDING configurable
ledvinap Jul 25, 2019
bd5f21d
Configurable real type and double support
ledvinap Jul 25, 2019
2160ee3
Add changes from code-fix
ledvinap Jul 25, 2019
ee4136c
Add #define conditionals
ledvinap Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ APP = test_suite
# bar/file3
# -----------------------------------------------------------------------------

FILES_PRJ = test/test_suite
FILES_PRJ = test/test_suite printf


# ------------------------------------------------------------------------------
Expand All @@ -50,9 +50,9 @@ FILES_PRJ = test/test_suite
# -Iinclude_path3 \
# ------------------------------------------------------------------------------

C_INCLUDES =
C_INCLUDES =

C_DEFINES =
C_DEFINES =


# ------------------------------------------------------------------------------
Expand All @@ -65,7 +65,7 @@ TRG = $(PATH_BIN)/$(APP)
# object files
# ------------------------------------------------------------------------------
FILES_TMP = $(FILES_PRJ)
FILES_O = $(addsuffix .o, $(FILES_TMP))
FILES_O = $(addprefix $(PATH_OBJ)/, $(addsuffix .o, $(notdir $(FILES_TMP))))


# ------------------------------------------------------------------------------
Expand All @@ -85,7 +85,7 @@ VPATH := $(sort $(dir $(FILES_TMP)))
# ------------------------------------------------------------------------------
AR = $(PATH_TOOLS_CC)ar
AS = $(PATH_TOOLS_CC)g++
CC = $(PATH_TOOLS_CC)g++
CC = $(PATH_TOOLS_CC)gcc
CL = $(PATH_TOOLS_CC)g++
NM = $(PATH_TOOLS_CC)nm
GCOV = $(PATH_TOOLS_CC)gcov
Expand All @@ -101,13 +101,15 @@ RM = $(PATH_TOOLS_UTIL)rm
SED = $(PATH_TOOLS_UTIL)sed


# convert GCC output for the VisualStudio(R) output window
#PRINT_ERR = $(SED) -e 's|.h:\([0-9]*\),|.h(\1) :|' -e 's|:\([0-9]*\):|(\1) :|'
PRINT_ERR = cat
# ------------------------------------------------------------------------------
# Compiler flags for the target architecture
# ------------------------------------------------------------------------------

GCCFLAGS = $(C_INCLUDES) \
$(C_DEFINES) \
-std=c++11 \
-g \
-Wall \
-pedantic \
Expand All @@ -124,23 +126,21 @@ GCCFLAGS = $(C_INCLUDES) \
-Winit-self \
-Wdouble-promotion \
-gdwarf-2 \
-fno-exceptions \
-O2 \
-Og \
-ffunction-sections \
-ffat-lto-objects \
-fdata-sections \
-fverbose-asm \
-Wextra \
-Wunused-parameter \
-Wfloat-equal

CFLAGS = $(GCCFLAGS) \
-Wunsuffixed-float-constants \
-x c \
-std=c99

CPPFLAGS = $(GCCFLAGS) \
-x c++ \
-std=c++11 \
-fno-rtti \
-fstrict-enums \
-fno-use-cxa-atexit \
Expand Down Expand Up @@ -225,11 +225,11 @@ version:
# ------------------------------------------------------------------------------
# Link/locate application
# ------------------------------------------------------------------------------
$(TRG) : $(FILES_O)
$(TRG) : $(FILES_O) Makefile
@-$(ECHO) +++ linkink application to generate: $(TRG)
@-$(CL) $(LFLAGS) -L. -lc $(PATH_OBJ)/*.o -Wl,-Map,$(TRG).map -o $(TRG)
-$(CL) $(LFLAGS) -L. -lc $(FILES_O) -Wl,-Map,$(TRG).map -o $(TRG)
# profiling
@-$(CL) $(LFLAGS) -L. -lc $(PATH_COV)/*.o --coverage -o $(PATH_COV)/$(APP)
# @-$(CL) $(LFLAGS) -L. -lc $(PATH_COV)/*.o --coverage -o $(PATH_COV)/$(APP)


# ------------------------------------------------------------------------------
Expand All @@ -244,28 +244,33 @@ $(TRG)_nm.txt : $(TRG)
@-$(SIZE) -A -t $(TRG) > $(TRG)_size.txt


%.o : %.cpp

$(PATH_OBJ)/%.o : %.cpp
@$(ECHO) +++ compile: $<
# Compile the source file
# ...and Reformat (using sed) any possible error/warning messages for the VisualStudio(R) output window
# ...and Create an assembly listing using objdump
# ...and Generate a dependency file (using the -MM flag)
@-$(CL) $(CPPFLAGS) $< -E -o $(PATH_PRE)/$(basename $(@F)).pre
@-$(CL) $(CPPFLAGS) $< -c -o $(PATH_OBJ)/$(basename $(@F)).o 2> $(PATH_ERR)/$(basename $(@F)).err
@-$(SED) -e 's|.h:\([0-9]*\),|.h(\1) :|' -e 's|:\([0-9]*\):|(\1) :|' $(PATH_ERR)/$(basename $(@F)).err
@-$(PRINT_ERR) $(PATH_ERR)/$(basename $(@F)).err
@-$(OBJDUMP) --disassemble --line-numbers -S $(PATH_OBJ)/$(basename $(@F)).o > $(PATH_LST)/$(basename $(@F)).lst
@-$(CL) $(CPPFLAGS) $< -MM > $(PATH_OBJ)/$(basename $(@F)).d
# profiling
@-$(CL) $(CPPFLAGS) -O0 --coverage $< -c -o $(PATH_COV)/$(basename $(@F)).o 2> $(PATH_NUL)
# @-$(CL) $(CPPFLAGS) -O0 --coverage $< -c -o $(PATH_COV)/$(basename $(@F)).o 2> $(PATH_NUL)

%.o : %.c
$(PATH_OBJ)/%.o : %.c
@$(ECHO) +++ compile: $<
# Compile the source file
# ...and Reformat (using sed) any possible error/warning messages for the VisualStudio(R) output window
# ...and Create an assembly listing using objdump
# ...and Generate a dependency file (using the -MM flag)
@-$(CL) $(CFLAGS) $< -E -o $(PATH_PRE)/$(basename $(@F)).pre
@-$(CC) $(CFLAGS) $< -c -o $(PATH_OBJ)/$(basename $(@F)).o 2> $(PATH_ERR)/$(basename $(@F)).err
@-$(SED) -e 's|.h:\([0-9]*\),|.h(\1) :|' -e 's|:\([0-9]*\):|(\1) :|' $(PATH_ERR)/$(basename $(@F)).err
@-$(PRINT_ERR) $(PATH_ERR)/$(basename $(@F)).err
@-$(OBJDUMP) -S $(PATH_OBJ)/$(basename $(@F)).o > $(PATH_LST)/$(basename $(@F)).lst
@-$(CC) $(CFLAGS) $< -MM > $(PATH_OBJ)/$(basename $(@F)).d

$(FILES_O) : Makefile

-include $(FILES_O:.o=.d)
Loading