]> git.droids-corp.org - dpdk.git/commitdiff
mk: do post processing on objects that register a driver
authorNeil Horman <nhorman@tuxdriver.com>
Fri, 17 Jun 2016 18:46:23 +0000 (14:46 -0400)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Wed, 6 Jul 2016 21:21:40 +0000 (23:21 +0200)
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@tuxdriver.com>
Acked-by: Panu Matilainen <pmatilai@redhat.com>
Acked-by: Remy Horton <remy.horton@intel.com>
mk/internal/rte.compile-pre.mk

index b9bff4a7b2779b3a595dc8d1674f91d4e3d844ce..5632d6e4540907faf1dcc3e78bf054f7b2644844 100644 (file)
@@ -88,10 +88,24 @@ 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 \"  PMDINFOGEN\" $@; \
+               OBJF=`readlink -f $@`; \
+               ${RTE_OUTPUT}/app/pmdinfogen \$$OBJF \$$OBJF.pmd.c; \
+               if [ \$$? -eq 0 ]; \
+               then \
+                       echo \"  PMDINFOBUILD\" $@; \
+                       $(CC) $(CFLAGS) -c -o \$$OBJF.pmd.o \$$OBJF.pmd.c; \
+                       $(CROSS)ld $(LDFLAGS) -r -o \$$OBJF.o \$$OBJF.pmd.o \$$OBJF; \
+                       mv -f \$$OBJF.o \$$OBJF; \
+               fi; \
+       fi;" && \
        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)))