Patchwork [sparc] add multiarch definitions for sparc-linux-gnu

login
register
mail settings
Submitter Matthias Klose
Date Nov. 14, 2012, 10:36 p.m.
Message ID <50A41CE1.5050202@ubuntu.com>
Download mbox | patch
Permalink /patch/199049/
State New
Headers show

Comments

Matthias Klose - Nov. 14, 2012, 10:36 p.m.
The following patch adds the multiarch definitions for sparc-linux-gnu. Tested
using a Debian/Ubuntu package build. Ok for the trunk?

  Matthias
David Miller - Nov. 14, 2012, 10:38 p.m.
From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 14 Nov 2012 23:36:17 +0100

> The following patch adds the multiarch definitions for sparc-linux-gnu. Tested
> using a Debian/Ubuntu package build. Ok for the trunk?

I'm fine with this.

Patch

2012-11-14  Matthias Klose  <doko@ubuntu.com>

	* config/sparc/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.
	* config/sparc/t-linux: New file; define MULTIARCH_DIRNAME.
	* config.gcc <sparc-*-linux*> (tmake_file): Include sparc/t-linux
	for 32bit non-biarch configurations.

Index: config/sparc/t-linux
===================================================================
--- config/sparc/t-linux	(revision 0)
+++ config/sparc/t-linux	(revision 0)
@@ -0,0 +1 @@ 
+MULTIARCH_DIRNAME = $(call if_multiarch,sparc-linux-gnu)
Index: config/sparc/t-linux64
===================================================================
--- config/sparc/t-linux64	(revision 193508)
+++ config/sparc/t-linux64	(working copy)
@@ -26,4 +26,5 @@ 
 
 MULTILIB_OPTIONS = m64/m32
 MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
Index: config.gcc
===================================================================
--- config.gcc	(revision 193508)
+++ config.gcc	(working copy)
@@ -2422,6 +2426,7 @@ 
 		tmake_file="${tmake_file} sparc/t-linux64"
 	else
 		tm_file="${tm_file} sparc/linux.h"
+		tmake_file="${tmake_file} sparc/t-linux"
 	fi
 	;;
 sparc-*-netbsdelf*)