summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog28
-rwxr-xr-xsrc/Makefile2
-rw-r--r--src/Makefile.inc.in2
3 files changed, 30 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 8decc3458..03fa110e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+linuxcnc (1:2.6.0~pre4) precise; urgency=low
+
+ * fix several bugs with NURBS handling (G5, G5.1, G5.2)
+ * add a Rapid Override control (analogous to Feed Override)
+ * support moving 3, 6, or all 9 axes for a tool change
+
+ * add a driver for the WJ200 VFD
+ * add a driver for the Mesa 7i90 AnyIO board
+
+ * general mechatronics: fix a NULL pointer bug
+
+ * touchy: accept all axes for G43.1 TLOs
+ * gmoccapy: fix a couple of bugs
+
+ * comp: reject invalid .comp files that don't match the component name
+
+ * docs: add docs for G5, G5.1, G5.2 NURBS G-codes
+ * docs: clarify naming requirements of .comp files
+ * docs: update classic ladder manpage
+ * docs: add info on the servo axis calibration assistant in Axis GUI
+ * docs: misc minor fixes
+
+ * fix a "crawling scrollbar" cosmetic bug in linuxcnctop
+ * fix handling of shell metacharacters in .ini filenames
+ * fix auto-closing of directories in config picker
+
+ -- Sebastian Kuzminsky <seb@highlab.com> Wed, 11 Jun 2014 21:39:31 -0600
+
linuxcnc (1:2.6.0~pre3) precise; urgency=low
* HAL: make halcmd arrow syntax ('=>', '<=', '<=>') more strict
diff --git a/src/Makefile b/src/Makefile
index 0e88f57c3..25bf3c6a0 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -1017,7 +1017,7 @@ $(sort $(RTOBJS)) : objects/rt%.o : %.c
../rtlib/%.o:
$(ECHO) Linking $@
- $(Q)ld -r -static -S -Os $(LDFLAGS) -o $@ $^ $(EXTRALINK) $(MATHLIB)
+ $(Q)ld -r -static -S $(LDFLAGS) -o $@ $^ $(EXTRALINK) $(MATHLIB)
endif
ifneq "$(filter normal sim,$(BUILD_SYS))" ""
diff --git a/src/Makefile.inc.in b/src/Makefile.inc.in
index 036efac30..d3b7dda27 100644
--- a/src/Makefile.inc.in
+++ b/src/Makefile.inc.in
@@ -75,7 +75,7 @@ RTPREFIX = @RTPREFIX@
RTAI = @RTAI@
RTFLAGS = @RTFLAGS@ @EXT_RTFLAGS@
KERNELDIR = @KERNELDIR@
-RTFLAGS := -Os -I. -I@RTDIR@/include $(RTFLAGS) -DRTAPI -D_GNU_SOURCE -Drealtime
+RTFLAGS := -I. -I@RTDIR@/include $(RTFLAGS) -DRTAPI -D_GNU_SOURCE -Drealtime
USE_RTLIBM = @USE_RTLIBM@
USE_LIBM = @USE_LIBM@
USE_STUBS = @USE_STUBS@