Skip to content

Commit 5bd26b6

Browse files
NTULINUXandypugh
authored andcommitted
RTAI: Fix build against RTAI+GNU11
This may break RTAI builds that still use gnu89. For some reason, if using GNU11, you don't need to define these anymore. Signed-off-by: Alec Ari <neotheuser@ymail.com>
1 parent ed00114 commit 5bd26b6

2 files changed

Lines changed: 1 addition & 20 deletions

File tree

src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ EXTRA_CFLAGS := $(filter-out -ffast-math,$(RTFLAGS)) -D__MODULE__ -I$(BASEPWD)/.
889889
-I$(BASEPWD)/emc/nml_intf -I$(BASEPWD)/emc/kinematics -I$(BASEPWD)/emc/tp -I$(BASEPWD)/emc/motion \
890890
-DSEQUENTIAL_SUPPORT -DHAL_SUPPORT -DDYNAMIC_PLCSIZE -DRT_SUPPORT -DOLD_TIMERS_MONOS_SUPPORT -DMODBUS_IO_MASTER \
891891
-fno-fast-math $(call cc-option,-mieee-fp) -fno-unsafe-math-optimizations \
892-
-Werror=frame-larger-than=2560 -Wno-declaration-after-statement \
892+
-Wno-declaration-after-statement \
893893
$(INTEGER_OVERFLOW_FLAGS)
894894
ifneq ($(KERNELRELEASE),)
895895
ifeq ($(RTARCH):$(RTAI):$(filter $(RTFLAGS),-msse),x86_64:3:)

src/rtapi/rtapi_math.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,25 +57,6 @@ extern double floor(double);
5757
#define isinf(x) __builtin_isinf((x))
5858
#define isfinite(x) __builtin_isfinite((x))
5959

60-
extern __inline double atan (double __y) {
61-
return atan2(__y, 1.);
62-
}
63-
64-
extern __inline double asin (double __x) {
65-
return atan2(__x, sqrt (1.0 - __x * __x));
66-
}
67-
68-
extern __inline double acos (double __x) {
69-
return atan2(sqrt(1.0 - __x * __x), __x);
70-
}
71-
72-
extern __inline double fmax(double __y, double __x) {
73-
return __y > __x || __builtin_isnan(__x) ? __y : __x;
74-
}
75-
extern __inline double fmin(double __y, double __x) {
76-
return __y < __x || __builtin_isnan(__x) ? __y : __x;
77-
}
78-
7960
#ifdef __i386__
8061
#include "rtapi_math_i386.h"
8162
#endif

0 commit comments

Comments
 (0)