[PATCH] tile: don't guard setting abi- variables with ifeq ($(subdir),misc)

[PATCH] tile: don't guard setting abi- variables with ifeq ($(subdir),misc)

[Chris Metcalf]

---
Joseph, you may want to check how mips is doing this, since I originally
copied the "make" support from mips.  It worked fine to create syscall.h,
but it was missing out on creating the multiple versions of stub.h,
until I removed the $(subdir) guard, which presumably is somewhat pointless
when we're just setting some variables anyway.  I note that the new arm
support doesn't use a $(subdir) guard either.

 ChangeLog.tile                               |    3 +++
 sysdeps/unix/sysv/linux/tile/tilegx/Makefile |    4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.tile b/ChangeLog.tile
index 3d52040..ce8c3e0 100644
--- a/ChangeLog.tile
+++ b/ChangeLog.tile
@@ -1,5 +1,8 @@
 2012-05-30  Chris Metcalf  <cmetcalf@tilera.com>
 
+	* sysdeps/unix/sysv/linux/tile/tilegx/Makefile: Remove test
+	that $(subdir) is "misc" when setting abi- variables.
+
 	* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/Makefile: New file.
 	* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/Makefile: New file.
 
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/Makefile b/sysdeps/unix/sysv/linux/tile/tilegx/Makefile
index f21610c..4f101f3 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/Makefile
+++ b/sysdeps/unix/sysv/linux/tile/tilegx/Makefile
@@ -1,10 +1,6 @@
-ifeq ($(subdir),misc)
-
 # Provide biarch definitions.
 abi-variants := 64 32
 abi-64-options := -D__LP64__
 abi-64-condition := __WORDSIZE == 64
 abi-32-options := -U__LP64__
 abi-32-condition := __WORDSIZE == 32
-
-endif
-- 
1.7.1

Re: [PATCH] tile: don't guard setting abi- variables with ifeq ($(subdir),misc)

[Joseph S. Myers]

On Wed, 30 May 2012, Chris Metcalf wrote:

> Joseph, you may want to check how mips is doing this, since I originally
> copied the "make" support from mips.  It worked fine to create syscall.h,
> but it was missing out on creating the multiple versions of stub.h,
> until I removed the $(subdir) guard, which presumably is somewhat pointless
> when we're just setting some variables anyway.  I note that the new arm
> support doesn't use a $(subdir) guard either.

Thanks for pointing this out; I've applied this patch.  I was following 
HJ's instructions, which didn't mention anything about moving things out 
of conditionals.

diff --git a/ChangeLog.mips b/ChangeLog.mips
index ced2d36..6243cfc 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,5 +1,8 @@
 2012-05-30  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/unix/sysv/linux/mips/Makefile [subdir = misc]: Move ABI
+	settings out of conditional.
+
 	* sysdeps/unix/sysv/linux/mips/syscalls.list: Remove
 	__connect_internal alias.
 
diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile
index fd6e3e0..2bbc9a4 100644
--- a/sysdeps/unix/sysv/linux/mips/Makefile
+++ b/sysdeps/unix/sysv/linux/mips/Makefile
@@ -6,6 +6,7 @@ ifeq ($(subdir),misc)
 sysdep_routines += cachectl cacheflush sysmips _test_and_set
 
 sysdep_headers += sys/cachectl.h sys/sysmips.h sys/tas.h
+endif
 
 # _MIPS_SIM_ABI32 == 1, _MIPS_SIM_ABIN32 == 2, _MIPS_SIM_ABI64 == 3
 abi-variants := o32 n32 n64
@@ -16,7 +17,6 @@ abi-n32-options := -D_MIPS_SIM=2
 abi-n32-condition := _MIPS_SIM == _MIPS_SIM_ABIN32
 abi-n64-options := -D_MIPS_SIM=3
 abi-n64-condition := _MIPS_SIM == _MIPS_SIM_ABI64
-endif
 
 ifeq ($(subdir),elf)
 ifeq ($(build-shared),yes)

-- 
Joseph S. Myers
joseph@codesourcery.com