Merge version 6.0-1+rpi1 and 6.0-4 to produce 6.0-4+rpi1

diff --cc debian/changelog
index 529afc2d91ac64204e180047a2c54efdfde96b97,a307b180d2943e30cf46dbd7ae136b9ada347ac0..bead6842eaa12b3787f32517a84693647b34709b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,27 +1,40 @@@
- pocl (6.0-1+rpi1) trixie-staging; urgency=medium
++pocl (6.0-4+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.5-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 26 Dec 2020 20:26:31 +0000]
 +  * Update symbols file for raspbian.
 + 
 +  [changes introduced in 3.0-4+rpi1 by Peter Michael Green]
 +  * Mark another symbol that does not appear in Raspbian as optional.
 +
 +  [changes introduced in 3.0-6+rpi1 by Peter Michael Green]
 +  * Mark another symbol that does not appear in Raspbian as optional.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 04 Jul 2024 21:58:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Jan 2025 18:06:36 +0000
++
+ pocl (6.0-4) unstable; urgency=medium
+ 
+   * Update symbols file.
+   * Drop unneeded -dev paragraph from -doc description.  (Closes: #1081689)
+   * Cherry-pick commit from upstream that as a side effect fixed "LLVM ERROR:
+     Instruction Combining did not reach a fixpoint after 1 iterations".
+     (Closes: #1091190)
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Thu, 09 Jan 2025 12:44:04 +0100
+ 
+ pocl (6.0-3) unstable; urgency=medium
+ 
+   * Switch to llvm 18.
+   * Update symbols file for amd64 and i386.
+   * Bump Standards-Version to 4.7.0, no changes needed.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Sat, 28 Sep 2024 21:54:32 +0200
+ 
+ pocl (6.0-2) unstable; urgency=medium
+ 
+   * Do not treat x32 as i386.
+   * Rebuild with GCC 14.  (Closes: #1075393)
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Fri, 26 Jul 2024 04:30:59 +0200
  
  pocl (6.0-1) unstable; urgency=medium
  

diff --cc debian/libpocl2t64.symbols
index 6b5bfc600c7867aa7d9a35aa6c1cecc8d57a5496,b6e21856a9b0aba114f7546c25a3654a74b596d7..b847cf3ec17399faf982735e8b163ce6773c6af1
--- 1/debian/libpocl2t64.symbols
--- 2/debian/libpocl2t64.symbols
+++ b/debian/libpocl2t64.symbols
@@@ -86,12 -90,12 +88,12 @@@ libpocl.so.2 #PACKAGE# #MINVER
   _ZTINSt8__detail15_BracketMatcherINSt7__cxx1112regex_traitsIcEELb1ELb0EEE@Base 3.0
   _ZTINSt8__detail15_BracketMatcherINSt7__cxx1112regex_traitsIcEELb1ELb1EEE@Base 3.0
   (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.10
 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
   (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.10
 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
-  (arch=armel armhf)_ZTISt19_Sp_make_shared_tag@Base 0.10
-  _ZTSN4llvm3Any11StorageBaseE@Base 5.0-2~llvm16
-  _ZTSN4llvm3Any11StorageImplIPKNS_6ModuleEEE@Base 5.0-2~llvm16
+  (arch=any-i386 armel armhf powerpc)_ZTISt19_Sp_make_shared_tag@Base 6.0-3~llvm18
+  (optional=lto)_ZTSN4llvm3Any11StorageBaseE@Base 5.0-2~llvm16
+  (optional=lto)_ZTSN4llvm3Any11StorageImplIPKNS_6ModuleEEE@Base 5.0-2~llvm16
   (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Base 1.0
   _ZTSNSt8__detail11_AnyMatcherINSt7__cxx1112regex_traitsIcEELb0ELb0ELb0EEE@Base 3.0
   _ZTSNSt8__detail11_AnyMatcherINSt7__cxx1112regex_traitsIcEELb0ELb0ELb1EEE@Base 3.0