From 0c61ca1a6b78ff166db2687bc175fe8ab2912c1c Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Wed, 23 Aug 2006 11:20:06 +0200
Subject: [PATCH] Renamed addLinkerSymbols() to defineSymbols().

---
 src/p_lx_elf.cpp | 20 ++++++++++----------
 src/p_lx_elf.h   | 12 ++++++------
 src/p_mach.cpp   |  4 ++--
 src/p_mach.h     |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
index 72500442..25a976b1 100644
--- a/src/p_lx_elf.cpp
+++ b/src/p_lx_elf.cpp
@@ -195,7 +195,7 @@ PackLinuxElf::addStubEntrySections(Filter const *)
 }
 
 
-void PackLinuxElf::addLinkerSymbols(Filter const *)
+void PackLinuxElf::defineSymbols(Filter const *)
 {
     // empty
 }
@@ -420,7 +420,7 @@ void PackLinuxElf32x86::addStubEntrySections(Filter const *ft)
     addLoader("FOLDEXEC", NULL);
 }
 
-void PackLinuxElf32x86::addLinkerSymbols(Filter const *const ft)
+void PackLinuxElf32x86::defineSymbols(Filter const *const ft)
 {
     if (0x80==(ft->id & 0xF0)) {
         int const mru = ft->n_mru ? 1+ ft->n_mru : 0;
@@ -489,7 +489,7 @@ PackLinuxElf32::buildLinuxLoader(
     addStubEntrySections(ft);
 
     freezeLoader();
-    addLinkerSymbols(ft);
+    defineSymbols(ft);
     linker->relocate();
     return getLoaderSize();
 }
@@ -539,13 +539,13 @@ PackLinuxElf64::buildLinuxLoader(
     addStubEntrySections(ft);
 
     freezeLoader();
-    addLinkerSymbols(ft);
+    defineSymbols(ft);
     linker->relocate();
     return getLoaderSize();
 }
 
 void
-PackLinuxElf64amd::addLinkerSymbols(Filter const *)
+PackLinuxElf64amd::defineSymbols(Filter const *)
 {
     unsigned const hlen = sz_elf_hdrs + sizeof(l_info) + sizeof(p_info);
     unsigned len = sz_pack2;
@@ -1552,7 +1552,7 @@ PackLinuxElf32::ARM_buildLoader(const Filter *ft, bool const isBE)
     }
 }
 
-void PackLinuxElf32::ARM_addLinkerSymbols(Filter const * /*ft*/)
+void PackLinuxElf32::ARM_defineSymbols(Filter const * /*ft*/)
 {
     unsigned const hlen = sz_elf_hdrs + sizeof(l_info) + sizeof(p_info);
     unsigned const len0 = sz_pack2;
@@ -1601,14 +1601,14 @@ void PackLinuxElf32::ARM_addLinkerSymbols(Filter const * /*ft*/)
 #undef PAGE_MASK
 }
 
-void PackLinuxElf32armLe::addLinkerSymbols(Filter const *ft)
+void PackLinuxElf32armLe::defineSymbols(Filter const *ft)
 {
-    ARM_addLinkerSymbols(ft);
+    ARM_defineSymbols(ft);
 }
 
-void PackLinuxElf32armBe::addLinkerSymbols(Filter const *ft)
+void PackLinuxElf32armBe::defineSymbols(Filter const *ft)
 {
-    ARM_addLinkerSymbols(ft);
+    ARM_defineSymbols(ft);
 }
 
 void PackLinuxElf32::pack4(OutputFile *fo, Filter &ft)
diff --git a/src/p_lx_elf.h b/src/p_lx_elf.h
index 7a9fbd23..e397b32f 100644
--- a/src/p_lx_elf.h
+++ b/src/p_lx_elf.h
@@ -59,7 +59,7 @@ protected:
         void const *proto,
         unsigned const brka
     ) = 0;
-    virtual void addLinkerSymbols(Filter const *);
+    virtual void defineSymbols(Filter const *);
     virtual void addStubEntrySections(Filter const *);
     virtual void unpack(OutputFile *fo) = 0;
 
@@ -91,7 +91,7 @@ protected:
     // These ARM routines are essentially common to big/little endian,
     // but the class hierarchy splits after this class.
     virtual int ARM_buildLoader(Filter const *ft, bool isBE);
-    virtual void ARM_addLinkerSymbols(Filter const *ft);
+    virtual void ARM_defineSymbols(Filter const *ft);
     virtual void ARM_updateLoader(OutputFile *);
     virtual void ARM_pack1(OutputFile *, bool isBE);
 
@@ -290,7 +290,7 @@ protected:
     //virtual void pack3(OutputFile *, Filter &);  // append loader
     virtual int buildLoader(const Filter *);
     virtual Linker* newLinker() const;
-    virtual void addLinkerSymbols(Filter const *);
+    virtual void defineSymbols(Filter const *);
 };
 
 /*************************************************************************
@@ -334,7 +334,7 @@ protected:
     virtual int buildLoader(const Filter *);
     virtual void addStubEntrySections(Filter const *);
     virtual Linker* newLinker() const;
-    virtual void addLinkerSymbols(Filter const *);
+    virtual void defineSymbols(Filter const *);
 };
 
 class PackBSDElf32x86 : public PackLinuxElf32x86
@@ -404,7 +404,7 @@ protected:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
     virtual int buildLoader(const Filter *);
     virtual void updateLoader(OutputFile *);
-    virtual void addLinkerSymbols(Filter const *);
+    virtual void defineSymbols(Filter const *);
 };
 
 class PackLinuxElf32armBe : public PackLinuxElf32Be
@@ -423,7 +423,7 @@ protected:
     virtual void pack1(OutputFile *, Filter &);  // generate executable header
     virtual int buildLoader(const Filter *);
     virtual void updateLoader(OutputFile *);
-    virtual void addLinkerSymbols(Filter const *);
+    virtual void defineSymbols(Filter const *);
 };
 
 #endif /*} already included */
diff --git a/src/p_mach.cpp b/src/p_mach.cpp
index f30da44e..f46df6b5 100644
--- a/src/p_mach.cpp
+++ b/src/p_mach.cpp
@@ -84,7 +84,7 @@ PackMachPPC32::addStubEntrySections(Filter const *)
 }
 
 
-void PackMachPPC32::addLinkerSymbols(Filter const *)
+void PackMachPPC32::defineSymbols(Filter const *)
 {
     // empty
 }
@@ -132,7 +132,7 @@ PackMachPPC32::buildMachLoader(
     addStubEntrySections(ft);
 
     freezeLoader();
-    addLinkerSymbols(ft);
+    defineSymbols(ft);
     linker->relocate();
     return getLoaderSize();
 }
diff --git a/src/p_mach.h b/src/p_mach.h
index e2af1e8d..a055d3a2 100644
--- a/src/p_mach.h
+++ b/src/p_mach.h
@@ -191,7 +191,7 @@ protected:
         upx_byte const *const fold,
         unsigned        const szfold,
         Filter const *ft );
-    virtual void addLinkerSymbols(Filter const *);
+    virtual void defineSymbols(Filter const *);
     virtual void addStubEntrySections(Filter const *);
 
     unsigned  n_segment;