Makefile

@@ -24,9 +24,9 @@
 
 GCC_VERSION      = 4.4.7
 BINUTILS_VERSION = 2.23.1
-NEWLIB_VERSION   = 1.16.0
+NEWLIB_VERSION   = 1.19.0
 DFU_VERSION      = 0.5.4
-AVR32_PATCH_REV	 = 3.4.2
+AVR32_PATCH_REV	 = 3.4.3
 ATMEL_HEADER_REV = 6.1.3.1475
 
 
@@ -73,13 +73,13 @@ BINUTILS_MD5 = 33adb18c3048d057ac58d07a3f1adb38
 
 NEWLIB_ARCHIVE = newlib-$(NEWLIB_VERSION).tar.gz
 NEWLIB_URL = ftp://sources.redhat.com/pub/newlib/$(NEWLIB_ARCHIVE)
-NEWLIB_MD5 = bf8f1f9e3ca83d732c00a79a6ef29bc4
+NEWLIB_MD5 = 0966e19f03217db9e9076894b47e6601
 
 AVR32PATCHES_ARCHIVE = avr32-patches.tar.gz
-AVR32PATCHES_URL = http://distribute.atmel.no/tools/opensource/Atmel-AVR-Toolchain-$(AVR32_PATCH_REV)/avr32/$(AVR32PATCHES_ARCHIVE)
+AVR32PATCHES_URL = http://distribute.atmel.no/tools/opensource/Atmel-AVR32-GNU-Toolchain/$(AVR32_PATCH_REV)/$(AVR32PATCHES_ARCHIVE)
 AVR32PATCHES_MD5 = 99b2f4497d264c9200538bb1229fdef9
 
-AVR32HEADERS_ARCHIVE = atmel-headers-$(ATMEL_HEADER_REV).zip
+AVR32HEADERS_ARCHIVE = headers.zip
 AVR32HEADERS_URL = http://www.atmel.com/Images/$(AVR32HEADERS_ARCHIVE)
 AVR32HEADERS_MD5 = d69e8e188470e4fea68a4650442b5750
 
@@ -228,20 +228,18 @@ extract-avr32patches stamps/extract-avr32patches : downloads/$(AVR32PATCHES_ARCH
 
 .PHONY: download-avr32headers
 downloads/$(AVR32HEADERS_ARCHIVE) download-avr32headers:
-	cd downloads && curl -LO $(AVR32HEADERS_URL)
+	cd downloads && cp ../headers/headers.zip .
 
 .PHONY: extract-headers
 extract-headers stamps/extract-headers : downloads/$(AVR32HEADERS_ARCHIVE)
-	@(t1=`openssl md5 $< | cut -f 2 -d " " -` && \
-	[ "$$t1" = "$(AVR32HEADERS_MD5)" ] || \
-	( echo "Bad Checksum! Please remove the following file and retry: $<" && false ))
-	unzip -o $<
+	cd downloads/ && unzip -o $(notdir $<)
 	mkdir -p stamps
 	touch stamps/extract-headers
 
 .PHONY: install-headers
 install-headers stamps/install-headers : stamps/extract-headers stamps/install-final-gcc
-	cp -r atmel-headers-$(ATMEL_HEADER_REV)/$(TARGET) $(PREFIX)/$(TARGET)/include/$(TARGET)
+	cp -r downloads/headers/* $(PREFIX)/$(TARGET)/include/
+	cp -r headers/avr32 $(PREFIX)/$(TARGET)/include/
 	mkdir -p stamps
 	touch stamps/install-headers
 
@@ -349,6 +347,7 @@ patch-binutils stamps/patch-binutils: stamps/extract-binutils stamps/extract-avr
 	for f in ../avr32-patches/binutils/*.patch; do \
 	patch -N -p0 <$${f} ; \
 	done ; \
+	patch -N -p1 <../patches/binutils/00-texinfo-5.0-support.patch ; \
 	popd ; \
 	[ -d stamps ] || mkdir stamps
 	touch stamps/patch-binutils;
@@ -379,7 +378,7 @@ build-binutils stamps/build-binutils: stamps/regen-binutils stamps/install-supp-
 	--disable-shared --disable-werror				\
 	--with-sysroot="$(PREFIX)/$(TARGET)" --with-bugurl=$(BUG_URL) &&	\
 	$(MAKE) all-bfd TARGET-bfd=headers; \
-	rm bfd/Makefile; \
+	rm -f bfd/Makefile; \
 	make configure-bfd; \
 	$(MAKE)
 	[ -d stamps ] || mkdir stamps ;
@@ -453,13 +452,19 @@ patch-gcc stamps/patch-gcc: stamps/extract-gcc stamps/extract-avr32patches
 	done ; \
 	patch -N -p0 <../patches/gcc/00-libstdc++-shared_ptr-without-rtti-bug-42019.patch ; \
 	patch -N -p0 <../patches/gcc/01-gcc-floor_log2-error.patch ; \
+	patch -N -p0 <../patches/gcc/02-libstdc++-libsupc++-with-fno-exceptions.patch ; \
+	patch -N -p0 <../patches/gcc/03-libstdc++-with-fno-exceptions.patch ; \
+	patch -N -p1 <../patches/gcc/04-texinfo-5.0-support.patch ; \
+	patch -N -p1 <../patches/gcc/05-gperf-3.0.4.patch ; \
+	patch -N -p0 < ../patches/gcc/06-gcc.texi.diff ; \
 	popd ;
 	[ -d stamps ] || mkdir stamps
 	touch stamps/patch-gcc;
 
-CFLAGS_FOR_TARGET="-ffunction-sections -fdata-sections			\
+CFLAGS_FOR_TARGET=-ffunction-sections -fdata-sections			\
 -fomit-frame-pointer -DPREFER_SIZE_OVER_SPEED -D__OPTIMIZE_SIZE__ -g	\
--Os -fno-unroll-loops"
+-Os -fno-unroll-loops
+CXXFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET) -fno-exceptions
 
 .PHONY: build-gcc
 build-gcc stamps/build-gcc: stamps/install-binutils stamps/prep-gcc
@@ -470,20 +475,19 @@ build-gcc stamps/build-gcc: stamps/install-binutils stamps/prep-gcc
 	../../gcc-$(GCC_VERSION)/configure --prefix="$(PREFIX)"		\
 	--target=$(TARGET) --enable-languages="c" --with-gnu-ld		\
 	--with-gnu-as --with-newlib --disable-nls --disable-libssp	\
-	--with-dwarf2 --enable-sjlj-exceptions				\
-	--enable-version-specific-runtime-libs --disable-libstdcxx-pch	\
+	--with-dwarf2 --enable-version-specific-runtime-libs --disable-libstdcxx-pch	\
 	--disable-shared						\
 	--with-build-time-tools="$(PREFIX)/$(TARGET)/bin"		\
-	--enable-cxx-flags=$(CFLAGS_FOR_TARGET)				\
+	--enable-cxx-flags="$(CXXFLAGS_FOR_TARGET)"				\
 	--with-sysroot="$(PREFIX)/$(TARGET)"				\
 	--with-build-sysroot="$(PREFIX)/$(TARGET)"			\
 	--with-build-time-tools="$(PREFIX)/$(TARGET)/bin"		\
-	CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)				\
+	CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)"				\
 	LDFLAGS_FOR_TARGET="--sysroot=\"$(PREFIX)/$(TARGET)\""		\
 	CPPFLAGS_FOR_TARGET="--sysroot=\"$(PREFIX)/$(TARGET)\""		\
 	--with-bugurl=$(BUG_URL) \
 	--with-pkgversion=$(PKG_VERSION) && \
-	rm ../../gcc-4.4.7/gcc/cp/cfns.h && \
+	rm -f ../../gcc-4.4.7/gcc/cp/cfns.h && \
 	$(MAKE) -j$(PROCS)
 	[ -d stamps ] || mkdir stamps
 	touch stamps/build-gcc;
@@ -513,15 +517,15 @@ build-final-gcc stamps/build-final-gcc: stamps/install-binutils stamps/install-g
 	../../gcc-$(GCC_VERSION)/configure --prefix=$(PREFIX) \
 	--target=$(TARGET) $(DEPENDENCIES) --enable-languages="c,c++" --with-gnu-ld \
 	--with-gnu-as --with-newlib --disable-nls --disable-libssp \
-	--with-dwarf2 --enable-sjlj-exceptions \
-	--enable-version-specific-runtime-libs --disable-libstdcxx-pch \
+	--with-dwarf2 --enable-version-specific-runtime-libs --disable-libstdcxx-pch \
 	--disable-shared --enable-__cxa_atexit \
 	--with-build-time-tools=$(PREFIX)/$(TARGET)/bin \
-	--enable-cxx-flags=$(CFLAGS_FOR_TARGET) \
+	--enable-cxx-flags="$(CXXFLAGS_FOR_TARGET)" \
 	--with-sysroot=$(PREFIX)/$(TARGET) \
 	--with-build-sysroot=$(PREFIX)/$(TARGET) \
 	--with-build-time-tools=$(PREFIX)/$(TARGET)/bin \
-	CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET) \
+	--disable-libstdcxx-verbose \
+	CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
 	LDFLAGS_FOR_TARGET="--sysroot=$(PREFIX)/$(TARGET)" \
 	CPPFLAGS_FOR_TARGET="--sysroot=$(PREFIX)/$(TARGET)" \
 	--with-bugurl=$(BUG_URL) \

README.asciidoc → README.md

@@ -11,9 +11,9 @@ Note: If you have previously built a toolchain of another version, out
 of the same builder directory, make sure to do the following first
 before building with newer sources:
 
-----
+```bash
 make clean
-----
+```
 
 === Requirements (OS X) ===
 
@@ -32,46 +32,46 @@ I'll add these to the Makefile once I have a consistent configuration
 that can be used for both Linux & OS X.
 
 With homebrew you can install those dependencies like this:
-----
+```bash
 brew install mpfr gmp libmpc texinfo
-----
+```
 
 If you would like to build dfu-programmer, also install libusb:
 
-----
+```bash
 brew install libusb-compat
-----
+```
 
 
 === Requirements (Ubuntu) ===
 
 These instructions should now also work on Ubuntu Linux, provided the
 following packages have been installed prior to attempting the build:
 
-----
-sudo apt-get install curl flex bison libgmp3-dev libmpfr-dev autoconf build-essential libncurses5-dev libmpc-dev texinfo
-----
+```bash
+sudo apt-get install curl flex bison libgmp3-dev libmpfr-dev autoconf build-essential libncurses5-dev libmpc-dev texinfo gperf
+```
 
 If you would like to build dfu-programmer, also install libusb:
 
-----
+```bash
 sudo apt-get install libusb-dev
-----
+```
 
 === Main Build Instructions ===
 
 Next build the toolchain:
 
-----
+```bash
 make install-cross
-----
+```
 
 You should be able to also specify a specific install/prefix location
 by building using the following type of invokation:
 
-----
+```bash
 PREFIX=$HOME/avr32-tools make install-cross
-----
+```
 
 If you do this, make sure you have permissions to create a directory
 at this location and/or to create directories within this location if
@@ -83,9 +83,9 @@ the directory already exists.
  is fixed in Apple's distribution of llvm-gcc, use the following
  command instead of the above to build.
 
-----
+```bash
 CC=gcc-4.2 make install-cross
-----
+```
 
 
 
@@ -101,24 +101,24 @@ location, which will be based on the git revision if you cloned the
 repository or the current date if you grabbed a tarball and/or you
 don't have the git binary. The message should look like the following:
 
-----
+```bash
 ====== INSTALLATION NOTE ======
 Your tools have now been installed at the following prefix:
 /Users/jsnyder/avr32-tools-bd2485b
 
 Please be sure to add something similar to the following to your .bash_profile, .zshrc, etc:
 export PATH=/Users/jsnyder/avr32-tools-bd2485b/bin:$PATH
-----
+```
 
 If it uses the date instead the the git short revision will bve
 replaced with a date number like: 20110726.
 
 If you also would like dfu-programmer installed intalled (make sure
 you have previously installed libusb as described in requirements):
 
-----
+```bash
 make install-dfu
-----
+```
 
 === Special Thanks ===