diff -Nru pocl-1.6/debian/changelog pocl-1.6/debian/changelog
--- pocl-1.6/debian/changelog	2021-02-03 20:21:03.000000000 +0000
+++ pocl-1.6/debian/changelog	2021-02-10 16:13:40.000000000 +0000
@@ -1,3 +1,10 @@
+pocl (1.6-4+rpi1) bullseye-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>  Wed, 10 Feb 2021 16:13:40 +0000
+
 pocl (1.6-4) unstable; urgency=medium
 
   * Restore setting unroll-threshold on LLVM 9 to avoid kernel/test_rotate
diff -Nru pocl-1.6/debian/libpocl2.symbols pocl-1.6/debian/libpocl2.symbols
--- pocl-1.6/debian/libpocl2.symbols	2021-02-03 20:21:03.000000000 +0000
+++ pocl-1.6/debian/libpocl2.symbols	2021-02-10 16:13:40.000000000 +0000
@@ -408,16 +408,16 @@
  _ZTIN4pocl9WorkgroupE@Base 0.12-5~llvm3.7
  (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)_ZTISt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail12DirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE1EE@Base 0.14-7~llvm4.0
- (arch=!armel !riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail12DirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
+ (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail12DirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
  (arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail15RecDirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE1EE@Base 0.14-7~llvm4.0
- (arch=!armel !riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail15RecDirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
+ (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail15RecDirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
  (arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN5clang22PCHContainerOperationsESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 0.12-5~llvm3.7
- (arch=!armel !riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN5clang22PCHContainerOperationsESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.12-5~llvm3.7
+ (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt23_Sp_counted_ptr_inplaceIN5clang22PCHContainerOperationsESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.12-5~llvm3.7
  _ZTS17BreakConstantGEPs@Base 0.12-5~llvm3.7
  _ZTS21WorkItemAliasAnalysis@Base 0.13
 #MISSING: 1.1-2~llvm5.0# _ZTSN4llvm10SelectInstE@Base 0.12-5~llvm3.7
@@ -452,16 +452,16 @@
  _ZTSN4pocl9WorkgroupE@Base 0.12-5~llvm3.7
  (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
  (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail12DirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE1EE@Base 0.14-7~llvm4.0
- (arch=!armel !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail12DirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
+ (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail12DirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
  (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail15RecDirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE1EE@Base 0.14-7~llvm4.0
- (arch=!armel !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail15RecDirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
+ (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail15RecDirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
  (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN5clang22PCHContainerOperationsESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 0.12-5~llvm3.7
- (arch=!armel !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN5clang22PCHContainerOperationsESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.12-5~llvm3.7
+ (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceIN5clang22PCHContainerOperationsESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.12-5~llvm3.7
  _ZTV17BreakConstantGEPs@Base 0.10
  _ZTV21WorkItemAliasAnalysis@Base 0.13
 #MISSING: 1.1-2~llvm5.0# _ZTVN4llvm10SelectInstE@Base 0.12-5~llvm3.7
@@ -492,11 +492,11 @@
  _ZTVN4pocl27ImplicitConditionalBarriersE@Base 0.10
  _ZTVN4pocl9WorkgroupE@Base 0.10
  (arch=armel riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail12DirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE1EE@Base 0.14-7~llvm4.0
- (arch=!armel !riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail12DirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
+ (optional=notarmelnotriscvandprobabllynotraspbian)_ZTVSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail12DirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
  (arch=armel riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail15RecDirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE1EE@Base 0.14-7~llvm4.0
- (arch=!armel !riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail15RecDirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
+ (optional=notarmelnotriscvandprobabllynotraspbian)_ZTVSt23_Sp_counted_ptr_inplaceIN4llvm3sys2fs6detail15RecDirIterStateESaIS4_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.14-7~llvm4.0
  (arch=armel riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN5clang22PCHContainerOperationsESaIS1_ELN9__gnu_cxx12_Lock_policyE1EE@Base 0.12-5~llvm3.7
- (arch=!armel !riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN5clang22PCHContainerOperationsESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.12-5~llvm3.7
+ (optional=notarmelnotriscvandprobabllynotraspbian)_ZTVSt23_Sp_counted_ptr_inplaceIN5clang22PCHContainerOperationsESaIS1_ELN9__gnu_cxx12_Lock_policyE2EE@Base 0.12-5~llvm3.7
  _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
  clGetExtensionFunctionAddress@Base 0.10