Merging upstream version 1.22.11.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 102 insertions, 0 deletions

diff --git a/scripts/t/Dpkg_Shlibs/anglebrackets.cpp b/scripts/t/Dpkg_Shlibs/anglebrackets.cpp
new file mode 100644
index 0000000..0db112e
--- /dev/null
+++ b/scripts/t/Dpkg_Shlibs/anglebrackets.cpp
@@ -0,0 +1,23 @@
+#define EXPORT(x) x {}
+
+class AngleBrackets {
+public:
+	AngleBrackets();
+	~AngleBrackets();
+
+	void operator>>(int a);
+	void operator>>=(int a);
+
+	template<typename T>
+	void operator>>(T a);
+
+	template<typename T>
+	void operator>>=(T a);
+};
+
+EXPORT(AngleBrackets::AngleBrackets())
+EXPORT(AngleBrackets::~AngleBrackets())
+EXPORT(void AngleBrackets::operator>>(int a))
+EXPORT(void AngleBrackets::operator>>=(int a))
+template<> void AngleBrackets::operator>><float>(float a) {}
+template<> void AngleBrackets::operator>>=<float>(float a) {}
diff --git a/scripts/t/Dpkg_Shlibs/anglebrackets.symbols b/scripts/t/Dpkg_Shlibs/anglebrackets.symbols
new file mode 100644
index 0000000..a98846d
--- /dev/null
+++ b/scripts/t/Dpkg_Shlibs/anglebrackets.symbols
@@ -0,0 +1,7 @@
+libanglebrackets.so.1 libanglebrackets1 #MINVER#
+ (c++)AngleBrackets::AngleBrackets() 1
+ (c++)AngleBrackets::~AngleBrackets() 1
+ (c++)AngleBrackets::operator>>=(int) 1
+ (c++)"void AngleBrackets::operator>>=<float>(float)" 1
+ (c++)AngleBrackets::operator>>(int) 1
+ (c++)"void AngleBrackets::operator>><float>(float)" 1
diff --git a/scripts/t/Dpkg_Shlibs/objdump.anglebrackets b/scripts/t/Dpkg_Shlibs/objdump.anglebrackets
new file mode 100644
index 0000000..68a1e1a
--- /dev/null
+++ b/scripts/t/Dpkg_Shlibs/objdump.anglebrackets
@@ -0,0 +1,71 @@
+
+./t/Dpkg_Shlibs/libobjdump.anglebrackets.so:     file format elf32-i386
+architecture: i386, flags 0x00000150:
+HAS_SYMS, DYNAMIC, D_PAGED
+start address 0x00000000
+
+Program Header:
+    LOAD off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**12
+         filesz 0x000003f4 memsz 0x000003f4 flags r--
+    LOAD off    0x00001000 vaddr 0x00001000 paddr 0x00001000 align 2**12
+         filesz 0x000001a8 memsz 0x000001a8 flags r-x
+    LOAD off    0x00002000 vaddr 0x00002000 paddr 0x00002000 align 2**12
+         filesz 0x00000118 memsz 0x00000118 flags r--
+    LOAD off    0x00002f2c vaddr 0x00003f2c paddr 0x00003f2c align 2**12
+         filesz 0x000000d8 memsz 0x000000dc flags rw-
+ DYNAMIC off    0x00002f34 vaddr 0x00003f34 paddr 0x00003f34 align 2**2
+         filesz 0x000000b0 memsz 0x000000b0 flags rw-
+    NOTE off    0x00000154 vaddr 0x00000154 paddr 0x00000154 align 2**2
+         filesz 0x00000024 memsz 0x00000024 flags r--
+EH_FRAME off    0x00002000 vaddr 0x00002000 paddr 0x00002000 align 2**2
+         filesz 0x0000004c memsz 0x0000004c flags r--
+   STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**4
+         filesz 0x00000000 memsz 0x00000000 flags rw-
+   RELRO off    0x00002f2c vaddr 0x00003f2c paddr 0x00003f2c align 2**0
+         filesz 0x000000d4 memsz 0x000000d4 flags r--
+
+Dynamic Section:
+  SONAME               libanglebrackets.so.1
+  INIT                 0x00001000
+  FINI                 0x00001194
+  INIT_ARRAY           0x00003f2c
+  INIT_ARRAYSZ         0x00000004
+  FINI_ARRAY           0x00003f30
+  FINI_ARRAYSZ         0x00000004
+  GNU_HASH             0x00000178
+  STRTAB               0x0000028c
+  SYMTAB               0x000001bc
+  STRSZ                0x0000012d
+  SYMENT               0x00000010
+  PLTGOT               0x00003ff4
+  REL                  0x000003bc
+  RELSZ                0x00000038
+  RELENT               0x00000008
+  RELCOUNT             0x00000003
+
+DYNAMIC SYMBOL TABLE:
+00000000  w   D  *UND*	00000000 __cxa_finalize
+00000000  w   D  *UND*	00000000 _ITM_registerTMCloneTable
+00000000  w   D  *UND*	00000000 _ITM_deregisterTMCloneTable
+00000000  w   D  *UND*	00000000 __gmon_start__
+00001170 g    DF .text	00000001 _ZN13AngleBracketsrSEi
+00001190 g    DF .text	00000001 _ZN13AngleBracketsrSIfEEvT_
+00001180 g    DF .text	00000001 _ZN13AngleBracketsrsIfEEvT_
+00001160 g    DF .text	00000001 _ZN13AngleBracketsrsEi
+00001140 g    DF .text	00000001 _ZN13AngleBracketsC1Ev
+00001140 g    DF .text	00000001 _ZN13AngleBracketsC2Ev
+00001150 g    DF .text	00000001 _ZN13AngleBracketsD1Ev
+00001150 g    DF .text	00000001 _ZN13AngleBracketsD2Ev
+
+
+DYNAMIC RELOCATION RECORDS
+OFFSET   TYPE              VALUE
+00003f2c R_386_RELATIVE    *ABS*
+00003f30 R_386_RELATIVE    *ABS*
+00004000 R_386_RELATIVE    *ABS*
+00003fe4 R_386_GLOB_DAT    __cxa_finalize
+00003fe8 R_386_GLOB_DAT    _ITM_registerTMCloneTable
+00003fec R_386_GLOB_DAT    _ITM_deregisterTMCloneTable
+00003ff0 R_386_GLOB_DAT    __gmon_start__
+
+
diff --git a/scripts/t/Dpkg_Shlibs/spacesyms-c-gen.pl b/scripts/t/Dpkg_Shlibs/spacesyms-c-gen.pl
index 48434f4..2d1f326 100755
--- a/scripts/t/Dpkg_Shlibs/spacesyms-c-gen.pl
+++ b/scripts/t/Dpkg_Shlibs/spacesyms-c-gen.pl
@@ -30,6 +30,7 @@ foreach my $version (qw(defaultver longver shortver)) {
     }
 }
 
+print "extern void (*funcs[])(void);\n";
 print "void (*funcs[])(void) = {\n";
 foreach my $symbol (@symbols) {
     print "$symbol,\n";