- Backport FA_TOUCH fixes from upsteam [bnc#1175025] [bnc#1177428]

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=558

ignore-auxv.diff

@@ -1,6 +1,6 @@
---- ./lib/rpmrc.c.orig	2020-09-30 07:48:01.215567727 +0000
-+++ ./lib/rpmrc.c	2020-09-30 12:22:46.612692258 +0000
-@@ -78,10 +78,12 @@ struct rpmOption {
+--- ./lib/rpmrc.c.orig	2019-06-26 14:17:31.416985688 +0000
++++ ./lib/rpmrc.c	2019-10-02 09:52:05.076903733 +0000
+@@ -79,11 +79,13 @@ struct rpmOption {
      int localize;
  };
  
@@ -8,21 +8,22 @@
  static struct rpmat_s {
      const char *platform;
      uint64_t hwcap;
+     uint64_t hwcap2;
  } rpmat;
 +#endif
  
  typedef struct defaultEntry_s {
      char * name;
-@@ -948,7 +950,7 @@ static int is_geode(void)
+@@ -950,7 +952,7 @@ static int is_geode(void)
  #endif
  
  
 -#if defined(__linux__)
 +#if defined(__linux__) && (defined(__powerpc__) || defined(__sparc__) || (defined(__arm__) && defined(__ARM_PCS_VFP)))
- /**
-  * Populate rpmat structure with auxv values
-  */
-@@ -1004,7 +1006,7 @@ static void defaultMachine(rpmrcCtx ctx,
+ #ifndef AT_HWCAP2 /* glibc < 2.18 */
+ #define AT_HWCAP2 26
+ #endif
+@@ -1013,7 +1015,7 @@ static void defaultMachine(rpmrcCtx ctx,
      canonEntry canon;
      int rc;