diff --git a/examples/aadlv2/rpc/rpc.aadl b/examples/aadlv2/rpc/rpc.aadl index 3b32b51db8dafb4e4eb78c611b31f560d9910216..a3fd490fba0d20c530dd35854dad0cdc1117e2c6 100644 --- a/examples/aadlv2/rpc/rpc.aadl +++ b/examples/aadlv2/rpc/rpc.aadl @@ -121,6 +121,7 @@ public Source_Name => "rpc_client"; Source_Text => ("rpc.c"); end Client_Side_Function; + --------------- -- Processor -- --------------- diff --git a/share/make/Makefile.am b/share/make/Makefile.am index d7abcc78635b1754cd4a09a3854af0d39aaafe7b..4b1e629be53e0fccc1f32dd4916a3d50033a6956 100644 --- a/share/make/Makefile.am +++ b/share/make/Makefile.am @@ -4,12 +4,10 @@ EXTRA_DIST=$(builddir)/Makefile.common $(srcdir)/Makefile.leon3-xm3 \ $(srcdir)/Makefile.leon.rtems \ $(srcdir)/Makefile.leon.rtems_posix \ $(srcdir)/Makefile.compcert $(srcdir)/Makefile.bench \ - $(srcdir)/Makefile.linux32 \ - $(srcdir)/Makefile.linux32_dll \ + $(srcdir)/Makefile.linux32 $(srcdir)/Makefile.linux_dll \ $(srcdir)/Makefile.linux32-xenomai-native \ $(srcdir)/Makefile.linux32-xenomai-posix \ - $(srcdir)/Makefile.linux64 \ - $(srcdir)/Makefile.linux64_dll $(srcdir)/Makefile.win32 \ + $(srcdir)/Makefile.linux64 $(srcdir)/Makefile.win32 \ $(srcdir)/Makefile.x86.linuxtaste \ $(srcdir)/Makefile.template $(srcdir)/Makefile.freertos \ $(srcdir)/Makefile.air diff --git a/share/make/Makefile.linux64_dll b/share/make/Makefile.linux64_dll deleted file mode 100644 index 05bc65e5e1b16aeac6a0e9065a8ff6fdeb794630..0000000000000000000000000000000000000000 --- a/share/make/Makefile.linux64_dll +++ /dev/null @@ -1,31 +0,0 @@ -# The goal of this target is to generate a DLL from a PolyORB-HI/C -# instead of a regular binary - -POHI_CFLAGS = -DDLL -fPIC \ - -DPOSIX -m64 -D_POSIX_SOURCE -D_GNU_SOURCE \ - $(GCC_GENERIC_FLAGS) - -TARGET_LDFLAGS = -fPIC -pie -shared \ - -lpthread -lrt -m64 -L$(RUNTIME_PATH)/libs/linux64/ \ - -lm - -EXEEXT=.so - -SIMULINK_LDFLAGS = -lm -CC = gcc -LD = gcc -GPROF = gprof - -USE_USB_BRICK=$(shell grep __PO_HI_NEED_DRIVER_SPACEWIRE_USB_BRICK deployment.h 2>/dev/null|wc -l) - -ifdef USE_GPROF -TARGET_LDFLAGS+=-pg -endif - -ifeq ($(USE_USB_BRICK),1) -TARGET_LDFLAGS+=-lSpaceWireUSBAPI -lConfigLibraryUSB -endif - -target-clean: - -target-objects: diff --git a/share/make/Makefile.linux32_dll b/share/make/Makefile.linux_dll similarity index 84% rename from share/make/Makefile.linux32_dll rename to share/make/Makefile.linux_dll index 9f15c6bdeaf5930b538a8905c0f27562550b2a7f..51e3695a8d3a689fe185c16dfa0e57be0322f98d 100644 --- a/share/make/Makefile.linux32_dll +++ b/share/make/Makefile.linux_dll @@ -2,11 +2,11 @@ # instead of a regular binary POHI_CFLAGS = -DDLL -fPIC \ - -DPOSIX -m32 -D_POSIX_SOURCE -D_GNU_SOURCE \ + -DPOSIX -D_POSIX_SOURCE -D_GNU_SOURCE \ $(GCC_GENERIC_FLAGS) TARGET_LDFLAGS = -fPIC -pie -shared \ - -lpthread -lrt -m32 -L$(RUNTIME_PATH)/libs/linux32/ \ + -lpthread -lrt -L$(RUNTIME_PATH)/libs/linux32/ \ -lm EXEEXT=.so