From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 22 Aug 2015 10:24:20 +0000 (+0200)
Subject: Allow building for x86_64
X-Git-Tag: v2.17-core94~37^2~22
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=fc155193bd22f477a592b0261497bbbcb3b849bb

Allow building for x86_64

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/stage2 b/lfs/stage2
index 3203983e28..3244fa36fa 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -63,7 +63,12 @@ $(TARGET) :
 
 	# Symlink /var/run -> /run.
 	ln -svf ../run /var/run
-	
+
+ifeq "$(MACHINE)" "x86_64"
+	ln -svf lib /lib64
+	ln -svf lib /usr/lib64
+endif
+
 	# Symlinks
 	# for this reason, stage2 rebuild will broke the iso:perl, grubbatch
 	-ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin
diff --git a/make.sh b/make.sh
index 4f6eedb0f4..a4e1f29358 100755
--- a/make.sh
+++ b/make.sh
@@ -245,6 +245,11 @@ prepareenv() {
 buildtoolchain() {
     local error=false
     case "${TARGET_ARCH}:${BUILD_ARCH}" in
+        # x86_64
+        x86_64:x86_64)
+             # This is working.
+             ;;
+
         # x86
         i586:i586|i586:i686|i586:x86_64)
             # These are working.
@@ -413,6 +418,9 @@ buildipfire() {
   ipfiremake iptables
 
   case "${TARGET_ARCH}" in
+	x86_64)
+		# No kernel, yet.
+		;;
 	i586)
 		# x86-pae (Native and new XEN) kernel build
 		ipfiremake linux			KCFG="-pae"
diff --git a/tools/make-functions b/tools/make-functions
index 4fbb530f45..0152155258 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -68,6 +68,12 @@ configure_target() {
 	fi
 
 	case "${target_arch}" in
+		x86_64)
+			BUILDTARGET="${TARGET_ARCH}-unknown-linux-gnu"
+			CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu"
+			CFLAGS_ARCH="-m64 -mtune=generic"
+			;;
+
 		i586)
 			BUILDTARGET="${target_arch}-pc-linux-gnu"
 			CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu"