Modify the compilation makefile to identify C files that export PMD information,
and use that to trigger execution of the pmdinfo binary. If the execution of
pmdinfo is successful, compile the output C file to an object, and use the
linker to do relocatable linking on the resultant object file into the parent
object that it came from. This effectively just adds the json string into the
string table of the object that defines the PMD to the outside world.
Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
CC: Bruce Richardson <bruce.richardson at intel.com>
CC: Thomas Monjalon <thomas.monjalon at 6wind.com>
CC: Stephen Hemminger <stephen at networkplumber.org>
CC: Panu Matilainen <pmatilai at redhat.com>
---
mk/internal/rte.compile-pre.mk | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk
index b9bff4a..6fa4042 100644
--- a/mk/internal/rte.compile-pre.mk
+++ b/mk/internal/rte.compile-pre.mk
@@ -80,7 +80,8 @@ C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax
highlight
C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," HOSTCC $(@)")
else
C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CFLAGS) \
- $(CFLAGS_$(@)) $(EXTRA_CFLAGS) -o $@ -c $<
+ $(CFLAGS_$(@)) $(EXTRA_CFLAGS) -o $@ -c $<
+
C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," CC $(@)")
endif
@@ -88,10 +89,26 @@ C_TO_O_CMD = 'cmd_$@ = $(C_TO_O_STR)'
C_TO_O_DO = @set -e; \
echo $(C_TO_O_DISP); \
$(C_TO_O) && \
+ sh -c "grep -q \"PMD_REGISTER_DRIVER(.*)\" $<; \
+ if [ \$$? -eq 0 ]; \
+ then \
+ echo MODGEN $@; \
+ OBJF=`readlink -f $@`; \
+ ${RTE_OUTPUT}/buildtools/pmdinfogen \$$OBJF \$$OBJF.mod.c; \
+ if [ \$$? -eq 0 ]; \
+ then \
+ echo MODBUILD $@; \
+ $(CC) -c -o \$$OBJF.mod.o \$$OBJF.mod.c; \
+ $(CROSS)ld -r -o \$$OBJF.o \$$OBJF.mod.o \$$OBJF; \
+ mv -f \$$OBJF.o \$$OBJF; \
+ fi; \
+ fi; \
+ true" && \
echo $(C_TO_O_CMD) > $(call obj2cmd,$(@)) && \
sed 's,'$@':,dep_'$@' =,' $(call obj2dep,$(@)).tmp > $(call
obj2dep,$(@)) && \
rm -f $(call obj2dep,$(@)).tmp
+
# return an empty string if string are equal
compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1)))
--
2.5.5
