Enabled VPATH feature: changed nearly all Makefiles (149 files).

[fw/sdcc] / support / regression / tests / libmullong.c

diff --git a/support/regression/tests/libmullong.c b/support/regression/tests/libmullong.c
index efe0c816c96ca7336ffde6e96b74160d3876f7e5..a469b93af99936c2528ed1042359fff2620f75c1 100644 (file)
--- a/support/regression/tests/libmullong.c
+++ b/support/regression/tests/libmullong.c
@@ -7,21 +7,19 @@
 #define type_{type}
 
 #if defined(PORT_HOST)
-#  include "../../../../../sdccconf.h"
+#  include "sdccconf.h"
+#  define mullong(a,b) mullong_wrapper(a,b)
 #  if defined(type_c) && !defined(WORDS_BIGENDIAN)
 #    define _SDCC_NO_ASM_LIB_FUNCS 1
 #    define near
 #    define long int
-#    include "../../../../../device/lib/_mullong.c"
-#    define mullong(a,b) mullong_wrapper(a,b)
-#  else
-#    define mullong(a,b) mullong_wrapper(a,b)
+#    include "device/lib/_mullong.c"
 #  endif
 #else
 #  if defined(type_c)
 #    define _SDCC_NO_ASM_LIB_FUNCS 1
 #  endif
-#  include "../../../../../device/lib/_mullong.c"
+#  include "device/lib/_mullong.c"
 #  define mullong _mullong
 #endif
 
@@ -37,25 +35,24 @@ struct
   short i;
   char c2;
 } pack_test;
-       
-long
-mullong_wrapper (long a, long b)
+
+TYPE_DWORD
+mullong_wrapper (TYPE_DWORD a, TYPE_DWORD b)
 {
   if (sizeof(pack_test) == 4)
     /* length of struct ok: use SDCC library */
     return _mullong (a, b);
   else
-  {
+    {
       /* buggy gcc: use generic multiplication */
       return a * b;
-  }
+    }
 }
-#endif
 
-#if defined(WORDS_BIGENDIAN)
+#else
 
-long
-mullong_wrapper (long a, long b)
+TYPE_DWORD
+mullong_wrapper (TYPE_DWORD a, TYPE_DWORD b)
 {
     return a * b;
 }