This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] [ARM] FDPIC: Fix ld testcase not to conflict with uclibc's includes.


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=f350fc2e37d79119afa73361f331b8be1174cf40

commit f350fc2e37d79119afa73361f331b8be1174cf40
Author: Christophe Lyon <christophe.lyon@st.com>
Date:   Tue Mar 20 10:56:02 2018 +0100

    [ARM] FDPIC: Fix ld testcase not to conflict with uclibc's includes.
    
    2018-04-25  Christophe Lyon  <christophe.lyon@st.com>
    	Mickaël Guêné  <mickael.guene@st.com>
    
    	ld/
    	* testsuite/ld-elf/pr2404b.c (main): Rename time variable into
    	time1.

Diff:
---
 ld/ChangeLog                  | 6 ++++++
 ld/testsuite/ld-elf/pr2404b.c | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 30de4cb..07f1723 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,6 +1,12 @@
 2018-04-25  Christophe Lyon  <christophe.lyon@st.com>
 	Mickaël Guêné  <mickael.guene@st.com>
 
+	* testsuite/ld-elf/pr2404b.c (main): Rename time variable into
+	time1.
+
+2018-04-25  Christophe Lyon  <christophe.lyon@st.com>
+	Mickaël Guêné  <mickael.guene@st.com>
+
 	* scripttempl/elf.sc: Define __tdata_start for .tdata section.
 
 2018-04-25  Christophe Lyon  <christophe.lyon@st.com>
diff --git a/ld/testsuite/ld-elf/pr2404b.c b/ld/testsuite/ld-elf/pr2404b.c
index 5f0f7b4..4bbc2b1 100644
--- a/ld/testsuite/ld-elf/pr2404b.c
+++ b/ld/testsuite/ld-elf/pr2404b.c
@@ -3,7 +3,7 @@
 extern int bar (void);
 
 int times = -1;
-int time;
+int time1;
 
 int
 main ()
@@ -12,9 +12,9 @@ main ()
   times = 20;
   printf ("times: %d\n", times);
 
-  printf ("time: %d\n", time);
-  time = 10;
-  printf ("time: %d\n", time);
+  printf ("time1: %d\n", time1);
+  time1 = 10;
+  printf ("time: %d\n", time1);
   bar ();
 
   return 0;


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]