From 6b11c8be4572f9b96804509e5bd9170a8cec162d Mon Sep 17 00:00:00 2001
From: Idwer Vollering <vidwer@gmail.com>
Date: Thu, 15 Nov 2012 21:14:36 +0100
Subject: crossgcc: update to acpica-20121114

Update acpica to release 20121114 and
update patches/ to build with this version of acpica.
Correct the creation of crossgcc-build.log
Bump CROSSGCC_VERSION.

Change-Id: I269454ebc3c78b5852e4a67e55bb5642edad191d
Signed-off-by: Idwer Vollering <vidwer@gmail.com>
Reviewed-on: http://review.coreboot.org/1861
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
---
 util/crossgcc/buildgcc                             | 19 +++++++++---------
 .../acpica-unix-20120420_unknown_warnings.patch    | 23 ----------------------
 ...0121114_32bit_optimization_fortify_source.patch | 11 +++++++++++
 3 files changed, 21 insertions(+), 32 deletions(-)
 delete mode 100644 util/crossgcc/patches/acpica-unix-20120420_unknown_warnings.patch
 create mode 100644 util/crossgcc/patches/acpica-unix-20121114_32bit_optimization_fortify_source.patch

(limited to 'util/crossgcc')

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 28e700b409..983dd3b9b6 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -20,8 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA
 #
 
-CROSSGCC_DATE="November 1st, 2012"
-CROSSGCC_VERSION="1.18"
+CROSSGCC_DATE="November 15th, 2012"
+CROSSGCC_VERSION="1.19"
 
 # default settings
 TARGETDIR=`pwd`/xgcc
@@ -41,7 +41,7 @@ W32API_VERSION=3.17-2
 W32API_VERSION_SHORT=3.17
 MINGWRT_VERSION=3.20-2
 MINGWRT_VERSION_SHORT=3.20
-IASL_VERSION=20120420
+IASL_VERSION=20121114
 PYTHON_VERSION=2.7.3
 EXPAT_VERSION=2.1.0
 
@@ -597,14 +597,15 @@ if [ -f $IASL_DIR/source/compiler/.success ]; then
 else
 printf "Building IASL ${IASL_VERSION} ... "
 (
-	cd $IASL_DIR/source/compiler
+	cd $IASL_DIR/generate/unix
 	export PATH=$PATH:$DESTDIR$TARGETDIR/bin
-	rm -f .failed
+	rm -f ../../source/compiler/.failed
 	CFLAGS="$HOSTCFLAGS"
-	$MAKE CC="$CC" || touch .failed
-	rm -f $DESTDIR$TARGETDIR/bin/iasl || touch .failed
-	cp iasl $DESTDIR$TARGETDIR/bin || touch .failed
-	if [ ! -f .failed ]; then touch .success; fi
+	$MAKE CC="$CC" || touch ../../source/compiler/.failed
+	rm -f $DESTDIR$TARGETDIR/bin/iasl || touch ../../source/compiler/.failed
+	if [ -d bin32 ]; then cp bin32/iasl $DESTDIR$TARGETDIR/bin || touch ../../source/compiler/.failed ; fi
+	if [ -d bin64 ]; then cp bin64/iasl $DESTDIR$TARGETDIR/bin || touch ../../source/compiler/.failed ; fi
+	if [ ! -f ../../source/compiler/.failed ]; then touch ../../source/compiler/.success; fi
 ) > $IASL_DIR/source/compiler/crossgcc-build.log 2>&1
 test -r $IASL_DIR/source/compiler/.failed && printf "${RED}failed${NC}\n" || \
 	     printf "${green}ok${NC}\n"
diff --git a/util/crossgcc/patches/acpica-unix-20120420_unknown_warnings.patch b/util/crossgcc/patches/acpica-unix-20120420_unknown_warnings.patch
deleted file mode 100644
index c027f175e5..0000000000
--- a/util/crossgcc/patches/acpica-unix-20120420_unknown_warnings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- acpica-unix-20120420/source/compiler/Makefile	2012-04-20 22:02:33.000000000 +0200
-+++ acpica-unix-20120420.patched/source/compiler/Makefile	2012-10-21 00:30:38.634470788 +0200
-@@ -257,19 +257,11 @@
- # gcc 4+ flags
- #
- CWARNINGFLAGS += \
--    -Waddress \
-     -Waggregate-return \
-     -Wchar-subscripts \
--    -Wempty-body \
--    -Wlogical-op \
-     -Wmissing-declarations \
--    -Wmissing-field-initializers \
--    -Wmissing-parameter-type \
-     -Wnested-externs \
--    -Wold-style-declaration \
--    -Wold-style-definition \
--    -Wredundant-decls \
--    -Wtype-limits
-+    -Wold-style-definition
- 
- #
- # Bison/Flex configuration
diff --git a/util/crossgcc/patches/acpica-unix-20121114_32bit_optimization_fortify_source.patch b/util/crossgcc/patches/acpica-unix-20121114_32bit_optimization_fortify_source.patch
new file mode 100644
index 0000000000..abf80bd35c
--- /dev/null
+++ b/util/crossgcc/patches/acpica-unix-20121114_32bit_optimization_fortify_source.patch
@@ -0,0 +1,11 @@
+diff -ur acpica-unix-20121114/generate/unix/Makefile.config acpica-unix-20121114.patched/generate/unix/Makefile.config
+--- acpica-unix-20121114/generate/unix/Makefile.config	2012-11-14 17:22:38.000000000 +0100
++++ acpica-unix-20121114.patched/generate/unix/Makefile.config	2012-11-15 21:19:36.683902859 +0100
+@@ -104,6 +104,7 @@
+ # automatically included in -Wall.
+ #
+ CFLAGS += \
++    -O \
+     $(BITSFLAG) \
+     -D$(HOST) \
+     -D_GNU_SOURCE \
-- 
cgit v1.2.3