public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
From: Andreas Jaeger <aj@suse.de>
To: binutils@sources.redhat.com
Subject: Small cleanup for x86-64
Date: Fri, 01 Jun 2001 04:52:00 -0000	[thread overview]
Message-ID: <hoofs85set.fsf@gee.suse.de> (raw)

The patch I've send yesterday is broken.  Before fixing this properly,
I'm committing now just a small cleanup patch.

Andreas

2001-06-01  Andreas Jaeger  <aj@suse.de>

	* elf64-x86-64.c (elf64_x86_64_relocate_section): Add PC8
	relocation, small reformatting.

Index: bfd/elf64-x86-64.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-x86-64.c,v
retrieving revision 1.17
diff -u -r1.17 elf64-x86-64.c
--- elf64-x86-64.c	2001/05/30 18:44:46	1.17
+++ elf64-x86-64.c	2001/06/01 11:50:05
@@ -1264,12 +1264,13 @@
 		      && ((! info->symbolic && h->dynindx != -1)
 			  || (h->elf_link_hash_flags
 			      & ELF_LINK_HASH_DEF_REGULAR) == 0)
-		      && ( r_type == R_X86_64_8 ||
-			   r_type == R_X86_64_16 ||
-                           r_type == R_X86_64_32 ||
-			   r_type == R_X86_64_64 ||
-                           r_type == R_X86_64_PC16 ||
-			   r_type == R_X86_64_PC32)
+		      && (r_type == R_X86_64_8
+			  || r_type == R_X86_64_16
+			  || r_type == R_X86_64_32
+			  || r_type == R_X86_64_64
+                         || r_type == R_X86_64_PC8
+			  || r_type == R_X86_64_PC16
+			  || r_type == R_X86_64_PC32)
                       && ((input_section->flags & SEC_ALLOC) != 0
                           /* DWARF will emit R_X86_64_32 relocations in its
                              sections against symbols defined externally
@@ -1440,11 +1441,12 @@
 	case R_X86_64_PC8:
 	case R_X86_64_PC16:
 	case R_X86_64_PC32:
-	  /* FIXME: The abi says the linker should make sure the value is
+	  /* FIXME: The ABI says the linker should make sure the value is
 	     the same when it's zeroextended to 64 bit.	 */
 	  if (info->shared
 	      && (input_section->flags & SEC_ALLOC) != 0
-	      && ((r_type != R_X86_64_PC8 && r_type != R_X86_64_PC16
+	      && ((r_type != R_X86_64_PC8
+		   && r_type != R_X86_64_PC16
 		   && r_type != R_X86_64_PC32)
 		  || (h != NULL
 		      && h->dynindx != -1
@@ -1505,7 +1507,8 @@
 		  memset (&outrel, 0, sizeof outrel);
 		  relocate = false;
 		}
-	      else if ((r_type == R_X86_64_PC8) || (r_type == R_X86_64_PC16)
+	      else if ((r_type == R_X86_64_PC8)
+		       || (r_type == R_X86_64_PC16)
 		       || (r_type == R_X86_64_PC32))
 		{
 		  BFD_ASSERT (h != NULL && h->dynindx != -1);

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.inka.de
    http://www.suse.de/~aj

                 reply	other threads:[~2001-06-01  4:52 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=hoofs85set.fsf@gee.suse.de \
    --to=aj@suse.de \
    --cc=binutils@sources.redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).