Avoid the usage of -mieee-fp compiler flag on systems like PPC that
don't support it.
Signed-off-by: Michael Buesch <m...@bu3sch.de>
---
diff --git a/src/Makefile b/src/Makefile
index f6e909b..8af2a3e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -593,7 +593,7 @@ EXTRA_CFLAGS = $(filter-out -ffast-math,$(RTFLAGS))
-D__MODULE__ -I$(BASEPWD) -I
-I$(BASEPWD)/libnml/posemath -I$(BASEPWD)/rtapi -I$(BASEPWD)/hal \
-I$(BASEPWD)/emc/nml_intf -I$(BASEPWD)/emc/kinematics
-I$(BASEPWD)/emc/motion \
-DSEQUENTIAL_SUPPORT -DHAL_SUPPORT -DDYNAMIC_PLCSIZE -DRT_SUPPORT
-DOLD_TIMERS_MONOS_SUPPORT -DMODBUS_IO_MASTER \
- -fno-fast-math -mieee-fp -fno-unsafe-math-optimizations \
+ -fno-fast-math $(call cc-option,-mieee-fp)
-fno-unsafe-math-optimizations \
$(call cc-option,-Wframe-larger-than=2560)
ifeq ($(RTARCH),x86_64)
EXTRA_CFLAGS += -msse
diff --git a/src/Makefile.modinc.in b/src/Makefile.modinc.in
index d90c52e..3ad58f0 100644
--- a/src/Makefile.modinc.in
+++ b/src/Makefile.modinc.in
@@ -32,11 +32,14 @@
# or
# comp --install example.c
+cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
+ > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
+
BUILDSYS = @BUILD_SYS@
KERNELDIR := @KERNELDIR@
CC := @CC@
-RTFLAGS = $(filter-out -ffast-math,@RTFLAGS@ @EXT_RTFLAGS@) -fno-fast-math
-mieee-fp -fno-unsafe-math-optimizations
+RTFLAGS = $(filter-out -ffast-math,@RTFLAGS@ @EXT_RTFLAGS@) -fno-fast-math
$(call cc-option,-mieee-fp) -fno-unsafe-math-optimizations
RTFLAGS := -Os -g -I. -...@rtdir@/include $(RTFLAGS) -DRTAPI -D_GNU_SOURCE
-Drealtime -D_FORTIFY_SOURCE=0
ifeq ($(RTARCH),x86_64)
EXTRA_CFLAGS += -msse
@@ -54,8 +57,6 @@ EXTRA_CFLAGS := $(RTFLAGS) -D__MODULE__ -...@includedir@/emc2
RTLIBDIR := @EMC2_RTLIB_DIR@
LIBDIR := @libdir@
endif
-cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
- > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
EXTRA_CFLAGS += $(call cc-option,-Wframe-larger-than=2560)
ifeq ($(BUILDSYS),kbuild)
--
Greetings Michael.
diff --git a/src/Makefile b/src/Makefile
index f6e909b..8af2a3e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -593,7 +593,7 @@ EXTRA_CFLAGS = $(filter-out -ffast-math,$(RTFLAGS)) -D__MODULE__ -I$(BASEPWD) -I
-I$(BASEPWD)/libnml/posemath -I$(BASEPWD)/rtapi -I$(BASEPWD)/hal \
-I$(BASEPWD)/emc/nml_intf -I$(BASEPWD)/emc/kinematics -I$(BASEPWD)/emc/motion \
-DSEQUENTIAL_SUPPORT -DHAL_SUPPORT -DDYNAMIC_PLCSIZE -DRT_SUPPORT -DOLD_TIMERS_MONOS_SUPPORT -DMODBUS_IO_MASTER \
- -fno-fast-math -mieee-fp -fno-unsafe-math-optimizations \
+ -fno-fast-math $(call cc-option,-mieee-fp) -fno-unsafe-math-optimizations \
$(call cc-option,-Wframe-larger-than=2560)
ifeq ($(RTARCH),x86_64)
EXTRA_CFLAGS += -msse
diff --git a/src/Makefile.modinc.in b/src/Makefile.modinc.in
index d90c52e..3ad58f0 100644
--- a/src/Makefile.modinc.in
+++ b/src/Makefile.modinc.in
@@ -32,11 +32,14 @@
# or
# comp --install example.c
+cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
+ > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
+
BUILDSYS = @BUILD_SYS@
KERNELDIR := @KERNELDIR@
CC := @CC@
-RTFLAGS = $(filter-out -ffast-math,@RTFLAGS@ @EXT_RTFLAGS@) -fno-fast-math -mieee-fp -fno-unsafe-math-optimizations
+RTFLAGS = $(filter-out -ffast-math,@RTFLAGS@ @EXT_RTFLAGS@) -fno-fast-math $(call cc-option,-mieee-fp) -fno-unsafe-math-optimizations
RTFLAGS := -Os -g -I. -...@rtdir@/include $(RTFLAGS) -DRTAPI -D_GNU_SOURCE -Drealtime -D_FORTIFY_SOURCE=0
ifeq ($(RTARCH),x86_64)
EXTRA_CFLAGS += -msse
@@ -54,8 +57,6 @@ EXTRA_CFLAGS := $(RTFLAGS) -D__MODULE__ -...@includedir@/emc2
RTLIBDIR := @EMC2_RTLIB_DIR@
LIBDIR := @libdir@
endif
-cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
- > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
EXTRA_CFLAGS += $(call cc-option,-Wframe-larger-than=2560)
ifeq ($(BUILDSYS),kbuild)
------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
