From 78afe2b06274dffacae8dbf891e9bd9f6a87c7645f443c57c71e1957ae43e692 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 30 Sep 2011 15:15:00 +0000
Subject: [PATCH] - avoid build failure on %%arm

- just use %arm for right arm architectures

OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=114
---
 crypt_blowfish-1.2-hack_around_arm.diff | 13 +++++++++++++
 glibc.changes                           | 10 ++++++++++
 glibc.spec                              | 11 ++++++++---
 3 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 crypt_blowfish-1.2-hack_around_arm.diff

diff --git a/crypt_blowfish-1.2-hack_around_arm.diff b/crypt_blowfish-1.2-hack_around_arm.diff
new file mode 100644
index 0000000..95a0887
--- /dev/null
+++ b/crypt_blowfish-1.2-hack_around_arm.diff
@@ -0,0 +1,13 @@
+--- x86.S
++++ x86.S
+@@ -196,8 +196,8 @@
+ 	hlt
+ 	jmp BF_die
+ 
+-#endif
+-
+ #if defined(__ELF__) && defined(__linux__)
+ .section .note.GNU-stack,"",@progbits
+ #endif
++
++#endif
diff --git a/glibc.changes b/glibc.changes
index df2a1f4..6ad5274 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Sep 30 17:14:04 CEST 2011 - dmueller@suse.de
+
+- avoid build failure on %%arm
+
+-------------------------------------------------------------------
+Thu Sep 29 07:40:25 UTC 2011 - adrian@suse.de
+
+- just use %arm for right arm architectures
+
 -------------------------------------------------------------------
 Tue Sep 27 11:24:02 UTC 2011 - aj@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index 2f28b07..5b66225 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -210,6 +210,8 @@ Patch74:        glibc-2.14-fix-ctors.patch
 Patch80:        crypt_blowfish-1.2-sha.diff
 # PATCH-FEATURE-OPENSUSE -- use separate symbol version for Owl extensions - lnussel@suse.de
 Patch81:        crypt_blowfish-1.2-versioning.diff
+# PATCH-FIX-OPENSUSE Avoid build failure on noexecstack marker on ARM dmueller@suse.de
+Patch82:        crypt_blowfish-1.2-hack_around_arm.diff
 
 %description
 The GNU C Library provides the most important standard libraries used
@@ -366,7 +368,7 @@ versions of your software.
 %endif
 
 %prep
-%ifarch %arm armv5tel armv7l armv8l
+%ifarch %arm
 # add glibc-ports for arm
 %setup -n glibc-%{version} -q -a 2 -a 3 -a 4
 %else
@@ -378,6 +380,9 @@ tar -xzf %SOURCE50
 pushd crypt_blowfish-%{crypt_bf_version}
 %patch80 -p1
 %patch81 -p1
+%ifarch %arm
+%patch82
+%endif
 popd
 mv crypt/{crypt.h,gnu-crypt.h}
 mv crypt_blowfish-%crypt_bf_version/*.[chS] crypt/
@@ -534,7 +539,7 @@ PARALLEL="%{?_smp_mflags}"
 %ifarch %ix86
 	add_ons=$add_ons,noversion
 %endif
-%ifarch %arm armv5tel armv7l armv8l
+%ifarch %arm
 	add_ons=$add_ons,glibc-ports-%{version}
 	# fails to build otherwise - need to recheck and fix
 	%define enable_stackguard_randomization 0
@@ -554,7 +559,7 @@ configure_and_build_glibc() {
 %if %{enable_stackguard_randomization}
 		--enable-stackguard-randomization \
 %endif
-%ifarch %arm armv5tel armv7l armv8l
+%ifarch %arm
 		--build=%{_target_cpu}-suse-linux-gnueabi \
 %else
 		--build=%{_target_cpu}-suse-linux \