about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-10-19 22:34:20 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-10-19 22:34:20 +0000
commit864198ed3011a446f42fc9dcb6d39617ce2477ea (patch)
tree3e5120d147d5eac8e145e2313b21df921a4b72ed /elf
parentd10a3ab27329c49a0feb86a10affb1f69054e4ab (diff)
downloadglibc-864198ed3011a446f42fc9dcb6d39617ce2477ea.tar.gz
glibc-864198ed3011a446f42fc9dcb6d39617ce2477ea.tar.xz
glibc-864198ed3011a446f42fc9dcb6d39617ce2477ea.zip
Remove gnu_unique_object configure test.
There is a configure test for assembler support for the
gnu_unique_object symbol type.  This support was added in binutils
2.20, so is present in all versions supported for building glibc.

Thus, I think the configure test can be removed; this patch does so.
Now, there is a caveat that the gas NEWS entry refers to this as a
feature for GNU/Linux targets.  But the condition is use of
ELFOSABI_GNU or ELFOSABI_NONE.  ELFOSABI_GNU covers Hurd as well as
GNU/Linux (as was the case with the older ELFOSABI_LINUX name), and
ELFOSABI_NONE means this is effectively OS-independent.  Furthermore,
I think a correct binutils port for any glibc target ought to support
this feature for use with glibc; glibc supports this as an
OS-independent feature (the configure test is only about glibc
testcases).

Tested for x86_64 (testsuite, and that installed shared libraries are
unchanged by the patch).

	* configure.ac (libc_cv_asm_unique_object): Remove configure test.
	* configure: Regenerated.
	* config.h.in (HAVE_ASM_UNIQUE_OBJECT): Remove #undef.
	* elf/tst-unique1.c (do_test) [HAVE_ASM_UNIQUE_OBJECT]: Make code
	unconditional.
	* elf/tst-unique1mod1.c [HAVE_ASM_UNIQUE_OBJECT]: Likewise.
	* elf/tst-unique1mod2.c [HAVE_ASM_UNIQUE_OBJECT]: Likewise.
	* elf/tst-unique2.c (do_test) [HAVE_ASM_UNIQUE_OBJECT]: Likewise.
	(do_test) [!HAVE_ASM_UNIQUE_OBJECT]: Remove conditional code.
	* elf/tst-unique2mod1.c [HAVE_ASM_UNIQUE_OBJECT]: Make code
	unconditional.
	* elf/tst-unique2mod2.c [HAVE_ASM_UNIQUE_OBJECT]: Likewise.
Diffstat (limited to 'elf')
-rw-r--r--elf/tst-unique1.c2
-rw-r--r--elf/tst-unique1mod1.c2
-rw-r--r--elf/tst-unique1mod2.c2
-rw-r--r--elf/tst-unique2.c4
-rw-r--r--elf/tst-unique2mod1.c2
-rw-r--r--elf/tst-unique2mod2.c2
6 files changed, 0 insertions, 14 deletions
diff --git a/elf/tst-unique1.c b/elf/tst-unique1.c
index 46d41d9ff4..17af6f1b18 100644
--- a/elf/tst-unique1.c
+++ b/elf/tst-unique1.c
@@ -6,7 +6,6 @@
 static int
 do_test (void)
 {
-#ifdef HAVE_ASM_UNIQUE_OBJECT
   void *h1 = dlopen ("tst-unique1mod1.so", RTLD_LAZY);
   if (h1 == NULL)
     {
@@ -68,7 +67,6 @@ do_test (void)
       puts ("f from tst-unique1mod2 failed");
       return 1;
     }
-#endif
   return 0;
 }
 
diff --git a/elf/tst-unique1mod1.c b/elf/tst-unique1mod1.c
index f59029d055..84b1f908d6 100644
--- a/elf/tst-unique1mod1.c
+++ b/elf/tst-unique1mod1.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#ifdef HAVE_ASM_UNIQUE_OBJECT
 asm (".data;"
      ".globl var\n"
      ".type var, %gnu_unique_object\n"
@@ -15,4 +14,3 @@ f (void)
   var = 1;
   return &var;
 }
-#endif
diff --git a/elf/tst-unique1mod2.c b/elf/tst-unique1mod2.c
index aa28f29ba9..126ca1ac6c 100644
--- a/elf/tst-unique1mod2.c
+++ b/elf/tst-unique1mod2.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#ifdef HAVE_ASM_UNIQUE_OBJECT
 asm (".data;"
      ".globl var\n"
      ".type var, %gnu_unique_object\n"
@@ -14,4 +13,3 @@ f (int *p)
 {
   return &var != p || *p != 1;
 }
-#endif
diff --git a/elf/tst-unique2.c b/elf/tst-unique2.c
index 7bb0687364..442675458b 100644
--- a/elf/tst-unique2.c
+++ b/elf/tst-unique2.c
@@ -7,7 +7,6 @@ extern int var;
 static int
 do_test (void)
 {
-#ifdef HAVE_ASM_UNIQUE_OBJECT
   var = 1;
 
   void *h = dlopen ("tst-unique2mod2.so", RTLD_LAZY);
@@ -23,9 +22,6 @@ do_test (void)
       return 1;
     }
   return f (&var);
-#else
-  return 0;
-#endif
 }
 
 #define TEST_FUNCTION do_test ()
diff --git a/elf/tst-unique2mod1.c b/elf/tst-unique2mod1.c
index b7e491b2e5..7cdb0eb0a0 100644
--- a/elf/tst-unique2mod1.c
+++ b/elf/tst-unique2mod1.c
@@ -1,10 +1,8 @@
 #include <config.h>
 
-#ifdef HAVE_ASM_UNIQUE_OBJECT
 asm (".data;"
      ".globl var\n"
      ".type var, %gnu_unique_object\n"
      ".size var, 4\n"
      "var:.zero 4\n"
      ".previous");
-#endif
diff --git a/elf/tst-unique2mod2.c b/elf/tst-unique2mod2.c
index aa28f29ba9..126ca1ac6c 100644
--- a/elf/tst-unique2mod2.c
+++ b/elf/tst-unique2mod2.c
@@ -1,6 +1,5 @@
 #include <config.h>
 
-#ifdef HAVE_ASM_UNIQUE_OBJECT
 asm (".data;"
      ".globl var\n"
      ".type var, %gnu_unique_object\n"
@@ -14,4 +13,3 @@ f (int *p)
 {
   return &var != p || *p != 1;
 }
-#endif