From ba6adff8d0bf6b2a4a9dc34e7ee120b5f378b398 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 15 Mar 2011 15:15:04 +0000 Subject: [PATCH] Fix abicheck to handle ppc64 architecture According to Alan Modra, the PowerPC64 ABI defines function symbols on their OPD entry, in the .opd section which is part of the data segment; so functions on this architecture have symbol type D in nm. The adjusted regex is slightly more accurate than the old one, which matched anything containing " T", "R", or "G ". Using a bracket expression seems to better match the likely intent of this regex. --- libxfce4util/abicheck.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libxfce4util/abicheck.sh b/libxfce4util/abicheck.sh index a4a2955..ed0afdc 100755 --- a/libxfce4util/abicheck.sh +++ b/libxfce4util/abicheck.sh @@ -20,5 +20,5 @@ # cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/libxfce4util.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi -nm -D .libs/libxfce4util.so | grep " T\|R\|G " | cut -d ' ' -f 3 | grep -v '^_.*' | grep -v '^ *$' | sort > actual-abi +nm -D .libs/libxfce4util.so | grep " [TRGD] " | cut -d ' ' -f 3 | grep -v '^_.*' | grep -v '^ *$' | sort > actual-abi diff -u expected-abi actual-abi && rm expected-abi actual-abi -- 1.7.4.1