This is the mail archive of the elfutils-devel@sourceware.org mailing list for the elfutils 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]

[patch] Code cleanup: Unify {BE,LE}{32,64} in lib/system.h.


Hi,

jankratochvil/bele

if you made some #include in link_maps.c it could:

link_map.c:51:0: error: "LE32" redefined [-Werror]
In file included from link_map.c:32:0:
../lib/system.h:40:0: note: this is the location of the previous definition


Thanks,
Jan


commit 1704baf67698c269bc81fbaec0483e53d9709702
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Apr 26 17:00:50 2013 +0200

    Unify {BE,LE}{32,64} in lib/system.h.
    
    lib/
    	* system.h (LE64, BE64): Move here the definitions from
    	libdwfl/link_map.c.
    
    libdwfl/
    	* link_map.c (BE32, BE64, LE32, LE64): Delete the definitions, move
    	them to lib/system.h.
    
    Signed-off-by: Jan Kratochvil <jan.kratochvil@redhat.com>

diff --git a/lib/ChangeLog b/lib/ChangeLog
index b97aba3..1fa4249 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* system.h (LE64, BE64): Move here the definitions from
+	libdwfl/link_map.c.
+
 2013-04-24  Mark Wielaard  <mjw@redhat.com>
 
 	* Makefile.am: Use AM_CPPFLAGS instead of INCLUDES.
diff --git a/lib/system.h b/lib/system.h
index 8367f2b..f31cfd0 100644
--- a/lib/system.h
+++ b/lib/system.h
@@ -38,10 +38,14 @@
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 # define LE32(n)	(n)
+# define LE64(n)	(n)
 # define BE32(n)	bswap_32 (n)
+# define BE64(n)	bswap_64 (n)
 #elif __BYTE_ORDER == __BIG_ENDIAN
 # define BE32(n)	(n)
+# define BE64(n)	(n)
 # define LE32(n)	bswap_32 (n)
+# define LE64(n)	bswap_64 (n)
 #else
 # error "Unknown byte order"
 #endif
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index e8285d1..0160534 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* link_map.c (BE32, BE64, LE32, LE64): Delete the definitions, move
+	them to lib/system.h.
+
 2013-04-24  Mark Wielaard  <mjw@redhat.com>
 
 	* Makefile.am: Use AM_CPPFLAGS instead of INCLUDES.
diff --git a/libdwfl/link_map.c b/libdwfl/link_map.c
index 00913fe..19f92df 100644
--- a/libdwfl/link_map.c
+++ b/libdwfl/link_map.c
@@ -39,18 +39,6 @@
 #define PROBE_VAL32	sizeof (Elf32_Phdr)
 #define PROBE_VAL64	sizeof (Elf64_Phdr)
 
-#if BYTE_ORDER == BIG_ENDIAN
-# define BE32(x)	(x)
-# define BE64(x)	(x)
-# define LE32(x)	bswap_32 (x)
-# define LE64(x)	bswap_64 (x)
-#else
-# define LE32(x)	(x)
-# define LE64(x)	(x)
-# define BE32(x)	bswap_32 (x)
-# define BE64(x)	bswap_64 (x)
-#endif
-
 
 /* Examine an auxv data block and determine its format.
    Return true iff we figured it out.  */

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