Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Oct 2022 16:00:54 GMT
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 829145388bad - main - x86/include/elf.h: make inclusion blocks for elf32.h and elf64.h similar
Message-ID:  <202210251600.29PG0se4090552@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=829145388badfa70796b97bed1d92be254966766

commit 829145388badfa70796b97bed1d92be254966766
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2022-10-22 20:05:59 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2022-10-25 16:00:44 +0000

    x86/include/elf.h: make inclusion blocks for elf32.h and elf64.h similar
    
    They were copy-pasted when x86/include/elf.h file was merged from its
    i386 and amd64 counterparts.  Having the text around inclusions
    significantly different is somewhat confusing.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D37085
---
 sys/x86/include/elf.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/sys/x86/include/elf.h b/sys/x86/include/elf.h
index e8744858e4b7..7b2825579e65 100644
--- a/sys/x86/include/elf.h
+++ b/sys/x86/include/elf.h
@@ -32,14 +32,11 @@
 #define	_MACHINE_ELF_H_ 1
 
 #if defined(__i386__) || defined(_MACHINE_ELF_WANT_32BIT)
-
-/*
- * ELF definitions for the i386 architecture.
- */
-
+/* ELF definitions for the i386 architecture. */
 #include <sys/elf32.h>	/* Definitions common to all 32 bit architectures. */
 #if defined(__ELF_WORD_SIZE) && __ELF_WORD_SIZE == 64
-#include <sys/elf64.h>	/* Definitions common to all 64 bit architectures. */
+/* Definitions common to all 64 bit architectures. */
+#include <sys/elf64.h>
 #endif
 
 #ifndef __ELF_WORD_SIZE



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210251600.29PG0se4090552>