From 9483d3fc0cb45953d025d39bdefa8ce7ca66ea5b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 3 Oct 2011 04:24:01 +0200
Subject: [PATCH] Revert "config/arch.*: add '-D_FILE_OFFSET_BITS=64'
 optimization to i386 and x86_64 builds"

This reverts commit e2e55a56cd44cdfd8a9425ebe3f8b53d3011e654.
---
 config/arch.i386                      | 2 +-
 config/arch.x86_64                    | 2 +-
 packages/debug/strace/build           | 5 -----
 packages/toolchain/devel/eglibc/build | 2 --
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/config/arch.i386 b/config/arch.i386
index 6b12d91dab..9b49f81788 100644
--- a/config/arch.i386
+++ b/config/arch.i386
@@ -7,5 +7,5 @@
   TARGET_SUBARCH=i686
 
 # setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-march=$TARGET_CPU -m32 -D_FILE_OFFSET_BITS=64"
+  TARGET_CFLAGS="-march=$TARGET_CPU -m32"
   TARGET_LDFLAGS="-march=$TARGET_CPU -m32"
diff --git a/config/arch.x86_64 b/config/arch.x86_64
index 79117937ab..e0d6b2ae0f 100644
--- a/config/arch.x86_64
+++ b/config/arch.x86_64
@@ -7,5 +7,5 @@
   TARGET_SUBARCH=x86_64
 
 # setup ARCH specific *FLAGS
-  TARGET_CFLAGS="-fPIC -march=$TARGET_CPU -m64 -D_FILE_OFFSET_BITS=64"
+  TARGET_CFLAGS="-fPIC -march=$TARGET_CPU -m64"
   TARGET_LDFLAGS="-fPIC -march=$TARGET_CPU -m64"
diff --git a/packages/debug/strace/build b/packages/debug/strace/build
index 23d0381687..84924993d2 100755
--- a/packages/debug/strace/build
+++ b/packages/debug/strace/build
@@ -22,11 +22,6 @@
 
 . config/options $1
 
-# Filter out some problematic *FLAGS
-  CFLAGS=`echo $CFLAGS | sed -e "s|-D_FILE_OFFSET_BITS=64||g"`
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-D_FILE_OFFSET_BITS=64||g"`
-
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME
diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build
index 4a0c4679e2..16736697bf 100755
--- a/packages/toolchain/devel/eglibc/build
+++ b/packages/toolchain/devel/eglibc/build
@@ -29,12 +29,10 @@ strip_gold # Fails to compile using the gold linker.
   CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||g"`
   CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-O2|g"`
   CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-O2|g"`
-  CFLAGS=`echo $CFLAGS | sed -e "s|-D_FILE_OFFSET_BITS=64||g"`
 
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-ffast-math||g"`
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-Ofast|-O2|g"`
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-O.|-O2|g"`
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-D_FILE_OFFSET_BITS=64||g"`
 
 # set some CFLAGS we need
   CFLAGS="$CFLAGS -g -fno-stack-protector"