diff -Nru pocl-1.7/debian/changelog pocl-1.7/debian/changelog
--- pocl-1.7/debian/changelog	2021-09-30 16:07:33.000000000 +0000
+++ pocl-1.7/debian/changelog	2021-10-14 15:52:34.000000000 +0000
@@ -1,3 +1,10 @@
+pocl (1.7-2+rpi1) bookworm-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.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Oct 2021 15:52:34 +0000
+
 pocl (1.7-2) unstable; urgency=medium
 
   * Work around getconf on qemu/riscv64 returning 'undefined', thanks to
diff -Nru pocl-1.7/debian/libpocl2.symbols pocl-1.7/debian/libpocl2.symbols
--- pocl-1.7/debian/libpocl2.symbols	2021-09-30 16:07:33.000000000 +0000
+++ pocl-1.7/debian/libpocl2.symbols	2021-10-14 15:52:34.000000000 +0000
@@ -32,15 +32,15 @@
  (optional=templinst)_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEPKS5_RKS8_@Base 1.6-2~hardening
  (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@Base 1.4-5~llvm9
  (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
  (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Base 1.0
  (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.10
- (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
+ (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
  (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.10
- (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
+ (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
  _ZTSSt19_Sp_make_shared_tag@Base 0.10
  _ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag@Base 1.1-8~llvm6.0+gcc8.2
 #MISSING: 0.14# check_compiler_cache@Base 0.10